diff options
author | Jose Antonio Marquez | 2012-03-10 16:30:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-10 16:30:45 -0800 |
commit | 7d4d8651d059a91d29142d7f07d3122eb64532fa (patch) | |
tree | 6f180ddb9f631b49271670771144759c39f3c919 /assets | |
parent | 94ddbc239965cb39431708e78dde5127c64b0060 (diff) | |
parent | 615be47750fb86c07acd9354da12a76abe6c24e0 (diff) | |
download | ninja-7d4d8651d059a91d29142d7f07d3122eb64532fa.tar.gz |
Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate
Diffstat (limited to 'assets')
-rw-r--r-- | assets/CanvasDataManager.js | 83 | ||||
-rw-r--r-- | assets/CanvasRuntime.js | 1362 | ||||
-rw-r--r-- | assets/descriptor.json | 43 | ||||
-rwxr-xr-x | assets/rdge-compiled.js | 452 |
4 files changed, 1847 insertions, 93 deletions
diff --git a/assets/CanvasDataManager.js b/assets/CanvasDataManager.js deleted file mode 100644 index 8afc9de0..00000000 --- a/assets/CanvasDataManager.js +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | |||
8 | var GeomObj = require("js/lib/geom/geom-obj").GeomObj; | ||
9 | var ShapePrimitive = require("js/lib/geom/shape-primitive").ShapePrimitive; | ||
10 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; | ||
11 | var GLRuntime = require("js/lib/rdge/runtime/GLRuntime").GLRuntime; | ||
12 | |||
13 | /////////////////////////////////////////////////////////////////////// | ||
14 | // Class ShapeRuntime | ||
15 | // Manages runtime shape display | ||
16 | /////////////////////////////////////////////////////////////////////// | ||
17 | var CanvasDataManager = function CanvasDataManager() | ||
18 | { | ||
19 | this.loadGLData = function(root, valueArray ) | ||
20 | { | ||
21 | var value = valueArray; | ||
22 | var nWorlds = value.length; | ||
23 | for (var i=0; i<nWorlds; i++) | ||
24 | { | ||
25 | var importStr = value[i]; | ||
26 | var startIndex = importStr.indexOf( "id: " ); | ||
27 | if (startIndex >= 0) | ||
28 | { | ||
29 | var endIndex = importStr.indexOf( "\n", startIndex ); | ||
30 | if (endIndex > 0) | ||
31 | { | ||
32 | var id = importStr.substring( startIndex+4, endIndex ); | ||
33 | var canvas = this.findCanvasWithID( id, root ); | ||
34 | if (canvas) | ||
35 | { | ||
36 | var rt = new GLRuntime( canvas, importStr ); | ||
37 | } | ||
38 | } | ||
39 | } | ||
40 | } | ||
41 | } | ||
42 | |||
43 | this.collectGLData = function( elt, dataArray ) | ||
44 | { | ||
45 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) | ||
46 | { | ||
47 | var data = elt.elementModel.shapeModel.GLWorld.export( true ); | ||
48 | dataArray.push( data ); | ||
49 | } | ||
50 | |||
51 | if (elt.children) | ||
52 | { | ||
53 | var nKids = elt.children.length; | ||
54 | for (var i=0; i<nKids; i++) | ||
55 | { | ||
56 | var child = elt.children[i]; | ||
57 | this.collectGLData( child, dataArray ); | ||
58 | } | ||
59 | } | ||
60 | } | ||
61 | |||
62 | this.findCanvasWithID = function( id, elt ) | ||
63 | { | ||
64 | var cid = elt.getAttribute( "data-RDGE-id" ); | ||
65 | if (cid == id) return elt; | ||
66 | |||
67 | if (elt.children) | ||
68 | { | ||
69 | var nKids = elt.children.length; | ||
70 | for (var i=0; i<nKids; i++) | ||
71 | { | ||
72 | var child = elt.children[i]; | ||
73 | var foundElt = this.findCanvasWithID( id, child ); | ||
74 | if (foundElt) return foundElt; | ||
75 | } | ||
76 | } | ||
77 | } | ||
78 | } | ||
79 | |||
80 | |||
81 | if (typeof exports === "object") { | ||
82 | exports.CanvasDataManager = CanvasDataManager; | ||
83 | } | ||
diff --git a/assets/CanvasRuntime.js b/assets/CanvasRuntime.js new file mode 100644 index 00000000..5caf72ee --- /dev/null +++ b/assets/CanvasRuntime.js | |||
@@ -0,0 +1,1362 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | |||
8 | /////////////////////////////////////////////////////////////////////// | ||
9 | // Class ShapeRuntime | ||
10 | // Manages runtime shape display | ||
11 | /////////////////////////////////////////////////////////////////////// | ||
12 | function CanvasDataManager() | ||
13 | { | ||
14 | this.loadGLData = function(root, valueArray, assetPath ) | ||
15 | { | ||
16 | this._assetPath = assetPath.slice(); | ||
17 | |||
18 | var value = valueArray; | ||
19 | var nWorlds = value.length; | ||
20 | for (var i=0; i<nWorlds; i++) | ||
21 | { | ||
22 | var importStr = value[i]; | ||
23 | var startIndex = importStr.indexOf( "id: " ); | ||
24 | if (startIndex >= 0) | ||
25 | { | ||
26 | var endIndex = importStr.indexOf( "\n", startIndex ); | ||
27 | if (endIndex > 0) | ||
28 | { | ||
29 | var id = importStr.substring( startIndex+4, endIndex ); | ||
30 | var canvas = this.findCanvasWithID( id, root ); | ||
31 | if (canvas) | ||
32 | { | ||
33 | var rt = new GLRuntime( canvas, importStr, assetPath ); | ||
34 | } | ||
35 | } | ||
36 | } | ||
37 | } | ||
38 | } | ||
39 | |||
40 | this.collectGLData = function( elt, dataArray ) | ||
41 | { | ||
42 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) | ||
43 | { | ||
44 | var data = elt.elementModel.shapeModel.GLWorld.export( true ); | ||
45 | dataArray.push( data ); | ||
46 | } | ||
47 | |||
48 | if (elt.children) | ||
49 | { | ||
50 | var nKids = elt.children.length; | ||
51 | for (var i=0; i<nKids; i++) | ||
52 | { | ||
53 | var child = elt.children[i]; | ||
54 | this.collectGLData( child, dataArray ); | ||
55 | } | ||
56 | } | ||
57 | } | ||
58 | |||
59 | this.findCanvasWithID = function( id, elt ) | ||
60 | { | ||
61 | var cid = elt.getAttribute( "data-RDGE-id" ); | ||
62 | if (cid == id) return elt; | ||
63 | |||
64 | if (elt.children) | ||
65 | { | ||
66 | var nKids = elt.children.length; | ||
67 | for (var i=0; i<nKids; i++) | ||
68 | { | ||
69 | var child = elt.children[i]; | ||
70 | var foundElt = this.findCanvasWithID( id, child ); | ||
71 | if (foundElt) return foundElt; | ||
72 | } | ||
73 | } | ||
74 | } | ||
75 | } | ||
76 | |||
77 | /////////////////////////////////////////////////////////////////////// | ||
78 | // Class GLRuntime | ||
79 | // Manages runtime fora WebGL canvas | ||
80 | /////////////////////////////////////////////////////////////////////// | ||
81 | function GLRuntime( canvas, importStr, assetPath ) | ||
82 | { | ||
83 | /////////////////////////////////////////////////////////////////////// | ||
84 | // Instance variables | ||
85 | /////////////////////////////////////////////////////////////////////// | ||
86 | this._canvas = canvas; | ||
87 | this._context = null; | ||
88 | this._importStr = importStr; | ||
89 | |||
90 | this.renderer = null; | ||
91 | this.myScene = null; | ||
92 | this.light = null; | ||
93 | this.light2 = null; | ||
94 | this._rootNode = null; | ||
95 | |||
96 | this._firstRender = true; | ||
97 | this._initialized = false; | ||
98 | |||
99 | this._useWebGL = false; | ||
100 | |||
101 | // view parameters | ||
102 | this._fov = 45.0; | ||
103 | this._zNear = 0.1; | ||
104 | this._zFar = 100.0; | ||
105 | this._viewDist = 5.0; | ||
106 | |||
107 | this._aspect = canvas.width/canvas.height; | ||
108 | |||
109 | this._geomRoot; | ||
110 | |||
111 | // all "live" materials | ||
112 | this._materials = []; | ||
113 | |||
114 | // provide the mapping for the asset directory | ||
115 | this._assetPath = assetPath.slice(); | ||
116 | if (this._assetPath[this._assetPath.length-1] != '/') | ||
117 | this._assetPath += '/'; | ||
118 | |||
119 | /////////////////////////////////////////////////////////////////////// | ||
120 | // accessors | ||
121 | /////////////////////////////////////////////////////////////////////// | ||
122 | this.getZNear = function() { return this._zNear; } | ||
123 | this.getZFar = function() { return this._zFar; } | ||
124 | this.getFOV = function() { return this._fov; } | ||
125 | this.getAspect = function() { return this._aspect; } | ||
126 | this.getViewDistance = function() { return this._viewDist; } | ||
127 | |||
128 | this.get2DContext = function() { return this._context; } | ||
129 | |||
130 | this.getViewportWidth = function() { return this._canvas.width; } | ||
131 | this.getViewportHeight = function() { return this._canvas.height; } | ||
132 | |||
133 | /////////////////////////////////////////////////////////////////////// | ||
134 | // accessors | ||
135 | /////////////////////////////////////////////////////////////////////// | ||
136 | this.loadScene = function() | ||
137 | { | ||
138 | // parse the data | ||
139 | // the GL runtime must start with a "sceneData: " | ||
140 | var index = importStr.indexOf( "scenedata: " ); | ||
141 | if (index >= 0) | ||
142 | { | ||
143 | this._useWebGL = true; | ||
144 | |||
145 |