Clean up Mapper

antag99 · Jul 6, 2016 · d3d2eda · d3d2eda
1 parent 549be60
commit d3d2eda
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/retinazer/src/main/java/com/github/antag99/retinazer/ComponentManager.java b/retinazer/src/main/java/com/github/antag99/retinazer/ComponentManager.java
@@ -147,11 +147,11 @@ void applyComponentChanges() {
             @SuppressWarnings("unchecked")
             Mapper<Component> mapper = (Mapper<Component>) array[i];
             Bag<Component> components = mapper.components;
-            Mask mask = mapper.removeMask;
+            Mask mask = mapper.remove;
             for (int ii = mask.nextSetBit(0); ii != -1; ii = mask.nextSetBit(ii + 1)) {
                 components.set(ii, null);
             }
-            mapper.componentsMask.andNot(mapper.removeMask);
+            mapper.componentsMask.andNot(mapper.remove);
         }
     }
 }
diff --git a/retinazer/src/main/java/com/github/antag99/retinazer/Engine.java b/retinazer/src/main/java/com/github/antag99/retinazer/Engine.java
@@ -163,9 +163,9 @@ private void flush() {
             entityManager.removeQueue.clear();
 
             for (Mapper<?> mapper : componentManager.array) {
-                mapper.removeMask.set(mapper.removeQueueMask);
-                mapper.removeMask.or(entityManager.remove);
-                mapper.removeQueueMask.clear();
+                mapper.remove.set(mapper.removeQueue);
+                mapper.remove.or(entityManager.remove);
+                mapper.removeQueue.clear();
             }
 
             familyManager.updateFamilyMembership();

diff --git a/retinazer/src/main/java/com/github/antag99/retinazer/FamilyManager.java b/retinazer/src/main/java/com/github/antag99/retinazer/FamilyManager.java
@@ -137,15 +137,15 @@ void updateFamilyMembership() {
             for (int component : components) {
                 Mapper<?> mapper = mappers[component];
                 tmpMask.set(mapper.componentsMask);
-                tmpMask.andNot(mapper.removeMask);
+                tmpMask.andNot(mapper.remove);
                 matchedEntities.and(tmpMask);
             }
 
             int[] excludedComponents = family.excludedComponents;
             for (int excludedComponent : excludedComponents) {
                 Mapper<?> mapper = mappers[excludedComponent];
                 tmpMask.set(mapper.componentsMask);
-                tmpMask.andNot(mapper.removeMask);
+                tmpMask.andNot(mapper.remove);
                 matchedEntities.andNot(tmpMask);
             }
 

diff --git a/retinazer/src/main/java/com/github/antag99/retinazer/Mapper.java b/retinazer/src/main/java/com/github/antag99/retinazer/Mapper.java
@@ -25,7 +25,6 @@
 import java.lang.reflect.InvocationTargetException;
 
 import com.github.antag99.retinazer.util.Bag;
-import com.github.antag99.retinazer.util.IntBag;
 import com.github.antag99.retinazer.util.Mask;
 
 /**
@@ -50,12 +49,9 @@ public final class Mapper<T extends Component> {
     Mask componentsMask = new Mask();
 
     /** Mask of components that will be removed */
-    Mask removeMask = new Mask();
+    Mask remove = new Mask();
     /** Mask of components to be removed later */
-    Mask removeQueueMask = new Mask();
-
-    /** Temporary buffer that stores the set bits of removeMask */
-    IntBag tmpRemove = new IntBag();
+    Mask removeQueue = new Mask();
 
     Mapper(Engine engine, Class<T> type, int typeIndex) {
         this.engine = engine;
@@ -156,11 +152,11 @@ public void remove(int entity) {
             return;
         }
 
-        if (removeQueueMask.get(entity)) {
+        if (removeQueue.get(entity)) {
             return;
         }
 
         engine.dirty = true;
-        removeQueueMask.set(entity);
+        removeQueue.set(entity);
     }
 }