Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
wizgrav committed Jun 14, 2018
1 parent 7164781 commit c5d6ce7
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 46 deletions.
79 changes: 42 additions & 37 deletions dist/rayglider.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require('./src/ui');
var twgl = require('twgl-base.js');
var twgl = require('twgl.js');
require('glsl-transpiler');
var Clubber = require('clubber');
var Config = require("./src/config");
Expand Down
7 changes: 4 additions & 3 deletions shaders/lib/test.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// The Garden of Jouls
// by wizgrav
// El Jardí de Catalunya
// by El Greco
// https://tinyurl.com/y8sbqhz7
#import C < color >
#import SDF < sdf >
#import CAM < camera >
Expand Down Expand Up @@ -123,4 +124,4 @@ void $main(inout vec4 fragColor, vec2 fragCoord) {

fragColor.rgb = col;
#endif
}
}
2 changes: 1 addition & 1 deletion src/asset.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var State = require("./state");
var twgl = require("twgl-base.js");
var twgl = require("twgl.js");
var util = require("./util");

twgl.setDefaults({crossOrigin: ""});
Expand Down
2 changes: 1 addition & 1 deletion src/boom.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var State = require("./state");
var twgl = require("twgl-base.js");
var twgl = require("twgl.js");
var util = require("./util");
var GLSL = require('glsl-transpiler');

Expand Down
4 changes: 2 additions & 2 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function parse(t, u) {
} else {
var ss = window.localStorage.getItem(sm);
if(ss) {
decomparse(s, sm);
decomparse(ss, sm);
} else {
var iframe = document.createElement("iframe");
iframe.setAttribute("name", "raygl$" + sm);
Expand All @@ -179,7 +179,7 @@ function parse(t, u) {
function decomparse(s, name) {
lzma.decompress(util.atob(s), function(s, error) {
var c = config.imports[name];
document.body.removeChild(c.iframe);
if(c.iframe) document.body.removeChild(c.iframe);
c.iframe = null;
parse(s, name);
}, function(percent) {});
Expand Down
2 changes: 1 addition & 1 deletion src/pass.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var State = require("./state");
var twgl = require("twgl-base.js");
var twgl = require("twgl.js");
var util = require("./util");
var resolve = util.resolve;
var buf;
Expand Down

0 comments on commit c5d6ce7

Please sign in to comment.