Skip to content

Commit

Permalink
Exampels: Clean up. (#21688)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mugen87
Mugen87 committed Apr 21, 2021
1 parent 342946c commit fc68156
Showing 1 changed file with 34 additions and 34 deletions.
68 changes: 34 additions & 34 deletions examples/webgl_gpgpu_birds.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
for ( let v = 0; v < triangles * 3; v ++ ) {

const triangleIndex = ~ ~ ( v / 3 );
const birdIndex = ~ ~ ( triangleIndex / trianglesPerBird )
const birdIndex = ~ ~ ( triangleIndex / trianglesPerBird );
const x = ( birdIndex % WIDTH ) / WIDTH;
const y = ~ ~ ( birdIndex / WIDTH ) / WIDTH;

Expand Down Expand Up @@ -468,18 +468,18 @@

const valuesChanger = function () {

velocityUniforms[ "separationDistance" ].value = effectController.separation;
velocityUniforms[ "alignmentDistance" ].value = effectController.alignment;
velocityUniforms[ "cohesionDistance" ].value = effectController.cohesion;
velocityUniforms[ "freedomFactor" ].value = effectController.freedom;
velocityUniforms[ 'separationDistance' ].value = effectController.separation;
velocityUniforms[ 'alignmentDistance' ].value = effectController.alignment;
velocityUniforms[ 'cohesionDistance' ].value = effectController.cohesion;
velocityUniforms[ 'freedomFactor' ].value = effectController.freedom;

};

valuesChanger();

gui.add( effectController, "separation", 0.0, 100.0, 1.0 ).onChange( valuesChanger );
gui.add( effectController, "alignment", 0.0, 100, 0.001 ).onChange( valuesChanger );
gui.add( effectController, "cohesion", 0.0, 100, 0.025 ).onChange( valuesChanger );
gui.add( effectController, 'separation', 0.0, 100.0, 1.0 ).onChange( valuesChanger );
gui.add( effectController, 'alignment', 0.0, 100, 0.001 ).onChange( valuesChanger );
gui.add( effectController, 'cohesion', 0.0, 100, 0.025 ).onChange( valuesChanger );
gui.close();

initBirds();
Expand All @@ -501,25 +501,25 @@
fillPositionTexture( dtPosition );
fillVelocityTexture( dtVelocity );

velocityVariable = gpuCompute.addVariable( "textureVelocity", document.getElementById( 'fragmentShaderVelocity' ).textContent, dtVelocity );
positionVariable = gpuCompute.addVariable( "texturePosition", document.getElementById( 'fragmentShaderPosition' ).textContent, dtPosition );
velocityVariable = gpuCompute.addVariable( 'textureVelocity', document.getElementById( 'fragmentShaderVelocity' ).textContent, dtVelocity );
positionVariable = gpuCompute.addVariable( 'texturePosition', document.getElementById( 'fragmentShaderPosition' ).textContent, dtPosition );

gpuCompute.setVariableDependencies( velocityVariable, [ positionVariable, velocityVariable ] );
gpuCompute.setVariableDependencies( positionVariable, [ positionVariable, velocityVariable ] );

positionUniforms = positionVariable.material.uniforms;
velocityUniforms = velocityVariable.material.uniforms;

positionUniforms[ "time" ] = { value: 0.0 };
positionUniforms[ "delta" ] = { value: 0.0 };
velocityUniforms[ "time" ] = { value: 1.0 };
velocityUniforms[ "delta" ] = { value: 0.0 };
velocityUniforms[ "testing" ] = { value: 1.0 };
velocityUniforms[ "separationDistance" ] = { value: 1.0 };
velocityUniforms[ "alignmentDistance" ] = { value: 1.0 };
velocityUniforms[ "cohesionDistance" ] = { value: 1.0 };
velocityUniforms[ "freedomFactor" ] = { value: 1.0 };
velocityUniforms[ "predator" ] = { value: new THREE.Vector3() };
positionUniforms[ 'time' ] = { value: 0.0 };
positionUniforms[ 'delta' ] = { value: 0.0 };
velocityUniforms[ 'time' ] = { value: 1.0 };
velocityUniforms[ 'delta' ] = { value: 0.0 };
velocityUniforms[ 'testing' ] = { value: 1.0 };
velocityUniforms[ 'separationDistance' ] = { value: 1.0 };
velocityUniforms[ 'alignmentDistance' ] = { value: 1.0 };
velocityUniforms[ 'cohesionDistance' ] = { value: 1.0 };
velocityUniforms[ 'freedomFactor' ] = { value: 1.0 };
velocityUniforms[ 'predator' ] = { value: new THREE.Vector3() };
velocityVariable.material.defines.BOUNDS = BOUNDS.toFixed( 2 );

velocityVariable.wrapS = THREE.RepeatWrapping;
Expand Down Expand Up @@ -549,11 +549,11 @@

// For Vertex and Fragment
birdUniforms = {
"color": { value: new THREE.Color( 0xff2200 ) },
"texturePosition": { value: null },
"textureVelocity": { value: null },
"time": { value: 1.0 },
"delta": { value: 0.0 }
'color': { value: new THREE.Color( 0xff2200 ) },
'texturePosition': { value: null },
'textureVelocity': { value: null },
'time': { value: 1.0 },
'delta': { value: 0.0 }
};

// THREE.ShaderMaterial
Expand Down Expand Up @@ -652,22 +652,22 @@
if ( delta > 1 ) delta = 1; // safety cap on large deltas
last = now;

positionUniforms[ "time" ].value = now;
positionUniforms[ "delta" ].value = delta;
velocityUniforms[ "time" ].value = now;
velocityUniforms[ "delta" ].value = delta;
birdUniforms[ "time" ].value = now;
birdUniforms[ "delta" ].value = delta;
positionUniforms[ 'time' ].value = now;
positionUniforms[ 'delta' ].value = delta;
velocityUniforms[ 'time' ].value = now;
velocityUniforms[ 'delta' ].value = delta;
birdUniforms[ 'time' ].value = now;
birdUniforms[ 'delta' ].value = delta;

velocityUniforms[ "predator" ].value.set( 0.5 * mouseX / windowHalfX, - 0.5 * mouseY / windowHalfY, 0 );
velocityUniforms[ 'predator' ].value.set( 0.5 * mouseX / windowHalfX, - 0.5 * mouseY / windowHalfY, 0 );

mouseX = 10000;
mouseY = 10000;

gpuCompute.compute();

birdUniforms[ "texturePosition" ].value = gpuCompute.getCurrentRenderTarget( positionVariable ).texture;
birdUniforms[ "textureVelocity" ].value = gpuCompute.getCurrentRenderTarget( velocityVariable ).texture;
birdUniforms[ 'texturePosition' ].value = gpuCompute.getCurrentRenderTarget( positionVariable ).texture;
birdUniforms[ 'textureVelocity' ].value = gpuCompute.getCurrentRenderTarget( velocityVariable ).texture;

renderer.render( scene, camera );

Expand Down

0 comments on commit fc68156

Please sign in to comment.