From 44a8ec171bedac6921d796501e654f856d716855 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Wed, 23 May 2012 10:19:39 -0700 Subject: Fixed merge problems --- js/lib/geom/shape-primitive.js | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'js/lib/geom/shape-primitive.js') diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js index 858f38c8..380cf334 100644 --- a/js/lib/geom/shape-primitive.js +++ b/js/lib/geom/shape-primitive.js @@ -49,7 +49,7 @@ ShapePrimitive.create = function(coords, normals, uvs, indices, primType, ver return prim; }; -ShapePrimitive.getBounds = function( prim ) +ShapePrimitive.getMeshBounds = function( verts, nVerts ) { if (!verts || (nVerts <= 0)) return null; @@ -76,31 +76,6 @@ ShapePrimitive.refineMesh = function( verts, norms, uvs, indices, nVertices, pa var oldVrtCount = nVertices; // get the param range - var verts = prim.bufferStreams[0]; - var nVerts = verts.length; - var xMin = verts[0], xMax = verts[0], - yMin = verts[1], yMax = verts[1], - zMin = verts[2], zMax = verts[2]; - - for (var index=3; index xMax) xMax = verts[index]; - - index++; - if (verts[index] < yMin) yMin = verts[index]; - else if (verts[index] > yMax) yMax = verts[index]; - - index++; - if (verts[index] < zMin) zMin = verts[index]; - else if (verts[index] > zMax) zMax = verts[index]; - - index++; - } - - return [xMin, yMin, zMin, xMax, yMax, zMax]; -}; - var pUMin = paramRange[0], pVMin = paramRange[1], pUMax = paramRange[2], pVMax = paramRange[3]; var iTriangle = 0; -- cgit v1.2.3