diff --git a/assets/Models/goblin1.fbx b/assets/Models/goblin1.fbx index baee626a..6f06610f 100644 Binary files a/assets/Models/goblin1.fbx and b/assets/Models/goblin1.fbx differ diff --git a/src/main/java/electrosphere/entity/state/LookAtState.java b/src/main/java/electrosphere/entity/state/LookAtState.java index ab4038bd..6b080bcb 100644 --- a/src/main/java/electrosphere/entity/state/LookAtState.java +++ b/src/main/java/electrosphere/entity/state/LookAtState.java @@ -11,10 +11,18 @@ public class LookAtState { Entity parent; float pitch; + float pitchMax; + float pitchMin; + float pitchNeutral; + String rotatorBoneName; - public LookAtState(Entity parent){ + public LookAtState(Entity parent, String rotatorBoneName, float pitchMax, float pitchMin, float pitchNeutral){ this.parent = parent; + this.pitchMax = pitchMax; + this.pitchMin = pitchMin; + this.pitchNeutral = pitchNeutral; + this.rotatorBoneName = rotatorBoneName; } public void setPitch(float pitch){ @@ -25,4 +33,8 @@ public class LookAtState { return pitch; } + public String getRotatorBoneName() { + return rotatorBoneName; + } + } diff --git a/src/main/java/electrosphere/game/data/creature/type/CreatureType.java b/src/main/java/electrosphere/game/data/creature/type/CreatureType.java index 20f48d32..f67d445c 100644 --- a/src/main/java/electrosphere/game/data/creature/type/CreatureType.java +++ b/src/main/java/electrosphere/game/data/creature/type/CreatureType.java @@ -12,6 +12,7 @@ public class CreatureType { CollidableTemplate collidable; List attackMoves; HealthSystem healthSystem; + LookAtSystem lookAtSystem; String modelPath; public String getName() { @@ -49,6 +50,10 @@ public class CreatureType { public CollidableTemplate getCollidable() { return collidable; } + + public LookAtSystem getLookAtSystem() { + return lookAtSystem; + } diff --git a/src/main/java/electrosphere/game/data/creature/type/LookAtSystem.java b/src/main/java/electrosphere/game/data/creature/type/LookAtSystem.java new file mode 100644 index 00000000..49d348dd --- /dev/null +++ b/src/main/java/electrosphere/game/data/creature/type/LookAtSystem.java @@ -0,0 +1,32 @@ +package electrosphere.game.data.creature.type; + +/** + * + * @author amaterasu + */ +public class LookAtSystem { + + String rotatorBoneName; + float minPitch; + float maxPitch; + float neutralPitch; + + public String getRotatorBoneName() { + return rotatorBoneName; + } + + public float getMinPitch() { + return minPitch; + } + + public float getMaxPitch() { + return maxPitch; + } + + public float getNeutralPitch() { + return neutralPitch; + } + + + +}