move actor masks to package

docs/src/progress/renderertodo.md

@@ -2058,6 +2058,7 @@ Code cleanup work
 Logging for loading thread failure
 Code cleanup
 More tests
+Move actor masks into dedicated package
 
 
 

src/main/java/electrosphere/client/entity/particle/ParticleUtils.java

@@ -11,7 +11,7 @@ import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.client.particle.ClientParticleTree;
 import electrosphere.renderer.actor.Actor;
-import electrosphere.renderer.actor.ActorTextureMask;
+import electrosphere.renderer.actor.mask.ActorTextureMask;
 
 import java.util.Arrays;
 

src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java

@@ -40,8 +40,8 @@ import electrosphere.entity.types.foliage.FoliageUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.entity.types.terrain.TerrainChunk;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.renderer.actor.ActorAnimationMask;
 import electrosphere.renderer.actor.instance.InstancedActor;
+import electrosphere.renderer.actor.mask.ActorAnimationMask;
 import electrosphere.renderer.anim.AnimChannel;
 import electrosphere.renderer.anim.Animation;
 import electrosphere.renderer.model.Bone;

src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityActorTab.java

@@ -17,9 +17,9 @@ import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.entity.types.tree.ProceduralTree;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.actor.Actor;
-import electrosphere.renderer.actor.ActorAnimationMask;
-import electrosphere.renderer.actor.ActorMeshMask;
 import electrosphere.renderer.actor.instance.InstancedActor;
+import electrosphere.renderer.actor.mask.ActorAnimationMask;
+import electrosphere.renderer.actor.mask.ActorMeshMask;
 import electrosphere.renderer.anim.AnimChannel;
 import electrosphere.renderer.anim.Animation;
 import electrosphere.renderer.model.Bone;

src/main/java/electrosphere/client/ui/menu/debug/server/ImGuiAI.java

@@ -15,7 +15,7 @@ import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.server.ServerCharacterData;
 import electrosphere.renderer.actor.Actor;
-import electrosphere.renderer.actor.ActorTextureMask;
+import electrosphere.renderer.actor.mask.ActorTextureMask;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;
 import electrosphere.renderer.ui.imgui.ImGuiWindow.ImGuiWindowCallback;
 import electrosphere.server.ai.AI;

src/main/java/electrosphere/controls/cursor/CursorState.java

@@ -23,7 +23,7 @@ import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.equip.ClientToolbarState;
 import electrosphere.renderer.actor.Actor;
-import electrosphere.renderer.actor.ActorTextureMask;
+import electrosphere.renderer.actor.mask.ActorTextureMask;
 import electrosphere.renderer.meshgen.BlockMeshgen;
 import electrosphere.renderer.ui.events.ScrollEvent;
 

src/main/java/electrosphere/engine/assetmanager/AssetManager.java

@@ -7,7 +7,7 @@ import electrosphere.collision.collidable.Collidable;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.queue.QueuedAsset;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.renderer.actor.ActorShaderMask;
+import electrosphere.renderer.actor.mask.ActorShaderMask;
 import electrosphere.renderer.buffer.HomogenousInstancedArray;
 import electrosphere.renderer.buffer.HomogenousUniformBuffer;
 import electrosphere.renderer.loading.ModelLoader;

src/main/java/electrosphere/entity/state/equip/ClientEquipState.java

@@ -31,7 +31,7 @@ import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
 import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.renderer.actor.Actor;
