-reverted numsymbols per tri

CIS-566-Fall-2022 · Dec 4, 2022 · a748177 · a748177
1 parent 7dce828
commit a748177
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/main.ts b/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');
 
@@ -137,13 +139,21 @@ function main() {
   sdf.setDimensions(window.innerWidth, window.innerHeight);
 
   time = 0;
+
+  let SymbolPositionT = 0;
+  let SymbolScaleT = 0;
+  let HeightT = 0;
   // This function will be called every frame
   function tick() {
     time +=1;
     color = vec4.fromValues(controls.Color[0] /255, controls.Color[1] / 255, controls.Color[2] / 255, 1);
     noiseColor = vec4.fromValues(controls['Noise Color'][0] /255, controls['Noise Color'][1] / 255, controls['Noise Color'][2] / 255, 1);
     height = controls['Depth'];
 
+    if(controls['SymbolScaleT'] == 'On'){SymbolScaleT += 0.01}
+    if(controls['SymbolPositionT'] == 'On'){SymbolPositionT += 0.01}
+    if(controls['HeightT'] == 'On'){HeightT += 0.01}
+
     if(controls['Camera Animation'] == 'On'){
       // camera.setPosition(vec3.fromValues(
       //   controls['CameraX'] + Math.sin(timeCamera) * 4, 
@@ -167,13 +177,16 @@ function main() {
       icosphere.create();
     }
 
+
+
     sdf.setRows(controls['Rows']);
     sdf.setTriScale(controls['TriScale']);
     sdf.setLowTriRange(controls['LowTriRange']);
     sdf.setHighTriRange(controls['HighTriRange']);
-    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.setHightT(HeightT);
+    sdf.setSymbolScaleT(SymbolScaleT);
+    sdf.setSymbolPositionT(SymbolPositionT);
+    //sdf.setNumSymbolsPerTri(controls['NumSymbolsPerTri']);
 
     renderer.render(camera, time, height, color, noiseColor, sdf, [
       square,

diff --git a/src/shaders/sdf-objects.glsl b/src/shaders/sdf-objects.glsl
@@ -275,6 +275,12 @@ float pyramidNormalSDF(vec3 p, float h, float depth, float depth_scale, float nu
                 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+u_SymbolPositionT, _z+g_rot+k)), -0.1+0.2*random(vec2(_x+i+k+u_SymbolPositionT, _z+g_rot)), -0.02+0.04*random(vec2(k+u_SymbolPositionT, 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);
                 }else{