Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Curioni <maxime.curioni@gmail.com>2008-07-24 12:29:48 +0400
committerMaxime Curioni <maxime.curioni@gmail.com>2008-07-24 12:29:48 +0400
commita0359c37506d05589bae86e4818fa653c8f281ab (patch)
tree35927f22801fa65585ac6f076abb29406189dd2a /source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
parentdd899939dabae68564f7a1d1994b50ee2f2cf8be (diff)
soc-2008-mxcurioni: added (without testing) the following classes: BBox, SShape, ViewShape. Also corrected a few typos (Get#->get#).
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp')
-rwxr-xr-xsource/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index c95231a72dc..cccf876db8b 100755
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -175,7 +175,7 @@ void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
// Parse the built winged-edge shape to update post-flags
set<Vec3r> normalsSet;
- vector<WVertex*>& wvertices = shape.GetVertexList();
+ vector<WVertex*>& wvertices = shape.getVertexList();
for(vector<WVertex*>::iterator wv=wvertices.begin(), wvend=wvertices.end();
wv!=wvend;
++wv){
@@ -238,9 +238,9 @@ void WingedEdgeBuilder::buildTriangleStrip( const real *vertices,
//Then rebuild it:
if(0 == nTriangle%2) // if nTriangle is even
{
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle]/3]);
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+1]/3]);
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+2]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle+1]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle+2]/3]);
triangleNormals.push_back(Vec3r(normals[nindices[nTriangle]],normals[nindices[nTriangle]+1], normals[nindices[nTriangle]+2]));
triangleNormals.push_back(Vec3r(normals[nindices[nTriangle+1]],normals[nindices[nTriangle+1]+1],normals[nindices[nTriangle+1]+2]));
@@ -254,9 +254,9 @@ void WingedEdgeBuilder::buildTriangleStrip( const real *vertices,
}
else // if nTriangle is odd
{
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle]/3]);
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+2]/3]);
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+1]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle+2]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle+1]/3]);
triangleNormals.push_back(Vec3r(normals[nindices[nTriangle]],normals[nindices[nTriangle]+1], normals[nindices[nTriangle]+2]));
triangleNormals.push_back(Vec3r(normals[nindices[nTriangle+2]],normals[nindices[nTriangle+2]+1],normals[nindices[nTriangle+2]+2]));
@@ -306,9 +306,9 @@ void WingedEdgeBuilder::buildTriangles(const real *vertices,
// Each triplet of vertices is considered as an independent triangle
for(unsigned i = 0; i < nvertices / 3; i++)
{
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i]/3]);
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i+1]/3]);
- triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i+2]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[3*i]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[3*i+1]/3]);
+ triangleVertices.push_back(currentShape->getVertexList()[vindices[3*i+2]/3]);
triangleNormals.push_back(Vec3r(normals[nindices[3*i]],normals[nindices[3*i]+1], normals[nindices[3*i]+2]));
triangleNormals.push_back(Vec3r(normals[nindices[3*i+1]],normals[nindices[3*i+1]+1],normals[nindices[3*i+1]+2]));