remove blender transform token support
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good

This commit is contained in:
austin 2024-08-09 18:06:44 -04:00
parent 4ff8f1a5d0
commit ff3914cc19
10 changed files with 0 additions and 34 deletions

View File

@ -8,7 +8,6 @@
"creatureId" : "CUBE_MAN", "creatureId" : "CUBE_MAN",
"hitboxes" : [], "hitboxes" : [],
"tokens" : [ "tokens" : [
"BLENDER_TRANSFORM",
"SENTIENT", "SENTIENT",
"GRAVITY" "GRAVITY"
], ],

View File

@ -10,7 +10,6 @@
} }
], ],
"tokens" : [ "tokens" : [
"BLENDER_TRANSFORM",
"GRAVITY" "GRAVITY"
], ],
"movementSystems" : [ "movementSystems" : [

View File

@ -50,7 +50,6 @@
} }
], ],
"tokens" : [ "tokens" : [
"BLENDER_TRANSFORM",
"SENTIENT", "SENTIENT",
"ATTACKER", "ATTACKER",
"GRAVITY", "GRAVITY",

View File

@ -50,7 +50,6 @@
} }
], ],
"tokens" : [ "tokens" : [
"BLENDER_TRANSFORM",
"SENTIENT", "SENTIENT",
"ATTACKER", "ATTACKER",
"GRAVITY", "GRAVITY",

View File

@ -50,7 +50,6 @@
} }
], ],
"tokens" : [ "tokens" : [
"BLENDER_TRANSFORM",
"SENTIENT", "SENTIENT",
"ATTACKER", "ATTACKER",
"GRAVITY", "GRAVITY",

View File

@ -32,7 +32,6 @@
}, },
"tokens" : [ "tokens" : [
"GRAVITY", "GRAVITY",
"BLENDER_TRANSFORM",
"MELEE", "MELEE",
"TARGETABLE", "TARGETABLE",
"OUTLINE" "OUTLINE"
@ -82,7 +81,6 @@
}, },
"tokens" : [ "tokens" : [
"GRAVITY", "GRAVITY",
"BLENDER_TRANSFORM",
"MELEE", "MELEE",
"TARGETABLE", "TARGETABLE",
"OUTLINE" "OUTLINE"

View File

@ -205,9 +205,6 @@ public class CreatureUtils {
} }
for(String token : rawType.getTokens()){ for(String token : rawType.getTokens()){
switch(token){ switch(token){
case "BLENDER_TRANSFORM":
ActorUtils.applyBlenderTransformer(rVal);
break;
case "ATTACKER": case "ATTACKER":
ClientAttackTree.attachTree(rVal); ClientAttackTree.attachTree(rVal);
rVal.putData(EntityDataStrings.ATTACK_MOVE_TYPE_ACTIVE, null); rVal.putData(EntityDataStrings.ATTACK_MOVE_TYPE_ACTIVE, null);
@ -476,9 +473,6 @@ public class CreatureUtils {
} }
for(String token : rawType.getTokens()){ for(String token : rawType.getTokens()){
switch(token){ switch(token){
case "BLENDER_TRANSFORM": {
PoseActorUtils.applyBlenderTransformer(rVal);
} break;
case "ATTACKER": { case "ATTACKER": {
ServerAttackTree.attachTree(rVal); ServerAttackTree.attachTree(rVal);
rVal.putData(EntityDataStrings.ATTACK_MOVE_TYPE_ACTIVE, null); rVal.putData(EntityDataStrings.ATTACK_MOVE_TYPE_ACTIVE, null);

View File

@ -45,9 +45,6 @@ public class FoliageUtils {
for(String token : rawType.getTokens()){ for(String token : rawType.getTokens()){
switch(token){ switch(token){
case "BLENDER_TRANSFORM":
ActorUtils.applyBlenderTransformer(rVal);
break;
case "BLENDER_ROTATION": case "BLENDER_ROTATION":
ActorUtils.applyBlenderRotation(rVal); ActorUtils.applyBlenderRotation(rVal);
break; break;
@ -79,9 +76,6 @@ public class FoliageUtils {
for(String token : rawType.getTokens()){ for(String token : rawType.getTokens()){
switch(token){ switch(token){
case "BLENDER_TRANSFORM":
ActorUtils.applyBlenderTransformer(rVal);
break;
case "BLENDER_ROTATION": case "BLENDER_ROTATION":
ActorUtils.applyBlenderRotation(rVal); ActorUtils.applyBlenderRotation(rVal);
break; break;

View File

@ -64,9 +64,6 @@ public class ItemUtils {
//tokens //tokens
for(String token : item.getTokens()){ for(String token : item.getTokens()){
switch(token){ switch(token){
case "BLENDER_TRANSFORM":
ActorUtils.applyBlenderTransformer(rVal);
break;
case "GRAVITY": case "GRAVITY":
Collidable collidable = (Collidable)rVal.getData(EntityDataStrings.PHYSICS_COLLIDABLE); Collidable collidable = (Collidable)rVal.getData(EntityDataStrings.PHYSICS_COLLIDABLE);
DBody collisionObject = (DBody)rVal.getData(EntityDataStrings.PHYSICS_COLLISION_BODY); DBody collisionObject = (DBody)rVal.getData(EntityDataStrings.PHYSICS_COLLISION_BODY);
@ -146,9 +143,6 @@ public class ItemUtils {
//tokens //tokens
for(String token : item.getTokens()){ for(String token : item.getTokens()){
switch(token){ switch(token){
case "BLENDER_TRANSFORM":
ActorUtils.applyBlenderTransformer(rVal);
break;
case "GRAVITY": case "GRAVITY":
Collidable collidable = (Collidable)rVal.getData(EntityDataStrings.PHYSICS_COLLIDABLE); Collidable collidable = (Collidable)rVal.getData(EntityDataStrings.PHYSICS_COLLIDABLE);
DBody collisionObject = (DBody)rVal.getData(EntityDataStrings.PHYSICS_COLLISION_BODY); DBody collisionObject = (DBody)rVal.getData(EntityDataStrings.PHYSICS_COLLISION_BODY);

View File

@ -17,13 +17,4 @@ public class PoseActorUtils {
return rVal; return rVal;
} }
public static void applyBlenderTransformer(Entity actorEntity){
PoseActor entityActor = EntityUtils.getPoseActor(actorEntity);
entityActor.setAnimationScalar(60f); //should be the value of the fps i think
}
public static void applyBlenderRotation(Entity actorEntity){
EntityUtils.getRotation(actorEntity).rotateLocalX((float)-Math.PI/2);
}
} }