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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/Data/creatures.json
View File

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

1
assets/Data/creatures/animals.json
View File

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

1
assets/Data/creatures/elf.json
View File

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

1
assets/Data/creatures/goblin.json
View File

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

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

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

2
assets/Data/items.json
View File

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

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

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

6
src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java
View File

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

6
src/main/java/electrosphere/entity/types/item/ItemUtils.java
View File

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

9
src/main/java/electrosphere/server/poseactor/PoseActorUtils.java
View File

@ -17,13 +17,4 @@ public class PoseActorUtils {
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);
}
}