From 00291b5cf4a0f16ddca425b74ed30e8ac35d40e2 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 22 Mar 2004 22:02:18 +0000 Subject: [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. --- source/gameengine/Rasterizer/RAS_MeshObject.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'source/gameengine/Rasterizer/RAS_MeshObject.h') 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 m_sortedMaterials; vector > m_xyz_index_to_vertex_index_mapping; vector 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); -- cgit v1.2.3