Skip to content

Official Codebase of 3DCodeVerse

Python

scene lib: fire and rock read GLSL_UTIL's astraHash31 instead of each carrying the same 3D hash

gaoypeng9c6f47829eb5
diff --git a/harness/codeverse3d/languages/scene_threejs/starter/src/lib/fire.js b/harness/codeverse3d/languages/scene_threejs/starter/src/lib/fire.js
index e0887acd..d50e6976 100644
--- a/harness/codeverse3d/languages/scene_threejs/starter/src/lib/fire.js
+++ b/harness/codeverse3d/languages/scene_threejs/starter/src/lib/fire.js
@@ -31,18 +31,13 @@ uniform float uRadius, uHeight, uIntensity, uCandle, uSeed;
uniform vec2 uWind;
uniform vec3 uBoxMin, uBoxMax, uCameraLocal;
uniform mat4 uLocalToClip;
-float fireHash(vec3 p) {
- p = fract(p * 0.1031);
- p += dot(p, p.yzx + 33.33);
- return fract((p.x + p.y) * p.z);
-}
float fireNoise(vec3 p) {
vec3 i = floor(p), f = fract(p);
f = f * f * (3.0 - 2.0 * f);
- return mix(mix(mix(fireHash(i), fireHash(i + vec3(1,0,0)), f.x),
- mix(fireHash(i + vec3(0,1,0)), fireHash(i + vec3(1,1,0)), f.x), f.y),
- mix(mix(fireHash(i + vec3(0,0,1)), fireHash(i + vec3(1,0,1)), f.x),
- mix(fireHash(i + vec3(0,1,1)), fireHash(i + vec3(1,1,1)), f.x), f.y), f.z);
+ return mix(mix(mix(astraHash31(i), astraHash31(i + vec3(1,0,0)), f.x),
+ mix(astraHash31(i + vec3(0,1,0)), astraHash31(i + vec3(1,1,0)), f.x), f.y),
+ mix(mix(astraHash31(i + vec3(0,0,1)), astraHash31(i + vec3(1,0,1)), f.x),
+ mix(astraHash31(i + vec3(0,1,1)), astraHash31(i + vec3(1,1,1)), f.x), f.y), f.z);
}
float fireFbm(vec3 p) {
return fireNoise(p) * 0.57 + fireNoise(p * 2.07 + 13.4) * 0.28
@@ -125,7 +120,7 @@ function fireMaterial({ radius, height, wind, intensity, candle, seed, steps, bo
if (leave <= enter) discard;
float ds = (leave - enter) / float(${steps});
// Static sub-pixel jitter avoids axial banding without temporal noise.
- float jitter = fireHash(vec3(gl_FragCoord.xy, 0.13));
+ float jitter = astraHash31(vec3(gl_FragCoord.xy, 0.13));
vec3 color = vec3(0.0);
float transmittance = 1.0;
vec3 firstHit = uCameraLocal + ray * leave;
diff --git a/harness/codeverse3d/languages/scene_threejs/starter/src/lib/rock.js b/harness/codeverse3d/languages/scene_threejs/starter/src/lib/rock.js
index 976a711d..f678e4a3 100644
--- a/harness/codeverse3d/languages/scene_threejs/starter/src/lib/rock.js
+++ b/harness/codeverse3d/languages/scene_threejs/starter/src/lib/rock.js
@@ -204,11 +204,6 @@ function rockMaterial(opts, type, height) {
varying vec3 vRockLocal, vRockLocalNormal;
varying float vRockCavity;
uniform float uRockKind, uRockSeed, uRockHeight, uRockMoisture, uRockMoss;
- float rockHash(vec3 p) {
- p = fract(p * 0.1031);
- p += dot(p, p.yzx + 33.33);
- return fract((p.x + p.y) * p.z);
- }
// Value and analytic spatial gradient. The gradient is filtered before
// normal perturbation; differentiating sampled noise makes visible
// 2x2 pixel blocks at grazing angles and when the camera approaches.
@@ -216,10 +211,10 @@ function rockMaterial(opts, type, height) {
vec3 i = floor(p), f = fract(p);
vec3 u = f*f*f*(f*(f*6.0-15.0)+10.0);
vec3 du = 30.0*f*f*(f*(f-2.0)+1.0);
- float a=rockHash(i), b=rockHash(i+vec3(1,0,0));
- float c=rockHash(i+vec3(0,1,0)), d=rockHash(i+vec3(1,1,0));
- float e=rockHash(i+vec3(0,0,1)), f1=rockHash(i+vec3(1,0,1));
- float g=rockHash(i+vec3(0,1,1)), h=rockHash(i+vec3(1,1,1));
+ float a=astraHash31(i), b=astraHash31(i+vec3(1,0,0));
+ float c=astraHash31(i+vec3(0,1,0)), d=astraHash31(i+vec3(1,1,0));
+ float e=astraHash31(i+vec3(0,0,1)), f1=astraHash31(i+vec3(1,0,1));
+ float g=astraHash31(i+vec3(0,1,1)), h=astraHash31(i+vec3(1,1,1));
float x0=mix(a,b,u.x), x1=mix(c,d,u.x), x2=mix(e,f1,u.x), x3=mix(g,h,u.x);
float y0=mix(x0,x1,u.y), y1=mix(x2,x3,u.y);
return vec4(mix(y0,y1,u.z),
diff --git a/harness/codeverse3d/languages/scene_threejs/starter/src/lib/shader.js b/harness/codeverse3d/languages/scene_threejs/starter/src/lib/shader.js
index e5ed06e2..22ee7e7d 100644
--- a/harness/codeverse3d/languages/scene_threejs/starter/src/lib/shader.js
+++ b/harness/codeverse3d/languages/scene_threejs/starter/src/lib/shader.js
@@ -77,6 +77,11 @@ export const GLSL_UTIL = [
' p3 += dot(p3, p3.yzx + 33.33);',
' return fract((p3.x + p3.y) * p3.z);',
'}',
+ 'float astraHash31(vec3 p) {',
+ ' p = fract(p * 0.1031);',
+ ' p += dot(p, p.yzx + 33.33);',
+ ' return fract((p.x + p.y) * p.z);',
+ '}',
'float astraNoise2(vec2 p) {',
' vec2 i = floor(p), f = fract(p);',
' f = f * f * (3.0 - 2.0 * f);',