Merge pull request #349 from REGoth-project/player-controller-cleanup

Player controller cleanup
REGoth-project · Jul 4, 2018 · 7c3888e · 7c3888e
2 parents b3c4837 + ddceec9
commit 7c3888e
Show file tree

Hide file tree

Showing 12 changed files with 1,105 additions and 855 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "lib/libdmusic"]
 	path = lib/libdmusic
 	url = https://github.com/frabert/libdmusic.git
+[submodule "lib/optional"]
+	path = lib/optional
+	url = https://github.com/TartanLlama/optional.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -313,6 +313,7 @@ else()
 endif()
 
 add_subdirectory(lib/adpcm)
+include_directories(lib/optional)
 
 add_subdirectory(src/target)
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT REGoth)

diff --git a/lib/optional b/lib/optional
diff --git a/src/engine/WorldMesh.cpp b/src/engine/WorldMesh.cpp
@@ -52,3 +52,12 @@ ZenLoad::zCMaterialData WorldMesh::getMatData(size_t triangleIdx) const
     assert(m_WorldMeshData.triangles[triangleIdx].submeshIndex < m_WorldMeshData.subMeshes.size());
     return m_WorldMeshData.subMeshes[m_WorldMeshData.triangles[triangleIdx].submeshIndex].material;
 }
+
+ZenLoad::MaterialGroup WorldMesh::getMaterialGroupOfTriangle(uint32_t triangleIdx)
+{
+    Math::float3 v3[3];
+    uint8_t matgroup;
+    // Beware! If triangle index is given such that the triangle is a building triangle of a VOB, this function will return material of the underlying worldmesh!!!
+    getTriangle(triangleIdx, v3, matgroup);
+    return static_cast<ZenLoad::MaterialGroup>(matgroup);
+}
diff --git a/src/engine/WorldMesh.h b/src/engine/WorldMesh.h
@@ -38,6 +38,11 @@ namespace World
          */
         void getTriangle(size_t triangleIdx, Math::float3* v3, uint8_t& matgroup);
 
+        /**
+         * Returns material group of give triangle index
+         */
+        ZenLoad::MaterialGroup getMaterialGroupOfTriangle(uint32_t triangleIdx);
+
         /**
          * @return Boundingbox max/min
          */