* Adjustment: Update Bullet version to 3.24.

Engine/lib/bullet/test/BulletDynamics/CMakeLists.txt

@@ -0,0 +1,25 @@
+SUBDIRS(pendulum )
+
+INCLUDE_DIRECTORIES(
+		"${PROJECT_SOURCE_DIR}/src"
+		"${PROJECT_SOURCE_DIR}/test/gtest-1.7.0/include")
+
+ADD_DEFINITIONS(-DUSE_GTEST)
+ADD_DEFINITIONS(-D_VARIADIC_MAX=10)
+
+LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath gtest)
+
+IF (NOT WIN32)
+	FIND_PACKAGE(Threads)
+	LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
+ENDIF()
+
+ADD_EXECUTABLE(Test_btKinematicCharacterController test_btKinematicCharacterController.cpp)
+
+ADD_TEST(Test_btKinematicCharacterController_PASS Test_btKinematicCharacterController)
+
+IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+			SET_TARGET_PROPERTIES(Test_btKinematicCharacterController PROPERTIES  DEBUG_POSTFIX "_Debug")
+			SET_TARGET_PROPERTIES(Test_btKinematicCharacterController PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
+			SET_TARGET_PROPERTIES(Test_btKinematicCharacterController PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
+ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)

Engine/lib/bullet/test/BulletDynamics/pendulum/CMakeLists.txt

@@ -0,0 +1,31 @@
+
+INCLUDE_DIRECTORIES(
+	.
+	../../../src
+	../../gtest-1.7.0/include
+)
+
+
+ADD_DEFINITIONS(-DUSE_GTEST)
+ADD_DEFINITIONS(-D_VARIADIC_MAX=10)
+
+LINK_LIBRARIES(
+ BulletDynamics BulletCollision LinearMath gtest
+)
+
+IF (NOT WIN32)
+	FIND_PACKAGE(Threads)
+	LINK_LIBRARIES( ${CMAKE_THREAD_LIBS_INIT} )
+ENDIF()
+
+	ADD_EXECUTABLE(Test_BulletDynamics
+		 ../../../examples/MultiBody/Pendulum.cpp
+	)
+
+ADD_TEST(Test_BulletDynamics_PASS Test_BulletDynamics)
+
+IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+			SET_TARGET_PROPERTIES(Test_BulletDynamics PROPERTIES  DEBUG_POSTFIX "_Debug")
+			SET_TARGET_PROPERTIES(Test_BulletDynamics PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
+			SET_TARGET_PROPERTIES(Test_BulletDynamics PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
+ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)

Engine/lib/bullet/test/BulletDynamics/pendulum/premake4.lua

@@ -0,0 +1,34 @@
+
+	project "Test_BulletDynamics"
+		
+	kind "ConsoleApp"
+	
+	defines {"USE_GTEST"}
+	
+
+	
+	includedirs 
+	{
+		".",
+		"../../../src",
+		"../../gtest-1.7.0/include"
+	
+	}
+
+
+	if os.is("Windows") then
+		--see http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012
+		defines {"_VARIADIC_MAX=10"}
+	end
+	
+	links {"BulletDynamics", "BulletCollision","LinearMath", "gtest"}
+	
+	files {
+		"../../../examples/MultiBody/Pendulum.cpp",
+		"../../../examples/MultiBody/pendulum_gold.h",
+	}
+
+	if os.is("Linux") then
+                links {"pthread"}
+        end
+

Engine/lib/bullet/test/BulletDynamics/test_btKinematicCharacterController.cpp

@@ -0,0 +1,26 @@
+
+
+#include <btBulletDynamicsCommon.h>
+#include <BulletDynamics/Character/btKinematicCharacterController.h>
+#include <gtest/gtest.h>
+#include <BulletCollision/CollisionDispatch/btGhostObject.h>
+
+GTEST_TEST(BulletDynamics, KinematicCharacterController)
+{
+	btPairCachingGhostObject* ghostObject = new btPairCachingGhostObject();
+	btBoxShape* convexShape = new btBoxShape(btVector3(1, 1, 1));
+
+	//For now only a simple test that it initializes correctly.
+	btKinematicCharacterController* tested = new btKinematicCharacterController(ghostObject, convexShape, 1);
+	EXPECT_TRUE(tested);
+
+	EXPECT_FLOAT_EQ(-9.8 * 3.0, tested->getGravity().x());
+	EXPECT_FLOAT_EQ(0, tested->getGravity().y());
+	EXPECT_FLOAT_EQ(0, tested->getGravity().z());
+}
+
+int main(int argc, char** argv)
+{
+	::testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
+}