(initially) Automatically generated
+ *+ * Attaches this tree to the entity. + *
+ * @param entity The entity to attach to + * @param tree The behavior tree to attach + * @param params Optional parameters that will be provided to the constructor + */ + public static ClientDoorState attachTree(Entity parent, Object ... params){ + ClientDoorState rVal = new ClientDoorState(parent,params); + //!!WARNING!! from here below should not be touched + //This was generated automatically to properly alert various systems that the btree exists and should be tracked + parent.putData(EntityDataStrings.TREE_CLIENTDOOR, rVal); + Globals.clientSceneWrapper.getScene().registerBehaviorTree(rVal); + Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_CLIENTDOOR_ID); + return rVal; + } + + /** + *Automatically generated
+ *+ * Detatches this tree from the entity. + *
+ * @param entity The entity to detach to + * @param tree The behavior tree to detach + */ + public static void detachTree(Entity entity, BehaviorTree tree){ + Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_CLIENTDOOR_ID); + } + + /** + *+ * Gets the ClientDoorState of the entity + *
+ * @param entity the entity + * @return The ClientDoorState + */ + public static ClientDoorState getClientDoorState(Entity entity){ + return (ClientDoorState)entity.getData(EntityDataStrings.TREE_CLIENTDOOR); + } + + /** + *+ * Checks if the entity has a ClientDoorState component + *
+ * @param entity the entity + * @return true if the entity contains the component, false otherwise + */ + public static boolean hasClientDoorState(Entity entity){ + return entity.containsKey(EntityDataStrings.TREE_CLIENTDOOR); + } + + /** + *Automatically generated
+ *+ * Sets state and handles the synchronization logic for it. + *
+ * @param state The value to set state to. + */ + public void setState(DoorState state){ + this.state = state; + } + + /** + *Automatically generated
+ *+ * Gets state. + *
+ */ + public DoorState getState(){ + return state; + } + + /** + *Automatically generated
+ *+ * Converts a short to the equivalent enum value + *
+ * @param shortVal The short value + * @return The enum value + */ + public static DoorState getDoorStateShortAsEnum(short shortVal){ + switch(shortVal){ + case 0: + return DoorState.OPEN; + case 1: + return DoorState.OPENING; + case 2: + return DoorState.CLOSED; + case 3: + return DoorState.CLOSING; + default: + return DoorState.OPEN; + } + } + + /** + *Automatically generated
+ *+ * Converts this enum type to an equivalent short value + *
+ * @param enumVal The enum value + * @return The short value + */ + public static short getDoorStateEnumAsShort(DoorState enumVal){ + switch(enumVal){ + case OPEN: + return 0; + case OPENING: + return 1; + case CLOSED: + return 2; + case CLOSING: + return 3; + default: + return 0; + } + } + +} diff --git a/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java b/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java new file mode 100644 index 00000000..aa8d8d49 --- /dev/null +++ b/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java @@ -0,0 +1,191 @@ +package electrosphere.entity.state.furniture; + + +import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.engine.Globals; +import electrosphere.entity.EntityDataStrings; +import electrosphere.net.synchronization.enums.FieldIdEnums; +import electrosphere.server.datacell.Realm; +import electrosphere.server.datacell.utils.DataCellSearchUtils; +import electrosphere.net.parser.net.message.SynchronizationMessage; +import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; +import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; +import electrosphere.entity.Entity; +import electrosphere.entity.btree.BehaviorTree; +import electrosphere.entity.btree.StateTransitionUtil; +import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem; +import electrosphere.entity.state.furniture.ClientDoorState.DoorState; +import electrosphere.game.data.furniture.DoorData; +import electrosphere.net.synchronization.annotation.SyncedField; +import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; + +/** + * State for controlling door furniture behavior + */ +@SynchronizedBehaviorTree(name = "serverDoor", isServer = true, correspondingTree="clientDoor") +public class ServerDoorState implements BehaviorTree { + + /** + * The current state of the door + */ + @SyncedField + DoorState state; + + /** + * The parent entity + */ + Entity parent; + + /** + * The data for the door behavior + */ + DoorData doorData; + + /** + * The state transition util + */ + StateTransitionUtil stateTransitionUtil; + + /** + * Constructor + * @param e + * @param params + */ + private ServerDoorState(Entity e, Object ... params){ + parent = e; + this.state = DoorState.CLOSED; + this.doorData = (DoorData)params[0]; + this.stateTransitionUtil = StateTransitionUtil.create(parent, true, new StateTransitionUtilItem[]{ + StateTransitionUtilItem.create( + DoorState.OPEN, + doorData.getOpen(), + true + ), + StateTransitionUtilItem.create( + DoorState.OPENING, + doorData.getOpening(), + () -> { + this.setState(DoorState.OPEN); + Realm parentRealm = Globals.realmManager.getEntityRealm(this.parent); + PhysicsEntityUtils.disableBody(parentRealm.getCollisionEngine(), this.parent); + } + ), + StateTransitionUtilItem.create( + DoorState.CLOSED, + doorData.getClosed(), + true + ), + StateTransitionUtilItem.create( + DoorState.CLOSING, + doorData.getClosing(), + () -> { + this.setState(DoorState.CLOSED); + Realm parentRealm = Globals.realmManager.getEntityRealm(this.parent); + PhysicsEntityUtils.enableBody(parentRealm.getCollisionEngine(), this.parent); + } + ), + }); + } + + @Override + public void simulate(float deltaTime){ + this.stateTransitionUtil.simulate(this.state); + } + + /** + * Tries interacting with the door + */ + public void interact(){ + switch(this.state){ + case OPEN: { + this.setState(DoorState.CLOSING); + } break; + case CLOSED: { + this.setState(DoorState.OPENING); + } break; + case OPENING: + case CLOSING: + //silently ignore + break; + } + } + + /** + *(initially) Automatically generated
+ *+ * Attaches this tree to the entity. + *
+ * @param entity The entity to attach to + * @param tree The behavior tree to attach + * @param params Optional parameters that will be provided to the constructor + */ + public static ServerDoorState attachTree(Entity parent, Object ... params){ + ServerDoorState rVal = new ServerDoorState(parent,params); + //!!WARNING!! from here below should not be touched + //This was generated automatically to properly alert various systems that the btree exists and should be tracked + ServerBehaviorTreeUtils.attachBTreeToEntity(parent, rVal); + parent.putData(EntityDataStrings.TREE_SERVERDOOR, rVal); + Globals.entityValueTrackingService.attachTreeToEntity(parent, BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID); + return rVal; + } + + /** + *Automatically generated
+ *+ * Detatches this tree from the entity. + *
+ * @param entity The entity to detach to + * @param tree The behavior tree to detach + */ + public static void detachTree(Entity entity, BehaviorTree tree){ + Globals.entityValueTrackingService.detatchTreeFromEntity(entity, BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID); + } + + /** + *+ * Gets the ServerDoorState of the entity + *
+ * @param entity the entity + * @return The ServerDoorState + */ + public static ServerDoorState getServerDoorState(Entity entity){ + return (ServerDoorState)entity.getData(EntityDataStrings.TREE_SERVERDOOR); + } + + /** + *+ * Checks if the entity has a ServerDoorState component + *
+ * @param entity the entity + * @return true if the entity contains the component, false otherwise + */ + public static boolean hasServerDoorState(Entity entity){ + return entity.containsKey(EntityDataStrings.TREE_SERVERDOOR); + } + + /** + *Automatically generated
+ *+ * Sets state and handles the synchronization logic for it. + *
+ * @param state The value to set state to. + */ + public void setState(DoorState state){ + this.state = state; + int value = ClientDoorState.getDoorStateEnumAsShort(state); + if(DataCellSearchUtils.getEntityDataCell(parent) != null){ + DataCellSearchUtils.getEntityDataCell(parent).broadcastNetworkMessage(SynchronizationMessage.constructUpdateClientStateMessage(parent.getId(), BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID, FieldIdEnums.TREE_SERVERDOOR_SYNCEDFIELD_STATE_ID, value)); + } + } + + /** + *Automatically generated
+ *+ * Gets state. + *
+ */ + public DoorState getState(){ + return state; + } + +} diff --git a/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java b/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java index 2ef0aaab..d3def281 100644 --- a/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java +++ b/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java @@ -31,6 +31,8 @@ import electrosphere.entity.state.equip.ClientEquipState; import electrosphere.entity.state.equip.ClientToolbarState; import electrosphere.entity.state.equip.ServerEquipState; import electrosphere.entity.state.equip.ServerToolbarState; +import electrosphere.entity.state.furniture.ClientDoorState; +import electrosphere.entity.state.furniture.ServerDoorState; import electrosphere.entity.state.gravity.ClientGravityTree; import electrosphere.entity.state.gravity.ServerGravityTree; import electrosphere.entity.state.hitbox.HitboxCollectionState; @@ -421,6 +423,12 @@ public class CommonEntityUtils { if(rawType.getGridAlignedData() != null){ Globals.clientScene.registerEntityToTag(entity, EntityTags.BLOCK_OCCUPANT); } + //furniture data + if(rawType.getFurnitureData() != null){ + if(rawType.getFurnitureData().getDoor() != null){ + ClientDoorState.attachTree(entity, rawType.getFurnitureData().getDoor()); + } + } //add health system if(rawType.getHealthSystem() != null){ ClientLifeTree.attachTree(entity,rawType.getHealthSystem()); @@ -732,6 +740,13 @@ public class CommonEntityUtils { //TODO: must register with all nearby scenes as well because it could possibly occupy other chunks } + //furniture data + if(rawType.getFurnitureData() != null){ + if(rawType.getFurnitureData().getDoor() != null){ + ServerDoorState.attachTree(entity, rawType.getFurnitureData().getDoor()); + } + } + /// /// /// AI (This SHOULD only be applied on the server with the way AI architected currently) diff --git a/src/main/java/electrosphere/game/data/common/CommonEntityType.java b/src/main/java/electrosphere/game/data/common/CommonEntityType.java index 3b602ab2..59b05fca 100644 --- a/src/main/java/electrosphere/game/data/common/CommonEntityType.java +++ b/src/main/java/electrosphere/game/data/common/CommonEntityType.java @@ -22,6 +22,7 @@ import electrosphere.game.data.creature.type.movement.MovementSystem; import electrosphere.game.data.creature.type.rotator.RotatorSystem; import electrosphere.game.data.foliage.type.AmbientAudio; import electrosphere.game.data.foliage.type.GrowthModel; +import electrosphere.game.data.furniture.FurnitureData; import electrosphere.game.data.graphics.GraphicsTemplate; import electrosphere.game.data.grident.GridAlignedData; import electrosphere.game.data.particle.ParticleEmitter; @@ -156,6 +157,11 @@ public class CommonEntityType { */ GridAlignedData gridAlignedData; + /** + * Data for furniture behaviors + */ + FurnitureData furnitureData; + /** * Gets the id for this creature type * @return The id @@ -403,6 +409,14 @@ public class CommonEntityType { public GridAlignedData getGridAlignedData() { return gridAlignedData; } + + /** + * Gets the data for furniture behaviors + * @return The data for furniture behaviors + */ + public FurnitureData getFurnitureData() { + return furnitureData; + } } diff --git a/src/main/java/electrosphere/game/data/common/interact/InteractionData.java b/src/main/java/electrosphere/game/data/common/interact/InteractionData.java index a4be7052..d1d38370 100644 --- a/src/main/java/electrosphere/game/data/common/interact/InteractionData.java +++ b/src/main/java/electrosphere/game/data/common/interact/InteractionData.java @@ -16,6 +16,11 @@ public class InteractionData { * Try harvesting the entity on interaction */ public static final String ON_INTERACT_HARVEST = "harvest"; + + /** + * Try opening/closing a door + */ + public static final String ON_INTERACT_DOOR = "door"; /** * The function to run on interaction diff --git a/src/main/java/electrosphere/game/data/furniture/DoorData.java b/src/main/java/electrosphere/game/data/furniture/DoorData.java new file mode 100644 index 00000000..4e93f9db --- /dev/null +++ b/src/main/java/electrosphere/game/data/furniture/DoorData.java @@ -0,0 +1,64 @@ +package electrosphere.game.data.furniture; + +import electrosphere.game.data.common.treedata.TreeDataState; + +/** + * Data about how a door functions + */ +public class DoorData { + + /** + * Tree data for when the door is already open + */ + TreeDataState open; + + /** + * Tree data for when the door is already closed + */ + TreeDataState closed; + + /** + * Tree data for when the door is beginning to open + */ + TreeDataState opening; + + /** + * Tree data for when the door is beginning to close + */ + TreeDataState closing; + + /** + * Gets the Tree data for when the door is already open + * @return The Tree data for when the door is already open + */ + public TreeDataState getOpen() { + return open; + } + + /** + * Gets the Tree data for when the door is already closed + * @return The Tree data for when the door is already closed + */ + public TreeDataState getClosed() { + return closed; + } + + /** + * Gets the Tree data for when the door is beginning to open + * @return the Tree data for when the door is beginning to open + */ + public TreeDataState getOpening() { + return opening; + } + + /** + * Gets the Tree data for when the door is beginning to close + * @return the Tree data for when the door is beginning to close + */ + public TreeDataState getClosing() { + return closing; + } + + + +} diff --git a/src/main/java/electrosphere/game/data/furniture/FurnitureData.java b/src/main/java/electrosphere/game/data/furniture/FurnitureData.java new file mode 100644 index 00000000..ff53e55e --- /dev/null +++ b/src/main/java/electrosphere/game/data/furniture/FurnitureData.java @@ -0,0 +1,21 @@ +package electrosphere.game.data.furniture; + +/** + * Data controlling furniture behavior + */ +public class FurnitureData { + + /** + * Data for door functionality + */ + DoorData door; + + /** + * Gets the data for door functionality + * @return The data for door functionality + */ + public DoorData getDoor() { + return door; + } + +} diff --git a/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java index 36ff1355..76c1f4f2 100644 --- a/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java +++ b/src/main/java/electrosphere/net/synchronization/client/ClientSynchronizationManager.java @@ -1,6 +1,7 @@ package electrosphere.net.synchronization.client; +import electrosphere.entity.state.furniture.ClientDoorState; import electrosphere.util.Utilities; import electrosphere.entity.state.item.ClientChargeState; import electrosphere.entity.state.movement.editor.ClientEditorMovementTree; @@ -210,6 +211,16 @@ public class ClientSynchronizationManager { } break; } } break; + case BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID: { + switch(message.getfieldId()){ + case FieldIdEnums.TREE_SERVERDOOR_SYNCEDFIELD_STATE_ID:{ + ClientDoorState tree = ClientDoorState.getClientDoorState(entity); + if(tree != null){ + tree.setState(ClientDoorState.getDoorStateShortAsEnum((short)message.getbTreeValue())); + } + } break; + } + } break; case BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID: { switch(message.getfieldId()){ case FieldIdEnums.TREE_SERVERGRAVITY_SYNCEDFIELD_STATE_ID:{ diff --git a/src/main/java/electrosphere/net/synchronization/enums/BehaviorTreeIdEnums.java b/src/main/java/electrosphere/net/synchronization/enums/BehaviorTreeIdEnums.java index 277ac8b1..c4ef4e60 100644 --- a/src/main/java/electrosphere/net/synchronization/enums/BehaviorTreeIdEnums.java +++ b/src/main/java/electrosphere/net/synchronization/enums/BehaviorTreeIdEnums.java @@ -13,6 +13,8 @@ public class BehaviorTreeIdEnums { public static final int BTREE_CLIENTTOOLBARSTATE_ID = 22; public static final int BTREE_SERVEREQUIPSTATE_ID = 5; public static final int BTREE_SERVERTOOLBARSTATE_ID = 23; + public static final int BTREE_CLIENTDOOR_ID = 28; + public static final int BTREE_SERVERDOOR_ID = 29; public static final int BTREE_CLIENTGRAVITY_ID = 12; public static final int BTREE_SERVERGRAVITY_ID = 7; public static final int BTREE_IDLE_ID = 8; diff --git a/src/main/java/electrosphere/net/synchronization/enums/FieldIdEnums.java b/src/main/java/electrosphere/net/synchronization/enums/FieldIdEnums.java index c852d500..d720be08 100644 --- a/src/main/java/electrosphere/net/synchronization/enums/FieldIdEnums.java +++ b/src/main/java/electrosphere/net/synchronization/enums/FieldIdEnums.java @@ -17,6 +17,8 @@ public class FieldIdEnums { public static final int TREE_SERVERBLOCKTREE_SYNCEDFIELD_CURRENTBLOCKVARIANT_ID = 9; public static final int TREE_CLIENTTOOLBARSTATE_SYNCEDFIELD_SELECTEDSLOT_ID = 30; public static final int TREE_SERVERTOOLBARSTATE_SYNCEDFIELD_SELECTEDSLOT_ID = 31; + public static final int TREE_CLIENTDOOR_SYNCEDFIELD_STATE_ID = 36; + public static final int TREE_SERVERDOOR_SYNCEDFIELD_STATE_ID = 37; public static final int TREE_CLIENTGRAVITY_SYNCEDFIELD_STATE_ID = 16; public static final int TREE_SERVERGRAVITY_SYNCEDFIELD_STATE_ID = 11; public static final int TREE_IDLE_SYNCEDFIELD_STATE_ID = 12; diff --git a/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java b/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java index 327d16d4..c92a0b51 100644 --- a/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java +++ b/src/main/java/electrosphere/net/synchronization/transport/StateCollection.java @@ -1,6 +1,8 @@ package electrosphere.net.synchronization.transport; +import electrosphere.entity.state.furniture.ServerDoorState; +import electrosphere.entity.state.furniture.ClientDoorState; import electrosphere.util.Utilities; import electrosphere.entity.state.item.ServerChargeState; import electrosphere.entity.state.item.ClientChargeState; @@ -90,6 +92,10 @@ public class StateCollection { ServerToolbarState tree = ServerToolbarState.getServerToolbarState(entity); collection.setValue(new SynchronizedFieldValue(BehaviorTreeIdEnums.BTREE_SERVERTOOLBARSTATE_ID,FieldIdEnums.TREE_SERVERTOOLBARSTATE_SYNCEDFIELD_SELECTEDSLOT_ID,tree.getSelectedSlot())); } break; + case BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID: { + ServerDoorState tree = ServerDoorState.getServerDoorState(entity); + collection.setValue(new SynchronizedFieldValue(BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID,FieldIdEnums.TREE_SERVERDOOR_SYNCEDFIELD_STATE_ID,ClientDoorState.getDoorStateEnumAsShort(tree.getState()))); + } break; case BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID: { ServerGravityTree tree = ServerGravityTree.getServerGravityTree(entity); collection.setValue(new SynchronizedFieldValue(BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID,FieldIdEnums.TREE_SERVERGRAVITY_SYNCEDFIELD_STATE_ID,ClientGravityTree.getGravityTreeStateEnumAsShort(tree.getState()))); @@ -182,6 +188,14 @@ public class StateCollection { } break; } } break; + case BehaviorTreeIdEnums.BTREE_SERVERDOOR_ID: { + ClientDoorState tree = ClientDoorState.getClientDoorState(entity); + switch(syncedValue.getFieldId()){ + case(FieldIdEnums.TREE_SERVERDOOR_SYNCEDFIELD_STATE_ID): { + tree.setState(ClientDoorState.getDoorStateShortAsEnum(((Double)syncedValue.getValue()).shortValue())); + } break; + } + } break; case BehaviorTreeIdEnums.BTREE_SERVERGRAVITY_ID: { ClientGravityTree tree = ClientGravityTree.getClientGravityTree(entity); switch(syncedValue.getFieldId()){ diff --git a/src/main/java/electrosphere/renderer/actor/Actor.java b/src/main/java/electrosphere/renderer/actor/Actor.java index 52efe6ab..7a4cea86 100644 --- a/src/main/java/electrosphere/renderer/actor/Actor.java +++ b/src/main/java/electrosphere/renderer/actor/Actor.java @@ -265,12 +265,20 @@ public class Actor { boneMask.addAll(group.getBoneNamesFirstPerson()); } } - } else if(this.boneGroups == null){ + } else if(animation.getBoneGroups() != null && this.boneGroups == null){ LoggerInterface.loggerRenderer.WARNING( "Trying to play animation on Actor that uses bone groups, but the Actor's bone group isn't defined!\n" + "Model path: " + modelPath + "\n" + "Animation name: " + animationName + "\n" ); + } else if(animation.getBoneGroups() == null){ + Model model = Globals.assetManager.fetchModel(this.modelPath); + if(model != null){ + boneMask = new LinkedList