more cleanup

This commit is contained in:
austin 2024-07-13 16:00:48 -04:00
parent 0bec1386f1
commit 856e0a6b22
138 changed files with 115 additions and 576 deletions

View File

@ -1,8 +1,5 @@
package electrosphere.client.fluid.cache; package electrosphere.client.fluid.cache;
import java.util.HashSet;
import java.util.Set;
import org.joml.Vector3i; import org.joml.Vector3i;
import electrosphere.server.terrain.manager.ServerTerrainChunk; import electrosphere.server.terrain.manager.ServerTerrainChunk;

View File

@ -13,7 +13,6 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.types.fluid.FluidChunk; import electrosphere.entity.types.fluid.FluidChunk;
import electrosphere.renderer.shader.ShaderProgram; import electrosphere.renderer.shader.ShaderProgram;
import electrosphere.renderer.texture.Texture;
import electrosphere.server.terrain.manager.ServerTerrainChunk; import electrosphere.server.terrain.manager.ServerTerrainChunk;
/** /**

View File

@ -1,11 +1,6 @@
package electrosphere.client.fluid.editing; package electrosphere.client.fluid.editing;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3i;
import electrosphere.client.terrain.cache.ChunkData;
import electrosphere.engine.Globals;
import electrosphere.net.parser.net.message.TerrainMessage;
/** /**
* Utilities for editing fluid from client side of things * Utilities for editing fluid from client side of things

View File

@ -2,7 +2,6 @@ package electrosphere.client.fluid.manager;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;

View File

@ -4,7 +4,6 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.joml.Matrix4d; import org.joml.Matrix4d;
import org.joml.Matrix4f;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Sphered; import org.joml.Sphered;
import org.joml.Vector3d; import org.joml.Vector3d;
@ -14,11 +13,9 @@ import org.joml.Vector3i;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.state.foliage.AmbientFoliage;
import electrosphere.entity.types.camera.CameraEntityUtils; import electrosphere.entity.types.camera.CameraEntityUtils;
import electrosphere.renderer.OpenGLState; import electrosphere.renderer.OpenGLState;
import electrosphere.renderer.RenderPipelineState; import electrosphere.renderer.RenderPipelineState;
import electrosphere.renderer.actor.instance.InstancedActor;
import electrosphere.renderer.actor.instance.TextureInstancedActor; import electrosphere.renderer.actor.instance.TextureInstancedActor;
import electrosphere.renderer.buffer.ShaderAttribute; import electrosphere.renderer.buffer.ShaderAttribute;

View File

@ -5,8 +5,7 @@ import org.joml.Vector3f;
import org.joml.Vector3i; import org.joml.Vector3i;
/** /**
* * Client's data on the world
* @author amaterasu
*/ */
public class ClientWorldData { public class ClientWorldData {

View File

@ -10,8 +10,7 @@ import electrosphere.entity.types.camera.CameraEntityUtils;
import org.joml.Vector3d; import org.joml.Vector3d;
/** /**
* * Crosshair logic
* @author amaterasu
*/ */
public class Crosshair { public class Crosshair {

View File

@ -5,7 +5,6 @@ import electrosphere.client.terrain.manager.ClientTerrainManager;
import electrosphere.game.server.world.ServerWorldData; import electrosphere.game.server.world.ServerWorldData;
import electrosphere.server.terrain.manager.ServerTerrainManager; import electrosphere.server.terrain.manager.ServerTerrainManager;
import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
public class CollisionWorldData { public class CollisionWorldData {

View File

@ -2,13 +2,9 @@ package electrosphere.collision.collidable;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.state.collidable.Impulse; import electrosphere.entity.state.collidable.Impulse;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Matrix4f;
import org.joml.Vector3f;
/** /**
* Stores the type of the collidable object as well as the impulses currently applied to it * Stores the type of the collidable object as well as the impulses currently applied to it

View File

@ -23,7 +23,6 @@ import electrosphere.client.terrain.cells.VoxelTextureAtlas;
import electrosphere.client.terrain.manager.ClientTerrainManager; import electrosphere.client.terrain.manager.ClientTerrainManager;
import electrosphere.collision.CollisionEngine; import electrosphere.collision.CollisionEngine;
import electrosphere.collision.CollisionWorldData; import electrosphere.collision.CollisionWorldData;
import electrosphere.collision.hitbox.HitboxManager;
import electrosphere.controls.CameraHandler; import electrosphere.controls.CameraHandler;
import electrosphere.controls.ControlCallback; import electrosphere.controls.ControlCallback;
import electrosphere.controls.ControlHandler; import electrosphere.controls.ControlHandler;
@ -80,8 +79,7 @@ import electrosphere.server.terrain.manager.ServerTerrainManager;
import electrosphere.util.FileUtils; import electrosphere.util.FileUtils;
/** /**
* * Global values
* @author amaterasu
*/ */
public class Globals { public class Globals {

View File

@ -1,8 +1,7 @@
package electrosphere.engine.assetmanager; package electrosphere.engine.assetmanager;
/** /**
* * Assets that should be included by the engine by default or generated
* @author amaterasu
*/ */
public class AssetDataStrings { public class AssetDataStrings {
public static final String ASSET_STRING_BITMAP_FONT_MESH_NAME = "quad"; public static final String ASSET_STRING_BITMAP_FONT_MESH_NAME = "quad";

View File

@ -1,8 +1,5 @@
package electrosphere.engine.assetmanager; package electrosphere.engine.assetmanager;
import org.ode4j.ode.DSpace;
import org.ode4j.ode.DWorld;
import electrosphere.collision.CollisionEngine; import electrosphere.collision.CollisionEngine;
/** /**

View File

@ -1,10 +1,7 @@
package electrosphere.engine.profiler; package electrosphere.engine.profiler;
import java.nio.IntBuffer;
import org.lwjgl.PointerBuffer; import org.lwjgl.PointerBuffer;
import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryStack;
import org.lwjgl.system.MemoryUtil;
import org.lwjgl.util.remotery.Remotery; import org.lwjgl.util.remotery.Remotery;
/** /**

View File

@ -1,57 +1,86 @@
package electrosphere.entity; package electrosphere.entity;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import electrosphere.engine.Globals;
/** /**
* * An entity
* @author amaterasu
*/ */
public class Entity { public class Entity {
/**
* The iterator used to assign entities unique ids
*/
static int entity_id_iterator = 0; static int entity_id_iterator = 0;
/**
* The id of this entity
*/
int id; int id;
/**
* The data associated with this entity
*/
HashMap<String,Object> data; HashMap<String,Object> data;
/**
* Gets the id of this entity
* @return The id
*/
public int getId() { public int getId() {
return id; return id;
} }
/**
* Sets the id of this entity
* @param id The id
*/
public void setId(int id){ public void setId(int id){
this.id = id; this.id = id;
} }
// HashMap<String, Object> getData() { /**
// return data; * Puts some data into this entity
// } * @param key The key for the data
* @param o The data
*/
public void putData(String key, Object o){ public void putData(String key, Object o){
data.put(key,o); data.put(key,o);
} }
/**
* Checks if an entity contains a key
* @param key The key
* @return true if the entity contains the key, false otherwise
*/
public boolean containsKey(String key){ public boolean containsKey(String key){
return data.containsKey(key); return data.containsKey(key);
} }
/**
* Gets some data on the entity
* @param key The key for the data
* @return The data if it exists, null otherwise
*/
public Object getData(String key){ public Object getData(String key){
return data.get(key); return data.get(key);
} }
/**
* Constructs an entity
*/
protected Entity(){ protected Entity(){
data = new HashMap<String,Object>(); data = new HashMap<String,Object>();
id = entity_id_iterator; id = entity_id_iterator;
entity_id_iterator++; entity_id_iterator++;
} }
/**
* Removes data from an entity based on the key of the data
* @param key The key
*/
public void removeData(String key){ public void removeData(String key){
data.remove(key); data.remove(key);
} }

View File

@ -1,8 +1,7 @@
package electrosphere.entity; package electrosphere.entity;
/** /**
* * Data strings for entities
* @author amaterasu
*/ */
public class EntityDataStrings { public class EntityDataStrings {

View File

@ -3,8 +3,7 @@ package electrosphere.entity.state;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
/** /**
* * State for looking at items
* @author amaterasu
*/ */
public class LookAtState { public class LookAtState {

View File

@ -1,6 +1,5 @@
package electrosphere.entity.state; package electrosphere.entity.state;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
@ -9,8 +8,7 @@ import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * Particle b tree
* @author amaterasu
*/ */
public class ParticleTree implements BehaviorTree { public class ParticleTree implements BehaviorTree {
Entity parent; Entity parent;

View File

@ -1,8 +1,7 @@
package electrosphere.entity.state; package electrosphere.entity.state;
/** /**
* * Ragdoll b tree
* @author amaterasu
*/ */
public class RagdollTree { public class RagdollTree {

View File

@ -1,14 +1,9 @@
package electrosphere.entity.state.collidable; package electrosphere.entity.state.collidable;
import org.joml.Matrix4d;
import org.joml.Matrix4f;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import org.joml.Vector4d;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils; import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable; import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
@ -17,13 +12,9 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.gravity.ClientGravityTree; import electrosphere.entity.state.gravity.ClientGravityTree;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.entity.types.item.ItemUtils;
import electrosphere.game.data.collidable.CollidableTemplate;
/** /**
* * Client collidable tree
* @author amaterasu
*/ */
public class ClientCollidableTree implements BehaviorTree { public class ClientCollidableTree implements BehaviorTree {

View File

@ -1,11 +1,9 @@
package electrosphere.entity.state.collidable; package electrosphere.entity.state.collidable;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
/** /**
* * An impulse to be applied to a collidable
* @author amaterasu
*/ */
public class Impulse { public class Impulse {

View File

@ -8,26 +8,14 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.gravity.ServerGravityTree; import electrosphere.entity.state.gravity.ServerGravityTree;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.entity.types.debug.DebugVisualizerUtils;
import electrosphere.entity.types.item.ItemUtils;
import electrosphere.game.data.collidable.CollidableTemplate;
import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.utils.DataCellSearchUtils;
import org.joml.Matrix4f;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import org.joml.Vector4d;
import org.joml.Vector4f;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
/** /**
* * Server collidable tree
* @author amaterasu
*/ */
public class ServerCollidableTree implements BehaviorTree { public class ServerCollidableTree implements BehaviorTree {

View File

@ -1,13 +1,10 @@
package electrosphere.entity.state.equip; package electrosphere.entity.state.equip;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;

View File

@ -1,14 +1,10 @@
package electrosphere.entity.state.foliage; package electrosphere.entity.state.foliage;
import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.types.camera.CameraEntityUtils;
/** /**
* Behavior tree for ambient foliage. Controls regrowing, wind movement, etc * Behavior tree for ambient foliage. Controls regrowing, wind movement, etc

View File

@ -3,12 +3,10 @@ package electrosphere.entity.state.gravity;
import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;

View File

@ -13,7 +13,6 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
@ -31,7 +30,6 @@ import electrosphere.entity.state.movement.ServerJumpTree;
import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SyncedField;
import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
import electrosphere.server.datacell.Realm;
@SynchronizedBehaviorTree(name = "serverGravity", isServer = true, correspondingTree="clientGravity") @SynchronizedBehaviorTree(name = "serverGravity", isServer = true, correspondingTree="clientGravity")
/** /**

View File

@ -7,7 +7,6 @@ import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
import electrosphere.entity.state.movement.AirplaneMovementTree; import electrosphere.entity.state.movement.AirplaneMovementTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
@ -20,7 +19,6 @@ import electrosphere.net.synchronization.annotation.SyncedField;
import electrosphere.net.synchronization.annotation.SynchronizableEnum; import electrosphere.net.synchronization.annotation.SynchronizableEnum;
import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
import electrosphere.renderer.actor.Actor; import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.anim.Animation;

View File

@ -14,13 +14,11 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.game.data.creature.type.CreatureType;
import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.net.synchronization.BehaviorTreeIdEnums; import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SyncedField;
import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.anim.Animation; import electrosphere.renderer.anim.Animation;
import electrosphere.server.datacell.utils.DataCellSearchUtils; import electrosphere.server.datacell.utils.DataCellSearchUtils;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;

View File

@ -1,7 +1,6 @@
package electrosphere.entity.state.inventory; package electrosphere.entity.state.inventory;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
@ -16,12 +15,9 @@ import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.net.parser.net.message.InventoryMessage;
import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.server.player.Player; import electrosphere.net.server.player.Player;
import electrosphere.server.datacell.EntityDataCellMapper;
import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.ServerDataCell; import electrosphere.server.datacell.ServerDataCell;
import electrosphere.server.datacell.utils.DataCellSearchUtils; import electrosphere.server.datacell.utils.DataCellSearchUtils;
import electrosphere.server.datacell.utils.EntityLookupUtils;
import electrosphere.util.Utilities;
public class InventoryUtils { public class InventoryUtils {

View File

@ -2,17 +2,11 @@ package electrosphere.entity.state.inventory;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.equip.ServerEquipState; import electrosphere.entity.state.equip.ServerEquipState;
import electrosphere.entity.types.item.ItemUtils;
import electrosphere.game.data.creature.type.equip.EquipPoint; import electrosphere.game.data.creature.type.equip.EquipPoint;
import electrosphere.menu.WindowStrings;
import electrosphere.menu.WindowUtils;
import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.net.parser.net.message.InventoryMessage;
import electrosphere.net.server.protocol.InventoryProtocol;
import electrosphere.server.datacell.utils.EntityLookupUtils; import electrosphere.server.datacell.utils.EntityLookupUtils;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;

View File

@ -4,8 +4,7 @@ import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
/** /**
* * Utility functions for dealing with life state
* @author amaterasu
*/ */
public class LifeUtils { public class LifeUtils {

View File

@ -3,13 +3,11 @@ package electrosphere.entity.state.movement;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
import electrosphere.collision.collidable.Collidable; import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;

View File

@ -1,7 +1,6 @@
package electrosphere.entity.state.movement; package electrosphere.entity.state.movement;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;

View File

@ -1,21 +1,16 @@
package electrosphere.entity.state.movement; package electrosphere.entity.state.movement;
import org.joml.Vector3d;
import org.ode4j.math.DVector3C; import org.ode4j.math.DVector3C;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.client.firstPerson.FirstPersonTree; import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
import electrosphere.entity.state.collidable.Impulse;
import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.entity.state.gravity.GravityUtils;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.game.data.creature.type.movement.JumpMovementSystem; import electrosphere.game.data.creature.type.movement.JumpMovementSystem;
import electrosphere.renderer.actor.Actor; import electrosphere.renderer.actor.Actor;

View File

@ -1,9 +1,7 @@
package electrosphere.entity.state.movement; package electrosphere.entity.state.movement;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;

View File

@ -4,7 +4,6 @@ import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.renderer.actor.Actor;
import electrosphere.server.poseactor.PoseActor; import electrosphere.server.poseactor.PoseActor;
public class ServerFallTree implements BehaviorTree { public class ServerFallTree implements BehaviorTree {

View File

@ -1,19 +1,14 @@
package electrosphere.entity.state.movement; package electrosphere.entity.state.movement;
import org.joml.Vector3d;
import org.ode4j.math.DVector3C; import org.ode4j.math.DVector3C;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.collidable.Impulse;
import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.entity.state.gravity.GravityUtils;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.renderer.actor.Actor;
import electrosphere.server.poseactor.PoseActor; import electrosphere.server.poseactor.PoseActor;
public class ServerJumpTree implements BehaviorTree { public class ServerJumpTree implements BehaviorTree {

View File

@ -1,14 +1,12 @@
package electrosphere.entity.state.movement; package electrosphere.entity.state.movement;
import electrosphere.engine.Main;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
/** /**
* * Server sprint tree
* @author amaterasu
*/ */
public class ServerSprintTree implements BehaviorTree { public class ServerSprintTree implements BehaviorTree {

View File

@ -1,14 +1,12 @@
package electrosphere.entity.state.movement; package electrosphere.entity.state.movement;
import electrosphere.engine.Main;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
/** /**
* * Client sprint tree
* @author amaterasu
*/ */
public class SprintTree implements BehaviorTree { public class SprintTree implements BehaviorTree {

View File

@ -2,7 +2,6 @@ package electrosphere.entity.state.movement.groundmove;
import electrosphere.net.synchronization.FieldIdEnums; import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.parser.net.message.SynchronizationMessage;

View File

@ -5,7 +5,6 @@ import java.util.List;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf; import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
@ -14,7 +13,6 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.view.ViewUtils; import electrosphere.entity.state.view.ViewUtils;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.renderer.actor.Actor; import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorBoneRotator; import electrosphere.renderer.actor.ActorBoneRotator;

View File

@ -5,7 +5,6 @@ import java.util.List;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf; import org.joml.Quaternionf;
import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
@ -14,8 +13,6 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.view.ViewUtils; import electrosphere.entity.state.view.ViewUtils;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorBoneRotator; import electrosphere.renderer.actor.ActorBoneRotator;
import electrosphere.server.poseactor.PoseActor; import electrosphere.server.poseactor.PoseActor;

View File

@ -13,8 +13,7 @@ import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * Camera entity utility functions
* @author amaterasu
*/ */
public class CameraEntityUtils { public class CameraEntityUtils {

View File

@ -1,6 +1,5 @@
package electrosphere.entity.types.collision; package electrosphere.entity.types.collision;
import org.joml.Matrix4f;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
@ -19,8 +18,7 @@ import electrosphere.entity.types.attach.AttachUtils;
import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.Realm;
/** /**
* * Collision object utility functions
* @author amaterasu
*/ */
public class CollisionObjUtils { public class CollisionObjUtils {

View File

@ -1,18 +1,10 @@
package electrosphere.entity.types.creature; package electrosphere.entity.types.creature;
import java.util.LinkedList;
import java.util.List;
import org.joml.Matrix4f;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable; import electrosphere.collision.collidable.Collidable;
import electrosphere.collision.hitbox.HitboxUtils;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityCreationUtils;
@ -26,8 +18,6 @@ import electrosphere.entity.state.attack.ServerAttackTree;
import electrosphere.entity.state.attack.ShooterTree; import electrosphere.entity.state.attack.ShooterTree;
import electrosphere.entity.state.block.ClientBlockTree; import electrosphere.entity.state.block.ClientBlockTree;
import electrosphere.entity.state.block.ServerBlockTree; import electrosphere.entity.state.block.ServerBlockTree;
import electrosphere.entity.state.collidable.ClientCollidableTree;
import electrosphere.entity.state.collidable.ServerCollidableTree;
import electrosphere.entity.state.equip.ClientEquipState; import electrosphere.entity.state.equip.ClientEquipState;
import electrosphere.entity.state.equip.ServerEquipState; import electrosphere.entity.state.equip.ServerEquipState;
import electrosphere.entity.state.gravity.ClientGravityTree; import electrosphere.entity.state.gravity.ClientGravityTree;
@ -55,7 +45,6 @@ import electrosphere.entity.state.rotator.RotatorTree;
import electrosphere.entity.state.rotator.ServerRotatorTree; import electrosphere.entity.state.rotator.ServerRotatorTree;
import electrosphere.entity.types.collision.CollisionObjUtils; import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.game.data.collidable.CollidableTemplate; import electrosphere.game.data.collidable.CollidableTemplate;
import electrosphere.game.data.collidable.HitboxData;
import electrosphere.game.data.creature.type.CreatureType; import electrosphere.game.data.creature.type.CreatureType;
import electrosphere.game.data.creature.type.SprintSystem; import electrosphere.game.data.creature.type.SprintSystem;
import electrosphere.game.data.creature.type.attack.AttackMove; import electrosphere.game.data.creature.type.attack.AttackMove;

View File

@ -1,7 +1,6 @@
package electrosphere.entity.types.debug; package electrosphere.entity.types.debug;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityCreationUtils;

View File

@ -1,9 +1,5 @@
package electrosphere.entity.types.foliage; package electrosphere.entity.types.foliage;
import electrosphere.audio.VirtualAudioSource;
import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityCreationUtils;
@ -12,26 +8,17 @@ import electrosphere.entity.EntityTags;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.ServerEntityUtils; import electrosphere.entity.ServerEntityUtils;
import electrosphere.entity.state.client.ambientaudio.ClientAmbientAudioTree; import electrosphere.entity.state.client.ambientaudio.ClientAmbientAudioTree;
import electrosphere.entity.state.idle.ClientIdleTree;
import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.entity.types.tree.ProceduralTree; import electrosphere.entity.types.tree.ProceduralTree;
import electrosphere.game.data.foliage.type.AmbientAudio; import electrosphere.game.data.foliage.type.AmbientAudio;
import electrosphere.game.data.foliage.type.FoliageType; import electrosphere.game.data.foliage.type.FoliageType;
import electrosphere.game.data.foliage.type.PhysicsObject;
import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.server.player.Player; import electrosphere.net.server.player.Player;
import electrosphere.renderer.actor.ActorUtils; import electrosphere.renderer.actor.ActorUtils;
import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.utils.ServerEntityTagUtils; import electrosphere.server.datacell.utils.ServerEntityTagUtils;
import electrosphere.util.Utilities;
import java.util.List;
import org.joml.Matrix4f;
import org.joml.Quaternionf;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import org.joml.Vector4f;
/** /**
* Utilities for generating foliage * Utilities for generating foliage

View File

@ -1,20 +1,12 @@
package electrosphere.entity.types.item; package electrosphere.entity.types.item;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.joml.Matrix4f;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
import org.ode4j.ode.DSpace;
import org.ode4j.ode.DWorld;
import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable; import electrosphere.collision.collidable.Collidable;
import electrosphere.collision.hitbox.HitboxUtils;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityCreationUtils;
@ -22,13 +14,10 @@ import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityTags; import electrosphere.entity.EntityTags;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.ServerEntityUtils; import electrosphere.entity.ServerEntityUtils;
import electrosphere.entity.state.collidable.ClientCollidableTree;
import electrosphere.entity.state.collidable.ServerCollidableTree;
import electrosphere.entity.state.gravity.ClientGravityTree; import electrosphere.entity.state.gravity.ClientGravityTree;
import electrosphere.entity.state.gravity.ServerGravityTree; import electrosphere.entity.state.gravity.ServerGravityTree;
import electrosphere.entity.state.hitbox.HitboxCollectionState; import electrosphere.entity.state.hitbox.HitboxCollectionState;
import electrosphere.game.data.collidable.CollidableTemplate; import electrosphere.game.data.collidable.CollidableTemplate;
import electrosphere.game.data.collidable.HitboxData;
import electrosphere.game.data.item.type.EquipWhitelist; import electrosphere.game.data.item.type.EquipWhitelist;
import electrosphere.game.data.item.type.Item; import electrosphere.game.data.item.type.Item;
import electrosphere.game.data.item.type.WeaponData; import electrosphere.game.data.item.type.WeaponData;
@ -38,7 +27,6 @@ import electrosphere.net.server.player.Player;
import electrosphere.renderer.actor.Actor; import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorUtils; import electrosphere.renderer.actor.ActorUtils;
import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.server.datacell.utils.ServerEntityTagUtils; import electrosphere.server.datacell.utils.ServerEntityTagUtils;
import electrosphere.server.poseactor.PoseActor; import electrosphere.server.poseactor.PoseActor;

View File

@ -1,13 +1,9 @@
package electrosphere.entity.types.object; package electrosphere.entity.types.object;
import org.joml.Matrix4f;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable; import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.engine.assetmanager.PhysicsMeshQueueItem; import electrosphere.engine.assetmanager.PhysicsMeshQueueItem;
@ -18,8 +14,6 @@ import electrosphere.entity.EntityTags;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.ServerEntityUtils; import electrosphere.entity.ServerEntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.collidable.ClientCollidableTree;
import electrosphere.entity.state.collidable.ServerCollidableTree;
import electrosphere.entity.state.gravity.ClientGravityTree; import electrosphere.entity.state.gravity.ClientGravityTree;
import electrosphere.entity.state.gravity.ServerGravityTree; import electrosphere.entity.state.gravity.ServerGravityTree;
import electrosphere.entity.state.hitbox.HitboxCollectionState; import electrosphere.entity.state.hitbox.HitboxCollectionState;
@ -32,14 +26,10 @@ import electrosphere.entity.state.inventory.UnrelationalInventoryState;
import electrosphere.entity.types.collision.CollisionObjUtils; import electrosphere.entity.types.collision.CollisionObjUtils;
import electrosphere.game.data.collidable.CollidableTemplate; import electrosphere.game.data.collidable.CollidableTemplate;
import electrosphere.game.data.object.type.ObjectData; import electrosphere.game.data.object.type.ObjectData;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorUtils; import electrosphere.renderer.actor.ActorUtils;
import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.ServerDataCell;
import electrosphere.server.datacell.utils.EntityLookupUtils;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
import electrosphere.server.datacell.utils.ServerEntityTagUtils; import electrosphere.server.datacell.utils.ServerEntityTagUtils;
import electrosphere.server.poseactor.PoseActor;
public class ObjectUtils { public class ObjectUtils {

View File

@ -16,8 +16,7 @@ import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * Particle utility functions
* @author amaterasu
*/ */
public class ParticleUtils { public class ParticleUtils {

View File

@ -4,12 +4,9 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Quaternionfc;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
import electrosphere.collision.hitbox.HitboxUtils;
import electrosphere.collision.hitbox.HitboxUtils.HitboxPositionCallback; import electrosphere.collision.hitbox.HitboxUtils.HitboxPositionCallback;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;

View File

@ -1,6 +1,5 @@
package electrosphere.entity.types.structure; package electrosphere.entity.types.structure;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityCreationUtils;
@ -22,8 +21,7 @@ import org.joml.Vector3f;
import org.joml.Vector4f; import org.joml.Vector4f;
/** /**
* * Structure entity utility functions
* @author amaterasu
*/ */
public class StructureUtils { public class StructureUtils {

View File

@ -6,7 +6,6 @@ import electrosphere.client.terrain.cells.DrawCell;
import electrosphere.client.terrain.cells.VoxelTextureAtlas; import electrosphere.client.terrain.cells.VoxelTextureAtlas;
import electrosphere.client.terrain.manager.ClientTerrainManager; import electrosphere.client.terrain.manager.ClientTerrainManager;
import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityCreationUtils;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;

View File

@ -15,34 +15,24 @@ import org.joml.Vector3f;
import org.joml.Vector4d; import org.joml.Vector4d;
import org.joml.Vector4f; import org.joml.Vector4f;
import org.ode4j.ode.DBody; import org.ode4j.ode.DBody;
import org.ode4j.ode.DCylinder;
import electrosphere.audio.VirtualAudioSource;
import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
import electrosphere.collision.CollisionBodyCreation; import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.PhysicsEntityUtils;
import electrosphere.collision.PhysicsUtils;
import electrosphere.collision.collidable.Collidable; import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.DrawableUtils;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityCreationUtils;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityTags;
import electrosphere.entity.EntityUtils; import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.types.attach.AttachUtils; import electrosphere.entity.types.attach.AttachUtils;
import electrosphere.entity.types.instance.InstanceTemplate; import electrosphere.entity.types.instance.InstanceTemplate;
import electrosphere.entity.types.instance.InstancedEntityUtils; import electrosphere.entity.types.instance.InstancedEntityUtils;
import electrosphere.game.data.foliage.type.AmbientAudio;
import electrosphere.game.data.foliage.type.FoliageType; import electrosphere.game.data.foliage.type.FoliageType;
import electrosphere.game.data.foliage.type.TreeModel; import electrosphere.game.data.foliage.type.TreeModel;
import electrosphere.renderer.actor.instance.InstancedActor; import electrosphere.renderer.actor.instance.InstancedActor;
import electrosphere.renderer.buffer.ShaderAttribute; import electrosphere.renderer.buffer.ShaderAttribute;
import electrosphere.renderer.buffer.HomogenousUniformBuffer.HomogenousBufferTypes; import electrosphere.renderer.buffer.HomogenousUniformBuffer.HomogenousBufferTypes;
import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.Realm;
import electrosphere.server.poseactor.PoseActor;
import electrosphere.server.poseactor.PoseActorUtils;
/** /**
* Used for generating procedural trees * Used for generating procedural trees

View File

@ -1,8 +1,7 @@
package electrosphere.entity.types.waypoint; package electrosphere.entity.types.waypoint;
/** /**
* * Waypoint entity utility functions
* @author amaterasu
*/ */
public class WaypointUtils { public class WaypointUtils {

View File

@ -1,8 +1,7 @@
package electrosphere.game.data.creature.type; package electrosphere.game.data.creature.type;
/** /**
* * Data about an animation
* @author amaterasu
*/ */
public class Animation { public class Animation {

View File

@ -1,8 +1,7 @@
package electrosphere.game.data.creature.type; package electrosphere.game.data.creature.type;
/** /**
* * Data about the health of a creature
* @author amaterasu
*/ */
public class HealthSystem { public class HealthSystem {
int maxHealth; int maxHealth;

View File

@ -1,8 +1,7 @@
package electrosphere.game.data.creature.type; package electrosphere.game.data.creature.type;
/** /**
* * Look at behavior and data
* @author amaterasu
*/ */
public class LookAtSystem { public class LookAtSystem {

View File

@ -1,8 +1,7 @@
package electrosphere.game.data.creature.type; package electrosphere.game.data.creature.type;
/** /**
* * Sprint data
* @author amaterasu
*/ */
public class SprintSystem { public class SprintSystem {
Animation animationStartUp; Animation animationStartUp;

View File

@ -1,8 +1,5 @@
package electrosphere.game.data.creature.type.movement; package electrosphere.game.data.creature.type.movement;
import electrosphere.game.data.creature.type.Animation;
import electrosphere.game.data.creature.type.SprintSystem;
public interface MovementSystem { public interface MovementSystem {
public String getType(); public String getType();

View File

@ -1,8 +1,7 @@
package electrosphere.game.data.foliage.type; package electrosphere.game.data.foliage.type;
/** /**
* * Physics data
* @author amaterasu
*/ */
public class PhysicsObject { public class PhysicsObject {

View File

@ -1,8 +1,7 @@
package electrosphere.game.data.structure.type.model; package electrosphere.game.data.structure.type.model;
/** /**
* * Collidable data
* @author amaterasu
*/ */
public class CollisionObjectTemplate { public class CollisionObjectTemplate {

View File

@ -3,8 +3,7 @@ package electrosphere.game.data.structure.type.model;
import java.util.List; import java.util.List;
/** /**
* * Structure data
* @author amaterasu
*/ */
public class StructureType { public class StructureType {

View File

@ -3,8 +3,7 @@ package electrosphere.game.data.structure.type.model;
import java.util.List; import java.util.List;
/** /**
* * Map of name of structure to data about said structure
* @author amaterasu
*/ */
public class StructureTypeMap { public class StructureTypeMap {
List<StructureType> structures; List<StructureType> structures;

View File

@ -1,9 +1,6 @@
package electrosphere.game.server.character; package electrosphere.game.server.character;
import electrosphere.game.server.character.diety.Diety;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map; import java.util.Map;
public class Character { public class Character {

View File

@ -1,8 +1,7 @@
package electrosphere.game.server.character; package electrosphere.game.server.character;
/** /**
* * Data strings for characters
* @author amaterasu
*/ */
public class CharacterDataStrings { public class CharacterDataStrings {

View File

@ -1,6 +1,5 @@
package electrosphere.game.server.character; package electrosphere.game.server.character;
import electrosphere.game.server.character.Character;
import electrosphere.game.server.character.diety.Diety; import electrosphere.game.server.character.diety.Diety;
import electrosphere.game.server.race.model.Race; import electrosphere.game.server.race.model.Race;
import electrosphere.game.server.structure.virtual.Structure; import electrosphere.game.server.structure.virtual.Structure;
@ -8,8 +7,7 @@ import electrosphere.game.server.town.Town;
import org.joml.Vector2i; import org.joml.Vector2i;
/** /**
* * Utility functions for dealing with characters
* @author amaterasu
*/ */
public class CharacterUtils { public class CharacterUtils {

View File

@ -1,8 +1,7 @@
package electrosphere.game.server.culture.religion; package electrosphere.game.server.culture.religion;
/** /**
* * Story data strings
* @author amaterasu
*/ */
public class StoryDataStrings { public class StoryDataStrings {
/* /*

View File

@ -7,8 +7,7 @@ import java.util.Random;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * Utility functions for spawning particle effects
* @author amaterasu
*/ */
public class ParticleEffects { public class ParticleEffects {

View File

@ -1,8 +1,7 @@
package electrosphere.game.server.race.model; package electrosphere.game.server.race.model;
/** /**
* * The race of a creature
* @author amaterasu
*/ */
public class Race { public class Race {

View File

@ -3,8 +3,7 @@ package electrosphere.game.server.race.model;
import java.util.List; import java.util.List;
/** /**
* * Map of name of race to data about said race
* @author amaterasu
*/ */
public class RaceMap { public class RaceMap {

View File

@ -5,8 +5,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
/** /**
* * Server representation of a structure
* @author amaterasu
*/ */
public class Structure { public class Structure {
int worldX; int worldX;

View File

@ -3,20 +3,14 @@ package electrosphere.game.server.structure.virtual;
import com.google.gson.Gson; import com.google.gson.Gson;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.logger.LoggerInterface;
import electrosphere.server.db.DatabaseResult; import electrosphere.server.db.DatabaseResult;
import electrosphere.server.db.DatabaseResultRow; import electrosphere.server.db.DatabaseResultRow;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* * Manages all server views of structures
* @author amaterasu
*/ */
public class StructureManager { public class StructureManager {

View File

@ -1,21 +1,16 @@
package electrosphere.game.server.structure.virtual; package electrosphere.game.server.structure.virtual;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.types.structure.StructureUtils;
import electrosphere.game.data.structure.type.model.StructureType; import electrosphere.game.data.structure.type.model.StructureType;
import electrosphere.game.server.character.Character; import electrosphere.game.server.character.Character;
import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.Realm;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.joml.Quaternionf;
import org.joml.Vector2f; import org.joml.Vector2f;
import org.joml.Vector3d;
import org.joml.Vector3f;
/** /**
* * Utility functions for dealing with structures on the server
* @author amaterasu
*/ */
public class VirtualStructureUtils { public class VirtualStructureUtils {

View File

@ -3,8 +3,7 @@ package electrosphere.game.server.symbolism.model;
import java.util.List; import java.util.List;
/** /**
* * A symbol
* @author amaterasu
*/ */
public class Symbol { public class Symbol {
String name; String name;

View File

@ -1,25 +1,15 @@
package electrosphere.game.server.town; package electrosphere.game.server.town;
import electrosphere.game.server.structure.virtual.Structure; import electrosphere.game.server.structure.virtual.Structure;
import electrosphere.game.server.structure.virtual.VirtualStructureUtils;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.game.server.character.Character; import electrosphere.game.server.character.Character;
import electrosphere.logger.LoggerInterface;
import electrosphere.server.db.DatabaseResult;
import electrosphere.server.terrain.manager.ServerTerrainChunk;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Random;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.joml.Vector2i; import org.joml.Vector2i;
/** /**
* * Server representation of a town
* @author amaterasu
*/ */
public class Town { public class Town {

View File

@ -19,8 +19,7 @@ import java.util.Random;
import org.joml.Vector2i; import org.joml.Vector2i;
/** /**
* * Server macro level data
* @author amaterasu
*/ */
public class MacroData { public class MacroData {

View File

@ -1,18 +1,14 @@
package electrosphere.game.server.world; package electrosphere.game.server.world;
import electrosphere.server.datacell.ServerDataCell;
import electrosphere.server.terrain.manager.ServerTerrainChunk; import electrosphere.server.terrain.manager.ServerTerrainChunk;
import electrosphere.server.terrain.manager.ServerTerrainManager; import electrosphere.server.terrain.manager.ServerTerrainManager;
import java.util.List;
import org.joml.Vector3d; import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.joml.Vector3i; import org.joml.Vector3i;
/** /**
* * Server data about the world
* @author amaterasu
*/ */
public class ServerWorldData { public class ServerWorldData {

View File

@ -1,7 +1,5 @@
package electrosphere.game.terrain.processing; package electrosphere.game.terrain.processing;
import java.util.Random;
public class TerrainInterpolator { public class TerrainInterpolator {

View File

@ -2,53 +2,27 @@ package electrosphere.menu;
import java.util.List; import java.util.List;
import org.joml.Vector3f;
import electrosphere.auth.AuthenticationManager; import electrosphere.auth.AuthenticationManager;
import electrosphere.controls.ControlHandler.ControlsState;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.engine.loadingthreads.LoadingThread; import electrosphere.engine.loadingthreads.LoadingThread;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.types.camera.CameraEntityUtils;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.game.data.creature.type.CreatureType;
import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
import electrosphere.menu.mainmenu.MenuGeneratorsKeybind; import electrosphere.menu.mainmenu.MenuGeneratorsKeybind;
import electrosphere.menu.mainmenu.MenuGeneratorsTitleMenu; import electrosphere.menu.mainmenu.MenuGeneratorsTitleMenu;
import electrosphere.net.NetUtils; import electrosphere.net.NetUtils;
import electrosphere.renderer.RenderingEngine;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorStaticMorph;
import electrosphere.renderer.actor.ActorUtils;
import electrosphere.renderer.model.Model;
import electrosphere.renderer.ui.elements.ActorPanel;
import electrosphere.renderer.ui.elements.Button; import electrosphere.renderer.ui.elements.Button;
import electrosphere.renderer.ui.elements.Div; import electrosphere.renderer.ui.elements.Div;
import electrosphere.renderer.ui.elements.FormElement; import electrosphere.renderer.ui.elements.FormElement;
import electrosphere.renderer.ui.elements.ImagePanel;
import electrosphere.renderer.ui.elements.Label; import electrosphere.renderer.ui.elements.Label;
import electrosphere.renderer.ui.elements.ScrollableContainer;
import electrosphere.renderer.ui.elements.Slider;
import electrosphere.renderer.ui.elements.TextInput; import electrosphere.renderer.ui.elements.TextInput;
import electrosphere.renderer.ui.elements.Window;
import electrosphere.renderer.ui.elementtypes.ClickableElement; import electrosphere.renderer.ui.elementtypes.ClickableElement;
import electrosphere.renderer.ui.elementtypes.ClickableElement.ClickEventCallback; import electrosphere.renderer.ui.elementtypes.ClickableElement.ClickEventCallback;
import electrosphere.renderer.ui.elementtypes.Element; import electrosphere.renderer.ui.elementtypes.Element;
import electrosphere.renderer.ui.elementtypes.NavigableElement.NavigationEventCallback;
import electrosphere.renderer.ui.elementtypes.ValueElement.ValueChangeEventCallback;
import electrosphere.renderer.ui.events.ClickEvent; import electrosphere.renderer.ui.events.ClickEvent;
import electrosphere.renderer.ui.events.NavigationEvent;
import electrosphere.renderer.ui.events.ValueChangeEvent;
import electrosphere.server.saves.SaveUtils; import electrosphere.server.saves.SaveUtils;
import electrosphere.server.terrain.generation.OverworldChunkGenerator; import electrosphere.server.terrain.generation.OverworldChunkGenerator;
import electrosphere.server.terrain.manager.ServerTerrainManager; import electrosphere.server.terrain.manager.ServerTerrainManager;
/** /**
* * Generator functions for creating menus
* @author amaterasu
*/ */
public class MenuGenerators { public class MenuGenerators {

View File

@ -17,8 +17,7 @@ import electrosphere.renderer.ui.elementtypes.Element;
import electrosphere.renderer.ui.events.ClickEvent; import electrosphere.renderer.ui.events.ClickEvent;
/** /**
* * Debug menu generation functions
* @author amaterasu
*/ */
public class MenuGeneratorsDebug { public class MenuGeneratorsDebug {

View File

@ -6,8 +6,7 @@ import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.EntityMessage;
/** /**
* * Utilities for dealing with the net
* @author amaterasu
*/ */
public class NetUtils { public class NetUtils {

View File

@ -1,15 +1,10 @@
package electrosphere.net.client; package electrosphere.net.client;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.engine.Main; import electrosphere.engine.Main;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityUtils;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.net.client.protocol.ClientProtocol; import electrosphere.net.client.protocol.ClientProtocol;
import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.parser.net.message.PlayerMessage;
import electrosphere.net.parser.net.message.ServerMessage; import electrosphere.net.parser.net.message.ServerMessage;
import electrosphere.net.parser.net.message.NetworkMessage.MessageType; import electrosphere.net.parser.net.message.NetworkMessage.MessageType;
import electrosphere.net.parser.net.message.ServerMessage.ServerMessageType; import electrosphere.net.parser.net.message.ServerMessage.ServerMessageType;
@ -17,24 +12,13 @@ import electrosphere.net.parser.net.raw.NetworkParser;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.math.BigInteger;
import java.net.Socket; import java.net.Socket;
import java.net.SocketException;
import java.security.spec.RSAKeyGenParameterSpec;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Properties;
import java.util.Random;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.crypto.spec.SecretKeySpec;
/** /**
* * Client networking thread
* @author amaterasu
*/ */
public class ClientNetworking implements Runnable{ public class ClientNetworking implements Runnable{

View File

@ -3,9 +3,7 @@ package electrosphere.net.client.protocol;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.AuthMessage; import electrosphere.net.parser.net.message.AuthMessage;
import electrosphere.net.parser.net.message.CharacterMessage;
import electrosphere.net.parser.net.message.LoreMessage; import electrosphere.net.parser.net.message.LoreMessage;
import electrosphere.net.parser.net.message.TerrainMessage;
public class AuthProtocol { public class AuthProtocol {

View File

@ -3,7 +3,6 @@ package electrosphere.net.client.protocol;
import org.joml.Vector3i; import org.joml.Vector3i;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.PlayerMessage; import electrosphere.net.parser.net.message.PlayerMessage;
import electrosphere.net.server.player.Player; import electrosphere.net.server.player.Player;

View File

@ -3,13 +3,10 @@ package electrosphere.net.client.protocol;
import org.joml.Vector3f; import org.joml.Vector3f;
import electrosphere.client.fluid.cache.FluidChunkData;
import electrosphere.client.scene.ClientWorldData; import electrosphere.client.scene.ClientWorldData;
import electrosphere.client.terrain.cache.ChunkData; import electrosphere.client.terrain.cache.ChunkData;
import electrosphere.collision.CollisionWorldData; import electrosphere.collision.CollisionWorldData;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.types.terrain.TerrainChunk;
import electrosphere.entity.types.terrain.TerrainChunkData;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.TerrainMessage; import electrosphere.net.parser.net.message.TerrainMessage;

View File

@ -3,8 +3,6 @@ package electrosphere.net.monitor;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -12,9 +10,7 @@ import java.util.UUID;
import com.google.gson.Gson; import com.google.gson.Gson;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.net.client.ClientNetworking;
import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.server.ServerConnectionHandler;
public class NetMonitor { public class NetMonitor {

View File

@ -1,14 +1,12 @@
package electrosphere.net.server.player; package electrosphere.net.server.player;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* * Server player manager
* @author amaterasu
*/ */
public class PlayerManager { public class PlayerManager {

View File

@ -3,25 +3,17 @@ package electrosphere.net.synchronization;
import electrosphere.net.synchronization.FieldIdEnums; import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.entity.state.block.ClientBlockTree; import electrosphere.entity.state.block.ClientBlockTree;
import electrosphere.entity.state.block.ServerBlockTree; import electrosphere.entity.state.block.ServerBlockTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.entity.state.equip.ClientEquipState; import electrosphere.entity.state.equip.ClientEquipState;
import electrosphere.entity.state.attack.ClientAttackTree; import electrosphere.entity.state.attack.ClientAttackTree;
import electrosphere.entity.state.attack.ServerAttackTree; import electrosphere.entity.state.attack.ServerAttackTree;
import electrosphere.entity.state.equip.ServerEquipState; import electrosphere.entity.state.equip.ServerEquipState;
import electrosphere.entity.state.gravity.ClientGravityTree; import electrosphere.entity.state.gravity.ClientGravityTree;
import electrosphere.entity.state.gravity.ServerGravityTree; import electrosphere.entity.state.gravity.ServerGravityTree;
import electrosphere.entity.state.idle.ServerIdleTree; import electrosphere.entity.state.idle.ServerIdleTree;
import electrosphere.entity.state.idle.ClientIdleTree; import electrosphere.entity.state.idle.ClientIdleTree;
import java.util.LinkedList; import java.util.LinkedList;

View File

@ -2,12 +2,9 @@ package electrosphere.renderer;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.engine.assetmanager.AssetDataStrings;
import electrosphere.entity.types.camera.CameraEntityUtils;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -18,37 +15,22 @@ import electrosphere.renderer.model.Model;
import electrosphere.renderer.shader.ShaderProgram; import electrosphere.renderer.shader.ShaderProgram;
import electrosphere.renderer.texture.Texture; import electrosphere.renderer.texture.Texture;
import org.joml.Matrix4d;
import org.joml.Matrix4f;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import org.lwjgl.glfw.GLFW;
import static org.lwjgl.glfw.GLFW.glfwMakeContextCurrent;
import static org.lwjgl.glfw.GLFW.glfwMaximizeWindow;
import org.lwjgl.opengl.GL11;
import static org.lwjgl.opengl.GL11.GL_FLOAT; import static org.lwjgl.opengl.GL11.GL_FLOAT;
import static org.lwjgl.opengl.GL11.GL_LEQUAL;
import static org.lwjgl.opengl.GL11.GL_LESS;
import static org.lwjgl.opengl.GL11.GL_TRIANGLES;
import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT;
import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL15;
import static org.lwjgl.opengl.GL15.GL_ARRAY_BUFFER; import static org.lwjgl.opengl.GL15.GL_ARRAY_BUFFER;
import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW; import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW;
import static org.lwjgl.opengl.GL15.glBindBuffer; import static org.lwjgl.opengl.GL15.glBindBuffer;
import static org.lwjgl.opengl.GL15.glGenBuffers; import static org.lwjgl.opengl.GL15.glGenBuffers;
import static org.lwjgl.opengl.GL20.glEnableVertexAttribArray; import static org.lwjgl.opengl.GL20.glEnableVertexAttribArray;
import static org.lwjgl.opengl.GL20.glGetUniformLocation;
import static org.lwjgl.opengl.GL20.glUniform3fv;
import static org.lwjgl.opengl.GL20.glUniformMatrix4fv;
import static org.lwjgl.opengl.GL20.glUseProgram;
import static org.lwjgl.opengl.GL20.glVertexAttribPointer; import static org.lwjgl.opengl.GL20.glVertexAttribPointer;
import static org.lwjgl.opengl.GL30.glBindVertexArray; import static org.lwjgl.opengl.GL30.glBindVertexArray;
import static org.lwjgl.opengl.GL30.glGenVertexArrays; import static org.lwjgl.opengl.GL30.glGenVertexArrays;
/** /**
* * Utilities to assist with rendering
* @author amaterasu
*/ */
public class RenderUtils { public class RenderUtils {

View File

@ -8,10 +8,6 @@ import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NavigableSet;
import java.util.PriorityQueue;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentSkipListSet;
import org.joml.Matrix4d; import org.joml.Matrix4d;
import org.joml.Matrix4f; import org.joml.Matrix4f;

View File

@ -13,7 +13,6 @@ import org.joml.Vector3f;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.RenderPipelineState; import electrosphere.renderer.RenderPipelineState;
import electrosphere.renderer.buffer.ShaderAttribute; import electrosphere.renderer.buffer.ShaderAttribute;

View File

@ -1,20 +1,15 @@
package electrosphere.renderer.anim; package electrosphere.renderer.anim;
import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.ListIterator;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.joml.Matrix4f;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * A single channel of keyframes in an animation
* @author amaterasu
*/ */
public class AnimChannel { public class AnimChannel {

View File

@ -7,8 +7,7 @@ import org.joml.Matrix4d;
import org.lwjgl.assimp.AINode; import org.lwjgl.assimp.AINode;
/** /**
* * A node that will be animated by an animation
* @author amaterasu
*/ */
public class AnimNode { public class AnimNode {
public String id; public String id;

View File

@ -4,23 +4,17 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.PriorityQueue;
import org.joml.Matrix4d;
import org.joml.Quaterniond; import org.joml.Quaterniond;
import org.joml.Quaternionf;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.joml.Vector4d; import org.joml.Vector4d;
import org.lwjgl.PointerBuffer;
import org.lwjgl.assimp.AIAnimation; import org.lwjgl.assimp.AIAnimation;
import org.lwjgl.assimp.AIMeshAnim; import org.lwjgl.assimp.AIMeshAnim;
import org.lwjgl.assimp.AIMeshKey;
import org.lwjgl.assimp.AINodeAnim; import org.lwjgl.assimp.AINodeAnim;
import org.lwjgl.assimp.AIQuatKey; import org.lwjgl.assimp.AIQuatKey;
import org.lwjgl.assimp.AIVectorKey; import org.lwjgl.assimp.AIVectorKey;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.loading.ModelPretransforms;
/** /**
* *

View File

@ -4,8 +4,7 @@ import org.joml.Quaterniond;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * A single keyframe of a single node within an animation
* @author amaterasu
*/ */
public class Keyframe implements Comparable<Keyframe>{ public class Keyframe implements Comparable<Keyframe>{
double time; double time;

View File

@ -6,8 +6,7 @@ import static org.lwjgl.opengl.GL30.glDeleteRenderbuffers;
import static org.lwjgl.opengl.GL30.glGenRenderbuffers; import static org.lwjgl.opengl.GL30.glGenRenderbuffers;
/** /**
* * A renderbuffer
* @author amaterasu
*/ */
public class Renderbuffer { public class Renderbuffer {
int renderbuffer; int renderbuffer;

View File

@ -10,8 +10,7 @@ import org.joml.Vector3d;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * Utility functions for dealing with entities that create light
* @author amaterasu
*/ */
public class LightEntityUtils { public class LightEntityUtils {

View File

@ -3,8 +3,7 @@ package electrosphere.renderer.light;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * Data about a point light
* @author amaterasu
*/ */
public class PointLight { public class PointLight {
Vector3f position; Vector3f position;

View File

@ -1,15 +1,9 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package electrosphere.renderer.light; package electrosphere.renderer.light;
import org.joml.Vector3f; import org.joml.Vector3f;
/** /**
* * Data about a spotlight
* @author amaterasu
*/ */
public class SpotLight { public class SpotLight {
Vector3f position; Vector3f position;

View File

@ -1,28 +1,17 @@
package electrosphere.renderer.loading; package electrosphere.renderer.loading;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.engine.Main;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.model.Material; import electrosphere.renderer.model.Material;
import electrosphere.renderer.model.Mesh; import electrosphere.renderer.model.Mesh;
import electrosphere.renderer.model.Model; import electrosphere.renderer.model.Model;
import electrosphere.renderer.texture.Texture;
import electrosphere.renderer.texture.TextureMap; import electrosphere.renderer.texture.TextureMap;
import electrosphere.util.FileUtils; import electrosphere.util.FileUtils;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.lwjgl.assimp.AIScene; import org.lwjgl.assimp.AIScene;
import static org.lwjgl.assimp.Assimp.*; import static org.lwjgl.assimp.Assimp.*;

Some files were not shown because too many files have changed in this diff Show More