Fixed MSVC Runtime mismatch

widberg · widberg · commit 287f3e0ea5a9 · 2019-07-29T14:53:58.000-04:00
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -23,6 +23,7 @@ set(BUILD_BULLET2_DEMOS          OFF CACHE INTERNAL "")
 set(BUILD_UNIT_TESTS             OFF CACHE INTERNAL "")
 set(BUILD_EXTRAS                 OFF CACHE INTERNAL "")
 set(BUILD_PYBULLET               OFF CACHE INTERNAL "")
+set(USE_MSVC_RUNTIME_LIBRARY_DLL ON  CACHE INTERNAL "")
 add_subdirectory(bullet)
 
 # entt
diff --git a/igneous/src/core/igneous.cpp b/igneous/src/core/igneous.cpp
@@ -84,6 +84,7 @@ int Application::run(int argc, char** argv, bgfx::Init init)
 		gui::update(dt);
 		bgfx::touch(0);
 		ImGui::NewFrame();
+		physics::update(dt);
 		update(dt);
 		render();
 		ImGui::Render();
diff --git a/igneous/src/physics/physics.cpp b/igneous/src/physics/physics.cpp
@@ -15,7 +15,7 @@ namespace physics
 	static btSequentialImpulseConstraintSolver* solver;
 	static btDiscreteDynamicsWorld* dynamicsWorld;
 	static btSphereShape sphere(10.0f);
-	static btTransform transform;
+	static btTransform identityTransform;
 
 	void init()
 	{
@@ -37,12 +37,16 @@ namespace physics
 		dynamicsWorld->setGravity(btVector3(0, -10, 0));
 		dynamicsWorld->debugDrawWorld();
 
-		transform.setFromOpenGLMatrix(glm::value_ptr(glm::identity<glm::mat4>()));
+		identityTransform.setFromOpenGLMatrix(glm::value_ptr(glm::identity<glm::mat4>()));
 		IG_CORE_INFO("Physics Initialized");
 	}
 
-	btRigidBody* createRigidBody(float mass, const btTransform& startTransform, btCollisionShape* shape, const btVector4& color = btVector4(1, 0, 0, 1))
+	RigidBodyHandle loadRigidBody(std::string path)
 	{
+		btScalar mass = 10.0f;
+		btCollisionShape* shape = &sphere;
+		btTransform transform = identityTransform;
+
 		assert((!shape || shape->getShapeType() != INVALID_SHAPE_PROXYTYPE));
 
 		//rigidbody is dynamic if and only if mass is non zero, otherwise static
@@ -56,7 +60,7 @@ namespace physics
 
 #define USE_MOTIONSTATE 1
 #ifdef USE_MOTIONSTATE
-		btDefaultMotionState * myMotionState = new btDefaultMotionState(startTransform);
+		btDefaultMotionState * myMotionState = new btDefaultMotionState(transform);
 
 		btRigidBody::btRigidBodyConstructionInfo cInfo(mass, myMotionState, shape, localInertia);
 
@@ -73,24 +77,13 @@ namespace physics
 		return body;
 	}
 
-	RigidBodyHandle loadRigidBody(std::string path)
-	{
-		return createRigidBody(10.0f, transform, &sphere);
-	}
-
 	void update(float dt)
 	{
 		dynamicsWorld->stepSimulation(dt);
 		ecs::registry.view<RigidBodyHandle, Transformation>().each([&](const auto, auto& rigidBody, auto& transformation)
 		{
 				btTransform t = rigidBody->getWorldTransform();
 				t.getOpenGLMatrix(glm::value_ptr(transformation));
-				/*
-				btVector3 origin = rigidBody->getWorldTransform().getOrigin();
-				transformation[3][0] = origin.getX();
-				transformation[3][1] = origin.getY();
-				transformation[3][2] = origin.getZ();
-				*/
 		});
 	}
 
