Many thanks to AdbC99@github for liblo fixes and joint rotation mode,…

… and drayde@github for hand tracking mode!

Merge branch 'master' of https://github.com/AdbC99/OSCeleton into adbc-liblo

Conflicts:
	src/OSCeleton.cpp

Fixed some conflicts between Linux/OSX builds and VS2008 build.

.gitignore

@@ -0,0 +1,10 @@
+*.ncb
+*.suo
+*.user
+liblo-0.26/lo/lo_endian.h
+liblo-0.26/config.h
+liblo-0.26/Makefile
+liblo-0.26/autom4te.cache
+liblo-0.26/lib
+Release
+Debug

Makefile

@@ -1,10 +1,10 @@
 all: osceleton
 
-liboscpack:
-	cd oscpack; make
+liblo:
+	cd liblo-0.26;./configure;make
 
-osceleton: liboscpack
-	g++ src/OSCeleton.cpp src/viewer.cpp -O3 -Wno-write-strings -Ioscpack -I/usr/X11/include -I/usr/include/ni -lOpenNI -lstdc++ -L/usr/X11/lib -lGL -lGLU -lglut oscpack/ip/*.o oscpack/ip/posix/*.o oscpack/osc/*.o -o osceleton
+osceleton: liblo
+	g++ src/OSCeleton.cpp src/viewer.cpp -O3 -Wno-write-strings -Iliblo-0.26 -I/usr/X11/include -I/usr/include/ni -lOpenNI -lstdc++ -L/usr/X11/lib -lGL -lGLU -lglut liblo-0.26/src/.libs/*.o -o osceleton
 
 clean:
-	rm -f osceleton ; cd oscpack ; make clean
+	rm -f osceleton ; cd liblo-0.26; make clean

OSCeleton.sln

@@ -2,17 +2,46 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OSCeleton", "src\OSCeleton.vcproj", "{380A9355-E839-4F55-98B1-B33D0CCA4340}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B} = {FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblo", "liblo-0.26\build\vs2008\liblo.vcproj", "{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		DebugDLL|Win32 = DebugDLL|Win32
+		DebugLib|Win32 = DebugLib|Win32
 		Release|Win32 = Release|Win32
+		ReleaseDLL|Win32 = ReleaseDLL|Win32
+		ReleaseLib|Win32 = ReleaseLib|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{380A9355-E839-4F55-98B1-B33D0CCA4340}.Debug|Win32.ActiveCfg = Debug|Win32
 		{380A9355-E839-4F55-98B1-B33D0CCA4340}.Debug|Win32.Build.0 = Debug|Win32
+		{380A9355-E839-4F55-98B1-B33D0CCA4340}.DebugDLL|Win32.ActiveCfg = Debug|Win32
+		{380A9355-E839-4F55-98B1-B33D0CCA4340}.DebugDLL|Win32.Build.0 = Debug|Win32
+		{380A9355-E839-4F55-98B1-B33D0CCA4340}.DebugLib|Win32.ActiveCfg = Debug|Win32
+		{380A9355-E839-4F55-98B1-B33D0CCA4340}.DebugLib|Win32.Build.0 = Debug|Win32
 		{380A9355-E839-4F55-98B1-B33D0CCA4340}.Release|Win32.ActiveCfg = Release|Win32
 		{380A9355-E839-4F55-98B1-B33D0CCA4340}.Release|Win32.Build.0 = Release|Win32
+		{380A9355-E839-4F55-98B1-B33D0CCA4340}.ReleaseDLL|Win32.ActiveCfg = Release|Win32
+		{380A9355-E839-4F55-98B1-B33D0CCA4340}.ReleaseDLL|Win32.Build.0 = Release|Win32
+		{380A9355-E839-4F55-98B1-B33D0CCA4340}.ReleaseLib|Win32.ActiveCfg = Release|Win32
+		{380A9355-E839-4F55-98B1-B33D0CCA4340}.ReleaseLib|Win32.Build.0 = Release|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.Debug|Win32.ActiveCfg = DebugLib|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.Debug|Win32.Build.0 = DebugLib|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.DebugLib|Win32.ActiveCfg = DebugLib|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.DebugLib|Win32.Build.0 = DebugLib|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.Release|Win32.ActiveCfg = ReleaseLib|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.Release|Win32.Build.0 = ReleaseLib|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.ReleaseLib|Win32.ActiveCfg = ReleaseLib|Win32
+		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}.ReleaseLib|Win32.Build.0 = ReleaseLib|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE