aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/shape-primitive.js
diff options
context:
space:
mode:
authorAnanya Sen2012-04-17 18:11:55 -0700
committerAnanya Sen2012-04-17 18:11:55 -0700
commit35abad196cc9feb76ef50c1b63032a38233a6d51 (patch)
tree914689c66d4ab6c6e088b571eade0a0e35082916 /js/lib/geom/shape-primitive.js
parent1f891c58bad0b7746659aa4138001b5ee76d9a0e (diff)
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-35abad196cc9feb76ef50c1b63032a38233a6d51.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/lib/geom/shape-primitive.js')
-rw-r--r--js/lib/geom/shape-primitive.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js
index bf0087b2..97873d32 100644
--- a/js/lib/geom/shape-primitive.js
+++ b/js/lib/geom/shape-primitive.js
@@ -8,11 +8,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
8var ShapePrimitive = {}; 8var ShapePrimitive = {};
9 9
10ShapePrimitive.create = function(coords, normals, uvs, indices, primType, vertexCount) { 10ShapePrimitive.create = function(coords, normals, uvs, indices, primType, vertexCount) {
11 var renderer = g_Engine.getContext().renderer; 11 var renderer = RDGE.globals.engine.getContext().renderer;
12 12
13 // to setup a primitive you must define it 13 // to setup a primitive you must define it
14 // create a new primitive definition here to then fill out 14 // create a new primitive definition here to then fill out
15 var prim = new rdgePrimitiveDefinition(); 15 var prim = new RDGE.rdgePrimitiveDefinition();
16 16
17 // the vertex definition declares how the data will be delivered to the shader 17 // the vertex definition declares how the data will be delivered to the shader
18 // the position of an element in array determines which attribute in a shader the 18 // the position of an element in array determines which attribute in a shader the