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

Some better animations

Browse Source
This commit is contained in:
austin 2022-02-16 17:50:14 -05:00
parent 894e6211a1
commit 92ec47f9fd
5 changed files with 28 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/Data/creatures/human.json
View File

@ -74,10 +74,10 @@
"movementSystems" : [ "movementSystems" : [
{ {
"type" : "GROUND", "type" : "GROUND",
"acceleration" : 16.0, "acceleration" : 1000.0,
"maxVelocity" : 1.0, "maxVelocity" : 1.0,
"animationStartup" : { "animationStartup" : {
"name" : "Armature|WalkStart", "name" : "Armature|Walk",
"length" : 1, "length" : 1,
"loops" : false "loops" : false
}, },
@ -87,7 +87,7 @@
"loops" : false "loops" : false
}, },
"animationWindDown" : { "animationWindDown" : {
"name" : "Armature|WalkStart", "name" : "Armature|Walk",
"length" : 1, "length" : 1,
"loops" : false "loops" : false
}, },

BIN
assets/Models/baseman.fbx
View File

Binary file not shown.

40
assets/Textures/default_texture_map.json
View File

@ -73,51 +73,51 @@
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"HandLeft" : [ "Hand.L" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"ForearmLeft" : [ "Forearm.L" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"BicepLeft" : [ "Bicep.L" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"HandRight" : [ "Hand.R" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"ForearmRight" : [ "Forearm.R" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"BicepRight" : [ "Bicep.R" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"FootLeft" : [ "Foot.L" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"FootRight" : [ "Foot.R" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"LowerLegLeft" : [ "LowerLeg.L" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"LowerLegRight" : [ "LowerLeg.R" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"UpperLegLeft" : [ "UpperLeg.L" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"UpperLegRight" : [ "UpperLeg.R" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
@ -125,11 +125,15 @@
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"ShoulderLeft" : [ "Shoulder.L" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"ShoulderRight" : [ "Shoulder.R" : [
"/Textures/skin1.png",
"/Textures/skin1.png"
],
"Neck" : [
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
@ -137,19 +141,19 @@
"/Textures/skin1.png", "/Textures/skin1.png",
"/Textures/skin1.png" "/Textures/skin1.png"
], ],
"EyebrowRight" : [ "Eyebrow.R" : [
"/Textures/b1.png", "/Textures/b1.png",
"/Textures/b1.png" "/Textures/b1.png"
], ],
"EyebrowLeft" : [ "Eyebrow.L" : [
"/Textures/b1.png", "/Textures/b1.png",
"/Textures/b1.png" "/Textures/b1.png"
], ],
"EyeRight" : [ "Eye.R" : [
"/Textures/w1.png", "/Textures/w1.png",
"/Textures/w1.png" "/Textures/w1.png"
], ],
"EyeLeft" : [ "Eye.L" : [
"/Textures/w1.png", "/Textures/w1.png",
"/Textures/w1.png" "/Textures/w1.png"
] ]

4
src/main/java/electrosphere/entity/Entity.java
View File

@ -50,8 +50,8 @@ public class Entity {
} }
public Entity(){ public Entity(){
data = new HashMap(); data = new HashMap<String,Object>();
dataKeys = new LinkedList(); dataKeys = new LinkedList<String>();
while(Globals.entityManager.getEntityFromId(entity_id_iterator)!=null){ while(Globals.entityManager.getEntityFromId(entity_id_iterator)!=null){
entity_id_iterator++; entity_id_iterator++;
} }

35
src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java
View File

@ -74,7 +74,7 @@ public class GroundMovementTree {
Collidable collidable; Collidable collidable;
CopyOnWriteArrayList<EntityMessage> networkMessageQueue = new CopyOnWriteArrayList(); CopyOnWriteArrayList<EntityMessage> networkMessageQueue = new CopyOnWriteArrayList<EntityMessage>();
long lastUpdateTime = 0; long lastUpdateTime = 0;
@ -225,17 +225,6 @@ public class GroundMovementTree {
entityActor.playAnimation(animationToPlay,1); entityActor.playAnimation(animationToPlay,1);
entityActor.incrementAnimationTime(0.01); entityActor.incrementAnimationTime(0.01);
} }
// if(sprintTree != null && sprintTree.state == SprintTreeState.SPRINTING){
// if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationSprintStart)){
// entityActor.playAnimation(animationSprintStart,1);
// entityActor.incrementAnimationTime(0.01);
// }
// } else {
// if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationStartUp)){
// entityActor.playAnimation(animationStartUp,1);
// entityActor.incrementAnimationTime(0.01);
// }
// }
} }
//check if can transition state //check if can transition state
if(velocity >= maxNaturalVelocity){ if(velocity >= maxNaturalVelocity){
@ -314,17 +303,6 @@ public class GroundMovementTree {
entityActor.playAnimation(animationToPlay,1); entityActor.playAnimation(animationToPlay,1);
entityActor.incrementAnimationTime(0.01); entityActor.incrementAnimationTime(0.01);
} }
// if(sprintTree != null && sprintTree.state == SprintTreeState.SPRINTING){
// if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationSprint)){
// entityActor.playAnimation(animationSprint,1);
// entityActor.incrementAnimationTime(0.01);
// }
// } else {
// if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationMain)){
// entityActor.playAnimation(animationMain,1);
// entityActor.incrementAnimationTime(0.01);
// }
// }
} }
if(velocity != maxNaturalVelocity){ if(velocity != maxNaturalVelocity){
velocity = maxNaturalVelocity; velocity = maxNaturalVelocity;
@ -401,17 +379,6 @@ public class GroundMovementTree {
entityActor.playAnimation(animationToPlay,1); entityActor.playAnimation(animationToPlay,1);
entityActor.incrementAnimationTime(0.01); entityActor.incrementAnimationTime(0.01);
} }
// if(sprintTree != null && sprintTree.state == SprintTreeState.SPRINTING){
// if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationSprintWindDown)){
// entityActor.playAnimation(animationSprintWindDown,1);
// entityActor.incrementAnimationTime(0.01);
// }
// } else {
// if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(animationSlowDown)){
// entityActor.playAnimation(animationSlowDown,1);
// entityActor.incrementAnimationTime(0.01);
// }
// }
} }
//check if can transition state //check if can transition state
if(velocity <= 0){ if(velocity <= 0){