From 82b6b752123022670c422b8a083c93d865c9533a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 9 Mar 2012 11:01:59 -0800
Subject: Adding webGL I/O runtime functionality

There is a problem that needs to be resolved in the CanvasRuntime.
---
 assets/descriptor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'assets/descriptor.json')

diff --git a/assets/descriptor.json b/assets/descriptor.json
index c3a3d934..fb56d208 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -4,7 +4,7 @@
 	"root": "/assets/",
 	"directories": [{"name": "images"}, {"name": "shaders"}],
 	"files": [
-		"CanvasDataManager.js",
+		"CanvasRuntime.js",
 		"images/black.png",
 		"images/blue.png",
 		"images/BoxB2_AO.png",
-- 
cgit v1.2.3


From 5da69dfd30f353ff753cba9322744e2f33f32a1a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 9 Mar 2012 13:36:15 -0800
Subject: Adding missing file for webGL, still need a fix for runtime

---
 assets/descriptor.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'assets/descriptor.json')

diff --git a/assets/descriptor.json b/assets/descriptor.json
index fb56d208..2b955c40 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -5,6 +5,7 @@
 	"directories": [{"name": "images"}, {"name": "shaders"}],
 	"files": [
 		"CanvasRuntime.js",
+		"rdge-compiled.js",
 		"images/black.png",
 		"images/blue.png",
 		"images/BoxB2_AO.png",
-- 
cgit v1.2.3


From 615be47750fb86c07acd9354da12a76abe6c24e0 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sat, 10 Mar 2012 16:27:48 -0800
Subject: Temp Runtime WebGL Fix

Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime.
---
 assets/descriptor.json | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

(limited to 'assets/descriptor.json')

diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2b955c40..0da58755 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -6,31 +6,53 @@
 	"files": [
 		"CanvasRuntime.js",
 		"rdge-compiled.js",
-		"images/black.png",
-		"images/blue.png",
 		"images/BoxB2_AO.png",
-		"images/BoxB2_DM.png",
-		"images/cubelight.png",
 		"images/grey.png",
-		"images/material_paint.png",
-		"images/metal.png",
-		"images/normalMap.png",
-		"images/random_normal.png",
 		"images/rocky-diffuse.jpg",
+		"images/BoxB2_DM.png",
+		"images/material_paint.png",
 		"images/rocky-normal.jpg",
+		"images/black.png",
+		"images/metal.png",
 		"images/rocky-spec.jpg",
+		"images/blue.png",
+		"images/normalMap.png",
 		"images/silver.png",
+		"images/cubelight.png",
+		"images/random_normal.png",
 		"images/white.png",
 		"shaders/Basic.frag.glsl",
+		"shaders/TwistVert.vert.glsl",
 		"shaders/Basic.vert.glsl",
+		"shaders/Water.frag.glsl",
+		"shaders/Deform.frag.glsl",
+		"shaders/Water2.frag.glsl",
+		"shaders/Flag.vert.glsl",
+		"shaders/ZInvert.frag.glsl",
+		"shaders/Fly.frag.glsl",
 		"shaders/linearGradient.frag.glsl",
+		"shaders/Julia.frag.glsl",
 		"shaders/linearGradient.vert.glsl",
+		"shaders/Keleidoscope.frag.glsl",
+		"shaders/plasma.frag.glsl",
+		"shaders/Mandel.frag.glsl",
+		"shaders/plasma.vert.glsl",
+		"shaders/Pulse.frag.glsl",
+		"shaders/radialBlur.frag.glsl",
+		"shaders/ReliefTunnel.frag.glsl",
 		"shaders/radialGradient.frag.glsl",
+		"shaders/SquareTunnel.frag.glsl",
 		"shaders/radialGradient.vert.glsl",
+		"shaders/Star.frag.glsl",
 		"shaders/test_fshader.glsl",
+		"shaders/Taper.frag.glsl",
 		"shaders/test_fshader_full.glsl",
+		"shaders/Taper.vert.glsl",
 		"shaders/test_vshader.glsl",
+		"shaders/Tunnel.frag.glsl",
 		"shaders/ub_fshader.glsl",
-		"shaders/ub_vshader.glsl"
+		"shaders/Twist.frag.glsl",
+		"shaders/ub_vshader.glsl",
+		"shaders/TwistVert.frag.glsl"
 	]
 }
\ No newline at end of file
-- 
cgit v1.2.3