Merge branch 'master' of github.com:ivansafrin/Polycode

BUILD.md

@@ -15,6 +15,9 @@ When Polycode and its Dependencies are built, they will be available
 in the Release/YourArchitecture folder under the main source tree in 
 a structure that should mimic the main binary release.
 
+If you wish to build a 32-bit version on a 64-bit machine in OS X, pass
+-DCMAKE_OSX_ARCHITECTURES=i386 as an argument to cmake
+
 ## Building dependencies ##
 
 Polycode depends on a number of third party packages that are not

BUILD.txt

@@ -15,6 +15,9 @@ When Polycode and its Dependencies are built, they will be available
 in the Release/YourArchitecture folder under the main source tree in 
 a structure that should mimic the main binary release.
 
+If you wish to build a 32-bit version on a 64-bit machine in OS X, pass
+-DCMAKE_OSX_ARCHITECTURES=i386 as an argument to cmake
+
 ## Building dependencies ##
 
 Polycode depends on a number of third party packages that are not

CMake/ExternalAssimp.cmake

@@ -6,6 +6,7 @@ SET(assimp_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/assimp)
 SET(assimp_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=d 
     -DENABLE_BOOST_WORKAROUND=ON 
     -DBUILD_ASSIMP_TOOLS=OFF 

CMake/ExternalBox2D.cmake

@@ -10,6 +10,7 @@ SET(box2d_PREFIX ${PROJECT_BINARY_DIR}/box2d)
 SET(box2d_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=_d 
     -DBOX2D_INSTALL=ON 
     -DBOX2D_BUILD_EXAMPLES=OFF 

CMake/ExternalBullet.cmake

@@ -5,6 +5,7 @@ SET(bullet_PREFIX ${PROJECT_BINARY_DIR}/bullet)
 SET(bullet_CMAKE_ARGS 
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=_d
     -DINSTALL_LIBS=ON
     -DBUILD_DEMOS=OFF

CMake/ExternalFreetype.cmake

@@ -6,6 +6,7 @@ SET(freetype_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/freetype)
 SET(freetype_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
 )
 
 EXTERNALPROJECT_ADD(freetype

CMake/ExternalLua51.cmake

@@ -6,6 +6,7 @@ SET(lua51_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/lua51)
 SET(lua51_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=d
 )
 

CMake/ExternalOggVorbis.cmake

@@ -6,6 +6,7 @@ SET(oggvorbis_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/oggvorbis)
 SET(oggvorbis_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
 )
 
 EXTERNALPROJECT_ADD(libogg

CMake/ExternalOpenAL.cmake

@@ -6,6 +6,7 @@ SET(openal_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/openal)
 SET(openal_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=d
 )
 

CMake/ExternalPNG.cmake

@@ -6,6 +6,7 @@ SET(libpng_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libpng)
 SET(libpng_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DPNG_SHARED=OFF
     -DBUILD_SHARED_LIBS=FALSE
     -DSKIP_INSTALL_FILES=1
@@ -15,8 +16,8 @@ EXTERNALPROJECT_ADD(zlib
     PREFIX ${libpng_PREFIX}
 
     DOWNLOAD_DIR ${POLYCODE_DEPS_DOWNLOAD_DIR}
-    URL http://zlib.net/zlib-1.2.5.tar.gz
-    URL_MD5 c735eab2d659a96e5a594c9e8541ad63
+    URL http://zlib.net/zlib-1.2.6.tar.gz
+    URL_MD5 618e944d7c7cd6521551e30b32322f4a
 
     PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
 
@@ -31,8 +32,8 @@ EXTERNALPROJECT_ADD(libpng
     PREFIX ${libpng_PREFIX}
 
     DOWNLOAD_DIR ${POLYCODE_DEPS_DOWNLOAD_DIR}
-    URL ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.7.tar.gz
-    URL_MD5 944b56a84b65d94054cc73d7ff965de8
+    URL ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.10.tar.gz
+    URL_MD5 9e5d864bce8f06751bbd99962ecf4aad
 
     INSTALL_DIR ${POLYCODE_DEPS_CORE_PREFIX}
     CMAKE_ARGS ${libpng_CMAKE_ARGS} -DCMAKE_PREFIX_PATH=${install_dir} # to find zlib

CMake/ExternalPhysFS.cmake

@@ -6,6 +6,7 @@ SET(physfs_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/physfs)
 SET(physfs_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
     -DCMAKE_DEBUG_POSTFIX=d
     -DPHYSFS_BUILD_TEST=FALSE
     -DPHYSFS_BUILD_SHARED=FALSE

Examples/C++/Build/Linux/Makefile

@@ -1,6 +1,6 @@
 CC=g++
 CFLAGS=-I../../Core/Dependencies/include -I../../Core/Dependencies/include/AL -I../../Core/include -I../../Modules/include -I../../Modules/Dependencies/include -I../../Modules/Dependencies/include/bullet
-LDFLAGS=-lrt -ldl -lpthread ../../Core/lib/libPolycore.a ../../Core/Dependencies/lib/libfreetype.a ../../Core/Dependencies/lib/liblibvorbisfile.a ../../Core/Dependencies/lib/liblibvorbis.a ../../Core/Dependencies/lib/liblibogg.a ../../Core/Dependencies/lib/libopenal.a ../../Core/Dependencies/lib/libphysfs.a ../../Core/Dependencies/lib/libpng15.a ../../Core/Dependencies/lib/libz.a -lGL -lGLU -lSDL ../../Modules/lib/libPolycode2DPhysics.a ../../Modules/Dependencies/lib/libBox2D.a ../../Modules/lib/libPolycode3DPhysics.a ../../Modules/Dependencies/lib/libBulletDynamics.a ../../Modules/Dependencies/lib/libBulletCollision.a ../../Modules/Dependencies/lib/libLinearMath.a ../../Modules/lib/libPolycodeNetworking.a
+LDFLAGS=-lrt -ldl -lpthread ../../Core/lib/libPolycore.a ../../Core/Dependencies/lib/libfreetype.a ../../Core/Dependencies/lib/liblibvorbisfile.a ../../Core/Dependencies/lib/liblibvorbis.a ../../Core/Dependencies/lib/liblibogg.a ../../Core/Dependencies/lib/libopenal.so ../../Core/Dependencies/lib/libphysfs.a ../../Core/Dependencies/lib/libpng15.a ../../Core/Dependencies/lib/libz.a -lGL -lGLU -lSDL ../../Modules/lib/libPolycode2DPhysics.a ../../Modules/Dependencies/lib/libBox2D.a ../../Modules/lib/libPolycode3DPhysics.a ../../Modules/Dependencies/lib/libBulletDynamics.a ../../Modules/Dependencies/lib/libBulletCollision.a ../../Modules/Dependencies/lib/libLinearMath.a ../../Modules/lib/libPolycodeNetworking.a
 
 default: 2DAudio 2DParticles 2DPhysics_Basic 2DPhysics_CollisionOnly 2DPhysics_Contacts 2DPhysics_Joints 2DPhysics_PointCollision 2DShapes 2DTransforms 3DAudio 3DBasics 3DMeshParticles 3DParticles 3DPhysics_Basic 3DPhysics_Character 3DPhysics_CollisionOnly 3DPhysics_Contacts 3DPhysics_RayTest 3DPhysics_Vehicle AdvancedLighting BasicImage BasicLighting BasicText EventHandling KeyboardInput MouseInput Networking_Client Networking_Server PlayingSounds ScreenEntities ScreenSprites SkeletalAnimation UpdateLoop  
 

Examples/C++/Contents/2DParticles/HelloPolycodeApp.cpp

@@ -12,9 +12,10 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 	
 	Screen *screen = new Screen();	
-	ScreenParticleEmitter *emitter = new ScreenParticleEmitter("Resources/particle.png", screen,
-		 Particle::BILLBOARD_PARTICLE, ParticleEmitter::CONTINUOUS_EMITTER, 4, 200,
-		Vector3(0.0,-50.0,0.0), Vector3(0.0,0.0,0.0), Vector3(20.5, 40.0, 0.0));
+	ScreenParticleEmitter *emitter = new ScreenParticleEmitter("Resources/particle.png", 
+		screen, Particle::BILLBOARD_PARTICLE, ParticleEmitter::CONTINUOUS_EMITTER, 4, 200, 
+		Vector3(0.0,-50.0,0.0), Vector3(0.0,0.0,0.0), Vector3(20.5, 40.0, 0.0), 
+		Vector3(1.5,1.5,1.5));
 	
 	emitter->useScaleCurves = true;
 	emitter->scaleCurve.addControlPoint2d(0, 0.3);

Examples/C++/Contents/3DMeshParticles/HelloPolycodeApp.cpp

@@ -27,7 +27,8 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	
 	SceneParticleEmitter *emitter = new SceneParticleEmitter("Default", scene,
 		Particle::MESH_PARTICLE, ParticleEmitter::CONTINUOUS_EMITTER, 4, 100,
-		Vector3(0.0,1.0,0.0), Vector3(0.0,0.0,0.0), Vector3(0.3, 0.0, 0.3), mesh);
+		Vector3(0.0,1.0,0.0), Vector3(0.0,0.0,0.0), Vector3(0.3, 0.0, 0.3),
+		Vector3(1.5,1.5,1.5), mesh);
 			
 	emitter->useScaleCurves = true;
 	emitter->scaleCurve.addControlPoint2d(0, 0.1);

Examples/C++/Contents/3DParticles/HelloPolycodeApp.cpp

@@ -22,7 +22,8 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	
 	SceneParticleEmitter *emitter = new SceneParticleEmitter("TestParticle", scene,
 		Particle::BILLBOARD_PARTICLE, ParticleEmitter::CONTINUOUS_EMITTER, 4, 200,
-		Vector3(0.0,1.0,0.0), Vector3(0.0,0.0,0.0), Vector3(0.3, 0.0, 0.3));		
+		Vector3(0.0,1.0,0.0), Vector3(0.0,0.0,0.0), Vector3(0.3, 0.0, 0.3),
+		Vector3(1.5,1.5,1.5));		
 
 	
 	emitter->useScaleCurves = true;