-import electrosphere.renderer.actor.ActorMeshMask;
+import electrosphere.renderer.actor.mask.ActorMeshMask;
 
 @SynchronizedBehaviorTree(name = "clientEquipState", isServer = false, correspondingTree="serverEquipState")
 /**

src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java

@@ -31,7 +31,7 @@ import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
 import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums;
 import electrosphere.renderer.actor.Actor;
-import electrosphere.renderer.actor.ActorMeshMask;
+import electrosphere.renderer.actor.mask.ActorMeshMask;
 import electrosphere.util.FileUtils;
 import electrosphere.net.parser.net.message.InventoryMessage;
 import electrosphere.net.parser.net.message.NetworkMessage;

src/main/java/electrosphere/renderer/RenderUtils.java

@@ -5,7 +5,7 @@ import electrosphere.engine.Globals;
 import java.util.LinkedList;
 import java.util.List;
 
-import electrosphere.renderer.actor.ActorTextureMask;
+import electrosphere.renderer.actor.mask.ActorTextureMask;
 import electrosphere.renderer.model.Mesh;
 import electrosphere.renderer.model.Model;
 import electrosphere.renderer.texture.Texture;

src/main/java/electrosphere/renderer/actor/Actor.java

@@ -9,6 +9,10 @@ import electrosphere.mem.JomlPool;
 import electrosphere.renderer.OpenGLState;
 import electrosphere.renderer.RenderPipelineState;
 import electrosphere.renderer.actor.ActorUniformMap.UniformValue;
+import electrosphere.renderer.actor.mask.ActorAnimationMask;
+import electrosphere.renderer.actor.mask.ActorMeshMask;
+import electrosphere.renderer.actor.mask.ActorShaderMask;
+import electrosphere.renderer.actor.mask.ActorTextureMask;
 import electrosphere.renderer.model.Bone;
 import electrosphere.renderer.model.Model;
 import electrosphere.renderer.texture.Texture;
@@ -198,7 +202,7 @@ public class Actor {
     public double getAnimationTime(String animation){
         ActorAnimationMask mask = this.getAnimationMask(animation);
         if(mask != null){
-            return mask.time;
+            return mask.getTime();
         }
         return INVALID_ANIMATION;
     }
@@ -415,7 +419,7 @@ public class Actor {
 
         toRemoveMasks.clear();
         for(ActorAnimationMask mask : this.animationQueue){
-            if(mask.animationName == animationName && mask.priority == priority){
+            if(mask.getAnimationName() == animationName && mask.getPriority() == priority){
                 toRemoveMasks.add(mask);
             }
         }
@@ -460,7 +464,7 @@ public class Actor {
         List<String> currentAnimationMask = new LinkedList<String>();
         for(ActorAnimationMask mask : animationQueue){
             currentAnimationMask.clear();
-            for(String currentBone : mask.boneMask){
+            for(String currentBone : mask.getBones()){
                 if(!bonesUsed.contains(currentBone)){
                     bonesUsed.add(currentBone);
                     currentAnimationMask.add(currentBone);
@@ -500,10 +504,10 @@ public class Actor {
      */
     public ActorAnimationMask getAnimationMask(String animationName){
         for(ActorAnimationMask mask : this.getAnimationQueue()){
-            if(mask.animationName.equals(animationName)){
+            if(mask.getAnimationName().equals(animationName)){
                 return mask;
-            } else if(mask.animationName.equalsIgnoreCase(animationName)){
-                LoggerInterface.loggerEngine.WARNING("Animation mask failed to find, but there is an animation with a very similar name! " + animationName + " vs " + mask.animationName);
+            } else if(mask.getAnimationName().equalsIgnoreCase(animationName)){
+                LoggerInterface.loggerEngine.WARNING("Animation mask failed to find, but there is an animation with a very similar name! " + animationName + " vs " + mask.getAnimationName());
             }
         }
         return null;

src/main/java/electrosphere/renderer/actor/mask/ActorAnimationMask.java

@@ -1,4 +1,4 @@
-package electrosphere.renderer.actor;
+package electrosphere.renderer.actor.mask;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/renderer/actor/mask/ActorMeshMask.java

@@ -1,4 +1,4 @@
-package electrosphere.renderer.actor;
+package electrosphere.renderer.actor.mask;
 
 import java.util.HashMap;
 import java.util.LinkedList;

src/main/java/electrosphere/renderer/actor/mask/ActorShaderMask.java

@@ -1,4 +1,4 @@
-package electrosphere.renderer.actor;
+package electrosphere.renderer.actor.mask;
 
 /**
  * Masks a shader on a mesh with another shader

src/main/java/electrosphere/renderer/actor/mask/ActorTextureMask.java

@@ -1,4 +1,4 @@
-package electrosphere.renderer.actor;
+package electrosphere.renderer.actor.mask;
 
 import java.util.List;
 

src/main/java/electrosphere/renderer/model/Mesh.java

@@ -6,8 +6,8 @@ import electrosphere.engine.Globals;
 import electrosphere.renderer.OpenGLState;
 import electrosphere.renderer.RenderPipelineState;
 import electrosphere.renderer.RenderingEngine;
-import electrosphere.renderer.actor.ActorTextureMask;
 import electrosphere.renderer.actor.instance.InstanceData;
+import electrosphere.renderer.actor.mask.ActorTextureMask;
 import electrosphere.renderer.light.LightManager;
 import electrosphere.renderer.shader.StandardUniformManager;
 import electrosphere.renderer.shader.VisualShader;

src/main/java/electrosphere/renderer/model/Model.java

@@ -3,10 +3,10 @@ package electrosphere.renderer.model;
 import electrosphere.renderer.OpenGLState;
 import electrosphere.renderer.RenderPipelineState;
 import electrosphere.renderer.actor.ActorBoneRotator;
-import electrosphere.renderer.actor.ActorMeshMask;
-import electrosphere.renderer.actor.ActorShaderMask;
 import electrosphere.renderer.actor.ActorStaticMorph;
-import electrosphere.renderer.actor.ActorTextureMask;
+import electrosphere.renderer.actor.mask.ActorMeshMask;
+import electrosphere.renderer.actor.mask.ActorShaderMask;
+import electrosphere.renderer.actor.mask.ActorTextureMask;
 import electrosphere.renderer.anim.AnimChannel;
 import electrosphere.renderer.anim.Animation;
 import electrosphere.renderer.loading.ModelPretransforms;

src/main/java/electrosphere/server/entity/poseactor/PoseActor.java

@@ -17,9 +17,9 @@ import electrosphere.data.entity.creature.bonegroups.BoneGroup;
 import electrosphere.engine.Globals;
 import electrosphere.entity.state.AnimationPriorities;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.renderer.actor.ActorAnimationMask;
 import electrosphere.renderer.actor.ActorBoneRotator;
 import electrosphere.renderer.actor.ActorStaticMorph;
+import electrosphere.renderer.actor.mask.ActorAnimationMask;
 import electrosphere.renderer.model.Bone;
 
 /**