Awake fluid chunks based on neighbor state

buildNumber.properties

@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Sun Dec 01 17:46:45 EST 2024
+#Sun Dec 01 18:23:03 EST 2024
-buildNumber=482
+buildNumber=484

docs/src/progress/renderertodo.md

@@ -1214,6 +1214,7 @@ Memory pooling for chunk buffer allocations
 Server homogenous fluid chunk declarations
 Unsleeping fluid chunks on edit
 Conditionally rasterize fluid chunks based on homogeneity
+Awake fluid chunks based on neighbor state
 
 
 

src/fluid/includes/chunkmask.h

@@ -3,6 +3,11 @@
 #ifndef CHUNKMASK_H
 #define CHUNKMASK_H
 
+/**
+ * The number of entries in the neighbor array
+ */
+#define NEIGHBOR_ARRAY_COUNT 27
+
 #define CENTER_LOC 13
 
 #define CHUNK_222 1

src/fluid/includes/environment.h

@@ -22,6 +22,7 @@ typedef struct {
     jfieldID u0JId;
     jfieldID v0JId;
     jfieldID w0JId;
+    jfieldID neighborsId;
     jfieldID chunkmaskJId;
     jfieldID updatedId;
     jfieldID totalDensityId;

src/fluid/src/javainterface.c

@@ -110,6 +110,7 @@ JNIEXPORT void JNICALL Java_electrosphere_server_fluid_simulator_FluidAccelerate
     environment->lookupTable.serverFluidChunkTable.u0JId = (*env)->GetFieldID(env,fluidSimStorageClass,"b0VelocityX","[Ljava/nio/ByteBuffer;");
     environment->lookupTable.serverFluidChunkTable.v0JId = (*env)->GetFieldID(env,fluidSimStorageClass,"b0VelocityY","[Ljava/nio/ByteBuffer;");
     environment->lookupTable.serverFluidChunkTable.w0JId = (*env)->GetFieldID(env,fluidSimStorageClass,"b0VelocityZ","[Ljava/nio/ByteBuffer;");
+    environment->lookupTable.serverFluidChunkTable.neighborsId = (*env)->GetFieldID(env,fluidSimStorageClass,"neighbors","[Lelectrosphere/server/fluid/manager/ServerFluidChunk;");
     environment->lookupTable.serverFluidChunkTable.chunkmaskJId = (*env)->GetFieldID(env,fluidSimStorageClass,"chunkMask","I");
     environment->lookupTable.serverFluidChunkTable.totalDensityId = (*env)->GetFieldID(env,fluidSimStorageClass,"totalDensity","F");
     environment->lookupTable.serverFluidChunkTable.updatedId = (*env)->GetFieldID(env,fluidSimStorageClass,"updated","Z");

src/fluid/src/metadata/metadatacalc.c

@@ -41,17 +41,49 @@ void updateMetadata(JNIEnv * env, int numChunks, Chunk ** passedInChunks, Enviro
                 }
             }
         }
+        //get whether the chunk is currently homogenous or not
+        int homogenous = sum <= 0 ? JNI_TRUE : JNI_FALSE;
+        (*env)->SetBooleanField(env,jObj,environment->lookupTable.serverFluidChunkTable.homogenousId,homogenous);
 
         //update total density
         (*env)->SetBooleanField(env,jObj,updatedId,JNI_TRUE);
         (*env)->SetFloatField(env,jObj,totalDensityId,sum);
 
-        if(sum <= 0){
+        //check if any neighbor is non-homogenous
-            //sleep the chunk if it has no density
+        jobject neighborArr = (*env)->GetObjectField(env,jObj,environment->lookupTable.serverFluidChunkTable.neighborsId);
-            (*env)->SetBooleanField(env,jObj,environment->lookupTable.serverFluidChunkTable.asleepId,JNI_TRUE);
+        int nonHomogenousNeighbor = JNI_FALSE;
-            (*env)->SetBooleanField(env,jObj,environment->lookupTable.serverFluidChunkTable.homogenousId,JNI_TRUE);
+        for(int j = 0; j < NEIGHBOR_ARRAY_COUNT; j++){
-        } else {
+            if(j == CENTER_LOC){
-            (*env)->SetBooleanField(env,jObj,environment->lookupTable.serverFluidChunkTable.homogenousId,JNI_FALSE);
+                continue;
+            }
+            jobject neighborObj = (*env)->GetObjectArrayElement(env,neighborArr,j);
+            if(neighborObj != NULL){
+                int neighborHomogenous = (*env)->GetBooleanField(env,neighborObj,environment->lookupTable.serverFluidChunkTable.homogenousId);
+                if(neighborHomogenous == JNI_FALSE){
+                    nonHomogenousNeighbor = JNI_TRUE;
+                    break;
+                }
+            }
+        }
+
+        //figure out if this chunk should sleep or not
+        int shouldSleep = JNI_TRUE;
+        if(nonHomogenousNeighbor == JNI_TRUE || homogenous == JNI_FALSE){
+            shouldSleep = JNI_FALSE;
+        }
+        (*env)->SetBooleanField(env,jObj,environment->lookupTable.serverFluidChunkTable.asleepId,shouldSleep);
+
+        //if this cell is awake AND non-homogenous, make sure all neighbors are awake
+        if(shouldSleep == JNI_FALSE && homogenous == JNI_FALSE){
+            for(int j = 0; j < NEIGHBOR_ARRAY_COUNT; j++){
+                if(j == CENTER_LOC){
+                    continue;
+                }
+                jobject neighborObj = (*env)->GetObjectArrayElement(env,neighborArr,j);
+                if(neighborObj != NULL){
+                    (*env)->SetBooleanField(env,neighborObj,environment->lookupTable.serverFluidChunkTable.asleepId,JNI_FALSE);
+                }
+            }
         }
     }
 }

