From 232784ffafe834f75a46ca7fc311e8ca2ff5eec9 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Mon, 5 Mar 2012 16:33:51 -0800 Subject: Corrections for canvas file IO --- .../RDGE/runtime/CanvasDataManager.js | 29 ++-------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'js/helper-classes/RDGE/runtime/CanvasDataManager.js') diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js index 46d944a1..efbfe4db 100644 --- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js +++ b/js/helper-classes/RDGE/runtime/CanvasDataManager.js @@ -12,7 +12,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot /////////////////////////////////////////////////////////////////////// function CanvasDataManager() { - this.loadGLData = function(root, valueArray) + this.loadGLData = function(root, valueArray, NinjaUtils) { var value = valueArray; var nWorlds = value.length; @@ -29,32 +29,7 @@ function CanvasDataManager() var canvas = this.findCanvasWithID( id, root ); if (canvas) { - //var loadForAuthoring = true; - var index = importStr.indexOf( "scenedata: " ); - //if (index >= 0) loadForAuthoring = false; - var loadForAuthoring = false; - - if (loadForAuthoring) - { - if (!canvas.elementModel) - { - NJUtils.makeElementModel(canvas, "Canvas", "shape", true); - } - - if (canvas.elementModel) - { - if (canvas.elementModel.shapeModel.GLWorld) - canvas.elementModel.shapeModel.GLWorld.clearTree(); - - var world = new GLWorld( canvas ); - canvas.elementModel.shapeModel.GLWorld = world; - world.import( importStr ); - } - } - else - { - var rt = new GLRuntime( canvas, importStr ); - } + var rt = new GLRuntime( canvas, importStr ); } } } -- cgit v1.2.3