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:
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp')
-rw-r--r--source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index 0a3ab97717b..d1389ac17c1 100644
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -65,8 +65,8 @@ void WingedEdgeBuilder::visitNodeTransformAfter(NodeTransform &UNUSED(transform)
bool WingedEdgeBuilder::buildWShape(WShape &shape, IndexedFaceSet &ifs)
{
- unsigned int vsize = ifs.vsize();
- unsigned int nsize = ifs.nsize();
+ uint vsize = ifs.vsize();
+ uint nsize = ifs.nsize();
// soc unused - unsigned tsize = ifs.tsize();
const float *vertices = ifs.vertices();
@@ -117,21 +117,21 @@ bool WingedEdgeBuilder::buildWShape(WShape &shape, IndexedFaceSet &ifs)
// create a WVertex for each vertex
buildWVertices(shape, new_vertices, vsize);
- const unsigned int *vindices = ifs.vindices();
- const unsigned int *nindices = ifs.nindices();
- const unsigned int *tindices = nullptr;
+ const uint *vindices = ifs.vindices();
+ const uint *nindices = ifs.nindices();
+ const uint *tindices = nullptr;
if (ifs.tsize()) {
tindices = ifs.tindices();
}
- const unsigned int *mindices = nullptr;
+ const uint *mindices = nullptr;
if (ifs.msize()) {
mindices = ifs.mindices();
}
- const unsigned int *numVertexPerFace = ifs.numVertexPerFaces();
- const unsigned int numfaces = ifs.numFaces();
+ const uint *numVertexPerFace = ifs.numVertexPerFaces();
+ const uint numfaces = ifs.numFaces();
- for (unsigned int index = 0; index < numfaces; index++) {
+ for (uint index = 0; index < numfaces; index++) {
switch (faceStyle[index]) {
case IndexedFaceSet::TRIANGLE_STRIP:
buildTriangleStrip(new_vertices,
@@ -231,7 +231,7 @@ bool WingedEdgeBuilder::buildWShape(WShape &shape, IndexedFaceSet &ifs)
void WingedEdgeBuilder::buildWVertices(WShape &shape, const float *vertices, unsigned vsize)
{
WVertex *vertex;
- for (unsigned int i = 0; i < vsize; i += 3) {
+ for (uint i = 0; i < vsize; i += 3) {
vertex = new WVertex(Vec3f(vertices[i], vertices[i + 1], vertices[i + 2]));
vertex->setId(i / 3);
shape.AddVertex(vertex);
@@ -367,7 +367,7 @@ void WingedEdgeBuilder::buildTriangles(const float * /*vertices*/,
vector<bool> triangleFaceEdgeMarks;
// Each triplet of vertices is considered as an independent triangle
- for (unsigned int i = 0; i < nvertices / 3; i++) {
+ for (uint 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]);
@@ -412,10 +412,10 @@ void WingedEdgeBuilder::transformVertices(const float *vertices,
const float *v = vertices;
float *pv = res;
- for (unsigned int i = 0; i < vsize / 3; i++) {
+ for (uint i = 0; i < vsize / 3; i++) {
HVec3r hv_tmp(v[0], v[1], v[2]);
HVec3r hv(transform * hv_tmp);
- for (unsigned int j = 0; j < 3; j++) {
+ for (uint j = 0; j < 3; j++) {
pv[j] = hv[j] / hv[3];
}
v += 3;
@@ -431,10 +431,10 @@ void WingedEdgeBuilder::transformNormals(const float *normals,
const float *n = normals;
float *pn = res;
- for (unsigned int i = 0; i < nsize / 3; i++) {
+ for (uint i = 0; i < nsize / 3; i++) {
Vec3r hn(n[0], n[1], n[2]);
hn = GeomUtils::rotateVector(transform, hn);
- for (unsigned int j = 0; j < 3; j++) {
+ for (uint j = 0; j < 3; j++) {
pn[j] = hn[j];
}
n += 3;