Skip to content

Commit 062e913

Browse files
torinmbtorinmb
committed
include fragToMinimalRenderer
1 parent aadf9ac commit 062e913

9 files changed

+24
-82
lines changed

‎dist/shader-park-TouchDesigner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.40 - July 9, 2023 22:12:25 */
1+
/* Version: 0.1.41 - July 9, 2023 22:26:47 */
22
(function (global, factory) {
33
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
44
typeof define === 'function' && define.amd ? define(['exports'], factory) :

‎dist/shader-park-core.cjs.js

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.40 - July 9, 2023 22:12:23 */
1+
/* Version: 0.1.41 - July 9, 2023 22:26:45 */
22
'use strict';
33

44
Object.defineProperty(exports, '__esModule', { value: true });
@@ -95687,27 +95687,8 @@ function sculptToFullGLSLSource(source) {
9568795687
}
9568895688

9568995689
var generatedGLSL = sculptToGLSL(source);
95690-
return generatedGLSL; // let fullFrag =
95691-
// minimalHeader +
95692-
// usePBRHeader +
95693-
// useHemisphereLight +
95694-
// uniformsToGLSL(generatedGLSL.uniforms) +
95695-
// "const float STEP_SIZE_CONSTANT = " +
95696-
// generatedGLSL.stepSizeConstant +
95697-
// ";\n" +
95698-
// "const int MAX_ITERATIONS = " +
95699-
// generatedGLSL.maxIterations +
95700-
// ";\n" +
95701-
// "#define MAX_REFLECTIONS " +
95702-
// generatedGLSL.maxReflections +
95703-
// "\n" +
95704-
// sculptureStarterCode +
95705-
// generatedGLSL.geoGLSL +
95706-
// "\n" +
95707-
// generatedGLSL.colorGLSL +
95708-
// "\n" +
95709-
// fragFooter;
95710-
// return fullFrag;
95690+
var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + "#define MAX_REFLECTIONS " + generatedGLSL.maxReflections + "\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
95691+
return fullFrag;
9571195692
}
9571295693
/**
9571395694
* for fast and efficient use on the web
@@ -95723,7 +95704,6 @@ function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUniforms) {
9572395704
var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + "#define MAX_REFLECTIONS " + generatedGLSL.maxReflections + "\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
9572495705
return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
9572595706
}
95726-
9572795707
function fragToMinimalRenderer(canvas, fullFrag, updateUniforms) {
9572895708
// if no update function is provided assume no-op
9572995709
if (updateUniforms === undefined) {
@@ -96009,14 +95989,15 @@ function sculptToTouchDesignerShaderSource(source) {
9600995989
};
9601095990
}
9601195991

96012-
console.log('using shader-park-core version: 0.1.40'); /// Generate code for various targets
95992+
console.log('using shader-park-core version: 0.1.41'); /// Generate code for various targets
9601395993

9601495994
exports.baseUniforms = baseUniforms;
9601595995
exports.bindStaticData = bindStaticData;
9601695996
exports.createSculpture = createSculpture;
9601795997
exports.createSculptureWithGeometry = createSculptureWithGeometry;
9601895998
exports.defaultFragSourceGLSL = defaultFragSourceGLSL;
9601995999
exports.fragFooter = fragFooter;
96000+
exports.fragToMinimalRenderer = fragToMinimalRenderer;
9602096001
exports.generatedGLSLToMinimalRenderer = generatedGLSLToMinimalRenderer;
9602196002
exports.glslToMinimalHTMLRenderer = glslToMinimalHTMLRenderer;
9602296003
exports.glslToMinimalRenderer = glslToMinimalRenderer;

‎dist/shader-park-core.esm.js

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.40 - July 9, 2023 22:12:23 */
1+
/* Version: 0.1.41 - July 9, 2023 22:26:45 */
22
function createMetadataMethodsForProperty(metadataMap, kind, property) {
33
return {
44
getMetadata: function (key) {
@@ -95683,27 +95683,8 @@ function sculptToFullGLSLSource(source) {
9568395683
}
9568495684

9568595685
var generatedGLSL = sculptToGLSL(source);
95686-
return generatedGLSL; // let fullFrag =
95687-
// minimalHeader +
95688-
// usePBRHeader +
95689-
// useHemisphereLight +
95690-
// uniformsToGLSL(generatedGLSL.uniforms) +
95691-
// "const float STEP_SIZE_CONSTANT = " +
95692-
// generatedGLSL.stepSizeConstant +
95693-
// ";\n" +
95694-
// "const int MAX_ITERATIONS = " +
95695-
// generatedGLSL.maxIterations +
95696-
// ";\n" +
95697-
// "#define MAX_REFLECTIONS " +
95698-
// generatedGLSL.maxReflections +
95699-
// "\n" +
95700-
// sculptureStarterCode +
95701-
// generatedGLSL.geoGLSL +
95702-
// "\n" +
95703-
// generatedGLSL.colorGLSL +
95704-
// "\n" +
95705-
// fragFooter;
95706-
// return fullFrag;
95686+
var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + "#define MAX_REFLECTIONS " + generatedGLSL.maxReflections + "\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
95687+
return fullFrag;
9570795688
}
9570895689
/**
9570995690
* for fast and efficient use on the web
@@ -95719,7 +95700,6 @@ function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUniforms) {
9571995700
var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + "#define MAX_REFLECTIONS " + generatedGLSL.maxReflections + "\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
9572095701
return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
9572195702
}
95722-
9572395703
function fragToMinimalRenderer(canvas, fullFrag, updateUniforms) {
9572495704
// if no update function is provided assume no-op
9572595705
if (updateUniforms === undefined) {
@@ -96005,6 +95985,6 @@ function sculptToTouchDesignerShaderSource(source) {
9600595985
};
9600695986
}
9600795987

96008-
console.log('using shader-park-core version: 0.1.40'); /// Generate code for various targets
95988+
console.log('using shader-park-core version: 0.1.41'); /// Generate code for various targets
9600995989

96010-
export { baseUniforms, bindStaticData, createSculpture, createSculptureWithGeometry, defaultFragSourceGLSL, fragFooter, generatedGLSLToMinimalRenderer, glslToMinimalHTMLRenderer, glslToMinimalRenderer, glslToOfflineRenderer, glslToThreeJSMaterial, glslToThreeJSMesh, glslToThreeJSShaderSource, glslToTouchDesignerShaderSource, minimalHeader, minimalVertexSource, sculptToFullGLSLSource, sculptToGLSL, sculptToHydraGLSL, sculptToHydraRenderer, sculptToMinimalHTMLRenderer, sculptToMinimalRenderer, sculptToOfflineRenderer, sculptToRawSDF4Meshing, sculptToThreeJSMaterial, sculptToThreeJSMesh, sculptToThreeJSShaderSource, sculptToTouchDesignerShaderSource, sculptureStarterCode, uniformsToGLSL, useHemisphereLight, usePBRHeader };
95990+
export { baseUniforms, bindStaticData, createSculpture, createSculptureWithGeometry, defaultFragSourceGLSL, fragFooter, fragToMinimalRenderer, generatedGLSLToMinimalRenderer, glslToMinimalHTMLRenderer, glslToMinimalRenderer, glslToOfflineRenderer, glslToThreeJSMaterial, glslToThreeJSMesh, glslToThreeJSShaderSource, glslToTouchDesignerShaderSource, minimalHeader, minimalVertexSource, sculptToFullGLSLSource, sculptToGLSL, sculptToHydraGLSL, sculptToHydraRenderer, sculptToMinimalHTMLRenderer, sculptToMinimalRenderer, sculptToOfflineRenderer, sculptToRawSDF4Meshing, sculptToThreeJSMaterial, sculptToThreeJSMesh, sculptToThreeJSShaderSource, sculptToTouchDesignerShaderSource, sculptureStarterCode, uniformsToGLSL, useHemisphereLight, usePBRHeader };

‎dist/shader-park-core.umd.js

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.40 - July 9, 2023 22:12:19 */
1+
/* Version: 0.1.41 - July 9, 2023 22:26:41 */
22
(function (global, factory) {
33
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
44
typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -95689,27 +95689,8 @@
9568995689
}
9569095690

9569195691
var generatedGLSL = sculptToGLSL(source);
95692-
return generatedGLSL; // let fullFrag =
95693-
// minimalHeader +
95694-
// usePBRHeader +
95695-
// useHemisphereLight +
95696-
// uniformsToGLSL(generatedGLSL.uniforms) +
95697-
// "const float STEP_SIZE_CONSTANT = " +
95698-
// generatedGLSL.stepSizeConstant +
95699-
// ";\n" +
95700-
// "const int MAX_ITERATIONS = " +
95701-
// generatedGLSL.maxIterations +
95702-
// ";\n" +
95703-
// "#define MAX_REFLECTIONS " +
95704-
// generatedGLSL.maxReflections +
95705-
// "\n" +
95706-
// sculptureStarterCode +
95707-
// generatedGLSL.geoGLSL +
95708-
// "\n" +
95709-
// generatedGLSL.colorGLSL +
95710-
// "\n" +
95711-
// fragFooter;
95712-
// return fullFrag;
95692+
var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + "#define MAX_REFLECTIONS " + generatedGLSL.maxReflections + "\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
95693+
return fullFrag;
9571395694
}
9571495695
/**
9571595696
* for fast and efficient use on the web
@@ -95725,7 +95706,6 @@
9572595706
var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(generatedGLSL.uniforms) + "const float STEP_SIZE_CONSTANT = " + generatedGLSL.stepSizeConstant + ";\n" + "const int MAX_ITERATIONS = " + generatedGLSL.maxIterations + ";\n" + "#define MAX_REFLECTIONS " + generatedGLSL.maxReflections + "\n" + sculptureStarterCode + generatedGLSL.geoGLSL + "\n" + generatedGLSL.colorGLSL + "\n" + fragFooter;
9572695707
return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
9572795708
}
95728-
9572995709
function fragToMinimalRenderer(canvas, fullFrag, updateUniforms) {
9573095710
// if no update function is provided assume no-op
9573195711
if (updateUniforms === undefined) {
@@ -96011,14 +95991,15 @@
9601195991
};
9601295992
}
9601395993

96014-
console.log('using shader-park-core version: 0.1.40'); /// Generate code for various targets
95994+
console.log('using shader-park-core version: 0.1.41'); /// Generate code for various targets
9601595995

9601695996
exports.baseUniforms = baseUniforms;
9601795997
exports.bindStaticData = bindStaticData;
9601895998
exports.createSculpture = createSculpture;
9601995999
exports.createSculptureWithGeometry = createSculptureWithGeometry;
9602096000
exports.defaultFragSourceGLSL = defaultFragSourceGLSL;
9602196001
exports.fragFooter = fragFooter;
96002+
exports.fragToMinimalRenderer = fragToMinimalRenderer;
9602296003
exports.generatedGLSLToMinimalRenderer = generatedGLSLToMinimalRenderer;
9602396004
exports.glslToMinimalHTMLRenderer = glslToMinimalHTMLRenderer;
9602496005
exports.glslToMinimalRenderer = glslToMinimalRenderer;

‎dist/shader-park-minimal-renderer.cjs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.40 - July 9, 2023 22:12:23 */
1+
/* Version: 0.1.41 - July 9, 2023 22:26:45 */
22
'use strict';
33

44
Object.defineProperty(exports, '__esModule', { value: true });
@@ -1961,7 +1961,7 @@ function uniformsToGLSL(uniforms) {
19611961
// generatedGLSLToMinimalRenderer
19621962
// } from "./minimalRenderer";
19631963

1964-
console.log('using shader-park-core version: 0.1.40');
1964+
console.log('using shader-park-core version: 0.1.41');
19651965
function glslToMinimalRenderer(canvas, source, updateUniforms) {
19661966
var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(baseUniforms()) + "const float STEP_SIZE_CONSTANT = 0.9;\n" + "const int MAX_ITERATIONS = 300;\n" + "#define MAX_REFLECTIONS 0 \n" + sculptureStarterCode + source + glslFragFooter;
19671967
return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);

‎dist/shader-park-minimal-renderer.esm.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.40 - July 9, 2023 22:12:23 */
1+
/* Version: 0.1.41 - July 9, 2023 22:26:45 */
22
function createMetadataMethodsForProperty(metadataMap, kind, property) {
33
return {
44
getMetadata: function (key) {
@@ -1957,7 +1957,7 @@ function uniformsToGLSL(uniforms) {
19571957
// generatedGLSLToMinimalRenderer
19581958
// } from "./minimalRenderer";
19591959

1960-
console.log('using shader-park-core version: 0.1.40');
1960+
console.log('using shader-park-core version: 0.1.41');
19611961
function glslToMinimalRenderer(canvas, source, updateUniforms) {
19621962
var fullFrag = minimalHeader + usePBRHeader + useHemisphereLight + uniformsToGLSL(baseUniforms()) + "const float STEP_SIZE_CONSTANT = 0.9;\n" + "const int MAX_ITERATIONS = 300;\n" + "#define MAX_REFLECTIONS 0 \n" + sculptureStarterCode + source + glslFragFooter;
19631963
return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
@@ -2141,4 +2141,4 @@ function fragToMinimalRenderer(canvas, fullFrag, updateUniforms) {
21412141
}
21422142
}
21432143

2144-
export { baseUniforms, glslToMinimalRenderer, uniformsToGLSL, fragToMinimalRenderer };
2144+
export { baseUniforms, glslToMinimalRenderer, uniformsToGLSL };

‎dist/shader-park-p5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.40 - July 9, 2023 22:12:21 */
1+
/* Version: 0.1.41 - July 9, 2023 22:26:43 */
22
(function (global, factory) {
33
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
44
typeof define === 'function' && define.amd ? define(['exports'], factory) :

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "shader-park-core",
3-
"version": "0.1.40",
3+
"version": "0.1.41",
44
"description": "core glsl and js framework for shader-park",
55
"main": "dist/shader-park-core.esm.js",
66
"csj": "dist/shader-park-core.cjs.js",

‎targets/minimalRenderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export function generatedGLSLToMinimalRenderer(canvas, generatedGLSL, updateUnif
9494
return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);
9595
}
9696

97-
function fragToMinimalRenderer(canvas, fullFrag, updateUniforms) {
97+
export function fragToMinimalRenderer(canvas, fullFrag, updateUniforms) {
9898
// if no update function is provided assume no-op
9999
if (updateUniforms === undefined) {
100100
updateUniforms = () => {

0 commit comments

Comments
 (0)