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')

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


From 8d62c5b896a1f86f2c7726b30310d6b1c7f535d5 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 12 Mar 2012 14:24:00 -0700
Subject: Fix for 2D Canvas runtime

Array was not allowing for multiple items.
---
 assets/CanvasRuntime.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'assets')

diff --git a/assets/CanvasRuntime.js b/assets/CanvasRuntime.js
index 5caf72ee..445050bc 100644
--- a/assets/CanvasRuntime.js
+++ b/assets/CanvasRuntime.js
@@ -852,12 +852,12 @@ function RuntimeOval()
 		// translate
 		var xCtr = 0.5*world.getViewportWidth() + this._xOffset,
 			yCtr = 0.5*world.getViewportHeight() + this._yOffset;
-		var mat = Matrix.create( [
+		var mat = [
 							[ xScale,     0.0,  0.0,  xCtr],
 							[    0.0,  yScale,  0.0,  yCtr],
 							[    0.0,     0.0,  1.0,   0.0],
 							[    0.0,     0.0,  0.0,   1.0]
-						] );
+						];
 
 		// get a bezier representation of the circle
 		var bezPts = this.circularArcToBezier( [0,0,0],  [1,0,0], 2.0*Math.PI );
-- 
cgit v1.2.3