Skip to content

Commit aadf9ac

Browse files
torinmbtorinmb
committed
include fragToMinimalRenderer
1 parent 86a80c6 commit aadf9ac

9 files changed

+79
-20
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.39 - May 16, 2023 13:01:46 */
1+
/* Version: 0.1.40 - July 9, 2023 22:12:25 */
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: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.39 - May 16, 2023 13:01:44 */
1+
/* Version: 0.1.40 - July 9, 2023 22:12:23 */
22
'use strict';
33

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

9568995689
var generatedGLSL = sculptToGLSL(source);
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;
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;
9569295711
}
9569395712
/**
9569495713
* for fast and efficient use on the web
@@ -95990,7 +96009,7 @@ function sculptToTouchDesignerShaderSource(source) {
9599096009
};
9599196010
}
9599296011

95993-
console.log('using shader-park-core version: 0.1.39'); /// Generate code for various targets
96012+
console.log('using shader-park-core version: 0.1.40'); /// Generate code for various targets
9599496013

9599596014
exports.baseUniforms = baseUniforms;
9599696015
exports.bindStaticData = bindStaticData;

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

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

9568595685
var generatedGLSL = sculptToGLSL(source);
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;
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;
9568895707
}
9568995708
/**
9569095709
* for fast and efficient use on the web
@@ -95986,6 +96005,6 @@ function sculptToTouchDesignerShaderSource(source) {
9598696005
};
9598796006
}
9598896007

95989-
console.log('using shader-park-core version: 0.1.39'); /// Generate code for various targets
96008+
console.log('using shader-park-core version: 0.1.40'); /// Generate code for various targets
9599096009

9599196010
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 };

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

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

9569195691
var generatedGLSL = sculptToGLSL(source);
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;
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;
9569495713
}
9569595714
/**
9569695715
* for fast and efficient use on the web
@@ -95992,7 +96011,7 @@
9599296011
};
9599396012
}
9599496013

95995-
console.log('using shader-park-core version: 0.1.39'); /// Generate code for various targets
96014+
console.log('using shader-park-core version: 0.1.40'); /// Generate code for various targets
9599696015

9599796016
exports.baseUniforms = baseUniforms;
9599896017
exports.bindStaticData = bindStaticData;

‎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.39 - May 16, 2023 13:01:44 */
1+
/* Version: 0.1.40 - July 9, 2023 22:12:23 */
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.39');
1964+
console.log('using shader-park-core version: 0.1.40');
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.39 - May 16, 2023 13:01:44 */
1+
/* Version: 0.1.40 - July 9, 2023 22:12:23 */
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.39');
1960+
console.log('using shader-park-core version: 0.1.40');
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 };
2144+
export { baseUniforms, glslToMinimalRenderer, uniformsToGLSL, fragToMinimalRenderer };

‎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.39 - May 16, 2023 13:01:42 */
1+
/* Version: 0.1.40 - July 9, 2023 22:12:21 */
22
(function (global, factory) {
33
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
44
typeof define === 'function' && define.amd ? define(['exports'], factory) :

‎index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
sculptToMinimalRenderer,
1919
glslToMinimalRenderer,
2020
generatedGLSLToMinimalRenderer,
21+
fragToMinimalRenderer,
2122
sculptToFullGLSLSource
2223
} from './targets/minimalRenderer.js'
2324

@@ -84,6 +85,7 @@ export {
8485
glslToMinimalHTMLRenderer,
8586
sculptToRawSDF4Meshing,
8687
defaultFragSourceGLSL,
88+
fragToMinimalRenderer,
8789
sculptToGLSL,
8890
sculptToFullGLSLSource,
8991
baseUniforms,

‎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.39",
3+
"version": "0.1.40",
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",

0 commit comments

Comments
 (0)