add updateUniforms to generateedglsl

torinmb · torinmb · commit 6e1fa04eaf7e · 2022-07-21T23:57:07.000-07:00
diff --git a/dist/shader-park-core.cjs.js b/dist/shader-park-core.cjs.js
@@ -1,4 +1,4 @@
-/* Version: 0.1.29 - July 21, 2022 23:29:26 */
+/* Version: 0.1.30 - July 21, 2022 23:56:49 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -96404,7 +96404,7 @@ function sculptToMinimalRenderer(canvas, source, updateUniforms) {
   var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
   return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
 }
-function generatedGLSLToMinimalRenderer(canvas, generatedGLSL) {
+function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUniforms) {
   var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
   return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
 }
@@ -96653,7 +96653,7 @@ function sculptToTouchDesignerShaderSource(source) {
   };
 }
 
-console.log('using shader-park-core version: 0.1.29'); /// Generate code for various targets
+console.log('using shader-park-core version: 0.1.30'); /// Generate code for various targets
 
 exports.baseUniforms = baseUniforms;
 exports.bindStaticData = bindStaticData;
diff --git a/dist/shader-park-core.esm.js b/dist/shader-park-core.esm.js
@@ -1,4 +1,4 @@
-/* Version: 0.1.29 - July 21, 2022 23:29:26 */
+/* Version: 0.1.30 - July 21, 2022 23:56:49 */
 function createMetadataMethodsForProperty(metadataMap, kind, property) {
   return {
     getMetadata: function (key) {
@@ -96400,7 +96400,7 @@ function sculptToMinimalRenderer(canvas, source, updateUniforms) {
   var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
   return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
 }
-function generatedGLSLToMinimalRenderer(canvas, generatedGLSL) {
+function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUniforms) {
   var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
   return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
 }
@@ -96649,6 +96649,6 @@ function sculptToTouchDesignerShaderSource(source) {
   };
 }
 
-console.log('using shader-park-core version: 0.1.29'); /// Generate code for various targets
+console.log('using shader-park-core version: 0.1.30'); /// Generate code for various targets
 
 export { baseUniforms, bindStaticData, createSculpture, createSculptureWithGeometry, defaultFragSourceGLSL, fragFooter, generatedGLSLToMinimalRenderer, glslToMinimalHTMLRenderer, glslToMinimalRenderer, glslToOfflineRenderer, glslToThreeJSMaterial, glslToThreeJSMesh, glslToThreeJSShaderSource, glslToTouchDesignerShaderSource, minimalHeader, minimalVertexSource, sculptToGLSL, sculptToMinimalHTMLRenderer, sculptToMinimalRenderer, sculptToOfflineRenderer, sculptToRawSDF4Meshing, sculptToThreeJSMaterial, sculptToThreeJSMesh, sculptToThreeJSShaderSource, sculptToTouchDesignerShaderSource, sculptureStarterCode, uniformsToGLSL, useHemisphereLight, usePBRHeader };
diff --git a/dist/shader-park-core.umd.js b/dist/shader-park-core.umd.js
@@ -1,4 +1,4 @@
-/* Version: 0.1.29 - July 21, 2022 23:29:23 */
+/* Version: 0.1.30 - July 21, 2022 23:56:47 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
   typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -96406,7 +96406,7 @@
     var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
     return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
   }
-  function generatedGLSLToMinimalRenderer(canvas, generatedGLSL) {
+  function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUniforms) {
     var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
     return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
   }
@@ -96655,7 +96655,7 @@
     };
   }
 
-  console.log('using shader-park-core version: 0.1.29'); /// Generate code for various targets
+  console.log('using shader-park-core version: 0.1.30'); /// Generate code for various targets
 
   exports.baseUniforms = baseUniforms;
   exports.bindStaticData = bindStaticData;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shader-park-core",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "core glsl and js framework for shader-park",
   "main": "dist/shader-park-core.esm.js",
   "csj": "dist/shader-park-core.cjs.js",
diff --git a/targets/minimalRenderer.js b/targets/minimalRenderer.js
@@ -60,7 +60,7 @@ export function sculptToMinimalRenderer(canvas, source, updateUniforms) {
   return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
 }
 
-export function generatedGLSLToMinimalRenderer(canvas, generatedGLSL) {
+export function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUniforms) {
   let fullFrag =
   minimalHeader +
   usePBRHeader +

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Version: 0.1.29 - July 21, 2022 23:29:26 */`
	`1`	`+/* Version: 0.1.30 - July 21, 2022 23:56:49 */`
`2`	`2`	`'use strict';`
`3`	`3`
`4`	`4`	`Object.defineProperty(exports, '__esModule', { value: true });`
`@@ -96404,7 +96404,7 @@ function sculptToMinimalRenderer(canvas, source, updateUniforms) {`
`96404`	`96404`	`var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;`
`96405`	`96405`	`return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);`
`96406`	`96406`	`}`
`96407`		`-function generatedGLSLToMinimalRenderer(canvas, generatedGLSL) {`
	`96407`	`+function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUniforms) {`
`96408`	`96408`	`var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;`
`96409`	`96409`	`return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);`
`96410`	`96410`	`}`
`@@ -96653,7 +96653,7 @@ function sculptToTouchDesignerShaderSource(source) {`
`96653`	`96653`	`};`
`96654`	`96654`	`}`
`96655`	`96655`
`96656`		`-console.log('using shader-park-core version: 0.1.29'); /// Generate code for various targets`
	`96656`	`+console.log('using shader-park-core version: 0.1.30'); /// Generate code for various targets`
`96657`	`96657`
`96658`	`96658`	`exports.baseUniforms = baseUniforms;`
`96659`	`96659`	`exports.bindStaticData = bindStaticData;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "shader-park-core",`
`3`		`- "version": "0.1.29",`
	`3`	`+ "version": "0.1.30",`
`4`	`4`	`"description": "core glsl and js framework for shader-park",`
`5`	`5`	`"main": "dist/shader-park-core.esm.js",`
`6`	`6`	`"csj": "dist/shader-park-core.cjs.js",`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export function sculptToMinimalRenderer(canvas, source, updateUniforms) {`
`60`	`60`	`return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);`
`61`	`61`	`}`
`62`	`62`
`63`		`-export function generatedGLSLToMinimalRenderer(canvas, generatedGLSL) {`
	`63`	`+export function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUniforms) {`
`64`	`64`	`let fullFrag =`
`65`	`65`	`minimalHeader +`
`66`	`66`	`usePBRHeader +`