Added load collision hull mesh

widberg · widberg · commit d29fbe9bed8e · 2019-07-31T14:40:48.000-04:00
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -73,7 +73,6 @@ add_subdirectory(stb)
 
 # set libraries list
 set(IGNEOUS_LIBRARIES
-  assimp
   bgfx
   BulletDynamics
   BulletCollision
@@ -93,8 +92,6 @@ CACHE INTERNAL "")
 
 # set includes list
 set(IGNEOUS_INCLUDES
-  ${CMAKE_CURRENT_SOURCE_DIR}/assimp/include
-  ${CMAKE_CURRENT_BINARY_DIR}/assimp/include
   ${CMAKE_CURRENT_SOURCE_DIR}/bullet/src
   ${OPENAL_INCLUDE_DIR}
   ${RAKNET_INCLUDE_DIRS}
diff --git a/igneous/src/core/igneous.cpp b/igneous/src/core/igneous.cpp
@@ -1,6 +1,5 @@
 #include "igneous/igneous.hpp"
 
-#include <assimp/version.h>
 #include <btBulletDynamicsCommon.h>
 #include <bx/string.h>
 #include <entt/entt.hpp>
@@ -36,7 +35,6 @@ int Application::run(int argc, char** argv, bgfx::Init init)
 
 	IG_CORE_INFO("-----Version Info-----");
 	IG_CORE_INFO("Igneous Version: {}", IGNEOUS_VERSION);
-	IG_CORE_INFO("Assimp Version: {}.{}.{}", aiGetVersionMajor(), aiGetVersionMinor(), aiGetVersionRevision());
 	IG_CORE_INFO("Bullet Version: {}", BT_BULLET_VERSION);
 	IG_CORE_INFO("Dear ImGui Version: {}", IMGUI_VERSION);
 	IG_CORE_INFO("EnTT Version: {}", ENTT_VERSION);
diff --git a/igneous/src/physics/physics.cpp b/igneous/src/physics/physics.cpp
@@ -1,11 +1,14 @@
 #include "igneous/physics/physics.hpp"
 
+#include <fstream>
+
 #include <glm/gtc/type_ptr.hpp>
 
 #include "igneous/core/log.hpp"
 #include "igneous/ecs/ecs.hpp"
 #include "igneous/ecs/components/transformationComponent.hpp"
 #include "debugRenderer.hpp"
+#include "igneous/core/debug.hpp"
 
 namespace igneous {
 namespace physics
@@ -50,8 +53,33 @@ namespace physics
 
 	RigidBodyHandle loadRigidBody(std::string path)
 	{
+		std::ifstream file(path, std::ios::in | std::ios::binary);
+		if (file.fail())
+		{
+			IG_CORE_CRITICAL("Could not open model file: {}", path);
+		}
+
+		uint64_t collisionOffset;
+		file.read((char*)&collisionOffset, sizeof(uint64_t));
+		file.seekg(collisionOffset, std::ios::beg);
+
+		unsigned int numVerticies;
+		file.read((char*)&numVerticies, sizeof(unsigned int));
+		unsigned int verticiesSize = numVerticies * 3 * sizeof(float);
+
+		void* vertexData = malloc(verticiesSize);
+		file.read((char*)vertexData, verticiesSize);
+		file.close();
+		
+		btConvexHullShape* shape = new btConvexHullShape((btScalar*)vertexData, numVerticies, 3 * sizeof(float));
+		free(vertexData);
+
+		shape->optimizeConvexHull();
+#if IG_DEBUG
+		shape->initializePolyhedralFeatures();
+#endif
+
 		btScalar mass = 10.0f;
-		btCollisionShape* shape = &sphere;
 		btTransform transform = identityTransform;
 
 		assert((!shape || shape->getShapeType() != INVALID_SHAPE_PROXYTYPE));
diff --git a/igneous/src/renderer/renderer.cpp b/igneous/src/renderer/renderer.cpp
@@ -357,6 +357,8 @@ namespace renderer
 			meshes.push_back(mesh);
 		}
 
+		file.close();
+
 		Model* model = new Model;
 		model->meshes = meshes;
 		model->program = program;
diff --git a/tools/modelc/modelc.cpp b/tools/modelc/modelc.cpp
@@ -254,25 +254,13 @@ int main(int argc, char** argv)
 		unsigned int numIndicies = mesh->mNumFaces * 3;
 		std::cout << "Collision Mesh vertex count: " << mesh->mNumVertices << "\n";
 		outputFile.write((char*)&mesh->mNumVertices, sizeof(unsigned int));
-		std::cout << "Collision Mesh index count: " << numIndicies << "\n";
-		outputFile.write((char*)&numIndicies, sizeof(unsigned int));
 
 		for (unsigned int i = 0; i < mesh->mNumVertices; i++)
 		{
 			outputFile.write((char*)&mesh->mVertices[i].x, sizeof(float));
 			outputFile.write((char*)&mesh->mVertices[i].y, sizeof(float));
 			outputFile.write((char*)&mesh->mVertices[i].z, sizeof(float));
 		}
-
-		for (unsigned int i = 0; i < mesh->mNumFaces; i++)
-		{
-			aiFace face = mesh->mFaces[i];
-			for (unsigned int j = 0; j < face.mNumIndices; j++)
-			{
-				uint16_t index = face.mIndices[j];
-				outputFile.write((char*)&index, sizeof(uint16_t));
-			}
-		}
 	}
 	
 	outputFile.close();

Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,8 @@ namespace renderer`
`357`	`357`	`meshes.push_back(mesh);`
`358`	`358`	`}`
`359`	`359`
	`360`	`+ file.close();`
	`361`	`+`
`360`	`362`	`Model* model = new Model;`
`361`	`363`	`model->meshes = meshes;`
`362`	`364`	`model->program = program;`