8000 add "overwrite" construction mode · shader-park/shader-park-core@3114d54 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3114d54

Browse files
PWhiddyPWhiddy
committed
add "overwrite" construction mode
1 parent b2f7555 commit 3114d54

12 files changed

+244
-183
lines changed

‎dist/shader-park-TouchDesigner.js

Lines changed: 16 additions & 5 deletions
Large diffs are not rendered by default.

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

Lines changed: 17 additions & 6 deletions
Large diffs are not rendered by default.

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

Lines changed: 17 additions & 6 deletions
Large diffs are not rendered by default.

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

Lines changed: 17 additions & 6 deletions
Large diffs are not rendered by default.

‎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.42 - August 26, 2023 17:04:17 */
1+
/* Version: 0.2.0 - September 1, 2023 14:57:04 */
22
'use strict';
33

44
function _AsyncGenerator(e) {
@@ -2774,7 +2774,7 @@ function uniformsToGLSL(uniforms) {
27742774
// generatedGLSLToMinimalRenderer
27752775
// } from "./minimalRenderer";
27762776

2777-
console.log('using shader-park-core version: 0.1.42');
2777+
console.log('using shader-park-core version: 0.2.0');
27782778
function glslToMinimalRenderer(canvas, source, updateUniforms) {
27792779
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;
27802780
return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Version: 0.1.42 - August 26, 2023 17:04:17 */
1+
/* Version: 0.2.0 - September 1, 2023 14:57:04 */
22
function _AsyncGenerator(e) {
33
var r, t;
44
function resume(r, t) {
@@ -2772,7 +2772,7 @@ function uniformsToGLSL(uniforms) {
27722772
// generatedGLSLToMinimalRenderer
27732773
// } from "./minimalRenderer";
27742774

2775-
console.log('using shader-park-core version: 0.1.42');
2775+
console.log('using shader-park-core version: 0.2.0');
27762776
function glslToMinimalRenderer(canvas, source, updateUniforms) {
27772777
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;
27782778
return fragToMinimalRenderer(canvas, fullFrag, updateUniforms);

‎dist/shader-park-p5.js

Lines changed: 16 additions & 5 deletions
Large diffs are not rendered by default.

‎generators/sculpt.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,8 +780,9 @@ export function sculptToGLSL(userProvidedSrc) {
780780
INTERSECT: 12,
781781
BLEND: 13,
782782
MIXGEO: 14,
783+
OVERWRITE: 15,
783784
};
784-
const additiveModes = [modes.UNION, modes.BLEND, modes.MIXGEO];
785+
const additiveModes = [modes.UNION, modes.BLEND, modes.MIXGEO, modes.OVERWRITE];
785786

786787
const materialModes = {
787788
NORMAL: 20, // F it let's start at 20 why not
@@ -901,6 +902,11 @@ export function sculptToGLSL(userProvidedSrc) {
901902
getCurrentState().mixAmount = amount;
902903
}
903904

905+
// possible names: 'overwrite', 'set', 'replace'
906+
function overwrite() {
907+
getCurrentState().mode = modes.OVERWRITE;
908+
}
909+
904910
function getMode() {
905911
switch (getCurrentMode()) {
906912
case modes.UNION:
@@ -918,6 +924,9 @@ export function sculptToGLSL(userProvidedSrc) {
918924
case modes.MIXGEO:
919925
return ["mix", getCurrentState().mixAmount];
920926
break;
927+
case modes.OVERWRITE:
928+
return ["overwrite"];
929+
break;
921930
default:
922931
return ["add"];
923932
}
@@ -929,7 +938,11 @@ export function sculptToGLSL(userProvidedSrc) {
929938
appendSources("float " + primName + " = " + prim + ";\n");
930939
if (additiveModes.includes(getCurrentMode())) {
931940
let selectedCC = finalCol !== undefined ? finalCol : getCurrentMaterial();
932-
if (getCurrentState().materialMode === materialModes.NORMAL) {
941+
if (getCurrentMode() === modes.OVERWRITE) {
942+
appendColorSource(
943+
getMainMaterial() + " = " + selectedCC + ";\n"
944+
);
945+
} else if (getCurrentState().materialMode === materialModes.NORMAL) {
933946
appendColorSource(
934947
"if (" +
935948
primName +

‎glsl/glsl-lib.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,11 @@ float uTriangle( vec3 p, vec3 a, vec3 b, vec3 c )
336336
dot(nor,pa)*dot(nor,pa)/dot2(nor) );
337337
}
338338
339+
float overwrite( float d1, float d2 )
340+
{
341+
return d1;
342+
}
343+
339344
float add( float d1, float d2 )
340345
{
341346
return min(d1,d2);

0 commit comments

Comments
 (0)
0