Revision: 19932
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19932
Author: campbellbarton
Date: 2009-04-26 23:23:59 +0200 (Sun, 26 Apr 2009)
Log Message:
-----------
Rewind own commit that aimed to make converting meshes faster at startup.
Some files probably need to have UV's welded so better do this even though it
seems inefficient.
Modified Paths:
--------------
trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.cpp
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.cpp 2009-04-26
18:38:16 UTC (rev 19931)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.cpp 2009-04-26
21:23:59 UTC (rev 19932)
@@ -113,19 +113,18 @@
tangent.getValue(m_tangent);
}
+
// compare two vertices, and return TRUE if both are almost identical (they
can be shared)
-#define _VEC_EQUAL3(_v1, _v2) (_v1[0]==_v2[0] && _v1[1]==_v2[1] &&
_v1[2]==_v2[2])
-#define _VEC_EQUAL2(_v1, _v2) (_v1[0]==_v2[0] && _v1[1]==_v2[1])
bool RAS_TexVert::closeTo(const RAS_TexVert* other)
{
return (m_flag == other->m_flag &&
m_rgba == other->m_rgba &&
- _VEC_EQUAL3(m_normal, other->m_normal) &&
- _VEC_EQUAL3(m_tangent, other->m_tangent) &&
- _VEC_EQUAL2(m_uv1, other->m_uv1) &&
- _VEC_EQUAL2(m_uv2, other->m_uv2) // p --
- /* we know the verts must be shared so dont need to check this
*/
- /*&& FAST_MT_fuzzyEqual3(m_localxyz, other->m_localxyz)*/) ;
+ MT_fuzzyEqual(MT_Vector3(m_normal),
MT_Vector3(other->m_normal)) &&
+ MT_fuzzyEqual(MT_Vector3(m_tangent),
MT_Vector3(other->m_tangent)) &&
+ MT_fuzzyEqual(MT_Vector2(m_uv1), MT_Vector2(other->m_uv1)) &&
+ MT_fuzzyEqual(MT_Vector2(m_uv2), MT_Vector2(other->m_uv2)) /* &&
+ MT_fuzzyEqual(MT_Vector3(m_localxyz),
MT_Vector3(other->m_localxyz))*/) ;
+ /* dont bother comparing m_localxyz since we know there from the same
vert */
}
short RAS_TexVert::getFlag() const
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
