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:
authorNathan Letwory <nathan@letworyinteractive.com>2004-03-23 01:02:18 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2004-03-23 01:02:18 +0300
commit00291b5cf4a0f16ddca425b74ed30e8ac35d40e2 (patch)
tree952bb1c2f6fd8c2f34b950597ed0fa73a4ea7594 /source/gameengine/Rasterizer/RAS_MeshObject.h
parent5b90aafbd6815e29343f8e9aba9e3e20f85b3cc0 (diff)
[GameEngine] Commit all Kester's changes made to the gameengine to restore 2.25 like physics.
[SCons] Build with Solid as default when enabling the gameengine in the build process [SCons] Build solid and qhull from the extern directory and link statically against them That was about it. There are a few things that needs double checking: * Makefiles * Projectfiles * All the other systems than Linux and Windows on which the build (with scons) has been successfully tested.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_MeshObject.h')
-rw-r--r--source/gameengine/Rasterizer/RAS_MeshObject.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 3aeed836ba0..e26715ef210 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -66,7 +66,9 @@ public:
struct RAS_TriangleIndex
{
public:
- int m_index[3];
+ int m_index[3];
+ int m_array;
+ RAS_IPolyMaterial* m_matid;
bool m_collider;
};
@@ -131,12 +133,14 @@ public:
vector<RAS_IPolyMaterial*> m_sortedMaterials;
vector<vector<RAS_MatArrayIndex> > m_xyz_index_to_vertex_index_mapping;
vector<RAS_TriangleIndex > m_triangle_indices;
+
+ int m_class;
- int GetLightLayer();
+ unsigned int GetLightLayer();
int NumMaterials();
- const STR_String& GetMaterialName(int matid);
- RAS_MaterialBucket* GetMaterialBucket(int matid);
- const STR_String& GetTextureName(int matid);
+ const STR_String& GetMaterialName(unsigned int matid);
+ RAS_MaterialBucket* GetMaterialBucket(unsigned int matid);
+ const STR_String& GetTextureName(unsigned int matid);
virtual void AddPolygon(RAS_Polygon* poly);
void UpdateMaterialList();
@@ -217,8 +221,8 @@ public:
int GetVertexArrayLength(RAS_IPolyMaterial* mat);
RAS_TexVert* GetVertex(
- int matid,
- int index
+ unsigned int matid,
+ unsigned int index
);
const vecIndexArrays& GetIndexCache (RAS_IPolyMaterial* mat);