diff options
Diffstat (limited to 'js/lib')
30 files changed, 1624 insertions, 84 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index 3d6c6fc4..b8bceda6 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
@@ -4,17 +4,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | // Useless Global variables. | ||
8 | // TODO: Remove this as soon as QE test pass | ||
9 | /* | ||
10 | var shaderProgramArray = new Array; | ||
11 | var glContextArray = new Array; | ||
12 | var vertexShaderSource = ""; | ||
13 | var fragmentShaderSource = ""; | ||
14 | var rdgeStarted = false; | ||
15 | */ | ||
16 | |||
17 | var nodeCounter = 0; | ||
18 | 7 | ||
19 | var GeomObj = require("js/lib/geom/geom-obj").GeomObj; | 8 | var GeomObj = require("js/lib/geom/geom-obj").GeomObj; |
20 | var Line = require("js/lib/geom/line").Line; | 9 | var Line = require("js/lib/geom/line").Line; |
@@ -22,6 +11,8 @@ var Rectangle = require("js/lib/geom/rectangle").Rectangle; | |||
22 | var Circle = require("js/lib/geom/circle").Circle; | 11 | var Circle = require("js/lib/geom/circle").Circle; |
23 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; | 12 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; |
24 | 13 | ||
14 | var worldCounter = 0; | ||
15 | |||
25 | /////////////////////////////////////////////////////////////////////// | 16 | /////////////////////////////////////////////////////////////////////// |
26 | // Class GLWorld | 17 | // Class GLWorld |
27 | // Manages display in a canvas | 18 | // Manages display in a canvas |
@@ -76,6 +67,12 @@ var World = function GLWorld( canvas, use3D ) { | |||
76 | // no animated materials | 67 | // no animated materials |
77 | this._firstRender = true; | 68 | this._firstRender = true; |
78 | 69 | ||
70 | this._worldCount = worldCounter; | ||
71 | worldCounter++; | ||
72 | |||
73 | // keep a counter for generating node names | ||
74 | this._nodeCounter = 0; | ||
75 | |||
79 | /////////////////////////////////////////////////////////////////////// | 76 | /////////////////////////////////////////////////////////////////////// |
80 | // Property accessors | 77 | // Property accessors |
81 | /////////////////////////////////////////////////////////////////////// | 78 | /////////////////////////////////////////////////////////////////////// |
@@ -350,9 +347,12 @@ var World = function GLWorld( canvas, use3D ) { | |||
350 | return false; | 347 | return false; |
351 | }; | 348 | }; |
352 | 349 | ||
353 | 350 | this.generateUniqueNodeID = function() | |
354 | // END RDGE | 351 | { |
355 | //////////////////////////////////////////////////////////////////////////////////// | 352 | var str = String( this._nodeCounter ); |
353 | this._nodeCounter++; | ||
354 | return str; | ||
355 | } | ||
356 | 356 | ||
357 | 357 | ||
358 | // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state | 358 | // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state |
@@ -391,7 +391,7 @@ World.prototype.updateObject = function (obj) { | |||
391 | if (nPrims > 0) { | 391 | if (nPrims > 0) { |
392 | ctrTrNode = obj.getTransformNode(); | 392 | ctrTrNode = obj.getTransformNode(); |
393 | if (ctrTrNode == null) { | 393 | if (ctrTrNode == null) { |
394 | ctrTrNode = createTransformNode("objRootNode_" + nodeCounter++); | 394 | ctrTrNode = createTransformNode("objRootNode_" + this._nodeCounter++); |
395 | this._rootNode.insertAsChild( ctrTrNode ); | 395 | this._rootNode.insertAsChild( ctrTrNode ); |
396 | obj.setTransformNode( ctrTrNode ); | 396 | obj.setTransformNode( ctrTrNode ); |
397 | } | 397 | } |
@@ -401,7 +401,7 @@ World.prototype.updateObject = function (obj) { | |||
401 | }); | 401 | }); |
402 | ctrTrNode.meshes = []; | 402 | ctrTrNode.meshes = []; |
403 | 403 | ||
404 | ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + nodeCounter++, prims[0]); | 404 | ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[0]); |
405 | ctrTrNode.attachMaterial(materialNodes[0]); | 405 | ctrTrNode.attachMaterial(materialNodes[0]); |
406 | } | 406 | } |
407 | 407 | ||
@@ -420,12 +420,12 @@ World.prototype.updateObject = function (obj) { | |||
420 | }); | 420 | }); |
421 | childTrNode.meshes = []; | 421 | childTrNode.meshes = []; |
422 | } else { | 422 | } else { |
423 | childTrNode = createTransformNode("objNode_" + nodeCounter++); | 423 | childTrNode = createTransformNode("objNode_" + this._nodeCounter++); |
424 | ctrTrNode.insertAsChild(childTrNode); | 424 | ctrTrNode.insertAsChild(childTrNode); |
425 | } | 425 | } |
426 | 426 | ||
427 | // attach the instanced box goe | 427 | // attach the instanced box goe |
428 | childTrNode.attachMeshNode(this.renderer.id + "_prim_" + nodeCounter++, prim); | 428 | childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim); |
429 | childTrNode.attachMaterial(materialNodes[i]); | 429 | childTrNode.attachMaterial(materialNodes[i]); |
430 | } | 430 | } |
431 | }; | 431 | }; |
@@ -727,7 +727,7 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) { | |||
727 | } | 727 | } |
728 | }; | 728 | }; |
729 | 729 | ||
730 | World.prototype.export = function() { | 730 | World.prototype.export = function( exportForPublish ) { |
731 | var exportStr = "GLWorld 1.0\n"; | 731 | var exportStr = "GLWorld 1.0\n"; |
732 | var id = this.getCanvas().getAttribute( "data-RDGE-id" ); | 732 | var id = this.getCanvas().getAttribute( "data-RDGE-id" ); |
733 | exportStr += "id: " + id + "\n"; | 733 | exportStr += "id: " + id + "\n"; |
@@ -736,17 +736,28 @@ World.prototype.export = function() { | |||
736 | exportStr += "zNear: " + this._zNear + "\n"; | 736 | exportStr += "zNear: " + this._zNear + "\n"; |
737 | exportStr += "zFar: " + this._zFar + "\n"; | 737 | exportStr += "zFar: " + this._zFar + "\n"; |
738 | exportStr += "viewDist: " + this._viewDist + "\n"; | 738 | exportStr += "viewDist: " + this._viewDist + "\n"; |
739 | if (this._useWebGL) | ||
740 | exportStr += "webGL: true\n"; | ||
739 | 741 | ||
740 | // we need 2 export modes: One for save/restore, one for publish. | 742 | // we need 2 export modes: One for save/restore, one for publish. |
741 | // hardcoding for now | 743 | // hardcoding for now |
742 | var exportForPublish = false; | 744 | //var exportForPublish = false; |
745 | if (!exportForPublish) exportForPublish = false; | ||
743 | exportStr += "publish: " + exportForPublish + "\n"; | 746 | exportStr += "publish: " + exportForPublish + "\n"; |
744 | 747 | ||
745 | if (exportForPublish) { | 748 | if (exportForPublish && this._useWebGL) |
749 | { | ||
746 | exportStr += "scenedata: " + this.myScene.exportJSON() + "endscene\n"; | 750 | exportStr += "scenedata: " + this.myScene.exportJSON() + "endscene\n"; |
747 | } else { | 751 | |
752 | // write out all of the objects | ||
753 | exportStr += "tree\n"; | ||
754 | exportStr += this.exportObjects( this._geomRoot ); | ||
755 | exportStr += "endtree\n"; | ||
756 | } | ||
757 | else | ||
758 | { | ||
748 | // output the material library | 759 | // output the material library |
749 | exportStr += MaterialsModel.exportMaterials(); | 760 | //exportStr += MaterialsLibrary.export(); // THIS NEEDS TO BE DONE AT THE DOC LEVEL |
750 | 761 | ||
751 | // write out all of the objects | 762 | // write out all of the objects |
752 | exportStr += "tree\n"; | 763 | exportStr += "tree\n"; |
@@ -800,21 +811,26 @@ World.prototype.import = function( importStr ) { | |||
800 | 811 | ||
801 | // determine if the data was written for export (no Ninja objects) | 812 | // determine if the data was written for export (no Ninja objects) |
802 | // or for save/restore | 813 | // or for save/restore |
803 | var index = importStr.indexOf( "scenedata: " ); | 814 | //var index = importStr.indexOf( "scenedata: " ); |
804 | if (index >= 0) { | 815 | var index = importStr.indexOf( "webGL: " ); |
805 | var rdgeStr = importStr.substr( index+11 ); | 816 | this._useWebGL = (index >= 0) |
806 | var endIndex = rdgeStr.indexOf( "endscene\n" ); | 817 | if (this._useWebGL) |
807 | if (endIndex < 0) throw new Error( "ill-formed WebGL data" ); | 818 | { |
808 | var len = endIndex - index + 11; | 819 | // start RDGE |
809 | rdgeStr = rdgeStr.substr( 0, endIndex ); | 820 | rdgeStarted = true; |
810 | 821 | var id = this._canvas.getAttribute( "data-RDGE-id" ); | |
811 | this.myScene.importJSON( rdgeStr ); | 822 | this._canvas.rdgeid = id; |
812 | } else { | 823 | g_Engine.registerCanvas(this._canvas, this); |
813 | // load the material library | 824 | RDGEStart( this._canvas ); |
814 | importStr = MaterialsModel.importMaterials( importStr ); | 825 | this._canvas.task.stop() |
826 | } | ||
827 | |||
828 | this.importObjects( import |