diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/lib/geom/shape-primitive.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/lib/geom/shape-primitive.js')
-rw-r--r-- | js/lib/geom/shape-primitive.js | 334 |
1 files changed, 167 insertions, 167 deletions
diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js index c70eae03..e3ff9c06 100644 --- a/js/lib/geom/shape-primitive.js +++ b/js/lib/geom/shape-primitive.js | |||
@@ -32,201 +32,201 @@ POSSIBILITY OF SUCH DAMAGE. | |||
32 | var ShapePrimitive = {}; | 32 | var ShapePrimitive = {}; |
33 | 33 | ||
34 | ShapePrimitive.create = function(coords, normals, uvs, indices, primType, vertexCount) { | 34 | ShapePrimitive.create = function(coords, normals, uvs, indices, primType, vertexCount) { |
35 | var renderer = RDGE.globals.engine.getContext().renderer; | 35 | var renderer = RDGE.globals.engine.getContext().renderer; |
36 | 36 | ||
37 | // to setup a primitive you must define it | 37 | // to setup a primitive you must define it |
38 | // create a new primitive definition here to then fill out | 38 | // create a new primitive definition here to then fill out |
39 | var prim = new RDGE.rdgePrimitiveDefinition(); | 39 | var prim = new RDGE.rdgePrimitiveDefinition(); |
40 | 40 | ||
41 | // the vertex definition declares how the data will be delivered to the shader | 41 | // the vertex definition declares how the data will be delivered to the shader |
42 | // the position of an element in array determines which attribute in a shader the | 42 | // the position of an element in array determines which attribute in a shader the |
43 | // data is bound to | 43 | // data is bound to |
44 | prim.vertexDefinition = { | 44 | prim.vertexDefinition = { |
45 | // this shows two ways to map this data to an attribute | 45 | // this shows two ways to map this data to an attribute |
46 | "vert":{'type':renderer.VS_ELEMENT_POS, 'bufferIndex':0, 'bufferUsage': renderer.BUFFER_STATIC}, | 46 | "vert":{'type':renderer.VS_ELEMENT_POS, 'bufferIndex':0, 'bufferUsage': renderer.BUFFER_STATIC}, |
47 | "a_pos":{'type':renderer.VS_ELEMENT_POS, 'bufferIndex':0, 'bufferUsage': renderer.BUFFER_STATIC}, | 47 | "a_pos":{'type':renderer.VS_ELEMENT_POS, 'bufferIndex':0, 'bufferUsage': renderer.BUFFER_STATIC}, |
48 | 48 | ||
49 | "normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC}, | 49 | "normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC}, |
50 | "a_nrm":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC}, | 50 | "a_nrm":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC}, |
51 | "a_normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC}, | 51 | "a_normal":{'type':renderer.VS_ELEMENT_FLOAT3, 'bufferIndex':1, 'bufferUsage': renderer.BUFFER_STATIC}, |
52 | 52 | ||
53 | "texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC}, | 53 | "texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC}, |
54 | "a_texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC} | 54 | "a_texcoord":{'type':renderer.VS_ELEMENT_FLOAT2, 'bufferIndex':2, 'bufferUsage': renderer.BUFFER_STATIC} |
55 | }; | 55 | }; |
56 | 56 | ||
57 | // the actual data that correlates to the vertex definition | 57 | // the actual data that correlates to the vertex definition |
58 | prim.bufferStreams = [ coords, normals, uvs ]; | 58 | prim.bufferStreams = [ coords, normals, uvs ]; |
59 | 59 | ||
60 | // what type of buffers the data resides in, static is the most common case | 60 | // what type of buffers the data resides in, static is the most common case |
61 | prim.streamUsage = [ renderer.BUFFER_STATIC, renderer.BUFFER_STATIC, renderer.BUFFER_STATIC ]; | 61 | prim.streamUsage = [ renderer.BUFFER_STATIC, renderer.BUFFER_STATIC, renderer.BUFFER_STATIC ]; |
62 | 62 | ||
63 | // this tells the renderer to draw the primitive as a list of triangles | 63 | // this tells the renderer to draw the primitive as a list of triangles |
64 | prim.type = primType; | 64 | prim.type = primType; |
65 | 65 | ||
66 | prim.indexUsage = renderer.BUFFER_STREAM; | 66 | prim.indexUsage = renderer.BUFFER_STREAM; |
67 | prim.indexBuffer = indices; | 67 | prim.indexBuffer = indices; |
68 | 68 | ||
69 | // finally the primitive is created, buffers are generated and the system determines | 69 | // finally the primitive is created, buffers are generated and the system determines |
70 | // the data it needs to draw this primitive according to the previous definition | 70 | // the data it needs to draw this primitive according to the previous definition |
71 | renderer.createPrimitive(prim, vertexCount); | 71 | renderer.createPrimitive(prim, vertexCount); |
72 | 72 | ||
73 | return prim; | 73 | return prim; |
74 | }; | 74 | }; |
75 | 75 | ||
76 | ShapePrimitive.getMeshBounds = function( verts, nVerts ) | 76 | ShapePrimitive.getMeshBounds = function( verts, nVerts ) |
77 | { | 77 | { |
78 | if (!verts || (nVerts <= 0)) return null; | 78 | if (!verts || (nVerts <= 0)) return null; |
79 | 79 | ||
80 | var bounds = [verts[0], verts[1], verts[2], verts[0], verts[1], verts[2]]; | 80 | var bounds = [verts[0], verts[1], verts[2], verts[0], verts[1], verts[2]]; |
81 | var index = 3; | 81 | var index = 3; |
82 | for (var i=1; i<nVerts; i++) | 82 | for (var i=1; i<nVerts; i++) |
83 | { | 83 | { |
84 | var x = verts[index], y = verts[index+1], z = verts[index+2]; | 84 | var x = verts[index], y = verts[index+1], z = verts[index+2]; |
85 | index += 3; | 85 | index += 3; |
86 | 86 | ||
87 | if (x < bounds[0]) bounds[0] = x; | 87 | if (x < bounds[0]) bounds[0] = x; |
88 | else if (x > bounds[3]) bounds[3] = x; | 88 | else if (x > bounds[3]) bounds[3] = x; |
89 | if (y < bounds[1]) bounds[1] = y; | 89 | if (y < bounds[1]) bounds[1] = y; |
90 | else if (y > bounds[4]) bounds[4] = y; | 90 | else if (y > bounds[4]) bounds[4] = y; |
91 | if (z < bounds[2]) bounds[2] = z; | 91 | if (z < bounds[2]) bounds[2] = z; |
92 | else if (z > bounds[5]) bounds[5] = z; | 92 | else if (z > bounds[5]) bounds[5] = z; |
93 | } | 93 | } |
94 | 94 | ||
95 | return bounds; | 95 | return bounds; |
96 | }; | 96 | }; |
97 | 97 | ||
98 | ShapePrimitive.getBounds = function( prim ) | 98 | ShapePrimitive.getBounds = function( prim ) |
99 | { | 99 | { |
100 | var verts = prim.bufferStreams[0]; | 100 | var verts = prim.bufferStreams[0]; |
101 | var nVerts = verts.length; | 101 | var nVerts = verts.length; |
102 | var xMin = verts[0], xMax = verts[0], | 102 | var xMin = verts[0], xMax = verts[0], |
103 | yMin = verts[1], yMax = verts[1], | 103 | yMin = verts[1], yMax = verts[1], |
104 | zMin = verts[2], zMax = verts[2]; | 104 | zMin = verts[2], zMax = verts[2]; |
105 | 105 | ||
106 | for (var index=3; index<verts.length; ) | 106 | for (var index=3; index<verts.length; ) |
107 | { | 107 | { |
108 | if (verts[index] < xMin) xMin = verts[index]; | 108 | if (verts[index] < xMin) xMin = verts[index]; |
109 | else if (verts[index] > xMax) xMax = verts[index]; | 109 | else if (verts[index] > xMax) xMax = verts[index]; |
110 | 110 | ||
111 | index++; | 111 | index++; |
112 | if (verts[index] < yMin) yMin = verts[index]; | 112 | if (verts[index] < yMin) yMin = verts[index]; |
113 | else if (verts[index] > yMax) yMax = verts[index]; | 113 | else if (verts[index] > yMax) yMax = verts[index]; |
114 | 114 | ||
115 | index++; | 115 | index++; |
116 | if (verts[index] < zMin) zMin = verts[index]; | 116 | if (verts[index] < zMin) zMin = verts[index]; |
117 | else if (verts[index] > zMax) zMax = verts[index]; | 117 | else if (verts[index] > zMax) zMax = verts[index]; |
118 | 118 | ||
119 | index++; | 119 | index++; |
120 | } | 120 | } |
121 | 121 | ||
122 | return [xMin, yMin, zMin, xMax, yMax, zMax]; | 122 | return [xMin, yMin, zMin, xMax, yMax, zMax]; |
123 | }; | 123 | }; |
124 | 124 | ||
125 | ShapePrimitive.refineMesh = function( verts, norms, uvs, indices, nVertices, paramRange, tolerance ) | 125 | ShapePrimitive.refineMesh = function( verts, norms, uvs, indices, nVertices, paramRange, tolerance ) |
126 | { | 126 | { |
127 | var oldVrtCount = nVertices; | 127 | var oldVrtCount = nVertices; |
128 | 128 | ||
129 | // get the param range | 129 | // get the param range |
130 | var pUMin = paramRange[0], pVMin = paramRange[1], | 130 | var pUMin = paramRange[0], pVMin = paramRange[1], |
131 | pUMax = paramRange[2], pVMax = paramRange[3]; | 131 | pUMax = paramRange[2], pVMax = paramRange[3]; |
132 | var iTriangle = 0; | 132 | var iTriangle = 0; |
133 | var nTriangles = indices.length/3; | 133 | var nTriangles = indices.length/3; |
134 | var index = 0; | 134 | var index = 0; |
135 | while (iTriangle < nTriangles) | 135 | while (iTriangle < nTriangles) |
136 | { | 136 | { |
137 | // get the indices of the 3 vertices | 137 | // get the indices of the 3 vertices |
138 | var i0 = indices[index], | 138 | var i0 = indices[index], |
139 | i1 = indices[index+1], | 139 | i1 = indices[index+1], |
140 | i2 = indices[index+2]; | 140 | i2 = indices[index+2]; |
141 | 141 | ||
142 | // get the uv values | 142 | // get the uv values |
143 | //var vrtIndex = 3*iTriangle; | 143 | //var vrtIndex = 3*iTriangle; |
144 | var iuv0 = 2 * i0, | 144 | var iuv0 = 2 * i0, |
145 | iuv1 = 2 * i1, | 145 | iuv1 = 2 * i1, |
146 | iuv2 = 2 * i2; | 146 | iuv2 = 2 * i2; |
147 | var u0 = uvs[iuv0], v0 = uvs[iuv0+1], | 147 | var u0 = uvs[iuv0], v0 = uvs[iuv0+1], |
148 | u1 = uvs[iuv1], v1 = uvs[iuv1+1], | 148 | u1 = uvs[iuv1], v1 = uvs[iuv1+1], |
149 | u2 = uvs[iuv2], v2 = uvs[iuv2+1]; | 149 | u2 = uvs[iuv2], v2 = uvs[iuv2+1]; |
150 | 150 | ||
151 | // find the u and v range | 151 | // find the u and v range |
152 | var uMin = u0, vMin = v0; | 152 | var uMin = u0, vMin = v0; |
153 | if (u1 < uMin) uMin = u1; if (v1 < vMin) vMin = v1; | 153 | if (u1 < uMin) uMin = u1; if (v1 < vMin) vMin = v1; |
154 | if (u2 < uMin) uMin = u2; if (v2 < vMin) vMin = v2; | 154 | if (u2 < uMin) uMin = u2; if (v2 < vMin) vMin = v2; |
155 | var uMax = u0, vMax = v0; | 155 | var uMax = u0, vMax = v0; |
156 | if (u1 > uMax) uMax = u1; if (v1 > vMax) vMax = v1; | 156 | if (u1 > uMax) uMax = u1; if (v1 > vMax) vMax = v1; |
157 | if (u2 > uMax) uMax = u2; if (v2 > vMax) vMax = v2; | 157 | if (u2 > uMax) uMax = u2; if (v2 > vMax) vMax = v2; |
158 | 158 | ||
159 | // if the parameter range of the triangle is outside the | 159 | // if the parameter range of the triangle is outside the |
160 | // desired parameter range, advance to the next polygon and continue | 160 | // desired parameter range, advance to the next polygon and continue |
161 | if ((uMin > pUMax) || (uMax < pUMin) || (vMin > pVMax) || (vMax < pVMin)) | 161 | if ((uMin > pUMax) || (uMax < pUMin) || (vMin > pVMax) || (vMax < pVMin)) |
162 | { | 162 | { |
163 | // go to the next triangle | 163 | // go to the next triangle |
164 | iTriangle++; | 164 | iTriangle++; |
165 |