aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing
diff options
context:
space:
mode:
authorJonathan Duran2012-03-14 08:59:17 -0700
committerJonathan Duran2012-03-14 08:59:17 -0700
commite065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch)
tree6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/lib/drawing
parente8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff)
downloadninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz
Squashed commit of the following:
merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/lib/drawing')
-rwxr-xr-xjs/lib/drawing/world.js102
1 files changed, 62 insertions, 40 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 3d6c6fc4..df24f556 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/*
10var shaderProgramArray = new Array;
11var glContextArray = new Array;
12var vertexShaderSource = "";
13var fragmentShaderSource = "";
14var rdgeStarted = false;
15*/
16
17var nodeCounter = 0;
18 7
19var GeomObj = require("js/lib/geom/geom-obj").GeomObj; 8var GeomObj = require("js/lib/geom/geom-obj").GeomObj;
20var Line = require("js/lib/geom/line").Line; 9var Line = require("js/lib/geom/line").Line;
@@ -22,11 +11,13 @@ var Rectangle = require("js/lib/geom/rectangle").Rectangle;
22var Circle = require("js/lib/geom/circle").Circle; 11var Circle = require("js/lib/geom/circle").Circle;
23var MaterialsModel = require("js/models/materials-model").MaterialsModel; 12var MaterialsModel = require("js/models/materials-model").MaterialsModel;
24 13
14var worldCounter = 0;
15
25/////////////////////////////////////////////////////////////////////// 16///////////////////////////////////////////////////////////////////////
26// Class GLWorld 17// Class GLWorld
27// Manages display in a canvas 18// Manages display in a canvas
28/////////////////////////////////////////////////////////////////////// 19///////////////////////////////////////////////////////////////////////
29var World = function GLWorld( canvas, use3D ) { 20var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
30 /////////////////////////////////////////////////////////////////////// 21 ///////////////////////////////////////////////////////////////////////
31 // Instance variables 22 // Instance variables
32 /////////////////////////////////////////////////////////////////////// 23 ///////////////////////////////////////////////////////////////////////
@@ -39,7 +30,11 @@ var World = function GLWorld( canvas, use3D ) {
39 30
40 this._canvas = canvas; 31 this._canvas = canvas;
41 if (this._useWebGL) { 32 if (this._useWebGL) {
42 this._glContext = canvas.getContext("experimental-webgl"); 33 if(preserveDrawingBuffer) {
34 this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true});
35 } else {
36 this._glContext = canvas.getContext("experimental-webgl");
37 }
43 } else { 38 } else {
44 this._2DContext = canvas.getContext( "2d" ); 39 this._2DContext = canvas.getContext( "2d" );
45 } 40 }
@@ -76,6 +71,12 @@ var World = function GLWorld( canvas, use3D ) {
76 // no animated materials 71 // no animated materials
77 this._firstRender = true; 72 this._firstRender = true;
78 73
74 this._worldCount = worldCounter;
75 worldCounter++;
76
77 // keep a counter for generating node names
78 this._nodeCounter = 0;
79
79 /////////////////////////////////////////////////////////////////////// 80 ///////////////////////////////////////////////////////////////////////
80 // Property accessors 81 // Property accessors
81 /////////////////////////////////////////////////////////////////////// 82 ///////////////////////////////////////////////////////////////////////
@@ -350,9 +351,12 @@ var World = function GLWorld( canvas, use3D ) {
350 return false; 351 return false;
351 }; 352 };
352 353
353 354 this.generateUniqueNodeID = function()
354 // END RDGE 355 {
355 //////////////////////////////////////////////////////////////////////////////////// 356 var str = "" + this._nodeCounter;
357 this._nodeCounter++;
358 return str;
359 }
356 360
357 361
358 // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state 362 // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state
@@ -391,7 +395,7 @@ World.prototype.updateObject = function (obj) {
391 if (nPrims > 0) { 395 if (nPrims > 0) {
392 ctrTrNode = obj.getTransformNode(); 396 ctrTrNode = obj.getTransformNode();
393 if (ctrTrNode == null) { 397 if (ctrTrNode == null) {
394 ctrTrNode = createTransformNode("objRootNode_" + nodeCounter++); 398 ctrTrNode = createTransformNode("objRootNode_" + this._nodeCounter++);
395 this._rootNode.insertAsChild( ctrTrNode ); 399 this._rootNode.insertAsChild( ctrTrNode );
396 obj.setTransformNode( ctrTrNode ); 400 obj.setTransformNode( ctrTrNode );
397 } 401 }
@@ -401,7 +405,7 @@ World.prototype.updateObject = function (obj) {
401 }); 405 });
402 ctrTrNode.meshes = []; 406 ctrTrNode.meshes = [];
403 407
404 ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + nodeCounter++, prims[0]); 408 ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[0]);
405 ctrTrNode.attachMaterial(materialNodes[0]); 409 ctrTrNode.attachMaterial(materialNodes[0]);
406 } 410 }
407 411
@@ -420,12 +424,12 @@ World.prototype.updateObject = function (obj) {
420 }); 424 });
421 childTrNode.meshes = []; 425 childTrNode.meshes = [];
422 } else { 426 } else {
423 childTrNode = createTransformNode("objNode_" + nodeCounter++); 427 childTrNode = createTransformNode("objNode_" + this._nodeCounter++);
424 ctrTrNode.insertAsChild(childTrNode); 428 ctrTrNode.insertAsChild(childTrNode);
425 } 429 }
426 430
427 // attach the instanced box goe 431 // attach the instanced box goe
428 childTrNode.attachMeshNode(this.renderer.id + "_prim_" + nodeCounter++, prim); 432 childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
429 childTrNode.attachMaterial(materialNodes[i]); 433 childTrNode.attachMaterial(materialNodes[i]);
430 } 434 }
431}; 435};
@@ -680,7 +684,7 @@ World.prototype.render = function() {
680 var root = this.getGeomRoot(); 684 var root = this.getGeomRoot();
681 this.hRender( root ); 685 this.hRender( root );
682 } else { 686 } else {
683 g_Engine.setContext( this._canvas.rdgeId ); 687 g_Engine.setContext( this._canvas.rdgeid );
684 //this.draw(); 688 //this.draw();
685 this.restartRenderLoop(); 689 this.restartRenderLoop();
686 } 690 }
@@ -727,7 +731,8 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
727 } 731 }
728}; 732};
729 733
730World.prototype.export = function() { 734World.prototype.export = function()
735{
731 var exportStr = "GLWorld 1.0\n"; 736 var exportStr = "GLWorld 1.0\n";
732 var id = this.getCanvas().getAttribute( "data-RDGE-id" ); 737 var id = this.getCanvas().getAttribute( "data-RDGE-id" );
733 exportStr += "id: " + id + "\n"; 738 exportStr += "id: " + id + "\n";
@@ -736,17 +741,29 @@ World.prototype.export = function() {
736 exportStr += "zNear: " + this._zNear + "\n"; 741 exportStr += "zNear: " + this._zNear + "\n";
737 exportStr += "zFar: " + this._zFar + "\n"; 742 exportStr += "zFar: " + this._zFar + "\n";
738 exportStr += "viewDist: " + this._viewDist + "\n"; 743 exportStr += "viewDist: " + this._viewDist + "\n";
744 if (this._useWebGL)
745 exportStr += "webGL: true\n";
739 746
740 // we need 2 export modes: One for save/restore, one for publish. 747 // we need 2 export modes: One for save/restore, one for publish.
741 // hardcoding for now 748 // hardcoding for now
742 var exportForPublish = false; 749 //var exportForPublish = false;
750 //if (!exportForPublish) exportForPublish = false;
751 var exportForPublish = true;
743 exportStr += "publish: " + exportForPublish + "\n"; 752 exportStr += "publish: " + exportForPublish + "\n";
744 753
745 if (exportForPublish) { 754 if (exportForPublish && this._useWebGL)
755 {
746 exportStr += "scenedata: " + this.myScene.exportJSON() + "endscene\n"; 756 exportStr += "scenedata: " + this.myScene.exportJSON() + "endscene\n";
747 } else { 757
758 // write out all of the objects
759 exportStr += "tree\n";
760 exportStr += this.exportObjects( this._geomRoot );
761 exportStr += "endtree\n";
762 }
763 else
764 {
748 // output the material library 765 // output the material library
749 exportStr += MaterialsModel.exportMaterials(); 766 //exportStr += MaterialsLibrary.export(); // THIS NEEDS TO BE DONE AT THE DOC LEVEL
750 767
751 // write out all of the objects 768 // write out all of the objects
752 exportStr += "tree\n"; 769 exportStr += "tree\n";
@@ -800,21 +817,26 @@ World.prototype.import = function( importStr ) {
800 817
801 // determine if the data was written for export (no Ninja objects) 818 // determine if the data was written for export (no Ninja objects)
802 // or for save/restore 819 // or for save/restore
803 var index = importStr.indexOf( "scenedata: " ); 820 //var index = importStr.indexOf( "scenedata: " );
804 if (index >= 0) { 821 var index = importStr.indexOf( "webGL: " );
805 var rdgeStr = importStr.substr( index+11 ); 822 this._useWebGL = (index >= 0)
806 var endIndex = rdgeStr.indexOf( "endscene\n" ); 823 if (this._useWebGL)
807 if (endIndex < 0) throw new Error( "ill-formed WebGL data" ); 824 {
808 var len = endIndex - index + 11; 825 // start RDGE
809 rdgeStr = rdgeStr.substr( 0, endIndex ); 826 rdgeStarted = true;
810 827 var id = this._canvas.getAttribute( "data-RDGE-id" );
811 this.myScene.importJSON( rdgeStr ); 828 this._canvas.rdgeid = id;
812 } else { 829 g_Engine.registerCanvas(this._canvas, this);
813 // load the material library 830 RDGEStart( this._canvas );
814 importStr = MaterialsModel.importMaterials( importStr ); 831 this._canvas.task.stop()
832 }
833
834 this.importObjects( importStr, this._rootNode );
815 835
816 // import the objects 836 if (!this._useWebGL)
817 this.importObjects( importStr, this._rootNode ); 837 {
838 // render using canvas 2D
839 this.render();
818 } 840 }
819}; 841};
820 842