From 9cb79bb21e85e49b4846d35b350c738db4d32d14 Mon Sep 17 00:00:00 2001 From: Lolbot Date: Thu, 14 Feb 2013 09:30:36 +0000 Subject: [PATCH] fixed 3 files out of 2468: - removed 43 CR characters - removed 25 trailing whitespaces - replaced 0 tabs with spaces --- src/easymesh/easymesh-parser.y | 24 ++++++++++++------------ src/easymesh/easymesh.cpp | 16 ++++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/easymesh/easymesh-parser.y b/src/easymesh/easymesh-parser.y index 3a4ffad0..ed718148 100644 --- a/src/easymesh/easymesh-parser.y +++ b/src/easymesh/easymesh-parser.y @@ -131,22 +131,22 @@ transform_command: | T_TAPERY args4 { mc.m_mesh.TaperY($2.f0, $2.f1, $2.f2, $2.f3); } | T_TAPERZ args3 { mc.m_mesh.TaperZ($2.f0, $2.f1, $2.f2); } | T_TAPERZ args4 { mc.m_mesh.TaperZ($2.f0, $2.f1, $2.f2, $2.f3); } - | T_TWISTX args2 { mc.m_mesh.TwistX($2.f0, $2.f1); } - | T_TWISTY args2 { mc.m_mesh.TwistY($2.f0, $2.f1); } + | T_TWISTX args2 { mc.m_mesh.TwistX($2.f0, $2.f1); } + | T_TWISTY args2 { mc.m_mesh.TwistY($2.f0, $2.f1); } | T_TWISTZ args2 { mc.m_mesh.TwistZ($2.f0, $2.f1); } - | T_SHEARX args3 { mc.m_mesh.ShearX($2.f0, $2.f1, $2.f2); } - | T_SHEARX args4 { mc.m_mesh.ShearX($2.f0, $2.f1, $2.f2, $2.f3); } - | T_SHEARY args3 { mc.m_mesh.ShearY($2.f0, $2.f1, $2.f2); } - | T_SHEARY args4 { mc.m_mesh.ShearY($2.f0, $2.f1, $2.f2, $2.f3); } + | T_SHEARX args3 { mc.m_mesh.ShearX($2.f0, $2.f1, $2.f2); } + | T_SHEARX args4 { mc.m_mesh.ShearX($2.f0, $2.f1, $2.f2, $2.f3); } + | T_SHEARY args3 { mc.m_mesh.ShearY($2.f0, $2.f1, $2.f2); } + | T_SHEARY args4 { mc.m_mesh.ShearY($2.f0, $2.f1, $2.f2, $2.f3); } | T_SHEARZ args3 { mc.m_mesh.ShearZ($2.f0, $2.f1, $2.f2); } | T_SHEARZ args4 { mc.m_mesh.ShearZ($2.f0, $2.f1, $2.f2, $2.f3); } - | T_STRETCHX args3 { mc.m_mesh.StretchX($2.f0, $2.f1, $2.f2); } - | T_STRETCHY args3 { mc.m_mesh.StretchY($2.f0, $2.f1, $2.f2); } + | T_STRETCHX args3 { mc.m_mesh.StretchX($2.f0, $2.f1, $2.f2); } + | T_STRETCHY args3 { mc.m_mesh.StretchY($2.f0, $2.f1, $2.f2); } | T_STRETCHZ args3 { mc.m_mesh.StretchZ($2.f0, $2.f1, $2.f2); } - | T_BENDXY args2 { mc.m_mesh.BendXY($2.f0, $2.f1); } - | T_BENDXZ args2 { mc.m_mesh.BendXZ($2.f0, $2.f1); } - | T_BENDYX args2 { mc.m_mesh.BendYX($2.f0, $2.f1); } - | T_BENDYZ args2 { mc.m_mesh.BendYZ($2.f0, $2.f1); } + | T_BENDXY args2 { mc.m_mesh.BendXY($2.f0, $2.f1); } + | T_BENDXZ args2 { mc.m_mesh.BendXZ($2.f0, $2.f1); } + | T_BENDYX args2 { mc.m_mesh.BendYX($2.f0, $2.f1); } + | T_BENDYZ args2 { mc.m_mesh.BendYZ($2.f0, $2.f1); } | T_BENDZX args2 { mc.m_mesh.BendZX($2.f0, $2.f1); } | T_BENDZY args2 { mc.m_mesh.BendZY($2.f0, $2.f1); } | T_SCALEX args1 { mc.m_mesh.Scale(vec3($2.f0, 1.0, 1.0)); } diff --git a/src/easymesh/easymesh.cpp b/src/easymesh/easymesh.cpp index c8a33f92..41e035c9 100644 --- a/src/easymesh/easymesh.cpp +++ b/src/easymesh/easymesh.cpp @@ -815,7 +815,7 @@ void EasyMesh::ComputeTexCoord(float uv_scale, int uv_offset) m_vert[tri_list[cur_tri + 1]].m4 = vec2(-1.0f); m_vert[tri_list[cur_tri + 2]].m4 = vec2(-1.0f); } - + //uv[0] = vec2(-1.0f); //uv[1] = vec2(-1.0f); //uv[2] = vec2(-1.0f); @@ -1822,12 +1822,12 @@ void EasyMesh::AppendCog(int nbsides, float h, float d10, float d20, k = 3 * 12 * ((i + 1) % nbsides); int q[] = { /* The top and bottom faces */ - j, j, j, j, - j, j, j, j, - j, j, k, k, - k, k, j, j, - j, j, j, k, - k, j, j, j, + j, j, j, j, + j, j, j, j, + j, j, k, k, + k, k, j, j, + j, j, j, k, + k, j, j, j, /* The inner side quads */ j, j, j, j, j, k, k, j, @@ -1910,7 +1910,7 @@ void EasyMesh::AppendCog(int nbsides, float h, float d10, float d20, q[l + 2] + m[l + 2] * 3 + a[l + 2], q[l + 3] + m[l + 3] * 3 + a[l + 3], vbase); - + for (int n = 0; n < 12; n++) p[n] = rotmat * p[n]; }