rename ObsoleteDemos back to Demos

fix some relative path issues for loading assets

Demos/MovingConcaveDemo/CMakeLists.txt

@@ -0,0 +1,36 @@
+# This is basically the overall name of the project in Visual Studio this is the name of the Solution File
+
+
+# For every executable you have with a main method you should have an add_executable line below.
+# For every add executable line you should list every .cpp and .h file you have associated with that executable.  
+
+
+# This is the variable for Windows.  I use this to define the root of my directory structure.
+SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
+
+# You shouldn't have to modify anything below this line 
+########################################################
+
+
+INCLUDE_DIRECTORIES(
+ ${BULLET_PHYSICS_SOURCE_DIR}/src 
+ ../OpenGL 
+ ${GLUT_INCLUDE_DIR}
+)
+
+LINK_LIBRARIES(
+OpenGLSupport  BulletDynamics  BulletCollision LinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+)
+
+
+
+ADD_EXECUTABLE(AppMovingConcaveDemo
+ConcavePhysicsDemo.cpp
+)
+
+
+IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+			SET_TARGET_PROPERTIES(AppMovingConcaveDemo PROPERTIES  DEBUG_POSTFIX "_Debug")
+			SET_TARGET_PROPERTIES(AppMovingConcaveDemo PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
+			SET_TARGET_PROPERTIES(AppMovingConcaveDemo PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
+ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)

Demos/MovingConcaveDemo/ConcaveDemo.h

@@ -0,0 +1,48 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef CONCAVE_DEMO_H
+#define CONCAVE_DEMO_H
+
+#include "GlutDemoApplication.h"
+
+struct btCollisionAlgorithmCreateFunc;
+
+///ConcaveDemo shows usage of static concave triangle meshes
+///It also shows per-triangle material (friction/restitution) through CustomMaterialCombinerCallback
+class ConcaveDemo : public GlutDemoApplication
+{
+
+	btCollisionShape * m_trimeshShape;
+
+	public:
+
+	void	initGImpactCollision();
+	void	initPhysics();
+
+	virtual void clientMoveAndDisplay();
+
+	virtual void displayCallback();
+
+	virtual 	void renderme();
+	virtual void keyboardCallback(unsigned char key, int x, int y);
+
+	///Demo functions
+	void	shootTrimesh(const btVector3& startPosition,const btVector3& destination);
+
+
+};
+
+#endif //CONCAVE_DEMO_H
+