swapping arrays is raw arrays only
All checks were successful
studiorailgun/fluid-sim/pipeline/head This commit looks good
All checks were successful
studiorailgun/fluid-sim/pipeline/head This commit looks good
This commit is contained in:
parent
f93936a96e
commit
eac79e0afc
@ -201,35 +201,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
|
||||
Chunk * currentChunk = chunks[i];
|
||||
chunkJRaw = currentChunk->jchunk;
|
||||
chunkMask = currentChunk->chunkMask;
|
||||
jd = currentChunk->jd;
|
||||
jd0 = currentChunk->jd0;
|
||||
u = currentChunk->ju;
|
||||
v = currentChunk->jv;
|
||||
w = currentChunk->jw;
|
||||
u0 = currentChunk->ju0;
|
||||
v0 = currentChunk->jv0;
|
||||
w0 = currentChunk->jw0;
|
||||
setBuffArr(uJId,u0);
|
||||
setBuffArr(u0JId,u);
|
||||
|
||||
setBuffArr(vJId,v0);
|
||||
setBuffArr(v0JId,v);
|
||||
|
||||
setBuffArr(wJId,w0);
|
||||
setBuffArr(w0JId,w);
|
||||
|
||||
jobject tmpObj;
|
||||
tmpObj = currentChunk->ju;
|
||||
currentChunk->ju = currentChunk->ju0;
|
||||
currentChunk->ju0 = u;
|
||||
|
||||
tmpObj = currentChunk->jv;
|
||||
currentChunk->jv = currentChunk->jv0;
|
||||
currentChunk->jv0 = v;
|
||||
|
||||
tmpObj = currentChunk->jw;
|
||||
currentChunk->jw = currentChunk->jw0;
|
||||
currentChunk->jw0 = w;
|
||||
|
||||
float * tmpArr;
|
||||
for(int j = 0; j < 27; j++){
|
||||
@ -456,35 +427,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
|
||||
Chunk * currentChunk = chunks[i];
|
||||
chunkJRaw = currentChunk->jchunk;
|
||||
chunkMask = currentChunk->chunkMask;
|
||||
jd = currentChunk->jd;
|
||||
jd0 = currentChunk->jd0;
|
||||
u = currentChunk->ju;
|
||||
v = currentChunk->jv;
|
||||
w = currentChunk->jw;
|
||||
u0 = currentChunk->ju0;
|
||||
v0 = currentChunk->jv0;
|
||||
w0 = currentChunk->jw0;
|
||||
setBuffArr(uJId,u0);
|
||||
setBuffArr(u0JId,u);
|
||||
|
||||
setBuffArr(vJId,v0);
|
||||
setBuffArr(v0JId,v);
|
||||
|
||||
setBuffArr(wJId,w0);
|
||||
setBuffArr(w0JId,w);
|
||||
|
||||
jobject tmpObj;
|
||||
tmpObj = currentChunk->ju;
|
||||
currentChunk->ju = currentChunk->ju0;
|
||||
currentChunk->ju0 = u;
|
||||
|
||||
tmpObj = currentChunk->jv;
|
||||
currentChunk->jv = currentChunk->jv0;
|
||||
currentChunk->jv0 = v;
|
||||
|
||||
tmpObj = currentChunk->jw;
|
||||
currentChunk->jw = currentChunk->jw0;
|
||||
currentChunk->jw0 = w;
|
||||
|
||||
float * tmpArr;
|
||||
for(int j = 0; j < 27; j++){
|
||||
@ -819,9 +761,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
|
||||
Chunk * currentChunk = chunks[i];
|
||||
chunkJRaw = currentChunk->jchunk;
|
||||
chunkMask = currentChunk->chunkMask;
|
||||
u = currentChunk->ju;
|
||||
v = currentChunk->jv;
|
||||
w = currentChunk->jw;
|
||||
Java_electrosphere_FluidSim_advectDensity(env,chunkJRaw,DIM,chunkMask,currentChunk->d,currentChunk->d0,currentChunk->u,currentChunk->v,currentChunk->w,DIFFUSION_CONSTANT,VISCOSITY_CONSTANT,timestep);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user