diff options
author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/helper-classes | |
parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/helper-classes')
29 files changed, 237 insertions, 342 deletions
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js index 562a6e73..2f0283a9 100755 --- a/js/helper-classes/3D/math-utils.js +++ b/js/helper-classes/3D/math-utils.js | |||
@@ -729,7 +729,10 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, { | |||
729 | // the area of the polygon is the length of the normal | 729 | // the area of the polygon is the length of the normal |
730 | var area = VecUtils.vecMag(3, normal ); | 730 | var area = VecUtils.vecMag(3, normal ); |
731 | if (this.fpSign(area) != 0) | 731 | if (this.fpSign(area) != 0) |
732 | vec3.scale(normal, 1.0/area); | 732 | { |
733 | //vec3.scale(normal, 1.0/area); | ||
734 | normal = VecUtils.vecNormalize(3, normal, 1.0); | ||
735 | } | ||
733 | 736 | ||
734 | return normal; | 737 | return normal; |
735 | } | 738 | } |
diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js deleted file mode 100644 index 4985fc9a..00000000 --- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js +++ /dev/null | |||
@@ -1,98 +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 | |||
9 | /////////////////////////////////////////////////////////////////////// | ||
10 | // Class ShapeRuntime | ||
11 | // Manages runtime shape display | ||
12 | /////////////////////////////////////////////////////////////////////// | ||
13 | function CanvasDataManager() | ||
14 | { | ||
15 | this.loadGLData = function(root, valueArray) | ||
16 | { | ||
17 | var value = valueArray; | ||
18 | var nWorlds = value.length; | ||
19 | for (var i=0; i<nWorlds; i++) | ||
20 | { | ||
21 | var importStr = value[i]; | ||
22 | var startIndex = importStr.indexOf( "id: " ); | ||
23 | if (startIndex >= 0) | ||
24 | { | ||
25 | var endIndex = importStr.indexOf( "\n", startIndex ); | ||
26 | if (endIndex > 0) | ||
27 | { | ||
28 | var id = importStr.substring( startIndex+4, endIndex ); | ||
29 | var canvas = this.findCanvasWithID( id, root ); | ||
30 | if (canvas) | ||
31 | { | ||
32 | var loadForAuthoring = true; | ||
33 | var index = importStr.indexOf( "scenedata: " ); | ||
34 | if (index >= 0) loadForAuthoring = false; | ||
35 | |||
36 | if (loadForAuthoring) | ||
37 | { | ||
38 | if (!canvas.elementModel) | ||
39 | { | ||
40 | NJUtils.makeElementModel(canvas, "Canvas", "shape", true); | ||
41 | } | ||
42 | |||
43 | if (canvas.elementModel) | ||
44 | { | ||
45 | if (canvas.elementModel.shapeModel.GLWorld) | ||
46 | canvas.elementModel.shapeModel.GLWorld.clearTree(); | ||
47 | |||
48 | var world = new GLWorld( canvas ); | ||
49 | canvas.elementModel.shapeModel.GLWorld = world; | ||
50 | world.import( importStr ); | ||
51 | } | ||
52 | } | ||
53 | else | ||
54 | { | ||
55 | var rt = new GLRuntime( canvas, importStr ); | ||
56 | } | ||
57 | } | ||
58 | } | ||
59 | } | ||
60 | } | ||
61 | } | ||
62 | |||
63 | this.collectGLData = function( elt, dataArray ) | ||
64 | { | ||
65 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) | ||
66 | { | ||
67 | var data = elt.elementModel.shapeModel.GLWorld.export(); | ||
68 | dataArray.push( data ); | ||
69 | } | ||
70 | |||
71 | if (elt.children) | ||
72 | { | ||
73 | var nKids = elt.children.length; | ||
74 | for (var i=0; i<nKids; i++) | ||
75 | { | ||
76 | var child = elt.children[i]; | ||
77 | this.collectGLData( child, dataArray ); | ||
78 | } | ||
79 | } | ||
80 | } | ||
81 | |||
82 | this.findCanvasWithID = function( id, elt ) | ||
83 | { | ||
84 | var cid = elt.getAttribute( "data-RDGE-id" ); | ||
85 | if (cid == id) return elt; | ||
86 | |||
87 | if (elt.children) | ||
88 | { | ||
89 | var nKids = elt.children.length; | ||
90 | for (var i=0; i<nKids; i++) | ||
91 | { | ||
92 | var child = elt.children[i]; | ||
93 | this.findCanvasWithID( id, child ); | ||
94 | } | ||
95 | } | ||
96 | } | ||
97 | } | ||
98 | |||
diff --git a/js/helper-classes/RDGE/runtime/GLRuntime.js b/js/helper-classes/RDGE/runtime/GLRuntime.js deleted file mode 100644 index 5c99be02..00000000 --- a/js/helper-classes/RDGE/runtime/GLRuntime.js +++ /dev/null | |||
@@ -1,159 +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 | |||
9 | /////////////////////////////////////////////////////////////////////// | ||
10 | // Class GLRuntime | ||
11 | // Manages runtime fora WebGL canvas | ||
12 | /////////////////////////////////////////////////////////////////////// | ||
13 | function GLRuntime( canvas, importStr ) | ||
14 | { | ||
15 | /////////////////////////////////////////////////////////////////////// | ||
16 | // Instance variables | ||
17 | /////////////////////////////////////////////////////////////////////// | ||
18 | this._canvas = canvas; | ||
19 | this._importStr = importStr; | ||
20 | |||
21 | this.renderer = null; | ||
22 | this.myScene = null; | ||
23 | this.light = null; | ||
24 | this.light2 = null; | ||
25 | this._rootNode = null; | ||
26 | |||
27 | this._firstRender = true; | ||
28 | |||
29 | /////////////////////////////////////////////////////////////////////// | ||
30 | // initialization code | ||
31 | /////////////////////////////////////////////////////////////////////// | ||
32 | var id = canvas.getAttribute( "data-RDGE-id" ); | ||
33 | canvas.rdgeid = id; | ||
34 | g_Engine.registerCanvas(canvas, this); | ||
35 | RDGEStart( canvas ); | ||
36 | |||
37 | this.loadScene = function() | ||
38 | { | ||
39 | // parse the data | ||
40 | // the GL runtime must start with a "sceneData: " | ||
41 | var index = importStr.indexOf( "scenedata: " ); | ||
42 | if (index >= 0) | ||
43 | { | ||
44 | var rdgeStr = importStr.substr( index+11 ); | ||
45 | var endIndex = rdgeStr.indexOf( "endscene\n" ); | ||