Skip to content

Commit

Permalink
0.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@patriciogonzalezvivo
patriciogonzalezvivo committed Jun 15, 2018
1 parent e30f862 commit 605b17d
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 40 deletions.
22 changes: 13 additions & 9 deletions dist/GlslCanvas.es.js
View file
Expand Up @@ -1304,9 +1304,9 @@ var GlslCanvas = function () {
this.loadTexture(parsed[u].name, parsed[u].value[0]);
} else {
this.uniform(parsed[u].method, parsed[u].type, parsed[u].name, parsed[u].value);
this.forceRender = true;
}
}
this.forceRender = true;
}
}, {
key: 'setMouse',
Expand Down Expand Up @@ -1395,7 +1395,9 @@ var GlslCanvas = function () {
value: function render() {
this.visible = isCanvasVisible(this.canvas);
if (this.forceRender || this.animated && this.visible && !this.paused) {

this.renderPrograms();

// Trigger event
this.trigger('render', {});
this.change = false;
Expand All @@ -1412,28 +1414,25 @@ var GlslCanvas = function () {
value: function play() {
this.paused = false;
}
}, {
key: 'version',
value: function version() {
return '0.0.27';
}

// render main and buffers programs

}, {
key: 'renderPrograms',
value: function renderPrograms() {
var gl = this.gl,
W = gl.canvas.width,
H = gl.canvas.height;
var gl = this.gl;
var W = gl.canvas.width;
var H = gl.canvas.height;
this.updateVariables();
gl.viewport(0, 0, W, H);

for (var key in this.buffers) {
var buffer = this.buffers[key];
this.updateUniforms(buffer.program, key);
buffer.bundle.render(W, H, buffer.program, buffer.name);
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
}

this.updateUniforms(this.program, 'main');
gl.drawArrays(gl.TRIANGLES, 0, 6);
}
Expand Down Expand Up @@ -1654,6 +1653,11 @@ var GlslCanvas = function () {
}
gl.useProgram(this.program);
}
}, {
key: 'version',
value: function version() {
return '0.1.4';
}
}]);
return GlslCanvas;
}();
Expand Down
22 changes: 13 additions & 9 deletions dist/GlslCanvas.js
View file
Expand Up @@ -1709,9 +1709,9 @@ var GlslCanvas = function () {
this.loadTexture(parsed[u].name, parsed[u].value[0]);
} else {
this.uniform(parsed[u].method, parsed[u].type, parsed[u].name, parsed[u].value);
this.forceRender = true;
}
}
this.forceRender = true;
}
}, {
key: 'setMouse',
Expand Down Expand Up @@ -1800,7 +1800,9 @@ var GlslCanvas = function () {
value: function render() {
this.visible = isCanvasVisible(this.canvas);
if (this.forceRender || this.animated && this.visible && !this.paused) {

this.renderPrograms();

// Trigger event
this.trigger('render', {});
this.change = false;
Expand All @@ -1817,28 +1819,25 @@ var GlslCanvas = function () {
value: function play() {
this.paused = false;
}
}, {
key: 'version',
value: function version() {
return '0.0.27';
}

// render main and buffers programs

}, {
key: 'renderPrograms',
value: function renderPrograms() {
var gl = this.gl,
W = gl.canvas.width,
H = gl.canvas.height;
var gl = this.gl;
var W = gl.canvas.width;
var H = gl.canvas.height;
this.updateVariables();
gl.viewport(0, 0, W, H);

for (var key in this.buffers) {
var buffer = this.buffers[key];
this.updateUniforms(buffer.program, key);
buffer.bundle.render(W, H, buffer.program, buffer.name);
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
}

this.updateUniforms(this.program, 'main');
gl.drawArrays(gl.TRIANGLES, 0, 6);
}
Expand Down Expand Up @@ -2059,6 +2058,11 @@ var GlslCanvas = function () {
}
gl.useProgram(this.program);
}
}, {
key: 'version',
value: function version() {
return '0.1.4';
}
}]);
return GlslCanvas;
}();
Expand Down
2 changes: 1 addition & 1 deletion dist/GlslCanvas.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/GlslCanvas.min.js.map
View file

