Commit 416c650

emptyflashPWhiddy

authored and

committed

Allow users to pass uniforms and fix screen clearing

1 parent e7a26fb commit 416c650Copy full SHA for 416c650

File tree

+24

-28

lines changed

+24

-28

lines changed

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Version: 0.1.38 - January 19, 2023 15:44:27 */`
	`1`	`+/* Version: 0.1.38 - February 7, 2023 15:08:43 */`
`2`	`2`	`'use strict';`
`3`	`3`
`4`	`4`	`Object.defineProperty(exports, '__esModule', { value: true });`
`@@ -95883,25 +95883,24 @@ function fragToMinimalRenderer(canvas, fullFrag, updateUniforms) {`
`95883`	`95883`	`}`
`95884`	`95884`	`}`
`95885`	`95885`
`95886`		`-function sculptToHydraRenderer(source) {`
	`95886`	`+function sculptToHydraRenderer(source, userUniforms) {`
`95887`	`95887`	`var frag = sculptToHydraGLSL(source);`
`95888`	`95888`	`return {`
`95889`	`95889`	`out: function out(output) {`
`95890`		`- var uniforms = {`
	`95890`	`+ var uniforms = _objectSpread2({`
`95891`	`95891`	`time: output.regl.prop('time'),`
`95892`	`95892`	`opacity: 0.5,`
`95893`	`95893`	`_scale: 1.0,`
`95894`	`95894`	`resolution: output.regl.prop('resolution'),`
`95895`	`95895`	`stepSize: 0.85`
`95896`		`- }; // By default hydra doesn't clear the framebuffers`
	`95896`	`+ }, userUniforms); // By default hydra doesn't clear the framebuffers`
	`95897`	`+`
`95897`	`95898`
`95898`	`95899`	`output.tick = function (props) {`
`95899`		`- /*`
`95900`	`95900`	`output.regl.clear({`
`95901`	`95901`	`color: [0, 0, 0, 1],`
`95902`		`- framebuffer: output.getCurrent(),`
`95903`		`- })`
`95904`		`- */`
	`95902`	`+ framebuffer: output.getTexture()`
	`95903`	`+ });`
`95905`	`95904`	`output.draw(props);`
`95906`	`95905`	`};`
`95907`	`95906`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Version: 0.1.38 - January 19, 2023 15:44:27 */`
	`1`	`+/* Version: 0.1.38 - February 7, 2023 15:08:43 */`
`2`	`2`	`function createMetadataMethodsForProperty(metadataMap, kind, property) {`
`3`	`3`	`return {`
`4`	`4`	`getMetadata: function (key) {`
`@@ -95879,25 +95879,24 @@ function fragToMinimalRenderer(canvas, fullFrag, updateUniforms) {`
`95879`	`95879`	`}`
`95880`	`95880`	`}`
`95881`	`95881`
`95882`		`-function sculptToHydraRenderer(source) {`
	`95882`	`+function sculptToHydraRenderer(source, userUniforms) {`
`95883`	`95883`	`var frag = sculptToHydraGLSL(source);`
`95884`	`95884`	`return {`
`95885`	`95885`	`out: function out(output) {`
`95886`		`- var uniforms = {`
	`95886`	`+ var uniforms = _objectSpread2({`
`95887`	`95887`	`time: output.regl.prop('time'),`
`95888`	`95888`	`opacity: 0.5,`
`95889`	`95889`	`_scale: 1.0,`
`95890`	`95890`	`resolution: output.regl.prop('resolution'),`
`95891`	`95891`	`stepSize: 0.85`
`95892`		`- }; // By default hydra doesn't clear the framebuffers`
	`95892`	`+ }, userUniforms); // By default hydra doesn't clear the framebuffers`
	`95893`	`+`
`95893`	`95894`
`95894`	`95895`	`output.tick = function (props) {`
`95895`		`- /*`
`95896`	`95896`	`output.regl.clear({`
`95897`	`95897`	`color: [0, 0, 0, 1],`
`95898`		`- framebuffer: output.getCurrent(),`
`95899`		`- })`
`95900`		`- */`
	`95898`	`+ framebuffer: output.getTexture()`
	`95899`	`+ });`
`95901`	`95900`	`output.draw(props);`
`95902`	`95901`	`};`
`95903`	`95902`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Version: 0.1.38 - January 19, 2023 15:44:25 */`
	`1`	`+/* Version: 0.1.38 - February 7, 2023 15:08:41 */`
`2`	`2`	`(function (global, factory) {`
`3`	`3`	`typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :`
`4`	`4`	`typeof define === 'function' && define.amd ? define(['exports'], factory) :`
`@@ -95885,25 +95885,24 @@`
`95885`	`95885`	`}`
`95886`	`95886`	`}`
`95887`	`95887`
`95888`		`- function sculptToHydraRenderer(source) {`
	`95888`	`+ function sculptToHydraRenderer(source, userUniforms) {`
`95889`	`95889`	`var frag = sculptToHydraGLSL(source);`
`95890`	`95890`	`return {`
`95891`	`95891`	`out: function out(output) {`
`95892`		`- var uniforms = {`
	`95892`	`+ var uniforms = _objectSpread2({`
`95893`	`95893`	`time: output.regl.prop('time'),`
`95894`	`95894`	`opacity: 0.5,`
`95895`	`95895`	`_scale: 1.0,`
`95896`	`95896`	`resolution: output.regl.prop('resolution'),`
`95897`	`95897`	`stepSize: 0.85`
`95898`		`- }; // By default hydra doesn't clear the framebuffers`
	`95898`	`+ }, userUniforms); // By default hydra doesn't clear the framebuffers`
	`95899`	`+`
`95899`	`95900`
`95900`	`95901`	`output.tick = function (props) {`
`95901`		`- /*`
`95902`	`95902`	`output.regl.clear({`
`95903`	`95903`	`color: [0, 0, 0, 1],`
`95904`		`- framebuffer: output.getCurrent(),`
`95905`		`- })`
`95906`		`- */`
	`95904`	`+ framebuffer: output.getTexture()`
	`95905`	`+ });`
`95907`	`95906`	`output.draw(props);`
`95908`	`95907`	`};`
`95909`	`95908`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import {`
`10`	`10`	`hydraFragFooter,`
`11`	`11`	`} from "../glsl/glsl-lib.js";`
`12`	`12`
`13`		`-export function sculptToHydraRenderer(source) {`
	`13`	`+export function sculptToHydraRenderer(source,userUniforms) {`
`14`	`14`	`const frag = sculptToHydraGLSL(source);`
`15`	`15`	`return {`
`16`	`16`	`out: (output) => {`
`@@ -20,16 +20,15 @@ export function sculptToHydraRenderer(source) {`
`20`	`20`	`_scale: 1.0,`
`21`	`21`	`resolution: output.regl.prop('resolution'),`
`22`	`22`	`stepSize: 0.85,`
	`23`	`+ ...userUniforms`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`// By default hydra doesn't clear the framebuffers`
`26`	`27`	`output.tick = (props) => {`
`27`		`- /*`
`28`	`28`	`output.regl.clear({`
`29`	`29`	`color: [0, 0, 0, 1],`
`30`		`- framebuffer: output.getCurrent(),`
	`30`	`+ framebuffer: output.getTexture(),`
`31`	`31`	`})`
`32`		`- */`
`33`	`32`	`output.draw(props)`
`34`	`33`	`}`
`35`	`34`

Comments

(0)