src/main/java/electrosphere/server/fluid/manager/ServerFluidChunk.java

@@ -141,6 +141,11 @@ public class ServerFluidChunk {
      */
     public ByteBuffer[] b0VelocityZ = new ByteBuffer[ARRAY_CT];
 
+    /**
+     * The array of pointers to neighboring chunks
+     */
+    public ServerFluidChunk[] neighbors = new ServerFluidChunk[ARRAY_CT];
+
     /**
      * The chunk mask -- Stores which adjacent chunks are populated and which aren't
      */
@@ -473,24 +478,27 @@ public class ServerFluidChunk {
      * @param neighbor The neighbor ServerFluidChunk
      */
     public void setNeighbor(int x, int y, int z, ServerFluidChunk neighbor){
+        int index = ServerFluidChunk.getNeighborIndex(x, y, z);
         if(neighbor == null){
-            bWeights[getNeighborIndex(x,y,z)] = null;
+            bWeights[index ]= null;
-            b0Weights[getNeighborIndex(x,y,z)] = null;
+            b0Weights[index] = null;
-            bVelocityX[getNeighborIndex(x,y,z)] = null;
+            bVelocityX[index] = null;
-            bVelocityY[getNeighborIndex(x,y,z)] = null;
+            bVelocityY[index] = null;
-            bVelocityZ[getNeighborIndex(x,y,z)] = null;
+            bVelocityZ[index] = null;
-            b0VelocityX[getNeighborIndex(x,y,z)] = null;
+            b0VelocityX[index] = null;
-            b0VelocityY[getNeighborIndex(x,y,z)] = null;
+            b0VelocityY[index] = null;
-            b0VelocityZ[getNeighborIndex(x,y,z)] = null;
+            b0VelocityZ[index] = null;
+            neighbors[index] = null;
         } else {
-            bWeights[getNeighborIndex(x,y,z)] = neighbor.bWeights[CENTER_BUFF];
+            bWeights[index] = neighbor.bWeights[CENTER_BUFF];
-            b0Weights[getNeighborIndex(x,y,z)] = neighbor.b0Weights[CENTER_BUFF];
+            b0Weights[index] = neighbor.b0Weights[CENTER_BUFF];
-            bVelocityX[getNeighborIndex(x,y,z)] = neighbor.bVelocityX[CENTER_BUFF];
+            bVelocityX[index] = neighbor.bVelocityX[CENTER_BUFF];
-            bVelocityY[getNeighborIndex(x,y,z)] = neighbor.bVelocityY[CENTER_BUFF];
+            bVelocityY[index] = neighbor.bVelocityY[CENTER_BUFF];
-            bVelocityZ[getNeighborIndex(x,y,z)] = neighbor.bVelocityZ[CENTER_BUFF];
+            bVelocityZ[index] = neighbor.bVelocityZ[CENTER_BUFF];
-            b0VelocityX[getNeighborIndex(x,y,z)] = neighbor.b0VelocityX[CENTER_BUFF];
+            b0VelocityX[index] = neighbor.b0VelocityX[CENTER_BUFF];
-            b0VelocityY[getNeighborIndex(x,y,z)] = neighbor.b0VelocityY[CENTER_BUFF];
+            b0VelocityY[index] = neighbor.b0VelocityY[CENTER_BUFF];
-            b0VelocityZ[getNeighborIndex(x,y,z)] = neighbor.b0VelocityZ[CENTER_BUFF];
+            b0VelocityZ[index] = neighbor.b0VelocityZ[CENTER_BUFF];
+            neighbors[index] = neighbor;
         }
     }
 

src/main/java/electrosphere/server/fluid/manager/ServerFluidManager.java

@@ -292,7 +292,7 @@ public class ServerFluidManager {
     public void queue(int worldX, int worldY, int worldZ){
         if(simulate){
             ServerFluidChunk fluidChunk = this.getChunk(worldX, worldY, worldZ);
-            if(fluidChunk.isAllocated()){
+            if(fluidChunk.isAllocated() && !fluidChunk.isAsleep()){
                 this.simulationQueue.add(fluidChunk);
             }
         }