Fiw SmallLeafOctree finalization

Author: aTom3333

Readme.md

@@ -119,8 +119,8 @@ Advantages of this implementation:
  In practice measurements tends to agree to this around 33% memory saving.
 
 Drawbacks of this implementation:
- - Maybe slower. A bit of bitwise arithmetic is needed to work with the leaves at full
- depth which in theory slow down a bit. In practice, no significant slow down has been measured.
+ - Slower than `PACKED` octree. The use of a bit of bitwise arithmetic is needed to work with the leaves at full
+ depth. According to some measurement, this incurs a slowdown of about 15%.
 
 
 [chunky]: https://chunky.llbit.se/

build.gradle

@@ -12,7 +12,7 @@ apply plugin: 'application'
 mainClassName = 'dev.ferrand.chunky.octree.OctreePlugin'
 
 group 'dev.ferrand'
-version '0.4.0'
+version '0.4.1'
 
 compileJava {
     sourceCompatibility = JavaVersion.VERSION_1_8

src/main/java/dev/ferrand/chunky/octree/implementations/SmallLeafOctree.java

@@ -482,17 +482,18 @@ private void finalizationNode(int nodeIndex, int currentDepth) {
       int mergedType = SMALL_ANY_TYPE;
       for(int i = 0; i < 4; ++i) {
         int childIndex = treeData[nodeIndex] + i;
+        int combinedType = treeData[childIndex];
         if(mergedType == SMALL_ANY_TYPE) {
-          mergedType = treeData[childIndex] >>> 16;
-        } else if(!((treeData[childIndex] >>> 16) != SMALL_ANY_TYPE || ((treeData[childIndex] >>> 16) == mergedType))) {
+          mergedType = combinedType >>> 16;
+        } else if(!((combinedType >>> 16) == SMALL_ANY_TYPE || ((combinedType >>> 16) == mergedType))) {
           canMerge = false;
+          break;
         }
-        if(canMerge) {
-          if(mergedType == SMALL_ANY_TYPE) {
-            mergedType = treeData[childIndex] & 0xFFFF;
-          } else if(!((treeData[childIndex] & 0xFFFF) != SMALL_ANY_TYPE || ((treeData[childIndex] & 0xFFFF) == mergedType))) {
-            canMerge = false;
-          }
+        if(mergedType == SMALL_ANY_TYPE) {
+          mergedType = combinedType & 0xFFFF;
+        } else if(!((combinedType & 0xFFFF) == SMALL_ANY_TYPE || ((combinedType & 0xFFFF) == mergedType))) {
+          canMerge = false;
+          break;
         }
       }
       if(canMerge) {

src/main/resources/plugin.json

@@ -2,7 +2,7 @@
   "name": "OctreePlugin",
   "author": "a_Tom",
   "main": "dev.ferrand.chunky.octree.OctreePlugin",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "targetVersion": "2.3.0",
   "description": "Add more octree implementations."
 }