Large diffs are not rendered by default.

22 changes: 13 additions & 9 deletions lib/GlslCanvas.js
View file
Expand Up @@ -1705,9 +1705,9 @@ var GlslCanvas = function () {
this.loadTexture(parsed[u].name, parsed[u].value[0]);
} else {
this.uniform(parsed[u].method, parsed[u].type, parsed[u].name, parsed[u].value);
this.forceRender = true;
}
}
this.forceRender = true;
}
}, {
key: 'setMouse',
Expand Down Expand Up @@ -1796,7 +1796,9 @@ var GlslCanvas = function () {
value: function render() {
this.visible = isCanvasVisible(this.canvas);
if (this.forceRender || this.animated && this.visible && !this.paused) {

this.renderPrograms();

// Trigger event
this.trigger('render', {});
this.change = false;
Expand All @@ -1813,28 +1815,25 @@ var GlslCanvas = function () {
value: function play() {
this.paused = false;
}
}, {
key: 'version',
value: function version() {
return '0.0.27';
}

// render main and buffers programs

}, {
key: 'renderPrograms',
value: function renderPrograms() {
var gl = this.gl,
W = gl.canvas.width,
H = gl.canvas.height;
var gl = this.gl;
var W = gl.canvas.width;
var H = gl.canvas.height;
this.updateVariables();
gl.viewport(0, 0, W, H);

for (var key in this.buffers) {
var buffer = this.buffers[key];
this.updateUniforms(buffer.program, key);
buffer.bundle.render(W, H, buffer.program, buffer.name);
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
}

this.updateUniforms(this.program, 'main');
gl.drawArrays(gl.TRIANGLES, 0, 6);
}
Expand Down Expand Up @@ -2055,6 +2054,11 @@ var GlslCanvas = function () {
}
gl.useProgram(this.program);
}
}, {
key: 'version',
value: function version() {
return '0.1.4';
}
}]);
return GlslCanvas;
}();
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "glslCanvas",
"version": "0.1.3",
"version": "0.1.4",
"description": "Simple GLSL Fragment Shader Sandbox",
"main": "dist/GlslCanvas.js",
"module": "dist/GlslCanvas.es.js",
Expand Down
21 changes: 11 additions & 10 deletions src/GlslCanvas.js
View file
Expand Up @@ -27,8 +27,6 @@ import Texture from './gl/Texture';
import { isCanvasVisible, isDiff } from './tools/common';
import { subscribeMixin } from './tools/mixin';



export default class GlslCanvas {
constructor(canvas, contextOptions, options) {
subscribeMixin(this);
Expand Down Expand Up @@ -377,9 +375,9 @@ void main(){
}
else {
this.uniform(parsed[u].method, parsed[u].type, parsed[u].name, parsed[u].value);
this.forceRender = true;
}
}
this.forceRender = true;
}

setMouse(mouse) {
Expand Down Expand Up @@ -461,7 +459,9 @@ void main(){
this.visible = isCanvasVisible(this.canvas);
if (this.forceRender ||
(this.animated && this.visible && ! this.paused)) {

this.renderPrograms();

// Trigger event
this.trigger('render', {});
this.change = false;
Expand All @@ -477,23 +477,21 @@ void main(){
this.paused = false;
}

version() {
return '0.0.27';
}

// render main and buffers programs
renderPrograms() {
const gl = this.gl,
W = gl.canvas.width,
H = gl.canvas.height;
const gl = this.gl;
const W = gl.canvas.width;
const H = gl.canvas.height;
this.updateVariables();
gl.viewport(0, 0, W, H);

for (let key in this.buffers) {
const buffer = this.buffers[key];
this.updateUniforms(buffer.program, key);
buffer.bundle.render(W, H, buffer.program, buffer.name);
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
}

this.updateUniforms(this.program, 'main');
gl.drawArrays(gl.TRIANGLES, 0, 6);
}
Expand Down Expand Up @@ -694,6 +692,9 @@ void main(){
gl.useProgram(this.program);
}

version() {
return '0.1.4';
}
}

function loadAllGlslCanvas() {
Expand Down

0 comments on commit 605b17d

Please sign in to comment.