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

rename client sprint tree
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2024-09-03 21:47:03 -04:00
parent 21d94327f8
commit c783550ee5
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/electrosphere/controls/ControlHandler.java
View File

@ -92,7 +92,7 @@ import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing;
import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState;
import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.entity.state.movement.jump.ClientJumpTree;
import electrosphere.entity.state.movement.sprint.SprintTree; import electrosphere.entity.state.movement.sprint.ClientSprintTree;
import electrosphere.entity.state.movement.walk.ClientWalkTree; import electrosphere.entity.state.movement.walk.ClientWalkTree;
import electrosphere.entity.types.camera.CameraEntityUtils; import electrosphere.entity.types.camera.CameraEntityUtils;
import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.creature.CreatureUtils;
@ -824,7 +824,7 @@ public class ControlHandler {
mainGameControlList.add(controls.get(INPUT_CODE_SPRINT)); mainGameControlList.add(controls.get(INPUT_CODE_SPRINT));
controls.get(INPUT_CODE_SPRINT).setOnPress(new ControlMethod(){public void execute(){ controls.get(INPUT_CODE_SPRINT).setOnPress(new ControlMethod(){public void execute(){
if(Globals.playerEntity != null){ if(Globals.playerEntity != null){
SprintTree sprintTree = CreatureUtils.clientGetSprintTree(Globals.playerEntity); ClientSprintTree sprintTree = CreatureUtils.clientGetSprintTree(Globals.playerEntity);
if(sprintTree != null){ if(sprintTree != null){
sprintTree.start(); sprintTree.start();
} }
@ -832,7 +832,7 @@ public class ControlHandler {
}}); }});
controls.get(INPUT_CODE_SPRINT).setOnRelease(new ControlMethod(){public void execute(){ controls.get(INPUT_CODE_SPRINT).setOnRelease(new ControlMethod(){public void execute(){
if(Globals.playerEntity != null){ if(Globals.playerEntity != null){
SprintTree sprintTree = CreatureUtils.clientGetSprintTree(Globals.playerEntity); ClientSprintTree sprintTree = CreatureUtils.clientGetSprintTree(Globals.playerEntity);
if(sprintTree != null){ if(sprintTree != null){
sprintTree.stop(); sprintTree.stop();
} }

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

@ -20,7 +20,7 @@ import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
import electrosphere.entity.state.movement.FallTree; import electrosphere.entity.state.movement.FallTree;
import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.entity.state.movement.jump.ClientJumpTree;
import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState; import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState;
import electrosphere.entity.state.movement.sprint.SprintTree; import electrosphere.entity.state.movement.sprint.ClientSprintTree;
import electrosphere.entity.state.movement.walk.ClientWalkTree; import electrosphere.entity.state.movement.walk.ClientWalkTree;
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;
@ -87,7 +87,7 @@ public class ClientGroundMovementTree implements BehaviorTree {
@SyncedField @SyncedField
MovementRelativeFacing facing = MovementRelativeFacing.FORWARD; MovementRelativeFacing facing = MovementRelativeFacing.FORWARD;
SprintTree sprintTree; ClientSprintTree sprintTree;
ClientJumpTree jumpTree; ClientJumpTree jumpTree;
FallTree fallTree; FallTree fallTree;
@ -451,7 +451,7 @@ public class ClientGroundMovementTree implements BehaviorTree {
this.animationSprintWindDown = animationSprintWindDown; this.animationSprintWindDown = animationSprintWindDown;
} }
public void setSprintTree(SprintTree sprintTree){ public void setSprintTree(ClientSprintTree sprintTree){
this.sprintTree = sprintTree; this.sprintTree = sprintTree;
} }

4
src/main/java/electrosphere/entity/state/movement/sprint/SprintTree.java → src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java
View File

@ -8,7 +8,7 @@ import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.M
/** /**
* Client sprint tree * Client sprint tree
*/ */
public class SprintTree implements BehaviorTree { public class ClientSprintTree implements BehaviorTree {
public static enum SprintTreeState { public static enum SprintTreeState {
SPRINTING, SPRINTING,
@ -26,7 +26,7 @@ public class SprintTree implements BehaviorTree {
float maxVelocity; float maxVelocity;
public SprintTree(Entity e, float maxVelocity, int staminaMax){ public ClientSprintTree(Entity e, float maxVelocity, int staminaMax){
state = SprintTreeState.NOT_SPRINTING; state = SprintTreeState.NOT_SPRINTING;
parent = e; parent = e;
this.maxVelocity = maxVelocity; this.maxVelocity = maxVelocity;

8
src/main/java/electrosphere/entity/types/creature/CreatureUtils.java
View File

@ -41,7 +41,7 @@ import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree;
import electrosphere.entity.state.movement.jump.ClientJumpTree; import electrosphere.entity.state.movement.jump.ClientJumpTree;
import electrosphere.entity.state.movement.jump.ServerJumpTree; import electrosphere.entity.state.movement.jump.ServerJumpTree;
import electrosphere.entity.state.movement.sprint.ServerSprintTree; import electrosphere.entity.state.movement.sprint.ServerSprintTree;
import electrosphere.entity.state.movement.sprint.SprintTree; import electrosphere.entity.state.movement.sprint.ClientSprintTree;
import electrosphere.entity.state.movement.walk.ClientWalkTree; import electrosphere.entity.state.movement.walk.ClientWalkTree;
import electrosphere.entity.state.movement.walk.ServerWalkTree; import electrosphere.entity.state.movement.walk.ServerWalkTree;
import electrosphere.entity.state.physicssync.upright.ClientAlwaysUprightTree; import electrosphere.entity.state.physicssync.upright.ClientAlwaysUprightTree;
@ -148,7 +148,7 @@ public class CreatureUtils {
//sprint system //sprint system
if(groundMovementSystem.getSprintSystem() != null){ if(groundMovementSystem.getSprintSystem() != null){
SprintSystem sprintSystem = groundMovementSystem.getSprintSystem(); SprintSystem sprintSystem = groundMovementSystem.getSprintSystem();
SprintTree sprintTree = new SprintTree(rVal,sprintSystem.getMaxVelocity(),sprintSystem.getStaminaMax()); ClientSprintTree sprintTree = new ClientSprintTree(rVal,sprintSystem.getMaxVelocity(),sprintSystem.getStaminaMax());
if(sprintSystem.getAnimationStartUp()!= null){ if(sprintSystem.getAnimationStartUp()!= null){
moveTree.setAnimationSprintStartUp(sprintSystem.getAnimationStartUp().getNameThirdPerson()); moveTree.setAnimationSprintStartUp(sprintSystem.getAnimationStartUp().getNameThirdPerson());
} }
@ -844,8 +844,8 @@ public class CreatureUtils {
return (ClientIdleTree)e.getData(EntityDataStrings.TREE_IDLE); return (ClientIdleTree)e.getData(EntityDataStrings.TREE_IDLE);
} }
public static SprintTree clientGetSprintTree(Entity e){ public static ClientSprintTree clientGetSprintTree(Entity e){
return (SprintTree)e.getData(EntityDataStrings.CLIENT_SPRINT_TREE); return (ClientSprintTree)e.getData(EntityDataStrings.CLIENT_SPRINT_TREE);
} }
public static ServerSprintTree serverGetSprintTree(Entity e){ public static ServerSprintTree serverGetSprintTree(Entity e){