sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: bge - was converting float[] to MT_Vector's just to compare. use BLI_math instead.

Browse Source
This commit is contained in:
Campbell Barton 2013-02-23 01:57:56 +00:00
parent 9ef5d2d905
commit a528cb9905
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/gameengine/Rasterizer/CMakeLists.txt
View File

@ -29,6 +29,7 @@ set(INC
../Ketsji ../Ketsji
../SceneGraph ../SceneGraph
../../blender/makesdna ../../blender/makesdna
../../blender/blenlib
../../blender/blenkernel ../../blender/blenkernel
../../../intern/container ../../../intern/container
../../../intern/guardedalloc ../../../intern/guardedalloc

54
source/gameengine/Rasterizer/RAS_TexVert.cpp
View File

@ -32,20 +32,21 @@
#include "RAS_TexVert.h" #include "RAS_TexVert.h"
#include "MT_Matrix4x4.h" #include "MT_Matrix4x4.h"
#include "BLI_math.h"
RAS_TexVert::RAS_TexVert(const MT_Point3& xyz, RAS_TexVert::RAS_TexVert(const MT_Point3& xyz,
const MT_Point2 uvs[MAX_UNIT], const MT_Point2 uvs[MAX_UNIT],
const MT_Vector4& tangent, const MT_Vector4& tangent,
const unsigned int rgba, const unsigned int rgba,
const MT_Vector3& normal, const MT_Vector3& normal,
const bool flat, const bool flat,
const unsigned int origindex) const unsigned int origindex)
{ {
xyz.getValue(m_localxyz); xyz.getValue(m_localxyz);
SetRGBA(rgba); SetRGBA(rgba);
SetNormal(normal); SetNormal(normal);
tangent.getValue(m_tangent); tangent.getValue(m_tangent);
m_flag = (flat)? FLAT: 0; m_flag = (flat) ? FLAT: 0;
m_origindex = origindex; m_origindex = origindex;
m_unit = 2; m_unit = 2;
m_softBodyIndex = -1; m_softBodyIndex = -1;
@ -79,7 +80,7 @@ void RAS_TexVert::SetXYZ(const MT_Point3& xyz)
void RAS_TexVert::SetXYZ(const float xyz[3]) void RAS_TexVert::SetXYZ(const float xyz[3])
{ {
m_localxyz[0] = xyz[0]; m_localxyz[1] = xyz[1]; m_localxyz[2] = xyz[2]; copy_v3_v3(m_localxyz, xyz);
} }
void RAS_TexVert::SetUV(int index, const MT_Point2& uv) void RAS_TexVert::SetUV(int index, const MT_Point2& uv)
@ -89,8 +90,7 @@ void RAS_TexVert::SetUV(int index, const MT_Point2& uv)
void RAS_TexVert::SetUV(int index, const float uv[2]) void RAS_TexVert::SetUV(int index, const float uv[2])
{ {
m_uvs[index][0] = uv[0]; copy_v2_v2(m_uvs[index], uv);
m_uvs[index][1] = uv[1];
} }
void RAS_TexVert::SetRGBA(const unsigned int rgba) void RAS_TexVert::SetRGBA(const unsigned int rgba)
@ -106,7 +106,7 @@ void RAS_TexVert::SetFlag(const short flag)
void RAS_TexVert::SetUnit(const unsigned int u) void RAS_TexVert::SetUnit(const unsigned int u)
{ {
m_unit = u <= (unsigned int) MAX_UNIT ? u: (unsigned int)MAX_UNIT; m_unit = (u <= (unsigned int) MAX_UNIT) ? u: (unsigned int)MAX_UNIT;
} }
void RAS_TexVert::SetNormal(const MT_Vector3& normal) void RAS_TexVert::SetNormal(const MT_Vector3& normal)
@ -123,19 +123,21 @@ void RAS_TexVert::SetTangent(const MT_Vector3& tangent)
// compare two vertices, and return TRUE if both are almost identical (they can be shared) // compare two vertices, and return TRUE if both are almost identical (they can be shared)
bool RAS_TexVert::closeTo(const RAS_TexVert* other) bool RAS_TexVert::closeTo(const RAS_TexVert* other)
{ {
bool uv_match = true; const float eps = FLT_EPSILON;
for (int i=0; i<MAX_UNIT; i++) for (int i = 0; i < MAX_UNIT; i++) {
uv_match = uv_match && MT_fuzzyEqual(MT_Vector2(m_uvs[i]), MT_Vector2(other->m_uvs[i])); if (!compare_v2v2(m_uvs[i], other->m_uvs[i], eps)) {
return false;
}
}
return ( return (/* m_flag == other->m_flag && */
/* m_flag == other->m_flag && */ /* at the moment the face only stores the smooth/flat setting so don't bother comparing it */
/* at the moment the face only stores the smooth/flat setting so don't bother comparing it */ (m_rgba == other->m_rgba) &&
m_rgba == other->m_rgba && compare_v3v3(m_normal, other->m_normal, eps) &&
MT_fuzzyEqual(MT_Vector3(m_normal), MT_Vector3(other->m_normal)) && compare_v3v3(m_tangent, other->m_tangent, eps)
MT_fuzzyEqual(MT_Vector3(m_tangent), MT_Vector3(other->m_tangent)) && /* don't bother comparing m_localxyz since we know there from the same vert */
uv_match /* && /* && compare_v3v3(m_localxyz, other->m_localxyz, eps))*/
MT_fuzzyEqual(MT_Vector3(m_localxyz), MT_Vector3(other->m_localxyz))*/); );
/* don't bother comparing m_localxyz since we know there from the same vert */
} }
short RAS_TexVert::getFlag() const short RAS_TexVert::getFlag() const
@ -151,9 +153,9 @@ unsigned int RAS_TexVert::getUnit() const
void RAS_TexVert::Transform(const MT_Matrix4x4& mat, const MT_Matrix4x4& nmat) void RAS_TexVert::Transform(const MT_Matrix4x4& mat, const MT_Matrix4x4& nmat)
{ {
SetXYZ((mat*MT_Vector4(m_localxyz[0], m_localxyz[1], m_localxyz[2], 1.0)).getValue()); SetXYZ((mat * MT_Vector4(m_localxyz[0], m_localxyz[1], m_localxyz[2], 1.0)).getValue());
SetNormal((nmat*MT_Vector4(m_normal[0], m_normal[1], m_normal[2], 1.0)).getValue()); SetNormal((nmat * MT_Vector4(m_normal[0], m_normal[1], m_normal[2], 1.0)).getValue());
SetTangent((nmat*MT_Vector4(m_tangent[0], m_tangent[1], m_tangent[2], 1.0)).getValue()); SetTangent((nmat * MT_Vector4(m_tangent[0], m_tangent[1], m_tangent[2], 1.0)).getValue());
} }
void RAS_TexVert::TransformUV(int index, const MT_Matrix4x4& mat) void RAS_TexVert::TransformUV(int index, const MT_Matrix4x4& mat)