Commit faa222d

committed

change location of glsl functions + add glslFuncES3

1 parent ccdaef3 commit faa222dCopy full SHA for faa222d

File tree

+40

-5

lines changed

+40

-5

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,9 @@ module.exports = {`
`63`	`63`	`collapsable: true,`
`64`	`64`	`title: 'GLSL',`
`65`	`65`	`children: [`
`66`		`- '/references-js/geometries/glslFunc',`
`67`		`- '/references-js/geometries/glslSDF',`
	`66`	`+ '/references-js/glsl/glslFunc',`
	`67`	`+ '/references-js/glsl/glslFuncES3',`
	`68`	`+ '/references-js/glsl/glslSDF',`
`68`	`69`	`]`
`69`	`70`	`},`
`70`	`71`	`{`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,9 @@ getSpherical,`
`85`	`85`	`------`
`86`	`86`
`87`	`87`	`### GLSL`
`88`		`-[glslFunc](/references-js/geometries/glslFunc.html),`
`89`		`-[glslSDF](/references-js/geometries/glslSDF.html)`
	`88`	`+[glslFunc](/references-js/glsl/glslFunc.html),`
	`89`	`+[glslFuncES3](/references-js/glsl/glslFuncES3.html),`
	`90`	`+[glslSDF](/references-js/glsl/glslSDF.html)`
`90`	`91`
`91`	`92`	`------`
`92`	`93`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`
`21`	`21`	`### Description`
`22`		`-Creates a javascript function from a GLSL function. This enables the ability to use if statements(branching),work with integers and even create your own raymarcher. Note this will not work with GL ES3. To use GL ES3 look at glslFuncES3 (note, the error handeling of the glsl is not nearly as good as the glslFunc).`
	`22`	`+Creates a javascript function from a GLSL function. This enables the ability to use if statements(branching),work with integers and even create your own raymarcher. Note this will not work with GL ES3. To use GL ES3 look at [glslFuncES3](/references-js/glsl/glslFuncES3.html) (note, the error handeling of the glsl is not nearly as good as the glslFunc).`
`23`	`23`
`24`	`24`	`### Syntax`
`25`	`25`	```js

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,33 @@`
	`1`	`+### glslFuncES3()`
	`2`	`+`
	`3`	`+### Example`
	`4`	`+<!--`
	`5`	`+<iframe width="100%" height="450px" src="https://shaderpark.netlify.com/sculpture/-N01zT0sQ9alzTaxVDgG?example=true&embed=true" frameborder="0"></iframe>`
	`6`	`+`
	`7`	`+---`
	`8`	`+`
	`9`	`+::: details Example 2 Custom Color + Shape Extrusion (click to open)`
	`10`	`+<iframe width="100%" height="450px" src="https://shaderpark.netlify.com/sculpture/-N08hC7qDfxdQX9K91XY?embed=true&example=true" frameborder="0"></iframe>`
	`11`	`+:::`
	`12`	`+`
	`13`	`+---`
	`14`	`+`
	`15`	`+::: details Example 3 Custom Raymarcher`
	`16`	`+<iframe width="100%" height="450px" src="https://shaderpark.netlify.com/sculpture/-N08gr2FStcIFmTFOyKL?embed=true&example=true" frameborder="0"></iframe>`
	`17`	`+::: -->`
	`18`	`+`
	`19`	`+`
	`20`	`+`
	`21`	`+### Description`
	`22`	`+Creates a javascript function from a GLSL function. This enables the ability to use if statements(branching),work with integers and even create your own raymarcher. Note this will work with GL ES3, but does not have as nice of error handeling as [glslFunc](/references-js/glsl/glslFunc.html)`
	`23`	`+`
	`24`	`+### Syntax`
	`25`	+```js
	`26`	`+glslFuncES3(func);`
	`27`	+```
	`28`	`+`
	`29`	`+### Parameters`
	`30`	`+func String: a String containing a GLSL function.`
	`31`	`+`
	`32`	`+### Returns`
	`33`	`+Function: An encapsulated version of func. Any arguments given to this function will be forwarded as arguments to the provided glsl function.`

File renamed without changes.

Comments

(0)