-added number symbol modifier

Author: pjewell-biociphers

src/main.ts

@@ -34,7 +34,8 @@ const controls = {
   'HighTriRange': 1.0,
   'HeightT': 'Off',
   'SymbolScaleT': 'Off',
-  'SymbolPositionT': 'Off'
+  'SymbolPositionT': 'Off',
+  'NumSymbolsPerTri': 1.0,
 
 };
 
@@ -92,6 +93,7 @@ function main() {
   f1.add(controls, 'HeightT', [ 'On', 'Off' ]);
   f1.add(controls, 'SymbolScaleT', [ 'On', 'Off' ]);
   f1.add(controls, 'SymbolPositionT', [ 'On', 'Off' ]);
+  f1.add(controls, 'NumSymbolsPerTri', 0.0, 10.0).step(1.0);
 
   var f2 = gui.addFolder('Animation');
 
@@ -174,6 +176,7 @@ function main() {
     sdf.setHightT(controls['HeightT'] == 'On' ? 1.0 : 0.0);
     sdf.setSymbolScaleT(controls['SymbolScaleT'] == 'On' ? 1.0 : 0.0);
     sdf.setSymbolPositionT(controls['SymbolPositionT'] == 'On' ? 1.0 : 0.0);
+    sdf.setNumSymbolsPerTri(controls['NumSymbolsPerTri']);
 
     renderer.render(camera, time, height, color, noiseColor, sdf, [
       square,

src/rendering/gl/ShaderProgram.ts

@@ -88,6 +88,7 @@ class ShaderProgram {
   unifHightT: WebGLUniformLocation;
   unifSymbolScaleT: WebGLUniformLocation;
   unifSymbolPositionT: WebGLUniformLocation;
+  unifNumSymbolsPerTri: WebGLUniformLocation;
 
   constructor(shaders: Array<Shader>) {
     this.prog = gl.createProgram();
@@ -125,6 +126,8 @@ class ShaderProgram {
     this.unifHightT = gl.getUniformLocation(this.prog, "u_HeightT");
     this.unifSymbolScaleT = gl.getUniformLocation(this.prog, "u_SymbolScaleT");
     this.unifSymbolPositionT = gl.getUniformLocation(this.prog, "u_SymbolPositionT");
+    this.unifNumSymbolsPerTri = gl.getUniformLocation(this.prog, "u_NumSymbolsPerTri");
+
 
 
 
@@ -153,6 +156,7 @@ class ShaderProgram {
   setHightT(t: number){this.use();gl.uniform1f(this.unifHightT, t)}
   setSymbolScaleT(t: number){this.use();gl.uniform1f(this.unifSymbolScaleT, t)}
   setSymbolPositionT(t: number){this.use();gl.uniform1f(this.unifSymbolPositionT, t)}
+  setNumSymbolsPerTri(t: number){this.use();gl.uniform1f(this.unifNumSymbolsPerTri, t)}
 
   use() {
     if (activeProgram !== this.prog) {

src/shaders/sdf-objects.glsl

@@ -271,9 +271,13 @@ float pyramidNormalSDF(vec3 p, float h, float depth, float depth_scale, float nu
                 prisim_transform = transform(prisim_transform, vec3(0, 0, 0), vec3(0, 0, zshift));
                 float prisim = triprism(prisim_transform, greeble_width, greeble_height, abs(noiseTransform));
 
-                float scale = 0.02 + 0.04 * random(vec2(_x+i, _z+g_rot));
-                shape_transform = transform(shape_transform, vec3(0, 0, 0), vec3(-0.01+0.02*random(vec2(_x+i+_y, _z+g_rot)), -0.01+0.02*random(vec2(_x+i, _z+g_rot)), 0.0), vec3(1.0 * scale, 1000.0 * scale, 1.0 * scale));
-                prisim = flatSubtraction(prisim, randomSymbol(shape_transform, random(vec2(_x+j+i, _z+g_rot))));
+
+                for(float k=0.0; k<u_NumSymbolsPerTri; k++){
+                    float scale = 0.02 + 0.04 * random(vec2(_x+i, _z+g_rot+k));
+                    vec3 shape_transform2 = transform(shape_transform, vec3(0, 0, 0), vec3(-0.1+0.2*random(vec2(_x+i+_y, _z+g_rot+k)), -0.1+0.2*random(vec2(_x+i+k, _z+g_rot)), -0.02+0.04*random(vec2(k, k))), vec3(1.0 * scale, 1000.0 * scale, 1.0 * scale));
+                    prisim = flatSubtraction(prisim, randomSymbol(shape_transform2, random(vec2(_x+j+i, _z+g_rot+k))));
+                }
+
 
                 if(noiseHeight > 0.0){
                     final = flatUnion(final, prisim);

src/shaders/toolbox.glsl

@@ -4,6 +4,7 @@ uniform float u_Rows;
 uniform float u_TriScale;
 uniform float u_LowTriRange;
 uniform float u_HighTriRange;
+uniform float u_NumSymbolsPerTri;
 uniform float u_HeightT;
 uniform float u_SymbolScaleT;
 uniform float u_SymbolPositionT;