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

Fix for bug #945 getVertexArrayLength(x) returns different values on different runs of the game engine.

Browse Source 
http://projects.blender.org/tracker/index.php?func=detail&aid=945&group_id=9&atid=125

The material buckets were being sorted by pointer (ie their location in memory.)

Also fixed find shared verticies.
This commit is contained in:
Kester Maddock 2004-05-04 09:34:02 +00:00
parent 79f3e88021
commit f03fa79d28
7 changed files with 68 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gameengine/Converter/BL_SkinMeshObject.cpp
View File

@ -142,7 +142,7 @@ void BL_SkinMeshObject::Bucketize(double* oglmatrix,void* clientobj,bool useObje
ms.m_RGBAcolor = rgbavec;
ms.m_pDeformer = ((BL_DeformableGameObject*)clientobj)->m_pDeformer;
for (BucketMaterialSet::iterator it = m_materials.begin();it!=m_materials.end();it++)
for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();it++)
{
RAS_MaterialBucket* materialbucket = (*it);

15
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
View File

@ -79,7 +79,20 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const
);
}
bool RAS_IPolyMaterial::Less(const RAS_IPolyMaterial& rhs) const
{
return (
this->m_materialname < rhs.m_materialname ||
this->m_texturename < rhs.m_texturename ||
this->m_lightlayer < rhs.m_lightlayer ||
this->m_tile < rhs.m_tile ||
this->m_tilexrep < rhs.m_tilexrep ||
this->m_tileyrep < rhs.m_tileyrep ||
this->m_transparant < rhs.m_transparant ||
this->m_drawingmode < rhs.m_drawingmode ||
this->m_bIsTriangle < rhs.m_bIsTriangle
);
}
int RAS_IPolyMaterial::GetLightLayer()
{

9
source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
View File

@ -43,6 +43,9 @@
class RAS_IRasterizer;
/**
* Material properties.
*/
class RAS_IPolyMaterial
{
//todo: remove these variables from this interface/protocol class
@ -104,6 +107,7 @@ public:
virtual void Activate(RAS_IRasterizer* rasty, TCachingInfo& cachingInfo) const {}
bool Equals(const RAS_IPolyMaterial& lhs) const;
bool Less(const RAS_IPolyMaterial& rhs) const;
int GetLightLayer();
bool IsTransparant();
bool UsesTriangles();
@ -118,5 +122,10 @@ inline bool operator ==( const RAS_IPolyMaterial & rhs,const RAS_IPolyMaterial
return ( rhs.Equals(lhs));
}
inline bool operator < ( const RAS_IPolyMaterial & lhs, const RAS_IPolyMaterial & rhs)
{
return lhs.Less(rhs);
}
#endif //__RAS_IPOLYGONMATERIAL

4
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
View File

@ -97,7 +97,7 @@ void RAS_MaterialBucket::ClearScheduledPolygons()
RAS_IPolyMaterial* RAS_MaterialBucket::GetPolyMaterial()
RAS_IPolyMaterial* RAS_MaterialBucket::GetPolyMaterial() const
{
return m_material;
}
@ -137,7 +137,7 @@ void RAS_MaterialBucket::MarkVisibleMeshSlot(KX_MeshSlot& ms,
bool RAS_MaterialBucket::IsTransparant()
bool RAS_MaterialBucket::IsTransparant() const
{
return (m_material->IsTransparant());
}

26
source/gameengine/Rasterizer/RAS_MaterialBucket.h
View File

@ -51,7 +51,9 @@ typedef vector< KX_IndexArray* > vecIndexArrays;
typedef vector<RAS_TexVert> KX_VertexArray;
/**
* KX_VertexIndex
*/
struct KX_VertexIndex {
public:
KX_VertexIndex(int size);
@ -62,7 +64,9 @@ public:
};
/**
* KX_MeshSlot.
*/
class KX_MeshSlot
{
public:
@ -86,7 +90,9 @@ inline bool operator <( const KX_MeshSlot& rhs,const KX_MeshSlot& lhs)
return ( rhs.Less(lhs));
}
/**
* Contains a list of meshs with the same material properties.
*/
class RAS_MaterialBucket
{
typedef std::set<KX_MeshSlot> T_MeshSlotList;
@ -108,8 +114,8 @@ public:
void SchedulePolygons(int drawingmode);
void ClearScheduledPolygons();
RAS_IPolyMaterial* GetPolyMaterial();
bool IsTransparant();
RAS_IPolyMaterial* GetPolyMaterial() const;
bool IsTransparant() const;
static void StartFrame();
static void EndFrame();
@ -120,6 +126,16 @@ public:
bool visible,
bool color,
const MT_Vector4& rgbavec);
struct less
{
bool operator()(const RAS_MaterialBucket* x, const RAS_MaterialBucket* y) const
{
return *x->GetPolyMaterial() < *y->GetPolyMaterial();
}
};
typedef set<RAS_MaterialBucket*, less> Set;
};
#endif //__KX_BUCKET

12
source/gameengine/Rasterizer/RAS_MeshObject.cpp
View File

@ -108,7 +108,7 @@ RAS_MaterialBucket* RAS_MeshObject::GetMaterialBucket(unsigned int matid)
{
if (m_materials.size() > 0 && (matid < m_materials.size()))
{
BucketMaterialSet::const_iterator it = m_materials.begin();
RAS_MaterialBucket::Set::const_iterator it = m_materials.begin();
while (matid--) ++it;
return *it;
}
@ -270,7 +270,7 @@ int RAS_MeshObject::FindOrAddVertex(int vtxarray,
{
if ((*it).m_arrayindex1 == ao->m_index1 &&
((*it).m_array == vtxarray) &&
(RAS_IPolyMaterial*) (*it).m_matid == mat
(*(RAS_IPolyMaterial*) (*it).m_matid) == *mat
)
{
return (*it).m_index;
@ -396,7 +396,7 @@ void RAS_MeshObject::Bucketize(double* oglmatrix,
ms.m_bObjectColor = useObjectColor;
ms.m_RGBAcolor = rgbavec;
for (BucketMaterialSet::iterator it = m_materials.begin();it!=m_materials.end();++it)
for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
{
RAS_MaterialBucket* bucket = *it;
bucket->SchedulePolygons(0);
@ -421,7 +421,7 @@ void RAS_MeshObject::MarkVisible(double* oglmatrix,
ms.m_RGBAcolor = rgbavec;
ms.m_bObjectColor= useObjectColor;
for (BucketMaterialSet::iterator it = m_materials.begin();it!=m_materials.end();++it)
for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
{
RAS_MaterialBucket* bucket = *it;
bucket->SchedulePolygons(0);
@ -440,7 +440,7 @@ void RAS_MeshObject::RemoveFromBuckets(double* oglmatrix,
ms.m_mesh = this;
ms.m_OpenGLMatrix = oglmatrix;
for (BucketMaterialSet::iterator it = m_materials.begin();it!=m_materials.end();++it)
for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
{
RAS_MaterialBucket* bucket = *it;
// RAS_IPolyMaterial* polymat = bucket->GetPolyMaterial();
@ -562,7 +562,7 @@ void RAS_MeshObject::SchedulePolygons(int drawingmode,RAS_IRasterizer* rasty)
if (m_bModified)
{
for (BucketMaterialSet::iterator it = m_materials.begin();it!=m_materials.end();++it)
for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
{
RAS_MaterialBucket* bucket = *it;

19
source/gameengine/Rasterizer/RAS_MeshObject.h
View File

@ -41,10 +41,14 @@
#include <set>
#include "RAS_Polygon.h"
#include "RAS_MaterialBucket.h"
#include "MT_Transform.h"
#include "GEN_HashedPtr.h"
/**
* This class holds an array of vertices and indicies.
*/
class KX_ArrayOptimizer
{
public:
@ -63,6 +67,9 @@ public:
int m_index1;
};
/**
* This struct holds a triangle.
*/
struct RAS_TriangleIndex
{
public:
@ -72,6 +79,11 @@ public:
bool m_collider;
};
/**
* This class looks horribly broken. Only m_matid is used, and
* m_matid is a (int) RAS_IPolyMaterial*.
* --> m_matid == lhs.m_matid should be *m_matid == *lhs.m_matid
*/
class RAS_MatArrayIndex
{
public:
@ -124,9 +136,8 @@ class RAS_MeshObject
protected:
GEN_Map<class RAS_IPolyMaterial,KX_ArrayOptimizer*> m_matVertexArrayS;
typedef set<class RAS_MaterialBucket*> BucketMaterialSet;
BucketMaterialSet m_materials;
RAS_MaterialBucket::Set m_materials;
public:
// for now, meshes need to be in a certain layer (to avoid sorting on lights in realtime)
RAS_MeshObject(int lightlayer);
@ -178,8 +189,8 @@ public:
void ClearArrayData();
BucketMaterialSet::iterator GetFirstMaterial();
BucketMaterialSet::iterator GetLastMaterial();
RAS_MaterialBucket::Set::iterator GetFirstMaterial();
RAS_MaterialBucket::Set::iterator GetLastMaterial();
virtual RAS_TexVert* GetVertex(
short array,