studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small cleanup
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2024-07-31 17:19:30 -04:00
parent 6cf8edf9f2
commit 07d18b6126
16 changed files with 65 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.attack;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.engine.Globals;
@ -111,26 +112,19 @@ public class ClientAttackTree implements BehaviorTree {
}
/**
* Starts an attack
* <p> Automatically generated </p>
* <p>
* Requests that the server start this btree
* </p>
*/
public void start(){
currentMoveCanHold = false;
currentMoveHasWindup = false;
stillHold = true;
firesProjectile = false;
projectileToFire = null;
currentWeapon = null;
attackingPoint = null;
//figure out attack type we should be doing
String attackType = getAttackType();
//if we can attack, setup doing so
if(canAttack(attackType)){
setAttackMoveTypeActive(attackType);
currentMoveset = getMoveset(attackType);
if(currentMoveset != null){
Globals.clientConnection.queueOutgoingMessage(EntityMessage.constructstartAttackMessage());
}
}
Globals.clientConnection.queueOutgoingMessage(
SynchronizationMessage.constructClientRequestBTreeActionMessage(
Globals.clientSceneWrapper.mapClientToServerId(parent.getId()),
BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID,
1
)
);
}
public void release(){
@ -455,7 +449,6 @@ public class ClientAttackTree implements BehaviorTree {
}
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>

4
src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
View File

@ -511,7 +511,6 @@ public class ServerAttackTree implements BehaviorTree {
}
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -521,9 +520,6 @@ public class ServerAttackTree implements BehaviorTree {
*/
public static ServerAttackTree attachTree(Entity parent, Object ... params){
ServerAttackTree rVal = new ServerAttackTree(parent,params);
//put manual code here (setting params, etc)
//!!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);

18
src/main/java/electrosphere/entity/state/block/ClientBlockTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.block;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
@ -123,7 +124,6 @@ public class ClientBlockTree implements BehaviorTree {
}
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -225,4 +225,20 @@ public class ClientBlockTree implements BehaviorTree {
public void setCurrentBlockVariant(String currentBlockVariant){
this.currentBlockVariant = currentBlockVariant;
}
/**
* <p> Automatically generated </p>
* <p>
* Requests that the server start this btree
* </p>
*/
public void start(){
Globals.clientConnection.queueOutgoingMessage(
SynchronizationMessage.constructClientRequestBTreeActionMessage(
Globals.clientSceneWrapper.mapClientToServerId(parent.getId()),
BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID,
1
)
);
}
}

4
src/main/java/electrosphere/entity/state/block/ServerBlockTree.java
View File

@ -150,7 +150,6 @@ public class ServerBlockTree implements BehaviorTree {
}
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -160,9 +159,6 @@ public class ServerBlockTree implements BehaviorTree {
*/
public static ServerBlockTree attachTree(Entity parent, Object ... params){
ServerBlockTree rVal = new ServerBlockTree(parent,params);
//put manual code here (setting params, etc)
//!!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);

20
src/main/java/electrosphere/entity/state/equip/ClientEquipState.java
View File

@ -25,6 +25,7 @@ import electrosphere.game.data.item.type.EquipWhitelist;
import electrosphere.logger.LoggerInterface;
import electrosphere.net.parser.net.message.InventoryMessage;
import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
import electrosphere.renderer.actor.Actor;
import electrosphere.renderer.actor.ActorMeshMask;
@ -50,7 +51,7 @@ public class ClientEquipState implements BehaviorTree {
* @param equipPoints the list of available points
*/
private ClientEquipState(Entity parent, Object ... params){
List<EquipPoint> equipPoints = (List)params[0];
List<EquipPoint> equipPoints = (List<EquipPoint>)params[0];
this.parent = parent;
for(EquipPoint point : equipPoints){
this.equipPoints.add(point);
@ -413,7 +414,6 @@ public class ClientEquipState implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -452,4 +452,20 @@ public class ClientEquipState implements BehaviorTree {
return (ClientEquipState)entity.getData(EntityDataStrings.TREE_CLIENTEQUIPSTATE);
}
/**
* <p> Automatically generated </p>
* <p>
* Requests that the server start this btree
* </p>
*/
public void start(){
Globals.clientConnection.queueOutgoingMessage(
SynchronizationMessage.constructClientRequestBTreeActionMessage(
Globals.clientSceneWrapper.mapClientToServerId(parent.getId()),
BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID,
1
)
);
}
}

8
src/main/java/electrosphere/entity/state/equip/ServerEquipState.java
View File

@ -1,8 +1,6 @@
package electrosphere.entity.state.equip;
import electrosphere.net.synchronization.FieldIdEnums;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
@ -59,7 +57,7 @@ public class ServerEquipState implements BehaviorTree {
Map<String,Entity> equipMap = new HashMap<String,Entity>();
public ServerEquipState(Entity parent, Object ... params){
List<EquipPoint> equipPoints = (List)params[0];
List<EquipPoint> equipPoints = (List<EquipPoint>)params[0];
this.parent = parent;
for(EquipPoint point : equipPoints){
this.equipPoints.add(point);
@ -425,7 +423,6 @@ public class ServerEquipState implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -435,9 +432,6 @@ public class ServerEquipState implements BehaviorTree {
*/
public static ServerEquipState attachTree(Entity parent, Object ... params){
ServerEquipState rVal = new ServerEquipState(parent,params);
//put manual code here (setting params, etc)
//!!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);

27
src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
View File

@ -1,22 +1,18 @@
package electrosphere.entity.state.gravity;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.joml.Quaterniond;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.ode4j.ode.DBody;
import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.EntityDataStrings;
import electrosphere.entity.EntityUtils;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.state.collidable.ClientCollidableTree;
import electrosphere.entity.state.collidable.Impulse;
import electrosphere.entity.state.movement.FallTree;
import electrosphere.entity.state.movement.jump.ClientJumpTree;
@ -75,13 +71,6 @@ public class ClientGravityTree implements BehaviorTree {
return state;
}
public void start(){
//TODO: check if can start moving
state = GravityTreeState.ACTIVE;
if(state == GravityTreeState.NOT_ACTIVE){
frameCurrent = 0;
}
}
public void interrupt(){
state = GravityTreeState.NOT_ACTIVE;
@ -95,19 +84,6 @@ public class ClientGravityTree implements BehaviorTree {
static final float linearDamping = 0.1f;
public void simulate(float deltaTime){
// float velocity = CreatureUtils.getVelocity(parent);
// float acceleration = CreatureUtils.getAcceleration(parent);
// float maxNaturalVelocity = CreatureUtils.getMaxNaturalVelocity(parent);
// Actor entityActor = EntityUtils.getActor(parent);
Vector3d position = EntityUtils.getPosition(parent);
// Vector3f movementVector = CreatureUtils.getMovementVector(parent);
Quaterniond rotation = EntityUtils.getRotation(parent);
Vector3f newPosition;
ClientCollidableTree collidableTree = null;
if(ClientCollidableTree.hasClientCollidableTree(parent)){
collidableTree = ClientCollidableTree.getClientCollidableTree(parent);
}
//state machine
switch(state){
@ -192,7 +168,6 @@ public class ClientGravityTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>

4
src/main/java/electrosphere/entity/state/gravity/ServerGravityTree.java
View File

@ -219,7 +219,6 @@ public class ServerGravityTree implements BehaviorTree {
}
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -229,9 +228,6 @@ public class ServerGravityTree implements BehaviorTree {
*/
public static ServerGravityTree attachTree(Entity parent, Object ... params){
ServerGravityTree rVal = new ServerGravityTree(parent,params);
//put manual code here (setting params, etc)
//!!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);

2
src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.idle;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
@ -128,7 +129,6 @@ public class ClientIdleTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>

4
src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java
View File

@ -160,7 +160,6 @@ public class ServerIdleTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -170,9 +169,6 @@ public class ServerIdleTree implements BehaviorTree {
*/
public static ServerIdleTree attachTree(Entity parent, Object ... params){
ServerIdleTree rVal = new ServerIdleTree(parent,params);
//put manual code here (setting params, etc)
//!!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);

2
src/main/java/electrosphere/entity/state/life/ClientLifeTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.life;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import electrosphere.entity.btree.BehaviorTree;
import electrosphere.entity.btree.StateTransitionUtil;
@ -73,7 +74,6 @@ public class ClientLifeTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>

4
src/main/java/electrosphere/entity/state/life/ServerLifeTree.java
View File

@ -126,7 +126,6 @@ public class ServerLifeTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -136,9 +135,6 @@ public class ServerLifeTree implements BehaviorTree {
*/
public static ServerLifeTree attachTree(Entity parent, Object ... params){
ServerLifeTree rVal = new ServerLifeTree(parent,params);
//put manual code here (setting params, etc)
//!!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);

1
src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
View File

@ -670,7 +670,6 @@ public class ClientGroundMovementTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>

4
src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java
View File

@ -696,7 +696,6 @@ public class ServerGroundMovementTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -706,9 +705,6 @@ public class ServerGroundMovementTree implements BehaviorTree {
*/
public static ServerGroundMovementTree attachTree(Entity parent, Object ... params){
ServerGroundMovementTree rVal = new ServerGroundMovementTree(parent,params);
//put manual code here (setting params, etc)
//!!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);

21
src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java
View File

@ -1,6 +1,7 @@
package electrosphere.entity.state.movement.jump;
import electrosphere.net.parser.net.message.SynchronizationMessage;
import electrosphere.net.synchronization.BehaviorTreeIdEnums;
import org.ode4j.math.DVector3C;
import org.ode4j.ode.DBody;
@ -63,13 +64,20 @@ public class ClientJumpTree implements BehaviorTree {
this.jumpForce = this.jumpData.getJumpForce();
}
/**
* <p> Automatically generated </p>
* <p>
* Requests that the server start this btree
* </p>
*/
public void start(){
// if(state == JumpState.INACTIVE){
state = JumpState.ACTIVE;
currentFrame = 0;
currentJumpForce = jumpForce;
GravityUtils.clientAttemptActivateGravity(parent);
// }
Globals.clientConnection.queueOutgoingMessage(
SynchronizationMessage.constructClientRequestBTreeActionMessage(
Globals.clientSceneWrapper.mapClientToServerId(parent.getId()),
BehaviorTreeIdEnums.BTREE_CLIENTGROUNDMOVEMENTTREE_ID,
1
)
);
}
@Override
@ -157,7 +165,6 @@ public class ClientJumpTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>

4
src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java
View File

@ -151,7 +151,6 @@ public class ServerJumpTree implements BehaviorTree {
/**
* <p> (initially) Automatically generated </p>
* <p> More parameters can be safely added to this method</p>
* <p>
* Attaches this tree to the entity.
* </p>
@ -161,9 +160,6 @@ public class ServerJumpTree implements BehaviorTree {
*/
public static ServerJumpTree attachTree(Entity parent, Object ... params){
ServerJumpTree rVal = new ServerJumpTree(parent,params);
//put manual code here (setting params, etc)
//!!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);