rename ObsoleteDemos back to Demos

fix some relative path issues for loading assets

Demos/ThreadingDemo/CMakeLists.txt

@@ -0,0 +1,48 @@
+# 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 
+########################################################
+
+#currently this demo has only been tested under Windows 32bit
+#IF (WIN32)
+
+INCLUDE_DIRECTORIES(
+	${BULLET_PHYSICS_SOURCE_DIR}/src 
+	../OpenGL 
+	${VECTOR_MATH_INCLUDE}
+)
+
+LINK_LIBRARIES(
+BulletMultiThreaded BulletDynamics  BulletCollision LinearMath 
+)
+
+IF (WIN32)
+ADD_EXECUTABLE(AppThreadingDemo
+		main.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppThreadingDemo
+		main.cpp
+	)
+ENDIF()
+
+IF (UNIX)
+  TARGET_LINK_LIBRARIES(AppThreadingDemo pthread)
+ENDIF(UNIX)
+
+IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+			SET_TARGET_PROPERTIES(AppThreadingDemo PROPERTIES  DEBUG_POSTFIX "_Debug")
+			SET_TARGET_PROPERTIES(AppThreadingDemo PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
+			SET_TARGET_PROPERTIES(AppThreadingDemo PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
+ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+
+#ENDIF(WIN32)

Demos/ThreadingDemo/main.cpp

@@ -0,0 +1,185 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2010 Erwin Coumans  http://bulletphysics.org
+
+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.
+*/
+
+/// ThreadingDemo shows how to use the cross platform thread support interface.
+/// You can start threads and perform a blocking wait for completion
+/// Under Windows it uses Win32 Threads. On Mac and Linux it uses pthreads. On PlayStation 3 Cell SPU it uses SPURS.
+
+/// June 2010 
+/// New: critical section/barriers and non-blocking pollingn for completion, currently Windows only
+
+void	SampleThreadFunc(void* userPtr,void* lsMemory);
+void*	SamplelsMemoryFunc();
+
+#include <stdio.h>
+#include "BulletMultiThreaded/PlatformDefinitions.h"
+
+#ifdef USE_PTHREADS
+//#ifdef __APPLE__
+#include "BulletMultiThreaded/PosixThreadSupport.h"
+
+btThreadSupportInterface* createThreadSupport(int numThreads)
+{
+	PosixThreadSupport::ThreadConstructionInfo constructionInfo("testThreads",
+                                                                SampleThreadFunc,
+                                                                SamplelsMemoryFunc,
+                                                                numThreads);
+    btThreadSupportInterface* threadSupport = new PosixThreadSupport(constructionInfo);
+	
+	return threadSupport;
+	
+}
+
+
+#elif defined( _WIN32)
+#include "BulletMultiThreaded/Win32ThreadSupport.h"
+
+btThreadSupportInterface* createThreadSupport(int numThreads)
+{
+	Win32ThreadSupport::Win32ThreadConstructionInfo threadConstructionInfo("testThreads",SampleThreadFunc,SamplelsMemoryFunc,numThreads);
+	Win32ThreadSupport* threadSupport = new Win32ThreadSupport(threadConstructionInfo);
+	return threadSupport;
+	
+}
+
+#endif
+
+
+struct	SampleArgs
+{
+	SampleArgs()
+		:m_fakeWork(1)
+	{
+	}
+	btCriticalSection* m_cs;
+	float m_fakeWork;
+};
+
+struct SampleThreadLocalStorage
+{
+	int threadId;
+};
+
+
+void	SampleThreadFunc(void* userPtr,void* lsMemory)
+{
+	printf("thread started\n");
+
+	SampleThreadLocalStorage* localStorage = (SampleThreadLocalStorage*) lsMemory;
+
+	SampleArgs* args = (SampleArgs*) userPtr;
+	int workLeft = true;
+	while (workLeft)
+	{
+		args->m_cs->lock();
+		int count = args->m_cs->getSharedParam(0);
+		args->m_cs->setSharedParam(0,count-1);
+		args->m_cs->unlock();
+		if (count>0)
+		{
+			printf("thread %d processed number %d\n",localStorage->threadId, count);
+		}
+		//do some fake work
+		for (int i=0;i<1000000;i++)
+			args->m_fakeWork = btScalar(1.21)*args->m_fakeWork;
+		workLeft = count>0;
+	}
+	printf("finished\n");
+	//do nothing
+}
+
+
+void*	SamplelsMemoryFunc()
+{
+	//don't create local store memory, just return 0
+	return new SampleThreadLocalStorage;
+}
+
+
+
+
+
+
+
+
+
+
+int main(int argc,char** argv)
+{
+	int numThreads = 8;
+
+	btThreadSupportInterface* threadSupport = createThreadSupport(numThreads);
+
+	
+	threadSupport->startSPU();
+
+	for (int i=0;i<threadSupport->getNumTasks();i++)
+	{
+		SampleThreadLocalStorage* storage = (SampleThreadLocalStorage*)threadSupport->getThreadLocalMemory(i);
+		btAssert(storage);
+		storage->threadId = i;
+	}
+	
+
+	SampleArgs	args;
+	args.m_cs = threadSupport->createCriticalSection();
+	args.m_cs->setSharedParam(0,100);
+
+	
+		unsigned int arg0,arg1;
+	int i;
+	for (i=0;i<numThreads;i++)
+	{
+		threadSupport->sendRequest(1, (ppu_address_t) &args, i);
+	}
+
+	bool blockingWait =true;
+	if (blockingWait)
+	{
+		for (i=0;i<numThreads;i++)
+		{
+			threadSupport->waitForResponse(&arg0,&arg1);
+			printf("finished waiting for response: %d %d\n", arg0,arg1);
+		}
+	} else
+	{
+#if _WIN32
+		int numActiveThreads = numThreads;
+		while (numActiveThreads)
+		{
+			if (((Win32ThreadSupport*)threadSupport)->isTaskCompleted(&arg0,&arg1,0))
+			{
+				numActiveThreads--;
+				printf("numActiveThreads = %d\n",numActiveThreads);
+
+			} else
+			{
+				printf("polling\n");
+			}
+		};
+#else
+	btAssert(0);
+	printf("non-blocking wait is not supported on this platform\n");
+	exit(0);
+#endif
+	}
+
+printf("stopping threads\n");
+
+	delete threadSupport;
+	printf("Press ENTER to quit\n");
+	getchar();
+	return 0;
+}