Browse Source

Removes mesh, lua and particles samples

seanpaultaylor 11 years ago
parent
commit
2692d25bef
100 changed files with 318 additions and 3431 deletions
  1. 1 34
      gameplay.sln
  2. 0 9
      gameplay.xcworkspace/contents.xcworkspacedata
  3. 8 8
      gameplay/gameplay.xcodeproj/project.pbxproj
  4. 31 27
      gameplay/src/ParticleEmitter.cpp
  5. 18 18
      gameplay/src/ParticleEmitter.h
  6. 5 5
      gameplay/src/lua/lua_Global.cpp
  7. 1 1
      gameplay/src/lua/lua_Global.h
  8. 19 19
      gameplay/src/lua/lua_ParticleEmitter.cpp
  9. 3 3
      gameplay/src/lua/lua_ParticleEmitter.h
  10. 41 0
      gameplay/src/lua/lua_ParticleEmitterBlendMode.cpp
  11. 15 0
      gameplay/src/lua/lua_ParticleEmitterBlendMode.h
  12. 0 41
      gameplay/src/lua/lua_ParticleEmitterTextureBlending.cpp
  13. 0 15
      gameplay/src/lua/lua_ParticleEmitterTextureBlending.h
  14. 0 3
      samples/CMakeLists.txt
  15. 2 1
      samples/browser/res/common/inputs.form
  16. 47 54
      samples/browser/res/common/particles/editor.form
  17. 0 0
      samples/browser/res/common/particles/editor.png
  18. 0 0
      samples/browser/res/common/particles/editor.theme
  19. 0 0
      samples/browser/res/common/particles/explosion.particle
  20. 0 0
      samples/browser/res/common/particles/explosion.png
  21. 0 0
      samples/browser/res/common/particles/fire.particle
  22. 0 0
      samples/browser/res/common/particles/fire.png
  23. 0 0
      samples/browser/res/common/particles/grid.material
  24. 0 0
      samples/browser/res/common/particles/smoke.particle
  25. 0 0
      samples/browser/res/common/particles/smoke.png
  26. 8 0
      samples/browser/sample-browser.xcodeproj/project.pbxproj
  27. 1 1
      samples/browser/src/Audio3DSample.cpp
  28. 1 1
      samples/browser/src/BillboardSample.cpp
  29. 1 1
      samples/browser/src/CreateSceneSample.cpp
  30. 1 1
      samples/browser/src/FormsSample.cpp
  31. 1 1
      samples/browser/src/InputSample.cpp
  32. 1 1
      samples/browser/src/LightSample.cpp
  33. 1 1
      samples/browser/src/LoadSceneSample.cpp
  34. 90 88
      samples/browser/src/ParticlesSample.cpp
  35. 13 15
      samples/browser/src/ParticlesSample.h
  36. 3 3
      samples/browser/src/SamplesGame.cpp
  37. 1 1
      samples/browser/src/SpriteBatchSample.cpp
  38. 1 1
      samples/browser/src/TerrainSample.cpp
  39. 1 1
      samples/browser/src/TextSample.cpp
  40. 1 1
      samples/browser/src/TextureSample.cpp
  41. 1 1
      samples/browser/src/TriangleSample.cpp
  42. 1 1
      samples/browser/src/WaterSample.cpp
  43. 0 250
      samples/lua/.cproject
  44. 0 28
      samples/lua/.project
  45. 0 27
      samples/lua/CMakeLists.txt
  46. BIN
      samples/lua/[email protected]
  47. 0 9
      samples/lua/android/.classpath
  48. 0 57
      samples/lua/android/.cproject
  49. 0 57
      samples/lua/android/.project
  50. 0 25
      samples/lua/android/AndroidManifest.xml
  51. 0 62
      samples/lua/android/build.xml
  52. 0 95
      samples/lua/android/jni/Android.mk
  53. 0 6
      samples/lua/android/jni/Application.mk
  54. 0 4
      samples/lua/android/project.properties
  55. BIN
      samples/lua/android/res/drawable/icon.png
  56. 0 4
      samples/lua/android/res/values/strings.xml
  57. 0 17
      samples/lua/game.config
  58. BIN
      samples/lua/icon.png
  59. 0 84
      samples/lua/res/ai.lua
  60. 0 182
      samples/lua/res/game.lua
  61. BIN
      samples/lua/res/lua-logo.png
  62. BIN
      samples/lua/res/lua.fbx
  63. BIN
      samples/lua/res/lua.gpb
  64. 0 62
      samples/lua/res/lua.material
  65. BIN
      samples/lua/res/lua.mb
  66. 0 9
      samples/lua/res/lua.scene
  67. 0 38
      samples/lua/sample-lua-ios.plist
  68. 0 32
      samples/lua/sample-lua-macosx.plist
  69. 0 81
      samples/lua/sample-lua.pro
  70. 0 198
      samples/lua/sample-lua.vcxproj
  71. 0 53
      samples/lua/sample-lua.vcxproj.filters
  72. 0 15
      samples/lua/sample-lua.vcxproj.user
  73. 0 643
      samples/lua/sample-lua.xcodeproj/project.pbxproj
  74. 0 87
      samples/lua/sample-lua.xcodeproj/xcshareddata/xcschemes/sample-lua-ios.xcscheme
  75. 0 86
      samples/lua/sample-lua.xcodeproj/xcshareddata/xcschemes/sample-lua-macosx.xcscheme
  76. 0 24
      samples/lua/src/LuaGame.cpp
  77. 0 46
      samples/lua/src/LuaGame.h
  78. 0 250
      samples/mesh/.cproject
  79. 0 28
      samples/mesh/.project
  80. 0 27
      samples/mesh/CMakeLists.txt
  81. BIN
      samples/mesh/[email protected]
  82. 0 13
      samples/mesh/android/.classpath
  83. 0 57
      samples/mesh/android/.cproject
  84. 0 105
      samples/mesh/android/.project
  85. 0 25
      samples/mesh/android/AndroidManifest.xml
  86. 0 60
      samples/mesh/android/build.xml
  87. 0 95
      samples/mesh/android/jni/Android.mk
  88. 0 6
      samples/mesh/android/jni/Application.mk
  89. 0 3
      samples/mesh/android/project.properties
  90. BIN
      samples/mesh/android/res/drawable/icon.png
  91. 0 4
      samples/mesh/android/res/values/strings.xml
  92. 0 7
      samples/mesh/game.config
  93. BIN
      samples/mesh/icon.png
  94. BIN
      samples/mesh/res/duck.png
  95. BIN
      samples/mesh/res/mesh.fbx
  96. BIN
      samples/mesh/res/mesh.gpb
  97. 0 62
      samples/mesh/res/mesh.material
  98. BIN
      samples/mesh/res/mesh.mb
  99. 0 9
      samples/mesh/res/mesh.scene
  100. 0 42
      samples/mesh/sample-mesh-ios.plist

+ 1 - 34
gameplay.sln

@@ -1,13 +1,8 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2013 for Windows Desktop
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-mesh", "samples\mesh\sample-mesh.vcxproj", "{D672DC66-3CE0-4878-B0D2-813CA731012F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gameplay", "gameplay\gameplay.vcxproj", "{1032BA4B-57EB-4348-9E03-29DD63E80E4A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-browser", "samples\browser\sample-browser.vcxproj", "{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}"
@@ -15,11 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-browser", "samples\b
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-lua", "samples\lua\sample-lua.vcxproj", "{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-spaceship", "samples\spaceship\sample-spaceship.vcxproj", "{CC37B8E9-6402-4841-8D6A-5D908A5909B3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
@@ -30,11 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-character", "samples
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-particles", "samples\particles\sample-particles.vcxproj", "{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-racer", "samples\racer\sample-racer.vcxproj", "{82522888-E09A-ED48-AD7D-247237B37B3A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
@@ -47,12 +32,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|x64.ActiveCfg = Debug|x64
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|x64.Build.0 = Debug|x64
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|x64.ActiveCfg = DebugMem|x64
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|x64.Build.0 = DebugMem|x64
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|x64.ActiveCfg = Release|x64
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|x64.Build.0 = Release|x64
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|x64.ActiveCfg = Debug|x64
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|x64.Build.0 = Debug|x64
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|x64.ActiveCfg = DebugMem|x64
@@ -65,12 +44,6 @@ Global
 		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|x64.Build.0 = DebugMem|x64
 		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|x64.ActiveCfg = Release|x64
 		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|x64.Build.0 = Release|x64
-		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|x64.ActiveCfg = Debug|x64
-		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|x64.Build.0 = Debug|x64
-		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|x64.ActiveCfg = DebugMem|x64
-		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|x64.Build.0 = DebugMem|x64
-		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|x64.ActiveCfg = Release|x64
-		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|x64.Build.0 = Release|x64
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|x64.ActiveCfg = Debug|x64
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|x64.Build.0 = Debug|x64
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|x64.ActiveCfg = DebugMem|x64
@@ -83,12 +56,6 @@ Global
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|x64.Build.0 = DebugMem|x64
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|x64.ActiveCfg = Release|x64
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|x64.Build.0 = Release|x64
-		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|x64.ActiveCfg = Debug|x64
-		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|x64.Build.0 = Debug|x64
-		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|x64.ActiveCfg = DebugMem|x64
-		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|x64.Build.0 = DebugMem|x64
-		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|x64.ActiveCfg = Release|x64
-		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|x64.Build.0 = Release|x64
 		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|x64.ActiveCfg = Debug|x64
 		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|x64.Build.0 = Debug|x64
 		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|x64.ActiveCfg = DebugMem|x64

+ 0 - 9
gameplay.xcworkspace/contents.xcworkspacedata

@@ -10,15 +10,6 @@
    <FileRef
       location = "group:samples/character/sample-character.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:samples/lua/sample-lua.xcodeproj">
-   </FileRef>  
-   <FileRef
-      location = "group:samples/mesh/sample-mesh.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:samples/particles/sample-particles.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:samples/racer/sample-racer.xcodeproj">
    </FileRef>

+ 8 - 8
gameplay/gameplay.xcodeproj/project.pbxproj

@@ -195,8 +195,8 @@
 		420BBD831817416F00C7B720 /* lua_NodeType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB5E1817416E00C7B720 /* lua_NodeType.cpp */; };
 		420BBD861817416F00C7B720 /* lua_ParticleEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB601817416E00C7B720 /* lua_ParticleEmitter.cpp */; };
 		420BBD871817416F00C7B720 /* lua_ParticleEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB601817416E00C7B720 /* lua_ParticleEmitter.cpp */; };
-		420BBD8A1817416F00C7B720 /* lua_ParticleEmitterTextureBlending.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB621817416E00C7B720 /* lua_ParticleEmitterTextureBlending.cpp */; };
-		420BBD8B1817416F00C7B720 /* lua_ParticleEmitterTextureBlending.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB621817416E00C7B720 /* lua_ParticleEmitterTextureBlending.cpp */; };
+		420BBD8A1817416F00C7B720 /* lua_ParticleEmitterBlendMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB621817416E00C7B720 /* lua_ParticleEmitterBlendMode.cpp */; };
+		420BBD8B1817416F00C7B720 /* lua_ParticleEmitterBlendMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB621817416E00C7B720 /* lua_ParticleEmitterBlendMode.cpp */; };
 		420BBD8E1817416F00C7B720 /* lua_Pass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB641817416E00C7B720 /* lua_Pass.cpp */; };
 		420BBD8F1817416F00C7B720 /* lua_Pass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB641817416E00C7B720 /* lua_Pass.cpp */; };
 		420BBD921817416F00C7B720 /* lua_PhysicsCharacter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB661817416E00C7B720 /* lua_PhysicsCharacter.cpp */; };
@@ -789,8 +789,8 @@
 		420BBB5F1817416E00C7B720 /* lua_NodeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_NodeType.h; sourceTree = "<group>"; };
 		420BBB601817416E00C7B720 /* lua_ParticleEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_ParticleEmitter.cpp; sourceTree = "<group>"; };
 		420BBB611817416E00C7B720 /* lua_ParticleEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_ParticleEmitter.h; sourceTree = "<group>"; };
-		420BBB621817416E00C7B720 /* lua_ParticleEmitterTextureBlending.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_ParticleEmitterTextureBlending.cpp; sourceTree = "<group>"; };
-		420BBB631817416E00C7B720 /* lua_ParticleEmitterTextureBlending.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_ParticleEmitterTextureBlending.h; sourceTree = "<group>"; };
+		420BBB621817416E00C7B720 /* lua_ParticleEmitterBlendMode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_ParticleEmitterBlendMode.cpp; sourceTree = "<group>"; };
+		420BBB631817416E00C7B720 /* lua_ParticleEmitterBlendMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_ParticleEmitterBlendMode.h; sourceTree = "<group>"; };
 		420BBB641817416E00C7B720 /* lua_Pass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_Pass.cpp; sourceTree = "<group>"; };
 		420BBB651817416E00C7B720 /* lua_Pass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_Pass.h; sourceTree = "<group>"; };
 		420BBB661817416E00C7B720 /* lua_PhysicsCharacter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_PhysicsCharacter.cpp; sourceTree = "<group>"; };
@@ -1461,8 +1461,8 @@
 				420BBB5F1817416E00C7B720 /* lua_NodeType.h */,
 				420BBB601817416E00C7B720 /* lua_ParticleEmitter.cpp */,
 				420BBB611817416E00C7B720 /* lua_ParticleEmitter.h */,
-				420BBB621817416E00C7B720 /* lua_ParticleEmitterTextureBlending.cpp */,
-				420BBB631817416E00C7B720 /* lua_ParticleEmitterTextureBlending.h */,
+				420BBB621817416E00C7B720 /* lua_ParticleEmitterBlendMode.cpp */,
+				420BBB631817416E00C7B720 /* lua_ParticleEmitterBlendMode.h */,
 				420BBB641817416E00C7B720 /* lua_Pass.cpp */,
 				420BBB651817416E00C7B720 /* lua_Pass.h */,
 				420BBB661817416E00C7B720 /* lua_PhysicsCharacter.cpp */,
@@ -2221,7 +2221,7 @@
 				420BBED61817416F00C7B720 /* lua_VerticalLayout.cpp in Sources */,
 				42CC55CE1809A4EF00AAD8AD /* DebugNew.cpp in Sources */,
 				420BBE7A1817416F00C7B720 /* lua_TextBoxInputMode.cpp in Sources */,
-				420BBD8A1817416F00C7B720 /* lua_ParticleEmitterTextureBlending.cpp in Sources */,
+				420BBD8A1817416F00C7B720 /* lua_ParticleEmitterBlendMode.cpp in Sources */,
 				420BBDEA1817416F00C7B720 /* lua_PhysicsSpringConstraint.cpp in Sources */,
 				42CC59141809A4EF00AAD8AD /* MeshBatch.cpp in Sources */,
 				42CC55701809A4EF00AAD8AD /* AIAgent.cpp in Sources */,
@@ -2518,7 +2518,7 @@
 				420BBED71817416F00C7B720 /* lua_VerticalLayout.cpp in Sources */,
 				42CC55CF1809A4EF00AAD8AD /* DebugNew.cpp in Sources */,
 				420BBE7B1817416F00C7B720 /* lua_TextBoxInputMode.cpp in Sources */,
-				420BBD8B1817416F00C7B720 /* lua_ParticleEmitterTextureBlending.cpp in Sources */,
+				420BBD8B1817416F00C7B720 /* lua_ParticleEmitterBlendMode.cpp in Sources */,
 				420BBDEB1817416F00C7B720 /* lua_PhysicsSpringConstraint.cpp in Sources */,
 				42CC59151809A4EF00AAD8AD /* MeshBatch.cpp in Sources */,
 				42CC55711809A4EF00AAD8AD /* AIAgent.cpp in Sources */,

+ 31 - 27
gameplay/src/ParticleEmitter.cpp

@@ -26,7 +26,7 @@ ParticleEmitter::ParticleEmitter(unsigned int particleCountMax) :
     _rotationPerParticleSpeedMin(0.0f), _rotationPerParticleSpeedMax(0.0f),
     _rotationSpeedMin(0.0f), _rotationSpeedMax(0.0f),
     _rotationAxis(Vector3::zero()), _rotation(Matrix::identity()),
-    _spriteBatch(NULL), _spriteTextureBlending(BLEND_TRANSPARENT),  _spriteTextureWidth(0), _spriteTextureHeight(0), _spriteTextureWidthRatio(0), _spriteTextureHeightRatio(0), _spriteTextureCoords(NULL),
+    _spriteBatch(NULL), _spriteBlendMode(BLEND_ALPHA),  _spriteTextureWidth(0), _spriteTextureHeight(0), _spriteTextureWidthRatio(0), _spriteTextureHeightRatio(0), _spriteTextureCoords(NULL),
     _spriteAnimated(false),  _spriteLooped(false), _spriteFrameCount(1), _spriteFrameRandomOffset(0),_spriteFrameDuration(0L), _spriteFrameDurationSecs(0.0f), _spritePercentPerFrame(0.0f),
     _node(NULL), _orbitPosition(false), _orbitVelocity(false), _orbitAcceleration(false),
     _timePerEmission(PARTICLE_EMISSION_RATE_TIME_INTERVAL), _emitTime(0), _lastUpdated(0)
@@ -42,7 +42,7 @@ ParticleEmitter::~ParticleEmitter()
     SAFE_DELETE_ARRAY(_spriteTextureCoords);
 }
 
-ParticleEmitter* ParticleEmitter::create(const char* textureFile, TextureBlending textureBlending, unsigned int particleCountMax)
+ParticleEmitter* ParticleEmitter::create(const char* textureFile, BlendMode blendMode, unsigned int particleCountMax)
 {
     Texture* texture = Texture::create(textureFile, true);
 
@@ -54,17 +54,17 @@ ParticleEmitter* ParticleEmitter::create(const char* textureFile, TextureBlendin
     GP_ASSERT(texture->getWidth());
     GP_ASSERT(texture->getHeight());
 
-    ParticleEmitter* emitter = ParticleEmitter::create(texture, textureBlending, particleCountMax);
+    ParticleEmitter* emitter = ParticleEmitter::create(texture, blendMode, particleCountMax);
     SAFE_RELEASE(texture);
     return emitter;
 }
 
-ParticleEmitter* ParticleEmitter::create(Texture* texture, TextureBlending textureBlending,  unsigned int particleCountMax)
+ParticleEmitter* ParticleEmitter::create(Texture* texture, BlendMode blendMode,  unsigned int particleCountMax)
 {
     ParticleEmitter* emitter = new ParticleEmitter(particleCountMax);
     GP_ASSERT(emitter);
 
-    emitter->setTexture(texture, textureBlending);
+    emitter->setTexture(texture, blendMode);
 
     return emitter;
 }
@@ -108,8 +108,11 @@ ParticleEmitter* ParticleEmitter::create(Properties* properties)
         return NULL;
     }
 
-    const char* blendingString = sprite->getString("blending");
-    TextureBlending textureBlending = getTextureBlendingFromString(blendingString);
+    const char* blendModeString = sprite->getString("blendMode");
+    // Check for the old naming
+    if (blendModeString == NULL)
+        blendModeString = sprite->getString("blending");
+    BlendMode blendMode = getBlendModeFromString(blendModeString);
     int spriteWidth = sprite->getInt("width");
     int spriteHeight = sprite->getInt("height");
     bool spriteAnimated = sprite->getBool("animated");
@@ -174,7 +177,7 @@ ParticleEmitter* ParticleEmitter::create(Properties* properties)
     bool orbitAcceleration = properties->getBool("orbitAcceleration");
 
     // Apply all properties to a newly created ParticleEmitter.
-    ParticleEmitter* emitter = ParticleEmitter::create(texturePath.c_str(), textureBlending, particleCountMax);
+    ParticleEmitter* emitter = ParticleEmitter::create(texturePath.c_str(), blendMode, particleCountMax);
     if (!emitter)
     {
         GP_ERROR("Failed to create particle emitter.");
@@ -202,12 +205,12 @@ ParticleEmitter* ParticleEmitter::create(Properties* properties)
     return emitter;
 }
 
-void ParticleEmitter::setTexture(const char* texturePath, TextureBlending textureBlending)
+void ParticleEmitter::setTexture(const char* texturePath, BlendMode blendMode)
 {
     Texture* texture = Texture::create(texturePath, true);
     if (texture)
     {
-        setTexture(texture, textureBlending);
+        setTexture(texture, blendMode);
         texture->release();
     }
     else
@@ -216,7 +219,7 @@ void ParticleEmitter::setTexture(const char* texturePath, TextureBlending textur
     }
 }
 
-void ParticleEmitter::setTexture(Texture* texture, TextureBlending textureBlending)
+void ParticleEmitter::setTexture(Texture* texture, BlendMode blendMode)
 {
     // Create new batch before releasing old one, in case the same texture
     // is used for both (so it's not released before passing to the new batch).
@@ -230,7 +233,7 @@ void ParticleEmitter::setTexture(Texture* texture, TextureBlending textureBlendi
     _spriteBatch->getStateBlock()->setDepthWrite(false);
     _spriteBatch->getStateBlock()->setDepthTest(true);
 
-    setTextureBlending(textureBlending);
+    setBlendMode(blendMode);
     _spriteTextureWidth = texture->getWidth();
     _spriteTextureHeight = texture->getHeight();
     _spriteTextureWidthRatio = 1.0f / (float)texture->getWidth();
@@ -558,17 +561,17 @@ const Vector3& ParticleEmitter::getRotationAxisVariance() const
     return _rotationAxisVar;
 }
 
-void ParticleEmitter::setTextureBlending(TextureBlending textureBlending)
+void ParticleEmitter::setBlendMode(BlendMode blendMode)
 {
     GP_ASSERT(_spriteBatch);
     GP_ASSERT(_spriteBatch->getStateBlock());
 
-    switch (textureBlending)
+    switch (blendMode)
     {
-        case BLEND_OPAQUE:
+        case BLEND_NONE:
             _spriteBatch->getStateBlock()->setBlend(false);
             break;
-        case BLEND_TRANSPARENT:
+        case BLEND_ALPHA:
             _spriteBatch->getStateBlock()->setBlend(true);
             _spriteBatch->getStateBlock()->setBlendSrc(RenderState::BLEND_SRC_ALPHA);
             _spriteBatch->getStateBlock()->setBlendDst(RenderState::BLEND_ONE_MINUS_SRC_ALPHA);
@@ -584,16 +587,16 @@ void ParticleEmitter::setTextureBlending(TextureBlending textureBlending)
             _spriteBatch->getStateBlock()->setBlendDst(RenderState::BLEND_SRC_COLOR);
             break;
         default:
-            GP_ERROR("Unsupported texture blending mode (%d).", textureBlending);
+            GP_ERROR("Unsupported blend mode (%d).", blendMode);
             break;
     }
 
-    _spriteTextureBlending = textureBlending;
+    _spriteBlendMode = blendMode;
 }
 
-ParticleEmitter::TextureBlending ParticleEmitter::getTextureBlending() const
+ParticleEmitter::BlendMode ParticleEmitter::getBlendMode() const
 {
-    return _spriteTextureBlending;
+    return _spriteBlendMode;
 }
 
 void ParticleEmitter::setSpriteAnimated(bool animated)
@@ -832,17 +835,17 @@ void ParticleEmitter::generateColor(const Vector4& base, const Vector4& variance
     dst->w = base.w + variance.w * MATH_RANDOM_MINUS1_1();
 }
 
-ParticleEmitter::TextureBlending ParticleEmitter::getTextureBlendingFromString(const char* str)
+ParticleEmitter::BlendMode ParticleEmitter::getBlendModeFromString(const char* str)
 {
     GP_ASSERT(str);
 
-    if (strcmp(str, "BLEND_OPAQUE") == 0 || strcmp(str, "OPAQUE") == 0)
+    if (strcmp(str, "BLEND_NONE") == 0 || strcmp(str, "NONE") == 0 )
     {
-        return BLEND_OPAQUE;
+        return BLEND_NONE;
     }
-    else if (strcmp(str, "BLEND_TRANSPARENT") == 0 || strcmp(str, "TRANSPARENT") == 0)
+    else if (strcmp(str, "BLEND_ALPHA") == 0 || strcmp(str, "ALPHA") == 0 )
     {
-        return BLEND_TRANSPARENT;
+        return BLEND_ALPHA;
     }
     else if (strcmp(str, "BLEND_ADDITIVE") == 0 || strcmp(str, "ADDITIVE") == 0)
     {
@@ -854,7 +857,7 @@ ParticleEmitter::TextureBlending ParticleEmitter::getTextureBlendingFromString(c
     }
     else
     {
-        return BLEND_TRANSPARENT;
+        return BLEND_ALPHA;
     }
 }
 
@@ -1031,7 +1034,8 @@ unsigned int ParticleEmitter::draw()
 ParticleEmitter* ParticleEmitter::clone()
 {
     // Create a clone of this emitter
-    ParticleEmitter* emitter = ParticleEmitter::create(_spriteBatch->getSampler()->getTexture(), _spriteTextureBlending, _particleCountMax);
+    ParticleEmitter* emitter = ParticleEmitter::create(_spriteBatch->getSampler()->getTexture(),
+                                                       _spriteBlendMode, _particleCountMax);
 
     // Copy all properties to the clone
     emitter->setEmissionRate(_emissionRate);

+ 18 - 18
gameplay/src/ParticleEmitter.h

@@ -145,12 +145,12 @@ class ParticleEmitter : public Ref
 public:
 
     /**
-     * Defines the types of texture blending 
+     * Defines the types of blend modes
      */
-    enum TextureBlending
+    enum BlendMode
     {
-        BLEND_OPAQUE,
-        BLEND_TRANSPARENT,
+        BLEND_NONE,
+        BLEND_ALPHA,
         BLEND_ADDITIVE,
         BLEND_MULTIPLIED
     };
@@ -181,11 +181,11 @@ public:
      * Creates an uninitialized ParticleEmitter.
      *
      * @param texturePath A path to the image to use as this ParticleEmitter's texture.
-     * @param textureBlending The type of texture blending to be used for the particles emitted.
+     * @param blendMode The blend mode to be used for the particles emitted.
      * @param particleCountMax The maximum number of particles that can be alive at one time in this ParticleEmitter's system.
      * @script{create}
      */
-    static ParticleEmitter* create(const char* texturePath, TextureBlending textureBlending,  unsigned int particleCountMax);
+    static ParticleEmitter* create(const char* texturePath, BlendMode blendMode,  unsigned int particleCountMax);
 
     /**
      * Sets a new texture for this particle emitter.
@@ -193,9 +193,9 @@ public:
      * The current texture's reference count is decreased.
      *
      * @param texturePath Path to the new texture to set.
-     * @param textureBlending Blending mode for the new texture.
+     * @param blendMode Blend mode for the new texture.
      */
-    void setTexture(const char* texturePath, TextureBlending textureBlending);
+    void setTexture(const char* texturePath, BlendMode blendMode);
 
     /**
      * Sets a new texture for this particle emitter.
@@ -204,9 +204,9 @@ public:
      * current texture's reference count is decreased.
      *
      * @param texture The new texture to set.
-     * @param textureBlending Blending mode for the new texture.
+     * @param blendMode Blend mode for the new texture.
      */
-    void setTexture(Texture* texture, TextureBlending textureBlending);
+    void setTexture(Texture* texture, BlendMode blendMode);
 
     /**
      * Returns the texture currently set for this particle emitter.
@@ -705,23 +705,23 @@ public:
     unsigned int draw();
 
     /**
-     * Gets a TextureBlending enum from a corresponding string.
+     * Gets a blend mode from a corresponding string.
      */
-    static TextureBlending getTextureBlendingFromString(const char* src);
+    static ParticleEmitter::BlendMode getBlendModeFromString(const char* src);
 
     /**
      * Sets the texture blend mode for this particle emitter.
      *
-     * @param blending The new blend mode.
+     * @param blendMode The new blend mode.
      */
-    void setTextureBlending(TextureBlending blending);
+    void setBlendMode(BlendMode blendMode);
 
     /**
      * Gets the current texture blend mode for this particle emitter.
      *
      * @return The current blend mode.
      */
-    TextureBlending getTextureBlending() const;
+    BlendMode getBlendMode() const;
 
     /**
      * Clones the particle emitter and returns a new emitter.
@@ -746,11 +746,11 @@ private:
      * Creates an uninitialized ParticleEmitter.
      *
      * @param texture the texture to use.
-     * @param textureBlending The type of texture blending to be used for the particles emitted.
+     * @param blendMode The blend mode to be used for the particles emitted.
      * @param particleCountMax The maximum number of particles that can be alive at one time in this ParticleEmitter's system.
      * @script{create}
      */
-    static ParticleEmitter* create(Texture* texture, TextureBlending textureBlending,  unsigned int particleCountMax);
+    static ParticleEmitter* create(Texture* texture, BlendMode blendMode,  unsigned int particleCountMax);
 
     /**
      * Hidden copy assignment operator.
@@ -834,7 +834,7 @@ private:
     Vector3 _rotationAxisVar;
     Matrix _rotation;
     SpriteBatch* _spriteBatch;
-    TextureBlending _spriteTextureBlending;
+    BlendMode _spriteBlendMode;
     float _spriteTextureWidth;
     float _spriteTextureHeight;
     float _spriteTextureWidthRatio;

+ 5 - 5
gameplay/src/lua/lua_Global.cpp

@@ -682,12 +682,12 @@ void luaRegister_lua_Global()
         gameplay::ScriptUtil::registerConstantString("JOINT", "JOINT", scopePath);
     }
 
-    // Register enumeration ParticleEmitter::TextureBlending.
+    // Register enumeration ParticleEmitter::BlendMode.
     {
         std::vector<std::string> scopePath;
         scopePath.push_back("ParticleEmitter");
-        gameplay::ScriptUtil::registerConstantString("BLEND_OPAQUE", "BLEND_OPAQUE", scopePath);
-        gameplay::ScriptUtil::registerConstantString("BLEND_TRANSPARENT", "BLEND_TRANSPARENT", scopePath);
+        gameplay::ScriptUtil::registerConstantString("BLEND_NONE", "BLEND_NONE", scopePath);
+        gameplay::ScriptUtil::registerConstantString("BLEND_ALPHA", "BLEND_ALPHA", scopePath);
         gameplay::ScriptUtil::registerConstantString("BLEND_ADDITIVE", "BLEND_ADDITIVE", scopePath);
         gameplay::ScriptUtil::registerConstantString("BLEND_MULTIPLIED", "BLEND_MULTIPLIED", scopePath);
     }
@@ -1047,8 +1047,8 @@ const char* lua_stringFromEnumGlobal(std::string& enumname, unsigned int value)
         return lua_stringFromEnum_MouseMouseEvent((Mouse::MouseEvent)value);
     if (enumname == "Node::Type")
         return lua_stringFromEnum_NodeType((Node::Type)value);
-    if (enumname == "ParticleEmitter::TextureBlending")
-        return lua_stringFromEnum_ParticleEmitterTextureBlending((ParticleEmitter::TextureBlending)value);
+    if (enumname == "ParticleEmitter::BlendMode")
+        return lua_stringFromEnum_ParticleEmitterBlendMode((ParticleEmitter::BlendMode)value);
     if (enumname == "PhysicsCollisionObject::CollisionListener::EventType")
         return lua_stringFromEnum_PhysicsCollisionObjectCollisionListenerEventType((PhysicsCollisionObject::CollisionListener::EventType)value);
     if (enumname == "PhysicsCollisionObject::Type")

+ 1 - 1
gameplay/src/lua/lua_Global.h

@@ -31,7 +31,7 @@
 #include "lua_MeshPrimitiveType.h"
 #include "lua_MouseMouseEvent.h"
 #include "lua_NodeType.h"
-#include "lua_ParticleEmitterTextureBlending.h"
+#include "lua_ParticleEmitterBlendMode.h"
 #include "lua_PhysicsCollisionObjectCollisionListenerEventType.h"
 #include "lua_PhysicsCollisionObjectType.h"
 #include "lua_PhysicsCollisionShapeType.h"

+ 19 - 19
gameplay/src/lua/lua_ParticleEmitter.cpp

@@ -9,7 +9,7 @@
 #include "Quaternion.h"
 #include "Ref.h"
 #include "Scene.h"
-#include "lua_ParticleEmitterTextureBlending.h"
+#include "lua_ParticleEmitterBlendMode.h"
 
 namespace gameplay
 {
@@ -56,7 +56,7 @@ void luaRegister_ParticleEmitter()
         {"getSpriteHeight", lua_ParticleEmitter_getSpriteHeight},
         {"getSpriteWidth", lua_ParticleEmitter_getSpriteWidth},
         {"getTexture", lua_ParticleEmitter_getTexture},
-        {"getTextureBlending", lua_ParticleEmitter_getTextureBlending},
+        {"getBlendMode", lua_ParticleEmitter_getBlendMode},
         {"getVelocity", lua_ParticleEmitter_getVelocity},
         {"getVelocityVariance", lua_ParticleEmitter_getVelocityVariance},
         {"isActive", lua_ParticleEmitter_isActive},
@@ -83,7 +83,7 @@ void luaRegister_ParticleEmitter()
         {"setSpriteLooped", lua_ParticleEmitter_setSpriteLooped},
         {"setSpriteTexCoords", lua_ParticleEmitter_setSpriteTexCoords},
         {"setTexture", lua_ParticleEmitter_setTexture},
-        {"setTextureBlending", lua_ParticleEmitter_setTextureBlending},
+        {"setBlendMode", lua_ParticleEmitter_setBlendMode},
         {"setVelocity", lua_ParticleEmitter_setVelocity},
         {"start", lua_ParticleEmitter_start},
         {"stop", lua_ParticleEmitter_stop},
@@ -93,7 +93,7 @@ void luaRegister_ParticleEmitter()
     const luaL_Reg lua_statics[] = 
     {
         {"create", lua_ParticleEmitter_static_create},
-        {"getTextureBlendingFromString", lua_ParticleEmitter_static_getTextureBlendingFromString},
+        {"getBlendModeFromString", lua_ParticleEmitter_static_getBlendModeFromString},
         {NULL, NULL}
     };
     std::vector<std::string> scopePath;
@@ -1591,7 +1591,7 @@ int lua_ParticleEmitter_getTexture(lua_State* state)
     return 0;
 }
 
-int lua_ParticleEmitter_getTextureBlending(lua_State* state)
+int lua_ParticleEmitter_getBlendMode(lua_State* state)
 {
     // Get the number of parameters.
     int paramCount = lua_gettop(state);
@@ -1604,15 +1604,15 @@ int lua_ParticleEmitter_getTextureBlending(lua_State* state)
             if ((lua_type(state, 1) == LUA_TUSERDATA))
             {
                 ParticleEmitter* instance = getInstance(state);
-                ParticleEmitter::TextureBlending result = instance->getTextureBlending();
+                ParticleEmitter::BlendMode result = instance->getBlendMode();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ParticleEmitterTextureBlending(result));
+                lua_pushstring(state, lua_stringFromEnum_ParticleEmitterBlendMode(result));
 
                 return 1;
             }
 
-            lua_pushstring(state, "lua_ParticleEmitter_getTextureBlending - Failed to match the given parameters to a valid function signature.");
+            lua_pushstring(state, "lua_ParticleEmitter_getBlendMode - Failed to match the given parameters to a valid function signature.");
             lua_error(state);
             break;
         }
@@ -2716,7 +2716,7 @@ int lua_ParticleEmitter_setTexture(lua_State* state)
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                     // Get parameter 2 off the stack.
-                    ParticleEmitter::TextureBlending param2 = (ParticleEmitter::TextureBlending)lua_enumFromString_ParticleEmitterTextureBlending(luaL_checkstring(state, 3));
+                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)lua_enumFromString_ParticleEmitterBlendMode(luaL_checkstring(state, 3));
 
                     ParticleEmitter* instance = getInstance(state);
                     instance->setTexture(param1, param2);
@@ -2738,7 +2738,7 @@ int lua_ParticleEmitter_setTexture(lua_State* state)
                         break;
 
                     // Get parameter 2 off the stack.
-                    ParticleEmitter::TextureBlending param2 = (ParticleEmitter::TextureBlending)lua_enumFromString_ParticleEmitterTextureBlending(luaL_checkstring(state, 3));
+                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)lua_enumFromString_ParticleEmitterBlendMode(luaL_checkstring(state, 3));
 
                     ParticleEmitter* instance = getInstance(state);
                     instance->setTexture(param1, param2);
@@ -2761,7 +2761,7 @@ int lua_ParticleEmitter_setTexture(lua_State* state)
     return 0;
 }
 
-int lua_ParticleEmitter_setTextureBlending(lua_State* state)
+int lua_ParticleEmitter_setBlendMode(lua_State* state)
 {
     // Get the number of parameters.
     int paramCount = lua_gettop(state);
@@ -2775,15 +2775,15 @@ int lua_ParticleEmitter_setTextureBlending(lua_State* state)
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
             {
                 // Get parameter 1 off the stack.
-                ParticleEmitter::TextureBlending param1 = (ParticleEmitter::TextureBlending)lua_enumFromString_ParticleEmitterTextureBlending(luaL_checkstring(state, 2));
+                ParticleEmitter::BlendMode param1 = (ParticleEmitter::BlendMode)lua_enumFromString_ParticleEmitterBlendMode(luaL_checkstring(state, 2));
 
                 ParticleEmitter* instance = getInstance(state);
-                instance->setTextureBlending(param1);
+                instance->setBlendMode(param1);
                 
                 return 0;
             }
 
-            lua_pushstring(state, "lua_ParticleEmitter_setTextureBlending - Failed to match the given parameters to a valid function signature.");
+            lua_pushstring(state, "lua_ParticleEmitter_setBlendMode - Failed to match the given parameters to a valid function signature.");
             lua_error(state);
             break;
         }
@@ -2960,7 +2960,7 @@ int lua_ParticleEmitter_static_create(lua_State* state)
                     const char* param1 = gameplay::ScriptUtil::getString(1, false);
 
                     // Get parameter 2 off the stack.
-                    ParticleEmitter::TextureBlending param2 = (ParticleEmitter::TextureBlending)lua_enumFromString_ParticleEmitterTextureBlending(luaL_checkstring(state, 2));
+                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)lua_enumFromString_ParticleEmitterBlendMode(luaL_checkstring(state, 2));
 
                     // Get parameter 3 off the stack.
                     unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 3);
@@ -2997,7 +2997,7 @@ int lua_ParticleEmitter_static_create(lua_State* state)
     return 0;
 }
 
-int lua_ParticleEmitter_static_getTextureBlendingFromString(lua_State* state)
+int lua_ParticleEmitter_static_getBlendModeFromString(lua_State* state)
 {
     // Get the number of parameters.
     int paramCount = lua_gettop(state);
@@ -3012,15 +3012,15 @@ int lua_ParticleEmitter_static_getTextureBlendingFromString(lua_State* state)
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(1, false);
 
-                ParticleEmitter::TextureBlending result = ParticleEmitter::getTextureBlendingFromString(param1);
+                ParticleEmitter::BlendMode result = ParticleEmitter::getBlendModeFromString(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ParticleEmitterTextureBlending(result));
+                lua_pushstring(state, lua_stringFromEnum_ParticleEmitterBlendMode(result));
 
                 return 1;
             }
 
-            lua_pushstring(state, "lua_ParticleEmitter_static_getTextureBlendingFromString - Failed to match the given parameters to a valid function signature.");
+            lua_pushstring(state, "lua_ParticleEmitter_static_getBlendModeFromString - Failed to match the given parameters to a valid function signature.");
             lua_error(state);
             break;
         }

+ 3 - 3
gameplay/src/lua/lua_ParticleEmitter.h

@@ -44,7 +44,7 @@ int lua_ParticleEmitter_getSpriteFrameRandomOffset(lua_State* state);
 int lua_ParticleEmitter_getSpriteHeight(lua_State* state);
 int lua_ParticleEmitter_getSpriteWidth(lua_State* state);
 int lua_ParticleEmitter_getTexture(lua_State* state);
-int lua_ParticleEmitter_getTextureBlending(lua_State* state);
+int lua_ParticleEmitter_getBlendMode(lua_State* state);
 int lua_ParticleEmitter_getVelocity(lua_State* state);
 int lua_ParticleEmitter_getVelocityVariance(lua_State* state);
 int lua_ParticleEmitter_isActive(lua_State* state);
@@ -71,11 +71,11 @@ int lua_ParticleEmitter_setSpriteFrameRandomOffset(lua_State* state);
 int lua_ParticleEmitter_setSpriteLooped(lua_State* state);
 int lua_ParticleEmitter_setSpriteTexCoords(lua_State* state);
 int lua_ParticleEmitter_setTexture(lua_State* state);
-int lua_ParticleEmitter_setTextureBlending(lua_State* state);
+int lua_ParticleEmitter_setBlendMode(lua_State* state);
 int lua_ParticleEmitter_setVelocity(lua_State* state);
 int lua_ParticleEmitter_start(lua_State* state);
 int lua_ParticleEmitter_static_create(lua_State* state);
-int lua_ParticleEmitter_static_getTextureBlendingFromString(lua_State* state);
+int lua_ParticleEmitter_static_getBlendModeFromString(lua_State* state);
 int lua_ParticleEmitter_stop(lua_State* state);
 int lua_ParticleEmitter_update(lua_State* state);
 

+ 41 - 0
gameplay/src/lua/lua_ParticleEmitterBlendMode.cpp

@@ -0,0 +1,41 @@
+#include "Base.h"
+#include "lua_ParticleEmitterBlendMode.h"
+
+namespace gameplay
+{
+
+static const char* enumStringEmpty = "";
+
+static const char* luaEnumString_ParticleEmitterBlendMode_BLEND_NONE = "BLEND_NONE";
+static const char* luaEnumString_ParticleEmitterBlendMode_BLEND_ALPHA = "BLEND_ALPHA";
+static const char* luaEnumString_ParticleEmitterBlendMode_BLEND_ADDITIVE = "BLEND_ADDITIVE";
+static const char* luaEnumString_ParticleEmitterBlendMode_BLEND_MULTIPLIED = "BLEND_MULTIPLIED";
+
+ParticleEmitter::BlendMode lua_enumFromString_ParticleEmitterBlendMode(const char* s)
+{
+    if (strcmp(s, luaEnumString_ParticleEmitterBlendMode_BLEND_NONE) == 0)
+        return ParticleEmitter::BLEND_NONE;
+    if (strcmp(s, luaEnumString_ParticleEmitterBlendMode_BLEND_ALPHA) == 0)
+        return ParticleEmitter::BLEND_ALPHA;
+    if (strcmp(s, luaEnumString_ParticleEmitterBlendMode_BLEND_ADDITIVE) == 0)
+        return ParticleEmitter::BLEND_ADDITIVE;
+    if (strcmp(s, luaEnumString_ParticleEmitterBlendMode_BLEND_MULTIPLIED) == 0)
+        return ParticleEmitter::BLEND_MULTIPLIED;
+    return ParticleEmitter::BLEND_NONE;
+}
+
+const char* lua_stringFromEnum_ParticleEmitterBlendMode(ParticleEmitter::BlendMode e)
+{
+    if (e == ParticleEmitter::BLEND_NONE)
+        return luaEnumString_ParticleEmitterBlendMode_BLEND_NONE;
+    if (e == ParticleEmitter::BLEND_ALPHA)
+        return luaEnumString_ParticleEmitterBlendMode_BLEND_ALPHA;
+    if (e == ParticleEmitter::BLEND_ADDITIVE)
+        return luaEnumString_ParticleEmitterBlendMode_BLEND_ADDITIVE;
+    if (e == ParticleEmitter::BLEND_MULTIPLIED)
+        return luaEnumString_ParticleEmitterBlendMode_BLEND_MULTIPLIED;
+    return enumStringEmpty;
+}
+
+}
+

+ 15 - 0
gameplay/src/lua/lua_ParticleEmitterBlendMode.h

@@ -0,0 +1,15 @@
+#ifndef LUA_PARTICLEEMITTERBLENDMODE_H_
+#define LUA_PARTICLEEMITTERBLENDMODE_H_
+
+#include "ParticleEmitter.h"
+
+namespace gameplay
+{
+
+// Lua bindings for enum conversion functions for ParticleEmitter::BlendMode.
+ParticleEmitter::BlendMode lua_enumFromString_ParticleEmitterBlendMode(const char* s);
+const char* lua_stringFromEnum_ParticleEmitterBlendMode(ParticleEmitter::BlendMode e);
+
+}
+
+#endif

+ 0 - 41
gameplay/src/lua/lua_ParticleEmitterTextureBlending.cpp

@@ -1,41 +0,0 @@
-#include "Base.h"
-#include "lua_ParticleEmitterTextureBlending.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ParticleEmitterTextureBlending_BLEND_OPAQUE = "BLEND_OPAQUE";
-static const char* luaEnumString_ParticleEmitterTextureBlending_BLEND_TRANSPARENT = "BLEND_TRANSPARENT";
-static const char* luaEnumString_ParticleEmitterTextureBlending_BLEND_ADDITIVE = "BLEND_ADDITIVE";
-static const char* luaEnumString_ParticleEmitterTextureBlending_BLEND_MULTIPLIED = "BLEND_MULTIPLIED";
-
-ParticleEmitter::TextureBlending lua_enumFromString_ParticleEmitterTextureBlending(const char* s)
-{
-    if (strcmp(s, luaEnumString_ParticleEmitterTextureBlending_BLEND_OPAQUE) == 0)
-        return ParticleEmitter::BLEND_OPAQUE;
-    if (strcmp(s, luaEnumString_ParticleEmitterTextureBlending_BLEND_TRANSPARENT) == 0)
-        return ParticleEmitter::BLEND_TRANSPARENT;
-    if (strcmp(s, luaEnumString_ParticleEmitterTextureBlending_BLEND_ADDITIVE) == 0)
-        return ParticleEmitter::BLEND_ADDITIVE;
-    if (strcmp(s, luaEnumString_ParticleEmitterTextureBlending_BLEND_MULTIPLIED) == 0)
-        return ParticleEmitter::BLEND_MULTIPLIED;
-    return ParticleEmitter::BLEND_OPAQUE;
-}
-
-const char* lua_stringFromEnum_ParticleEmitterTextureBlending(ParticleEmitter::TextureBlending e)
-{
-    if (e == ParticleEmitter::BLEND_OPAQUE)
-        return luaEnumString_ParticleEmitterTextureBlending_BLEND_OPAQUE;
-    if (e == ParticleEmitter::BLEND_TRANSPARENT)
-        return luaEnumString_ParticleEmitterTextureBlending_BLEND_TRANSPARENT;
-    if (e == ParticleEmitter::BLEND_ADDITIVE)
-        return luaEnumString_ParticleEmitterTextureBlending_BLEND_ADDITIVE;
-    if (e == ParticleEmitter::BLEND_MULTIPLIED)
-        return luaEnumString_ParticleEmitterTextureBlending_BLEND_MULTIPLIED;
-    return enumStringEmpty;
-}
-
-}
-

+ 0 - 15
gameplay/src/lua/lua_ParticleEmitterTextureBlending.h

@@ -1,15 +0,0 @@
-#ifndef LUA_PARTICLEEMITTERTEXTUREBLENDING_H_
-#define LUA_PARTICLEEMITTERTEXTUREBLENDING_H_
-
-#include "ParticleEmitter.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for ParticleEmitter::TextureBlending.
-ParticleEmitter::TextureBlending lua_enumFromString_ParticleEmitterTextureBlending(const char* s);
-const char* lua_stringFromEnum_ParticleEmitterTextureBlending(ParticleEmitter::TextureBlending e);
-
-}
-
-#endif

+ 0 - 3
samples/CMakeLists.txt

@@ -53,8 +53,5 @@ add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletC
 
 add_subdirectory(browser)
 add_subdirectory(character)
-add_subdirectory(lua)
-add_subdirectory(mesh)
-add_subdirectory(particles)
 add_subdirectory(racer)
 add_subdirectory(spaceship)

+ 2 - 1
samples/browser/res/common/inputs.form

@@ -2,7 +2,8 @@ form inputTestControls
 {
     width = 200
     height = 350
-    alignment = ALIGN_TOP_RIGHT
+    alignment = ALIGN_BOTTOM_RIGHT
+    consumeInputEvents = false
 
     button showKeyboardButton
     {

+ 47 - 54
samples/particles/res/editor.form → samples/browser/res/common/particles/editor.form

@@ -2,18 +2,10 @@ form particleEditor
 {
     ${leftWidth} = 195
 
-    size = 100%, 100%
+    size = 95%, 100%
     consumeInputEvents = false
     style = Empty
 
-	checkBox vsync
-	{
-		position = 200, 5
-		text = VSYNC
-		checked = true
-        fontSize = 18
-	}
-
     container leftSide
     {
         layout = LAYOUT_VERTICAL
@@ -27,8 +19,8 @@ form particleEditor
 
 	        button save
 	        {
-                width = 100%
-		        text = Save
+                    width = 100%
+		    text = Save
 	        }
 
             button load : save
@@ -43,7 +35,7 @@ form particleEditor
             style = Form
             width = 100%
 
-	        layout
+            layout
             {
                 type = LAYOUT_VERTICAL
                 spacing = 5
@@ -57,14 +49,14 @@ form particleEditor
 
 	        image sprite
 	        {
-		        path = res/fire.png
-		        size = 120, 120
+                path = res/fire.png
+                size = 120, 120
 	        }
 
             container imageSettings
             {
                 width = 100%
-		        layout = LAYOUT_VERTICAL
+                layout = LAYOUT_VERTICAL
 
                 radioButton additive
                 {
@@ -148,8 +140,8 @@ form particleEditor
 
                 button updateFrames
                 {
-			        width = 100%
-			        text = Update
+                    width = 100%
+                    text = Update
                 }
             }
         }
@@ -158,64 +150,65 @@ form particleEditor
         container emission
         {
             style = Form
-	        layout = LAYOUT_VERTICAL
-	        width = ${leftWidth}
+            layout = LAYOUT_VERTICAL
+            width = ${leftWidth}
 
-	        // Burst emission
-	        button emit
-	        {
+            // Burst emission
+            button emit
+            {
                 width = 100%
-		        text = Emit
-	        }
+                text = Emit
+            }
 
             label spacer
             {
                 size = 5,5
             }
 
-	        // Emission rate
-	        slider emissionRate
-	        {
+            // Emission rate
+            slider emissionRate
+            {
                 width = 100%
-		        orientation = HORIZONTAL
-		        min = 1
-		        max = 500
-		        value = 100
-		        step = 1
-		        text = Emission Rate
-		        textAlignment = ALIGN_TOP_HCENTER
-		        valueTextVisible = true
-		        valueTextAlignment = ALIGN_BOTTOM_HCENTER
-		        valueTextPrecision = 2            
-	        }
+                orientation = HORIZONTAL
+                min = 1
+                max = 500
+                value = 100
+                step = 1
+                text = Emission Rate
+                textAlignment = ALIGN_TOP_HCENTER
+                valueTextVisible = true
+                valueTextAlignment = ALIGN_BOTTOM_HCENTER
+                valueTextPrecision = 2            
+            }
 
-	        slider burstSize : emissionRate
-	        {
-		        text = Burst Size
-		        value = 20
-		        max = 50
-		        step = 1
-	        }
+            slider burstSize : emissionRate
+            {
+                text = Burst Size
+                value = 20
+                max = 50
+                step = 1
+            }
 
-	        // Start / Stop Emitter
-	        checkBox started
-	        {
-		        text = Running
-		        checked = true
-	        }
+            // Start / Stop Emitter
+            checkBox started
+            {
+                text = Running
+                checked = true
+            }
         }
 
         button reset
-	    {
+        {
             width = ${leftWidth}
-		    text = Reset
-	    }
+            text = Reset
+        }
     }
 
     container particleProperties
     {
         style = Form
         alignment = ALIGN_TOP_RIGHT
+        y = 50
         size = 210, 100%
         layout = LAYOUT_VERTICAL
         scroll = SCROLL_VERTICAL

+ 0 - 0
samples/particles/res/editor.png → samples/browser/res/common/particles/editor.png


+ 0 - 0
samples/particles/res/editor.theme → samples/browser/res/common/particles/editor.theme


+ 0 - 0
samples/particles/res/explosion.particle → samples/browser/res/common/particles/explosion.particle


+ 0 - 0
samples/particles/res/explosion.png → samples/browser/res/common/particles/explosion.png


+ 0 - 0
samples/particles/res/fire.particle → samples/browser/res/common/particles/fire.particle


+ 0 - 0
samples/particles/res/fire.png → samples/browser/res/common/particles/fire.png


+ 0 - 0
samples/particles/res/grid.material → samples/browser/res/common/particles/grid.material


+ 0 - 0
samples/particles/res/smoke.particle → samples/browser/res/common/particles/smoke.particle


+ 0 - 0
samples/particles/res/smoke.png → samples/browser/res/common/particles/smoke.png


+ 8 - 0
samples/browser/sample-browser.xcodeproj/project.pbxproj

@@ -44,6 +44,8 @@
 		4258369E1A0F2AF400AFDFEB /* WaterSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4258369B1A0F2AF400AFDFEB /* WaterSample.cpp */; };
 		425F3A5617FBCBF00085454F /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 425F3A5517FBCBF00085454F /* libgameplay.a */; };
 		428F7BDE15CB131A009ED24C /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 428F7BDD15CB131A009ED24C /* game.config */; };
+		42A1BA201A27BCE200BF506D /* ParticlesSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42A1BA1E1A27BCE200BF506D /* ParticlesSample.cpp */; };
+		42A1BA211A27BCE200BF506D /* ParticlesSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42A1BA1E1A27BCE200BF506D /* ParticlesSample.cpp */; };
 		42BE773016A68CE3008AFA65 /* GamepadSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42BE772E16A68CE3008AFA65 /* GamepadSample.cpp */; };
 		42BE773116A68CE3008AFA65 /* GamepadSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42BE772E16A68CE3008AFA65 /* GamepadSample.cpp */; };
 		42BE773416A68CF2008AFA65 /* LightSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42BE773216A68CF2008AFA65 /* LightSample.cpp */; };
@@ -131,6 +133,8 @@
 		4258369C1A0F2AF400AFDFEB /* WaterSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaterSample.h; sourceTree = "<group>"; };
 		425F3A5517FBCBF00085454F /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "/Users/setaylor/Code/GamePlay/samples/character/../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos/libgameplay.a"; sourceTree = "<absolute>"; };
 		428F7BDD15CB131A009ED24C /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
+		42A1BA1E1A27BCE200BF506D /* ParticlesSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParticlesSample.cpp; sourceTree = "<group>"; };
+		42A1BA1F1A27BCE200BF506D /* ParticlesSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParticlesSample.h; sourceTree = "<group>"; };
 		42BE772E16A68CE3008AFA65 /* GamepadSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GamepadSample.cpp; sourceTree = "<group>"; };
 		42BE772F16A68CE3008AFA65 /* GamepadSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GamepadSample.h; sourceTree = "<group>"; };
 		42BE773216A68CF2008AFA65 /* LightSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LightSample.cpp; sourceTree = "<group>"; };
@@ -337,6 +341,8 @@
 				420D544715FE430D00AD0B91 /* MeshBatchSample.h */,
 				420D544815FE430D00AD0B91 /* MeshPrimitiveSample.cpp */,
 				420D544915FE430D00AD0B91 /* MeshPrimitiveSample.h */,
+				42A1BA1E1A27BCE200BF506D /* ParticlesSample.cpp */,
+				42A1BA1F1A27BCE200BF506D /* ParticlesSample.h */,
 				42BE773616A68D07008AFA65 /* PhysicsCollisionObjectSample.cpp */,
 				42BE773716A68D07008AFA65 /* PhysicsCollisionObjectSample.h */,
 				422FE592169690830062D1FE /* PostProcessSample.cpp */,
@@ -529,6 +535,7 @@
 				420D546C15FE430D00AD0B91 /* SpriteBatchSample.cpp in Sources */,
 				420D546E15FE430D00AD0B91 /* Sample.cpp in Sources */,
 				420D547015FE430D00AD0B91 /* TextSample.cpp in Sources */,
+				42A1BA201A27BCE200BF506D /* ParticlesSample.cpp in Sources */,
 				420D547215FE430D00AD0B91 /* TextureSample.cpp in Sources */,
 				420D547415FE430D00AD0B91 /* TriangleSample.cpp in Sources */,
 				9F4C6D00162735020076E137 /* GestureSample.cpp in Sources */,
@@ -559,6 +566,7 @@
 				420D546D15FE430D00AD0B91 /* SpriteBatchSample.cpp in Sources */,
 				420D546F15FE430D00AD0B91 /* Sample.cpp in Sources */,
 				420D547115FE430D00AD0B91 /* TextSample.cpp in Sources */,
+				42A1BA211A27BCE200BF506D /* ParticlesSample.cpp in Sources */,
 				420D547315FE430D00AD0B91 /* TextureSample.cpp in Sources */,
 				420D547515FE430D00AD0B91 /* TriangleSample.cpp in Sources */,
 				9F4C6D01162735020076E137 /* GestureSample.cpp in Sources */,

+ 1 - 1
samples/browser/src/Audio3DSample.cpp

@@ -3,7 +3,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Audio", "3D Audio", Audio3DSample, 1);
+    ADD_SAMPLE("Media", "Audio Listener", Audio3DSample, 1);
 #endif
 
 static const unsigned int MOVE_FORWARD = 1;

+ 1 - 1
samples/browser/src/BillboardSample.cpp

@@ -3,7 +3,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Graphics", "Billboards", BillboardSample, 12);
+    ADD_SAMPLE("Graphics", "Billboards", BillboardSample, 10);
 #endif
 
 static const unsigned int MOVE_FORWARD = 1;

+ 1 - 1
samples/browser/src/CreateSceneSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Scene", "Create Scene", CreateSceneSample, 1);
+    ADD_SAMPLE("Graphics", "Create Scene", CreateSceneSample, 15);
 #endif
 
 static Mesh* createCubeMesh(float size = 1.0f)

+ 1 - 1
samples/browser/src/FormsSample.cpp

@@ -1,7 +1,7 @@
 #include "FormsSample.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Graphics", "Forms", FormsSample, 10);
+    ADD_SAMPLE("Graphics", "Forms", FormsSample, 7);
 #endif
 
 // Input bit-flags

+ 1 - 1
samples/browser/src/InputSample.cpp

@@ -340,7 +340,7 @@ bool InputSample::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelDelta
         _mouseWheel = wheelDelta;
         break;
     }
-    return true;
+    return false;
 }
 
 void InputSample::keyEvent(Keyboard::KeyEvent evt, int key)

+ 1 - 1
samples/browser/src/LightSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Graphics", "Light", LightSample, 11);
+    ADD_SAMPLE("Graphics", "Light", LightSample, 8);
 #endif
 
 LightSample::LightSample()

+ 1 - 1
samples/browser/src/LoadSceneSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Scene", "Load Scene", LoadSceneSample, 2);
+    ADD_SAMPLE("Graphics", "Load Scene", LoadSceneSample, 17);
 #endif
 
 LoadSceneSample::LoadSceneSample()

+ 90 - 88
samples/particles/src/ParticlesGame.cpp → samples/browser/src/ParticlesSample.cpp

@@ -1,21 +1,43 @@
-#include "ParticlesGame.h"
+#include "ParticlesSample.h"
+#include "SamplesGame.h"
 
-// Declare our game instance.
-ParticlesGame game;
+#if defined(ADD_SAMPLE)
+ADD_SAMPLE("Graphics", "Particles", ParticlesSample, 9);
+#endif
 
-#define DEFAULT_PARTICLE_EMITTER "res/fire.particle"
+#define DEFAULT_PARTICLE_EMITTER "res/common/particles/fire.particle"
 
 const float INPUT_SENSITIVITY = 0.05f;
 const float PANNING_SENSITIVITY = 0.01f;
 const float ROTATE_SENSITIVITY = 0.25f;
 const Vector4 BACKGROUND_COLOR = Vector4::zero();
-const float ZOOM_DEFAULT = 6.0f;
-
-ParticlesGame::ParticlesGame() : _scene(NULL), _panning(false), _rotating(false), _zooming(false)
+const float ZOOM_DEFAULT = 4.0f;
+
+ParticlesSample::ParticlesSample()
+    : _scene(NULL), _cameraParent(NULL), _particleEmitterNode(NULL), _particleEmitter(NULL),
+      _wDown(false), _aDown(false), _sDown(false), _dDown(false), _touched(false), _prevX(0), _prevY(0),
+      _panning(false), _rotating(false), _zooming(false), _font(NULL), _form(NULL),
+      _startRed(NULL), _startGreen(NULL), _startBlue(NULL), _startAlpha(NULL),
+      _endRed(NULL), _endGreen(NULL), _endBlue(NULL), _endAlpha(NULL),
+      _startMin(NULL), _startMax(NULL), _endMin(NULL),_endMax(NULL),
+      _energyMin(NULL), _energyMax(NULL),
+      _emissionRate(NULL), _posVarX(NULL),_posVarY(NULL),
+      _posVarZ(NULL), _velX(NULL), _velY(NULL), _velZ(NULL),
+      _velVarX(NULL), _velVarY(NULL), _velVarZ(NULL),
+      _accelX(NULL), _accelY(NULL),_accelZ(NULL),
+      _accelVarX(NULL), _accelVarY(NULL), _accelVarZ(NULL),
+      _spinSpeedMin(NULL), _spinSpeedMax(NULL),
+      _axisX(NULL), _axisY(NULL), _axisZ(NULL),
+      _axisVarX(NULL), _axisVarY(NULL), _axisVarZ(NULL),
+      _rotationSpeedMin(NULL), _rotationSpeedMax(NULL),
+      _burstSize(NULL), _started(NULL), _reset(NULL),
+      _emit(NULL), _zoomIn(NULL), _zoomOut(NULL),
+      _save(NULL), _load(NULL),
+      _position(NULL), _particleProperties(NULL)
 {
 }
 
-void ParticlesGame::addGrid(unsigned int lineCount)
+void ParticlesSample::addGrid(unsigned int lineCount)
 {
     float z = -1;
     
@@ -95,18 +117,16 @@ void ParticlesGame::addGrid(unsigned int lineCount)
     mesh->setVertexData(&vertices[0], 0, pointCount);
 
     Model* model = Model::create(mesh);
-    model->setMaterial("res/grid.material");
+    model->setMaterial("res/common/particles/grid.material");
     SAFE_RELEASE(mesh);
 
     _scene->addNode("grid")->setModel(model);
     model->release();
 }
 
-void ParticlesGame::initialize()
+void ParticlesSample::initialize()
 {
     // Display the gameplay splash screen
-    displayScreen(this, &ParticlesGame::drawSplash, NULL, 250L);
-
     setMultiTouch(true);
 
     // Set keyboard state.
@@ -134,7 +154,7 @@ void ParticlesGame::initialize()
     _font = Font::create("res/ui/arial.gpb");
 
     // Load the form for editing ParticleEmitters.
-    _form = Form::create("res/editor.form");
+    _form = Form::create("res/common/particles/editor.form");
     _form->setConsumeInputEvents(false);
     //_form->setState(Control::FOCUS);
 
@@ -188,7 +208,6 @@ void ParticlesGame::initialize()
     _axisVarZ = (Slider*)_form->getControl("axisVarZ");
     _rotationSpeedMin = (Slider*)_form->getControl("rotationSpeedMin");
     _rotationSpeedMax = (Slider*)_form->getControl("rotationSpeedMax");
-    _vsync = (CheckBox*)_form->getControl("vsync");
 
     // Listen for UI events.
     _startRed->addListener(this, Listener::VALUE_CHANGED);
@@ -244,7 +263,6 @@ void ParticlesGame::initialize()
     _axisVarZ->addListener(this, Listener::VALUE_CHANGED);
     _rotationSpeedMin->addListener(this, Listener::VALUE_CHANGED);
     _rotationSpeedMax->addListener(this, Listener::VALUE_CHANGED);
-    _vsync->addListener(this, Listener::VALUE_CHANGED);
     _form->getControl("sprite")->addListener(this, Listener::CLICK);
     _form->getControl("additive")->addListener(this, Listener::VALUE_CHANGED);
     _form->getControl("transparent")->addListener(this, Listener::VALUE_CHANGED);
@@ -259,64 +277,64 @@ void ParticlesGame::initialize()
 }
 
 
-std::string ParticlesGame::toString(bool b)
+std::string ParticlesSample::toString(bool b)
 {
     return b ? "true" : "false";
 }
 
-std::string ParticlesGame::toString(int i)
+std::string ParticlesSample::toString(int i)
 {
     char buf[1024];
     sprintf(buf, "%d", i);
     return buf;
 }
 
-std::string ParticlesGame::toString(unsigned int i)
+std::string ParticlesSample::toString(unsigned int i)
 {
     char buf[1024];
     sprintf(buf, "%d", i);
     return buf;
 }
 
-std::string ParticlesGame::toString(const Vector3& v)
+std::string ParticlesSample::toString(const Vector3& v)
 {
     std::ostringstream s;
     s << v.x << ", " << v.y << ", " << v.z;
     return s.str();
 }
 
-std::string ParticlesGame::toString(const Vector4& v)
+std::string ParticlesSample::toString(const Vector4& v)
 {
     std::ostringstream s;
     s << v.x << ", " << v.y << ", " << v.z << ", " << v.w;
     return s.str();
 }
 
-std::string ParticlesGame::toString(const Quaternion& q)
+std::string ParticlesSample::toString(const Quaternion& q)
 {
     std::ostringstream s;
     s << q.x << ", " << q.y << ", " << q.z << ", " << q.w;
     return s.str();
 }
 
-std::string ParticlesGame::toString(ParticleEmitter::TextureBlending blending)
+std::string ParticlesSample::toString(ParticleEmitter::BlendMode blendMode)
 {
-    switch (blending)
+    switch (blendMode)
     {
-        case ParticleEmitter::BLEND_OPAQUE:
-            return "OPAQUE";
-        case ParticleEmitter::BLEND_TRANSPARENT:
-            return "TRANSPARENT";
+        case ParticleEmitter::BLEND_NONE:
+            return "NONE";
+        case ParticleEmitter::BLEND_ALPHA:
+            return "ALPHA";
         case ParticleEmitter::BLEND_ADDITIVE:
             return "ADDITIVE";
         case ParticleEmitter::BLEND_MULTIPLIED:
             return "MULTIPLIED";
         default:
-            return "TRANSPARENT";
+            return "ALPHA";
     }
 }
 
-void ParticlesGame::saveFile()
+void ParticlesSample::saveFile()
 {
     std::string filename;
     filename = FileSystem::displayFileDialog(FileSystem::SAVE, "Save Particle File", "Particle Files", "particle", "res");
@@ -350,7 +368,7 @@ void ParticlesGame::saveFile()
         "        path = " << texturePath << "\n" <<
         "        width = " << e->getSpriteWidth() << "\n" <<
         "        height = " << e->getSpriteHeight() << "\n" <<
-        "        blending = " << toString(e->getTextureBlending()) << "\n" <<
+        "        blendMode = " << toString(e->getBlendMode()) << "\n" <<
         "        animated = " << toString(e->isSpriteAnimated()) << "\n" <<
         "        looped = " << toString(e->isSpriteLooped()) << "\n" <<
         "        frameCount = " << e->getSpriteFrameCount() << "\n" <<
@@ -400,7 +418,7 @@ void ParticlesGame::saveFile()
     SAFE_DELETE(stream);
 }
 
-void ParticlesGame::controlEvent(Control* control, EventType evt)
+void ParticlesSample::controlEvent(Control* control, EventType evt)
 {
     std::string id = control->getId();
 
@@ -656,29 +674,25 @@ void ParticlesGame::controlEvent(Control* control, EventType evt)
                 emitter->stop();
             }
         }
-        else if (control == _vsync)
-        {
-            Game::getInstance()->setVsync(_vsync->isChecked());
-        }
         else if (id == "additive")
         {
             if (((RadioButton*)control)->isSelected())
-                emitter->setTextureBlending(ParticleEmitter::BLEND_ADDITIVE);
+                emitter->setBlendMode(ParticleEmitter::BLEND_ADDITIVE);
         }
-        else if (id == "transparent")
+        else if (id == "alpha")
         {
             if (((RadioButton*)control)->isSelected())
-                emitter->setTextureBlending(ParticleEmitter::BLEND_TRANSPARENT);
+                emitter->setBlendMode(ParticleEmitter::BLEND_ALPHA);
         }
         else if (id == "multiply")
         {
             if (((RadioButton*)control)->isSelected())
-                emitter->setTextureBlending(ParticleEmitter::BLEND_MULTIPLIED);
+                emitter->setBlendMode(ParticleEmitter::BLEND_MULTIPLIED);
         }
-        else if (id == "opaque")
+        else if (id == "none")
         {
             if (((RadioButton*)control)->isSelected())
-                emitter->setTextureBlending(ParticleEmitter::BLEND_OPAQUE);
+                emitter->setBlendMode(ParticleEmitter::BLEND_NONE);
         }
         break;
     case Listener::CLICK:
@@ -744,7 +758,7 @@ void ParticlesGame::controlEvent(Control* control, EventType evt)
     }
 }
 
-void ParticlesGame::updateFrames()
+void ParticlesSample::updateFrames()
 {
     Texture* texture = _particleEmitter->getTexture();
     TextBox* cBox = (TextBox*)_form->getControl("frameCount");
@@ -768,15 +782,14 @@ void ParticlesGame::updateFrames()
     }
 }
 
-void ParticlesGame::finalize()
+void ParticlesSample::finalize()
 {
-    SAFE_RELEASE(_scene);
-    SAFE_RELEASE(_form);
     SAFE_RELEASE(_font);
-    SAFE_RELEASE(_particleEmitter);
+    SAFE_RELEASE(_form);
+    SAFE_RELEASE(_scene);
 }
 
-void ParticlesGame::update(float elapsedTime)
+void ParticlesSample::update(float elapsedTime)
 {
     // Update camera movement
     if (_wDown)
@@ -812,13 +825,13 @@ void ParticlesGame::update(float elapsedTime)
     _particleEmitterNode->getParticleEmitter()->update(elapsedTime);
 }
 
-void ParticlesGame::render(float elapsedTime)
+void ParticlesSample::render(float elapsedTime)
 {
     // Clear the color and depth buffers.
     clear(CLEAR_COLOR_DEPTH, BACKGROUND_COLOR, 1.0f, 0);
 
     // Visit all the nodes in the scene for drawing.
-    _scene->visit(this, &ParticlesGame::drawScene, (void*)0);
+    _scene->visit(this, &ParticlesSample::drawScene, (void*)0);
 
     // Draw the UI.
     _form->draw();
@@ -827,7 +840,7 @@ void ParticlesGame::render(float elapsedTime)
     drawFrameRate(_font, Vector4(1, 1, 1, 1), 205, 40, getFrameRate());
 }
 
-bool ParticlesGame::drawScene(Node* node, void* cookie)
+bool ParticlesSample::drawScene(Node* node, void* cookie)
 {
     if (node->getModel())
         node->getModel()->draw();
@@ -836,47 +849,47 @@ bool ParticlesGame::drawScene(Node* node, void* cookie)
     return true;
 }
 
-bool ParticlesGame::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelDelta)
+bool ParticlesSample::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelDelta)
 {
     switch (evt)
     {
     case Mouse::MOUSE_PRESS_MIDDLE_BUTTON:
         Game::getInstance()->setMouseCaptured(true);
         _panning = true;
-        return true;
+        return false;
     case Mouse::MOUSE_RELEASE_MIDDLE_BUTTON:
         Game::getInstance()->setMouseCaptured(false);
         _panning = false;
-        return true;
+        return false;
     case Mouse::MOUSE_PRESS_LEFT_BUTTON:
         Game::getInstance()->setMouseCaptured(true);
         _rotating = true;
-        return true;
+        return false;
     case Mouse::MOUSE_RELEASE_LEFT_BUTTON:
         Game::getInstance()->setMouseCaptured(false);
         _rotating = false;
-        return true;
+        return false;
     case Mouse::MOUSE_PRESS_RIGHT_BUTTON:
         Game::getInstance()->setMouseCaptured(true);
         _zooming = true;
-        return true;
+        return false;
     case Mouse::MOUSE_RELEASE_RIGHT_BUTTON:
         Game::getInstance()->setMouseCaptured(false);
         _zooming = false;
-        return true;
+        return false;
     case Mouse::MOUSE_MOVE:
         if (_panning)
         {
             Vector3 n(-(float)x * PANNING_SENSITIVITY, (float)y * PANNING_SENSITIVITY, 0);
             _cameraParent->getMatrix().transformVector(&n);
             _cameraParent->translate(n);
-            return true;
+            return false;
         }
         else if (_rotating)
         {
             _cameraParent->rotateY(-MATH_DEG_TO_RAD((float)x * ROTATE_SENSITIVITY));
             _cameraParent->rotateX(-MATH_DEG_TO_RAD((float)y * ROTATE_SENSITIVITY));
-            return true;
+            return false;
         }
         else if (_zooming)
         {
@@ -884,7 +897,7 @@ bool ParticlesGame::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelDel
             v.normalize();
             v.scale((float)(x-y) * INPUT_SENSITIVITY);
             _scene->getActiveCamera()->getNode()->translate(v);
-            return true;
+            return false;
         }
         break;
 
@@ -895,15 +908,15 @@ bool ParticlesGame::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelDel
             v.normalize();
             v.scale((float)(wheelDelta));
             _scene->getActiveCamera()->getNode()->translate(v);
-            return true;
+            return false;
         }
         break;
     }
 
-    return true;
+    return false;
 }
 
-void ParticlesGame::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex)
+void ParticlesSample::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex)
 {
     // Touch events that don't hit the UI
     // allow the camera to rotate around the particle emitter.
@@ -938,7 +951,7 @@ void ParticlesGame::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int
     };
 }
 
-void ParticlesGame::keyEvent(Keyboard::KeyEvent evt, int key)
+void ParticlesSample::keyEvent(Keyboard::KeyEvent evt, int key)
 {
     switch(evt)
     {
@@ -949,8 +962,7 @@ void ParticlesGame::keyEvent(Keyboard::KeyEvent evt, int key)
             exit();
             break;
         case Keyboard::KEY_B:
-            // Disable blending.
-            _particleEmitterNode->getParticleEmitter()->setTextureBlending(ParticleEmitter::BLEND_OPAQUE);
+            _particleEmitterNode->getParticleEmitter()->setBlendMode(ParticleEmitter::BLEND_NONE);
             break;
         case Keyboard::KEY_W:
             _wDown = true;
@@ -987,7 +999,7 @@ void ParticlesGame::keyEvent(Keyboard::KeyEvent evt, int key)
     }
 }
 
-void ParticlesGame::loadEmitters()
+void ParticlesSample::loadEmitters()
 {
     // Load the default particle emitter
     _url = DEFAULT_PARTICLE_EMITTER;
@@ -999,7 +1011,7 @@ void ParticlesGame::loadEmitters()
     emitterChanged();
 }
 
-void ParticlesGame::emitterChanged()
+void ParticlesSample::emitterChanged()
 {
     ParticleEmitter* emitter = _particleEmitter;
 
@@ -1117,17 +1129,7 @@ void ParticlesGame::emitterChanged()
     emitter->start();
 }
 
-void ParticlesGame::drawSplash(void* param)
-{
-    clear(CLEAR_COLOR_DEPTH, Vector4(0, 0, 0, 1), 1.0f, 0);
-    SpriteBatch* batch = SpriteBatch::create("res/logo_powered_white.png");
-    batch->start();
-    batch->draw(this->getWidth() * 0.5f, this->getHeight() * 0.5f, 0.0f, 512.0f, 512.0f, 0.0f, 1.0f, 1.0f, 0.0f, Vector4::one(), true);
-    batch->finish();
-    SAFE_DELETE(batch);
-}
-
-void ParticlesGame::drawFrameRate(Font* font, const Vector4& color, unsigned int x, unsigned int y, unsigned int fps)
+void ParticlesSample::drawFrameRate(Font* font, const Vector4& color, unsigned int x, unsigned int y, unsigned int fps)
 {
     char buffer[30];
     sprintf(buffer, "FPS: %u\nParticles: %u", fps, _particleEmitterNode->getParticleEmitter()->getParticlesCount());
@@ -1136,27 +1138,27 @@ void ParticlesGame::drawFrameRate(Font* font, const Vector4& color, unsigned int
     font->finish();
 }
 
-void ParticlesGame::resizeEvent(unsigned int width, unsigned int height)
+void ParticlesSample::resizeEvent(unsigned int width, unsigned int height)
 {
     setViewport(gameplay::Rectangle(width, height));
     _form->setSize(width, height);
     _scene->getActiveCamera()->setAspectRatio((float)getWidth() / (float)getHeight());
 }
 
-void ParticlesGame::updateTexture()
+void ParticlesSample::updateTexture()
 {
     std::string file = FileSystem::displayFileDialog(FileSystem::OPEN, "Select Texture", "Texture Files", "png", "res");
     if (file.length() > 0)
     {
         // Set new sprite on our emitter
-        _particleEmitter->setTexture(file.c_str(), _particleEmitter->getTextureBlending());
+        _particleEmitter->setTexture(file.c_str(), _particleEmitter->getBlendMode());
 
         // Update the UI to display the new sprite
         updateImageControl();
     }
 }
 
-void ParticlesGame::updateImageControl()
+void ParticlesSample::updateImageControl()
 {
     ImageControl* img = (ImageControl*)_form->getControl("sprite");
     img->setImage(_particleEmitter->getTexture()->getPath());
@@ -1178,7 +1180,7 @@ void ParticlesGame::updateImageControl()
     ((TextBox*)_form->getControl("frameWidth"))->setText(toString(_particleEmitter->getSpriteWidth()).c_str());
     ((TextBox*)_form->getControl("frameHeight"))->setText(toString(_particleEmitter->getSpriteHeight()).c_str());
 
-    switch (_particleEmitter->getTextureBlending())
+    switch (_particleEmitter->getBlendMode())
     {
     case ParticleEmitter::BLEND_ADDITIVE:
         ((RadioButton*)_form->getControl("additive"))->setSelected(true);
@@ -1186,11 +1188,11 @@ void ParticlesGame::updateImageControl()
     case ParticleEmitter::BLEND_MULTIPLIED:
         ((RadioButton*)_form->getControl("multiply"))->setSelected(true);
         break;
-    case ParticleEmitter::BLEND_OPAQUE:
-        ((RadioButton*)_form->getControl("opaque"))->setSelected(true);
+    case ParticleEmitter::BLEND_NONE:
+        ((RadioButton*)_form->getControl("none"))->setSelected(true);
         break;
-    case ParticleEmitter::BLEND_TRANSPARENT:
-        ((RadioButton*)_form->getControl("transparent"))->setSelected(true);
+    case ParticleEmitter::BLEND_ALPHA:
+        ((RadioButton*)_form->getControl("alpha"))->setSelected(true);
         break;
     }
 }

+ 13 - 15
samples/particles/src/ParticlesGame.h → samples/browser/src/ParticlesSample.h

@@ -1,21 +1,22 @@
-#ifndef PARTICLESGAME_H_
-#define PARTICLESGAME_H_
+#ifndef PARTICLESSAMPLE_H_
+#define PARTICLESSAMPLE_H_
 
 #include "gameplay.h"
+#include "Sample.h"
 
 using namespace gameplay;
 
 /**
  * Main game class.
  */
-class ParticlesGame: public Game, Control::Listener
+class ParticlesSample: public Sample, Control::Listener
 {
 public:
 
     /**
      * Constructor.
      */
-    ParticlesGame();
+    ParticlesSample();
 
     /**
      * @see Game::touchEvent
@@ -68,8 +69,6 @@ private:
 
     bool drawScene(Node* node, void* cookie);
 
-    void drawSplash(void* param);
-
     void loadEmitters();
 
     void emitterChanged();
@@ -98,19 +97,20 @@ private:
     
     std::string toString(const Quaternion& q);
     
-    std::string toString(ParticleEmitter::TextureBlending blending);
+    std::string toString(ParticleEmitter::BlendMode blendMode);
 
     Scene* _scene;
-    Node* _particleEmitterNode;
     Node* _cameraParent;
-    Form* _form;
+    Node* _particleEmitterNode;
+    ParticleEmitter* _particleEmitter;
     bool _wDown, _sDown, _aDown, _dDown;
     bool _touched;
     int _prevX, _prevY;
-    ParticleEmitter* _particleEmitter;
-    std::string _url;
+    bool _panning;
+    bool _rotating;
+    bool _zooming;
     Font* _font;
-    
+    Form* _form;
     Slider* _startRed;
     Slider* _startGreen;
     Slider* _startBlue;
@@ -162,9 +162,7 @@ private:
     Container* _position;
     Container* _particleProperties;
     CheckBox* _vsync;
-    bool _panning;
-    bool _rotating;
-    bool _zooming;
+    std::string _url;
 };
 
 #endif

+ 3 - 3
samples/browser/src/SamplesGame.cpp

@@ -271,6 +271,7 @@ void SamplesGame::exitActiveSample()
 
     // Reset some game options
     setMultiTouch(false);
+    setMouseCaptured(false);
 }
 
 void SamplesGame::addSample(const char* category, const char* title, void* func, unsigned int order)
@@ -281,10 +282,9 @@ void SamplesGame::addSample(const char* category, const char* title, void* func,
     {
         _categories = new std::vector<std::string>();
         _categories->push_back("Graphics");
-        _categories->push_back("Scene");
-        _categories->push_back("Input");
         _categories->push_back("Physics");
-        _categories->push_back("Audio");
+        _categories->push_back("Media");
+        _categories->push_back("Input");
         _samples->resize(_categories->size());
     }
 

+ 1 - 1
samples/browser/src/SpriteBatchSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Graphics", "Sprite Batch", SpriteBatchSample, 8);
+    ADD_SAMPLE("Graphics", "Sprite Batch", SpriteBatchSample, 5);
 #endif
 
 

+ 1 - 1
samples/browser/src/TerrainSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Scene", "Terrain", TerrainSample, 4);
+    ADD_SAMPLE("Graphics", "Terrain", TerrainSample, 11);
 #endif
 
 struct TerrainHitFilter : public PhysicsController::HitFilter

+ 1 - 1
samples/browser/src/TextSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Graphics", "Text", TextSample, 9);
+    ADD_SAMPLE("Graphics", "Text", TextSample, 6);
 #endif
 
 #define FONT_COUNT 5

+ 1 - 1
samples/browser/src/TextureSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Graphics", "Textures", TextureSample, 6);
+    ADD_SAMPLE("Graphics", "Textures", TextureSample, 4);
 #endif
 
 Node* addQuadModelAndNode(Scene* scene, Mesh* mesh)

+ 1 - 1
samples/browser/src/TriangleSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-    ADD_SAMPLE("Graphics", "Draw Triangle", TriangleSample, 1);
+    ADD_SAMPLE("Graphics", "Triangle", TriangleSample, 1);
 #endif
 
 /**

+ 1 - 1
samples/browser/src/WaterSample.cpp

@@ -2,7 +2,7 @@
 #include "SamplesGame.h"
 
 #if defined(ADD_SAMPLE)
-ADD_SAMPLE("Graphics", "Water", WaterSample, 14);
+ADD_SAMPLE("Graphics", "Water", WaterSample, 12);
 #endif
 
 // Camera movement consts

+ 0 - 250
samples/lua/.cproject

@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1398371745">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1398371745" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1398371745" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug" postannouncebuildStep="Copying Assets" postbuildStep="rsync -rau ${workspace_loc:/${ProjName}}/../../gameplay/res/shaders ${workspace_loc:/${ProjName}}/res;rsync -rau ${workspace_loc:/${ProjName}}/../../gameplay/res/ui ${workspace_loc:/${ProjName}}/res;cp -rf ${workspace_loc:/${ProjName}}/../../gameplay/res/logo_powered_white.png ${workspace_loc:/${ProjName}}/res;touch -cm ${workspace_loc:/${ProjName}}/res">
-					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1398371745." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.398904927" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
-							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.988200021" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-							<builder buildPath="${workspace_loc:/sample-lua}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.876200166" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
-							<tool id="cdt.managedbuild.tool.gnu.archiver.base.866735685" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.560898115" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
-								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1429296446" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1898159997" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.preprocessor.def.398281249" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="__linux__"/>
-									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.include.paths.2075462944" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;../../../gameplay/src&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/bullet/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/lua/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/png/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/zlib/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/ogg/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/vorbis/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/openal/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/glew/include&quot;"/>
-									<listOptionValue builtIn="false" value="/usr/include/gtk-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/gtk-2.0/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/atk-1.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/cairo"/>
-									<listOptionValue builtIn="false" value="/usr/include/gdk-pixbuf-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/pango-1.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/gio-unix-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/freetype2"/>
-									<listOptionValue builtIn="false" value="/usr/include/glib-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/glib-2.0/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/pixman-1"/>
-									<listOptionValue builtIn="false" value="/usr/include/libpng12"/>
-									<listOptionValue builtIn="false" value="/usr/include/harfbuzz"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.other.other.1908541726" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++11 -lstdc++ -pthread" valueType="string"/>
-								<option id="gnu.cpp.compiler.option.warnings.allwarn.1722542853" name="All warnings (-Wall)" superClass="gnu.cpp.compiler.option.warnings.allwarn" value="false" valueType="boolean"/>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1748163672" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.410617847" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
-								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.2115184363" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
-								<option id="gnu.c.compiler.exe.debug.option.debugging.level.574923725" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.387429259" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.255205051" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1660616117" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
-								<option id="gnu.cpp.link.option.libs.658028748" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value="gameplay"/>
-									<listOptionValue builtIn="false" value="m"/>
-									<listOptionValue builtIn="false" value="lua"/>
-									<listOptionValue builtIn="false" value="png"/>
-									<listOptionValue builtIn="false" value="z"/>
-									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="ogg"/>
-									<listOptionValue builtIn="false" value="BulletDynamics"/>
-									<listOptionValue builtIn="false" value="BulletCollision"/>
-									<listOptionValue builtIn="false" value="LinearMath"/>
-									<listOptionValue builtIn="false" value="openal"/>
-									<listOptionValue builtIn="false" value="GLEW"/>
-									<listOptionValue builtIn="false" value="GL"/>
-									<listOptionValue builtIn="false" value="rt"/>
-									<listOptionValue builtIn="false" value="dl"/>
-									<listOptionValue builtIn="false" value="X11"/>
-									<listOptionValue builtIn="false" value="pthread"/>
-									<listOptionValue builtIn="false" value="gtk-x11-2.0"/>
-									<listOptionValue builtIn="false" value="glib-2.0"/>
-									<listOptionValue builtIn="false" value="gobject-2.0"/>
-								</option>
-								<option id="gnu.cpp.link.option.paths.1559970707" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/lua/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/zlib/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/png/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/bullet/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/ogg/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/vorbis/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/openal/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/glew/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/gameplay/${ConfigName}}"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2103321597" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1170110256" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1289775511" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1305822535">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1305822535" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1305822535" name="Release" parent="cdt.managedbuild.config.gnu.exe.release" postannouncebuildStep="Copying Assets" postbuildStep="rsync -rau ${workspace_loc:/${ProjName}}/../../gameplay/res/shaders ${workspace_loc:/${ProjName}}/res;rsync -rau ${workspace_loc:/${ProjName}}/../../gameplay/res/ui ${workspace_loc:/${ProjName}}/res;cp -rf ${workspace_loc:/${ProjName}}/../../gameplay/res/logo_powered_white.png ${workspace_loc:/${ProjName}}/res;touch -cm ${workspace_loc:/${ProjName}}/res">
-					<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1305822535." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.398290673" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
-							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.381241351" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-							<builder buildPath="${workspace_loc:/sample-lua}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.294700975" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
-							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1090574164" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1104638363" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
-								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.476201955" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.366487993" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.preprocessor.def.1473907832" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="__linux__"/>
-									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.include.paths.1197336809" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/gameplay/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/bullet/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/lua/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/png/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/zlib/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/ogg/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/vorbis/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/openal/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/glew/include&quot;"/>
-									<listOptionValue builtIn="false" value="/usr/include/gtk-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/gtk-2.0/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/atk-1.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/cairo"/>
-									<listOptionValue builtIn="false" value="/usr/include/gdk-pixbuf-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/pango-1.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/gio-unix-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/freetype2"/>
-									<listOptionValue builtIn="false" value="/usr/include/glib-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/glib-2.0/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/pixman-1"/>
-									<listOptionValue builtIn="false" value="/usr/include/libpng12"/>
-									<listOptionValue builtIn="false" value="/usr/include/harfbuzz"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.other.other.1124272762" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++11 -lstdc++ -pthread" valueType="string"/>
-								<option id="gnu.cpp.compiler.option.warnings.allwarn.83712620" name="All warnings (-Wall)" superClass="gnu.cpp.compiler.option.warnings.allwarn" value="false" valueType="boolean"/>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1575112738" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.2049307243" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
-								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1514495442" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
-								<option id="gnu.c.compiler.exe.release.option.debugging.level.1595029142" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1300873811" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1181871462" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1709838127" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
-								<option id="gnu.cpp.link.option.libs.420872388" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value="gameplay"/>
-									<listOptionValue builtIn="false" value="m"/>
-									<listOptionValue builtIn="false" value="lua"/>
-									<listOptionValue builtIn="false" value="png"/>
-									<listOptionValue builtIn="false" value="z"/>
-									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="ogg"/>
-									<listOptionValue builtIn="false" value="BulletDynamics"/>
-									<listOptionValue builtIn="false" value="BulletCollision"/>
-									<listOptionValue builtIn="false" value="LinearMath"/>
-									<listOptionValue builtIn="false" value="openal"/>
-									<listOptionValue builtIn="false" value="GLEW"/>
-									<listOptionValue builtIn="false" value="GL"/>
-									<listOptionValue builtIn="false" value="rt"/>
-									<listOptionValue builtIn="false" value="dl"/>
-									<listOptionValue builtIn="false" value="X11"/>
-									<listOptionValue builtIn="false" value="pthread"/>
-									<listOptionValue builtIn="false" value="gtk-x11-2.0"/>
-									<listOptionValue builtIn="false" value="glib-2.0"/>
-									<listOptionValue builtIn="false" value="gobject-2.0"/>
-								</option>
-								<option id="gnu.cpp.link.option.paths.837073668" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/lua/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/zlib/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/png/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/bullet/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/ogg/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/vorbis/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/openal/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/glew/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/gameplay/${ConfigName}}"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1263974058" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.880384457" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1657783485" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="sample-lua.cdt.managedbuild.target.gnu.exe.2043390756" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1305822535;cdt.managedbuild.config.gnu.exe.release.1305822535.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.2049307243;cdt.managedbuild.tool.gnu.c.compiler.input.1300873811">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1398371745;cdt.managedbuild.config.gnu.exe.debug.1398371745.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.410617847;cdt.managedbuild.tool.gnu.c.compiler.input.387429259">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1305822535;cdt.managedbuild.config.gnu.exe.release.1305822535.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1104638363;cdt.managedbuild.tool.gnu.cpp.compiler.input.1575112738">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1398371745;cdt.managedbuild.config.gnu.exe.debug.1398371745.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.560898115;cdt.managedbuild.tool.gnu.cpp.compiler.input.1748163672">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/sample-lua"/>
-		</configuration>
-		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/sample-lua"/>
-		</configuration>
-	</storageModule>
-</cproject>

+ 0 - 28
samples/lua/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sample-lua</name>
-	<comment></comment>
-	<projects>
-		<project>gameplay</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>

+ 0 - 27
samples/lua/CMakeLists.txt

@@ -1,27 +0,0 @@
-set(GAME_NAME sample-lua)
-
-set(GAME_SRC
-    src/LuaGame.cpp
-    src/LuaGame.h
-)
-
-add_executable(${GAME_NAME}
-    ${GAME_SRC}
-)
-
-target_link_libraries(${GAME_NAME} ${GAMEPLAY_LIBRARIES})
-
-set_target_properties(${GAME_NAME} PROPERTIES
-    OUTPUT_NAME "${GAME_NAME}"
-    CLEAN_DIRECT_OUTPUT 1
-)
-
-source_group(res FILES ${GAME_RES} ${GAMEPLAY_RES} ${GAMEPLAY_RES_SHADERS} ${GAMEPLAY_RES_UI})
-source_group(src FILES ${GAME_SRC})
-
-COPY_RES( ${GAME_NAME} )
-COPY_RES_EXTRA( ${GAME_NAME} ${CMAKE_SOURCE_DIR}/gameplay
-    res/logo_powered_white.png 
-    res/shaders/*
-    res/ui/*
-)

BIN
samples/lua/[email protected]


+ 0 - 9
samples/lua/android/.classpath

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>

+ 0 - 57
samples/lua/android/.cproject

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.android.toolchain.gcc.135762196">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.135762196" moduleId="org.eclipse.cdt.core.settings" name="Default">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.android.toolchain.gcc.135762196" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
-					<folderInfo id="com.android.toolchain.gcc.135762196.412640941" name="/" resourcePath="">
-						<toolChain id="com.android.toolchain.gcc.1331449750" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
-							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.1635460037" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.141968149" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
-								<outputEntries>
-									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
-									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>
-								</outputEntries>
-							</builder>
-							<tool id="com.android.gcc.compiler.945401023" name="Android GCC Compiler" superClass="com.android.gcc.compiler">
-								<inputType id="com.android.gcc.inputType.491829714" superClass="com.android.gcc.inputType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="jni"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="sample-lua.null.648127177" name="sample-lua"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.135762196;com.android.toolchain.gcc.135762196.412640941;com.android.gcc.compiler.945401023;com.android.gcc.inputType.491829714">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.android.AndroidPerProjectProfile"/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Default">
-			<resource resourceType="PROJECT" workspacePath="/sample-lua"/>
-		</configuration>
-	</storageModule>
-</cproject>

+ 0 - 57
samples/lua/android/.project

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sample-lua</name>
-	<comment></comment>
-	<projects>
-		<project>gameplay</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>src</name>
-			<type>2</type>
-			<locationURI>$%257BPARENT-2-PROJECT_LOC%257D/lua/src</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>

+ 0 - 25
samples/lua/android/AndroidManifest.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="org.gameplay3d.sample_lua"
-        android:versionCode="1"
-        android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="16" />
-	<uses-feature android:glEsVersion="0x00020000"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
-                android:label="@string/app_name"
-                android:configChanges="orientation|screenSize|keyboardHidden"
-				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:screenOrientation="landscape">
-            <meta-data android:name="android.app.lib_name" android:value="sample-lua" />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest> 

+ 0 - 62
samples/lua/android/build.xml

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="sample-lua" default="help">
-
-    <property file="local.properties" />
-    <property file="ant.properties" />
-
-    <loadproperties srcFile="project.properties" />
-
-    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project -t 1 -p . -s'" unless="sdk.dir" />
-	<fail message="OS not supported. Supported platforms: Windows, MacOS X or Linux.">
-	    <condition>
-	      <not>
-	        <or>
-	          <os family="unix"/>
-	          <os family="windows"/>
-	        </or>
-	      </not>
-	    </condition>
-	</fail>
-	<macrodef name="build-native">
-		<attribute name="location"/>
-	     <sequential>
-            <exec osfamily="unix" dir="@{location}/android" executable="ndk-build">
-                <arg value="-j4"/>
-            </exec>
-			<exec osfamily="windows" dir="@{location}/android" executable="cmd">
-				<arg value="/c"/>
-				<arg value="ndk-build -j4"/>
-			</exec> 
-	    </sequential>
-	</macrodef>
-    
-    <target name="-pre-build">
-		<build-native location="../../../gameplay"/>
-    	<build-native location=".."/>
-        <mkdir dir="../src/org/gameplay3d"/>
-	    <copy todir="../src/org/gameplay3d">
-            <fileset dir="../../../gameplay/src/org/gameplay3d"/>
-	    </copy>
-    </target>
-
-    <target name="-post-compile">
-        <copy file="../game.config" tofile="assets/game.config"/>
-        <copy file="../res/ai.lua" tofile="assets/res/ai.lua"/>
-        <copy file="../res/game.lua" tofile="assets/res/game.lua"/>
-        <copy file="../res/lua.gpb" tofile="assets/res/lua.gpb"/>
-        <copy file="../res/lua.material" tofile="assets/res/lua.material"/>
-        <copy file="../res/lua.scene" tofile="assets/res/lua.scene"/>
-        <copy file="../res/lua-logo.png" tofile="assets/res/lua-logo.png"/>
-        <copy file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
-        <copy todir="assets/res/shaders">
-            <fileset dir="../../../gameplay/res/shaders"/>
-        </copy>
-         <copy todir="assets/res/ui">
-            <fileset dir="../../../gameplay/res/ui"/>
-        </copy>
-    </target>
-
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>

+ 0 - 95
samples/lua/android/jni/Android.mk

@@ -1,95 +0,0 @@
-SAMPLE_PATH := $(call my-dir)/../../src
-
-# external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
-OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
-VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
-OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
-
-# libgameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/$(TARGET_ARCH_ABI)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libgameplay
-LOCAL_SRC_FILES := libgameplay.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-# libpng
-LOCAL_PATH := $(PNG_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libpng 
-LOCAL_SRC_FILES := libpng.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libz
-LOCAL_PATH := $(ZLIB_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libz
-LOCAL_SRC_FILES := libz.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# liblua
-LOCAL_PATH := $(LUA_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := liblua
-LOCAL_SRC_FILES := liblua.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libLinearMath
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libLinearMath
-LOCAL_SRC_FILES := libLinearMath.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libBulletCollision
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libBulletCollision
-LOCAL_SRC_FILES := libBulletCollision.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libBulletDynamics
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libBulletDynamics
-LOCAL_SRC_FILES := libBulletDynamics.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libogg
-LOCAL_PATH := $(OGG_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libogg
-LOCAL_SRC_FILES := libogg.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libvorbis
-LOCAL_PATH := $(VORBIS_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libvorbis
-LOCAL_SRC_FILES := libvorbis.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libOpenAL
-LOCAL_PATH := $(OPENAL_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libOpenAL
-LOCAL_SRC_FILES := libOpenAL.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# sample-lua
-LOCAL_PATH := $(SAMPLE_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := sample-lua
-LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp LuaGame.cpp
-LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
-LOCAL_ARM_MODE := arm
-LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lOpenSLES
-LOCAL_CFLAGS    := -D__ANDROID__ -I"../../../external-deps/lua/include" -I"../../../external-deps/bullet/include" -I"../../../external-deps/png/include" -I"../../../external-deps/ogg/include" -I"../../../external-deps/vorbis/include" -I"../../../external-deps/openal/include" -I"../../../gameplay/src"
-LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
-LOCAL_SHARED_LIBRARIES := gameplay
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,android/native_app_glue)

+ 0 - 6
samples/lua/android/jni/Application.mk

@@ -1,6 +0,0 @@
-NDK_TOOLCHAIN_VERSION := 4.8
-APP_CPPFLAGS += -std=c++11
-APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a x86
-APP_PLATFORM := android-16
-

+ 0 - 4
samples/lua/android/project.properties

@@ -1,4 +0,0 @@
-target=android-16
-android.library=false
-source.dir=../src
-

BIN
samples/lua/android/res/drawable/icon.png


+ 0 - 4
samples/lua/android/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Lua</string>
-</resources>

+ 0 - 17
samples/lua/game.config

@@ -1,17 +0,0 @@
-window
-{
-    title = Lua
-    width = 1280
-    height = 720
-    fullscreen = false
-}
-
-scripts
-{
-    initialize = res/game.lua#initialize
-    update = res/game.lua#update
-    render = res/game.lua#render
-    finalize = res/game.lua#finalize
-    keyEvent = res/game.lua#keyEvent
-    touchEvent = res/game.lua#touchEvent
-}

BIN
samples/lua/icon.png


+ 0 - 84
samples/lua/res/ai.lua

@@ -1,84 +0,0 @@
--- Create an AIAgent for the box
-_modelNode:setAgent(AIAgent.create())
-
--- Store state machine for agent
-_stateMachine = _modelNode:getAgent():getStateMachine()
-
--- Register AI states
-stateIdle = _stateMachine:addState("idle")
-
-stateSpinning = _stateMachine:addState("spinning")
-stateSpinning:addScriptCallback("update", "spinningUpdate")
-
-stateSpinning = _stateMachine:addState("sliding")
-stateSpinning:addScriptCallback("enter", "slidingEnter")
-stateSpinning:addScriptCallback("exit", "slidingExit")
-
-stateBouncing = _stateMachine:addState("bouncing")
-stateBouncing:addScriptCallback("enter", "bouncingEnter")
-stateBouncing:addScriptCallback("exit", "bouncingExit")
-
-stateScale = _stateMachine:addState("scale")
-stateScale:addScriptCallback("enter", "scaleEnter")
-stateScale:addScriptCallback("exit", "scaleExit")
-
--- Set initial state
-_stateMachine:setState("spinning")
-
--- Create animations
-_slidingClip = _modelNode:createAnimation("sliding", Transform.ANIMATE_TRANSLATE(), 6, { 0, 250, 750, 1250, 1750, 2000 }, { 0,0,0, 2,0,0, 2,0,-4, -2,0,-4, -2,0,0, 0,0,0 }, Curve.LINEAR):getClip()
-_slidingClip:setRepeatCount(AnimationClip.REPEAT_INDEFINITE())
-_bouncingClip = _modelNode:createAnimation("bouncing", Transform.ANIMATE_TRANSLATE_Y(), 3, { 0, 500, 1000 }, { 0, 0.75, 0 }, Curve.CUBIC_IN_OUT):getClip()
-_bouncingClip:setRepeatCount(AnimationClip.REPEAT_INDEFINITE())
-_scaleClip = _modelNode:createAnimation("scale", Transform.ANIMATE_SCALE(), 3, { 0, 750, 1500 }, { 1,1,1, 2,2,2, 1,1,1 }, Curve.QUADRATIC_IN_OUT):getClip()
-_scaleClip:setRepeatCount(AnimationClip.REPEAT_INDEFINITE())
-
--- Called by game.lua to toggle AI state
-function toggleState()
-    local state = _stateMachine:getActiveState():getId()
-    if state == "spinning" then
-        _stateMachine:setState("sliding")
-    elseif state == "sliding" then
-        _stateMachine:setState("bouncing")
-    elseif state == "bouncing" then
-        _stateMachine:setState("scale")
-    elseif state == "scale" then
-        _stateMachine:setState("idle")
-    elseif state == "idle" then
-        _stateMachine:setState("spinning")
-    end
-end
-
--- SPINNING state handlers
-function spinningUpdate(agent, state, elapsedTime)
-    _modelNode:rotateY(elapsedTime * math.rad(0.05))
-end
-
--- SLIDING state handlers
-function slidingEnter(agent, state)
-    _slidingClip:play()
-end
-
-function slidingExit(agent, state)
-    _slidingClip:pause()
-end
-
--- BOUNCING state handlers
-function bouncingEnter(agent, state)
-    _bouncingClip:play()
-end
-
-function bouncingExit(agent, state)
-    _bouncingClip:pause()
-end
-
--- SCALE state handlers
-function scaleEnter(agent, state)
-    _scaleClip:play()
-end
-
-function scaleExit(agent, state)
-    _scaleClip:pause()
-end
-
-

+ 0 - 182
samples/lua/res/game.lua

@@ -1,182 +0,0 @@
--- This lua script file represents a lua implementation translation of sample00-mesh with a box instead of a duck.
-
-function initialize()
-    -- Display splash screen for at least 1 second.
-    ScreenDisplayer.start("drawSplash", 1000)
-
-    _touched = false
-    _touchX = 0
-
-    -- Load font
-    _font = Font.create("res/ui/arial.gpb")
-
-    -- Load mesh/scene from file
-    _scene = Scene.load("res/lua.scene")
-
-    -- Get the box node
-    _modelNode = _scene:findNode("box")
-
-    -- Find the light node
-    local lightNode = _scene:findNode("directionalLight1")
-
-    -- Bind the light node's direction into the box material.
-    _modelNode:getModel():getMaterial():getParameter("u_directionalLightColor[0]"):setValue(lightNode:getLight():getColor())
-    _modelNode:getModel():getMaterial():getParameter("u_directionalLightDirection[0]"):bindValue(lightNode, "&Node::getForwardVectorWorld")
-
-    -- Update the aspect ratio for our scene's camera to match the current device resolution
-    local game = Game.getInstance()
-    _scene:getActiveCamera():setAspectRatio(game:getWidth() / game:getHeight())
-
-    -- Create the grid and add it to the scene.
-    local model = createGridModel()
-    _scene:addNode("grid"):setModel(model)
-
-    -- Load the AI script
-    game:getScriptController():loadScript("res/ai.lua")
-
-    ScreenDisplayer.finish()
-end
-
-function update(elapsedTime)
-end
-
--- Avoid allocating new objects every frame.
-textColor = Vector4.new(0, 0.5, 1, 1)
-
-function render(elapsedTime)
-    -- Clear the color and depth buffers.
-    Game.getInstance():clear(Game.CLEAR_COLOR_DEPTH, Vector4.zero(), 1.0, 0)
-
-    -- Visit all the nodes in the scene, drawing the models/mesh.
-    _scene:visit("drawScene")
-
-    -- Draw the fps.
-    local buffer = string.format("%u\n%s", Game.getInstance():getFrameRate(), _stateMachine:getActiveState():getId())
-    _font:start()
-    _font:drawText(buffer, 5, 1, textColor, 18)
-    _font:finish()
-end
-
-function finalize()
-    _font = nil
-    _scene = nil
-end
-
-function drawScene(node)
-    local model = node:getModel()
-    if model then
-        model:draw()
-    end
-    return true
-end
-
-function drawSplash()
-    local game = Game.getInstance()
-    game:clear(Game.CLEAR_COLOR_DEPTH, 0, 0, 0, 1, 1.0, 0)
-    local batch = SpriteBatch.create("res/logo_powered_white.png")
-    batch:start()
-    batch:draw(game:getWidth() * 0.5, game:getHeight() * 0.5, 0.0, 512.0, 512.0, 0.0, 1.0, 1.0, 0.0, Vector4.one(), true)
-    batch:finish()
-end
-
-function keyEvent(evt, key)
-    if evt == Keyboard.KEY_PRESS then
-        if key == Keyboard.KEY_ESCAPE then
-            Game.getInstance():exit()
-        end
-    end
-end
-
-function touchEvent(evt, x, y, contactIndex)
-    if evt == Touch.TOUCH_PRESS then
-        _touchTime = Game.getAbsoluteTime()
-        _touched = true
-        _touchX = x
-    elseif evt == Touch.TOUCH_RELEASE then
-        _touched = false
-        _touchX = 0
-
-        -- Basic emulation of tap to change state
-        if (Game.getAbsoluteTime() - _touchTime) < 200 then
-            toggleState()
-        end
-    elseif evt == Touch.TOUCH_MOVE then
-        local deltaX = x - _touchX
-        _touchX = x
-        _modelNode:rotateY(math.rad(deltaX * 0.5))
-    end    
-end
-
-function createGridModel()
-    local lineCount = 41
-    local pointCount = lineCount * 4
-    local verticesSize = pointCount * (3 + 3)
-
-    local vertices = {}
-    local gridLength = math.floor(lineCount / 2)
-    local value = -gridLength
-
-    while #vertices + 1 < verticesSize do
-        -- Default line color is dark grey
-        local red, green, blue = 0.3, 0.3, 0.3
-
-        -- Every 10th line is brighter grey
-        if math.floor(value + 0.5) % 10 == 0 then
-            red, green, blue = 0.45, 0.45, 0.45
-        end
-        -- The Z axis is blue
-        if value == 0 then
-            red, green, blue = 0.15, 0.15, 0.7
-        end
-
-        -- Build the lines
-        vertices[#vertices+1] = value
-        vertices[#vertices+1] = 0.0
-        vertices[#vertices+1] = -gridLength
-        vertices[#vertices+1] = red
-        vertices[#vertices+1] = green
-        vertices[#vertices+1] = blue
-
-        vertices[#vertices+1] = value
-        vertices[#vertices+1] = 0.0
-        vertices[#vertices+1] = gridLength
-        vertices[#vertices+1] = red
-        vertices[#vertices+1] = green
-        vertices[#vertices+1] = blue
-
-        -- The X axis is red
-        if value == 0.0 then
-            red, green, blue = 0.7, 0.15, 0.15
-        end
-        vertices[#vertices+1] = -gridLength
-        vertices[#vertices+1] = 0.0
-        vertices[#vertices+1] = value
-        vertices[#vertices+1] = red
-        vertices[#vertices+1] = green
-        vertices[#vertices+1] = blue
-
-        vertices[#vertices+1] = gridLength
-        vertices[#vertices+1] = 0.0
-        vertices[#vertices+1] = value
-        vertices[#vertices+1] = red
-        vertices[#vertices+1] = green
-        vertices[#vertices+1] = blue
-
-        value = value + 1.0
-    end
-
-    local elements = { 
-        VertexFormat.Element.new(VertexFormat.POSITION, 3),
-        VertexFormat.Element.new(VertexFormat.COLOR, 3)
-    }
-    local mesh = Mesh.createMesh(VertexFormat.new(elements, 2), pointCount, false)
-    if mesh == nil then
-        return nil, "Error creating grid mesh."
-    end
-    mesh:setPrimitiveType(Mesh.LINES)
-    mesh:setVertexData(vertices, 0, pointCount)
-
-    local model = Model.create(mesh)
-    model:setMaterial("res/lua.material#grid")
-    return model
-end

BIN
samples/lua/res/lua-logo.png


BIN
samples/lua/res/lua.fbx


BIN
samples/lua/res/lua.gpb


+ 0 - 62
samples/lua/res/lua.material

@@ -1,62 +0,0 @@
-material cube
-{
-    technique
-    {
-        pass 0
-        {
-            // shaders
-            vertexShader = res/shaders/textured.vert
-            fragmentShader = res/shaders/textured.frag
-            defines = SPECULAR;DIRECTIONAL_LIGHT_COUNT 1
-            
-            // uniforms
-            u_worldViewProjectionMatrix = WORLD_VIEW_PROJECTION_MATRIX
-            u_inverseTransposeWorldViewMatrix = INVERSE_TRANSPOSE_WORLD_VIEW_MATRIX
-            u_cameraPosition = CAMERA_WORLD_POSITION
-            u_ambientColor = SCENE_AMBIENT_COLOR
-            u_specularExponent = 50
-            
-            // samplers
-            sampler u_diffuseTexture
-            {
-                path = res/lua-logo.png
-                mipmap = true
-                wrapS = CLAMP
-                wrapT = CLAMP
-                minFilter = LINEAR_MIPMAP_LINEAR
-                magFilter = LINEAR
-            }
-
-            // render state
-            renderState
-            {
-                cullFace = true
-                depthTest = true
-            }
-        }
-    }
-}
-
-material grid
-{
-    technique
-    {
-        pass 0
-        {
-            // shaders
-            vertexShader = res/shaders/colored.vert
-            fragmentShader = res/shaders/colored.frag
-			defines = VERTEX_COLOR
-
-             // uniforms
-            u_worldViewProjectionMatrix = WORLD_VIEW_PROJECTION_MATRIX
-            
-            // render state
-            renderState
-            {
-                cullFace = true
-                depthTest = true
-            }
-        }
-    }
-}

BIN
samples/lua/res/lua.mb


+ 0 - 9
samples/lua/res/lua.scene

@@ -1,9 +0,0 @@
-scene
-{
-    path = res/lua.gpb
-    
-    node box
-    {
-        material = res/lua.material
-    }
-}

+ 0 - 38
samples/lua/sample-lua-ios.plist

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Lua</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.png</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.gameplay3d.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.games</string>
-	<key>UIStatusBarHidden</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
-</plist>

+ 0 - 32
samples/lua/sample-lua-macosx.plist

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.png</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.gameplay3d.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.games</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

+ 0 - 81
samples/lua/sample-lua.pro

@@ -1,81 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator
-#
-#-------------------------------------------------
-
-QT -= core gui
-
-TARGET = sample-lua
-TEMPLATE = app
-
-SOURCES += src/LuaGame.cpp
-
-HEADERS += src/LuaGame.h 
-
-INCLUDEPATH += $$PWD/../../gameplay/src
-INCLUDEPATH += $$PWD/../../external-deps/bullet/include
-INCLUDEPATH += $$PWD/../../external-deps/lua/include
-INCLUDEPATH += $$PWD/../../external-deps/png/include
-INCLUDEPATH += $$PWD/../../external-deps/zlib/include
-INCLUDEPATH += $$PWD/../../external-deps/ogg/include
-INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
-INCLUDEPATH += $$PWD/../../external-deps/openal/include
-linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
-linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/atk-1.0
-linux:!android: INCLUDEPATH += /usr/include/cairo
-linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-linux:!android: INCLUDEPATH += /usr/include/pango-1.0
-linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
-linux:!android: INCLUDEPATH += /usr/include/freetype2
-linux:!android: INCLUDEPATH += /usr/include/glib-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/pixman-1
-linux:!android: INCLUDEPATH += /usr/include/libpng12
-linux:!android: INCLUDEPATH += /usr/include/harfbuzz
-DEPENDPATH += INCLUDEPATH
-
-linux:!android: DEFINES += GP_USE_GAMEPAD
-linux:!android: DEFINES += __linux__
-linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
-
-linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
-linux:!android: LIBS += -lm
-linux:!android: LIBS += -lGL
-linux:!android: LIBS += -lrt
-linux:!android: LIBS += -ldl
-linux:!android: LIBS += -lX11
-linux:!android: LIBS += -lpthread
-linux:!android: LIBS += -lgtk-x11-2.0
-linux:!android: LIBS += -lglib-2.0
-linux:!android: LIBS += -lgobject-2.0
-
-linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
-
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-
-

+ 0 - 198
samples/lua/sample-lua.vcxproj

@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugMem|x64">
-      <Configuration>DebugMem</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>sample-lua</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Configuration)\</OutDir>
-    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <CustomBuildBeforeTargets />
-    <IntDir>$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Configuration)\</OutDir>
-    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <CustomBuildBeforeTargets />
-    <IntDir>$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(Configuration)\</OutDir>
-    <CustomBuildBeforeTargets />
-    <IntDir>$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\gameplay\src;..\..\external-deps\bullet\include;..\..\external-deps\lua\include;..\..\external-deps\openal\include\AL;..\..\external-deps\ogg\include;..\..\external-deps\vorbis\include;..\..\external-deps\png\include;..\..\external-deps\zlib\include;..\..\external-deps\glew\include</AdditionalIncludeDirectories>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>OpenGL32.lib;GLU32.lib;GLEW.lib;OpenAL.lib;lua.lib;png.lib;zlib.lib;gameplay.lib;ogg.lib;vorbis.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\external-deps\lua\lib\windows\x64\Debug;..\..\external-deps\bullet\lib\windows\x64\Debug;..\..\external-deps\openal\lib\windows\x64\Debug;..\..\external-deps\ogg\lib\windows\x64\Debug;..\..\external-deps\vorbis\lib\windows\x64\Debug;..\..\external-deps\glew\lib\windows\x64\Debug;..\..\external-deps\png\lib\windows\x64\Debug;..\..\external-deps\zlib\lib\windows\x64\Debug;..\..\gameplay\windows\x64\Debug</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-      <Message>
-      </Message>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent>
-      <Command>xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d
-xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d
-copy ..\..\gameplay\res\logo_powered_white.png res</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;GP_USE_MEM_LEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\gameplay\src;..\..\external-deps\bullet\include;..\..\external-deps\lua\include;..\..\external-deps\openal\include\AL;..\..\external-deps\ogg\include;..\..\external-deps\vorbis\include;..\..\external-deps\png\include;..\..\external-deps\zlib\include;..\..\external-deps\glew\include</AdditionalIncludeDirectories>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ShowIncludes>false</ShowIncludes>
-      <PreprocessToFile>false</PreprocessToFile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>OpenGL32.lib;GLU32.lib;GLEW.lib;OpenAL.lib;lua.lib;png.lib;zlib.lib;gameplay.lib;ogg.lib;vorbis.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\external-deps\lua\lib\windows\x64\Debug;..\..\external-deps\bullet\lib\windows\x64\Debug;..\..\external-deps\openal\lib\windows\x64\Debug;..\..\external-deps\ogg\lib\windows\x64\Debug;..\..\external-deps\vorbis\lib\windows\x64\Debug;..\..\external-deps\glew\lib\windows\x64\Debug;..\..\external-deps\png\lib\windows\x64\Debug;..\..\external-deps\zlib\lib\windows\x64\Debug;..\..\gameplay\windows\x64\DebugMem</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-      <Message>
-      </Message>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent>
-      <Command>xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d
-xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d
-copy ..\..\gameplay\res\logo_powered_white.png res</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\gameplay\src;..\..\external-deps\bullet\include;..\..\external-deps\lua\include;..\..\external-deps\openal\include\AL;..\..\external-deps\ogg\include;..\..\external-deps\vorbis\include;..\..\external-deps\png\include;..\..\external-deps\zlib\include;..\..\external-deps\glew\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>OpenGL32.lib;GLU32.lib;GLEW.lib;OpenAL.lib;lua.lib;png.lib;zlib.lib;gameplay.lib;ogg.lib;vorbis.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\external-deps\lua\lib\windows\x64\Release;..\..\external-deps\bullet\lib\windows\x64\Release;..\..\external-deps\openal\lib\windows\x64\Release;..\..\external-deps\ogg\lib\windows\x64\Release;..\..\external-deps\vorbis\lib\windows\x64\Release;..\..\external-deps\glew\lib\windows\x64\Release;..\..\external-deps\png\lib\windows\x64\Release;..\..\external-deps\zlib\lib\windows\x64\Release;..\..\gameplay\windows\x64\Release</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-      <Message>
-      </Message>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent>
-      <Command>xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d
-xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d
-copy ..\..\gameplay\res\logo_powered_white.png res</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="bar-descriptor.xml">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="game.config" />
-    <None Include="icon.png" />
-    <None Include="res\ai.lua" />
-    <None Include="res\game.lua" />
-    <None Include="res\lua.fbx" />
-    <None Include="res\lua.gpb" />
-    <None Include="res\lua.material" />
-    <None Include="res\lua.mb" />
-    <None Include="res\lua.scene" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\LuaGame.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\LuaGame.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="res\lua-logo.png" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

+ 0 - 53
samples/lua/sample-lua.vcxproj.filters

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="res">
-    </Filter>
-    <Filter Include="src">
-    </Filter>
-    <Filter Include="res\shaders">
-      <UniqueIdentifier>{68243144-f027-4318-bbef-5f0e62ae5e82}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="icon.png" />
-    <None Include="bar-descriptor.xml" />
-    <None Include="game.config" />
-    <None Include="res\ai.lua">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\game.lua">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.gpb">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.material">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.mb">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.scene">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.fbx">
-      <Filter>res</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\LuaGame.h">
-      <Filter>src</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\LuaGame.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="res\lua-logo.png">
-      <Filter>res</Filter>
-    </Image>
-  </ItemGroup>
-</Project>

+ 0 - 15
samples/lua/sample-lua.vcxproj.user

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;../../bin/windows;</LocalDebuggerEnvironment>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;../../bin/windows;</LocalDebuggerEnvironment>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;../../bin/windows;</LocalDebuggerEnvironment>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>

+ 0 - 643
samples/lua/sample-lua.xcodeproj/project.pbxproj

@@ -1,643 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		421090EE18299F3A00761E40 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 421090ED18299F3A00761E40 /* GameKit.framework */; };
-		422E8EDF19586791001DE81F /* libBulletCollision.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 422E8EDC19586791001DE81F /* libBulletCollision.a */; };
-		422E8EE019586791001DE81F /* libBulletDynamics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 422E8EDD19586791001DE81F /* libBulletDynamics.a */; };
-		422E8EE119586791001DE81F /* libLinearMath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 422E8EDE19586791001DE81F /* libLinearMath.a */; };
-		42438B531491AD2000D218B8 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42438B521491AD2000D218B8 /* libgameplay.a */; };
-		424CC03E161FCC1700577827 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424CC03D161FCC1700577827 /* IOKit.framework */; };
-		425EDAA017FB3F4000AABF95 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 425EDA9917FB3F4000AABF95 /* liblua.a */; };
-		425EDAA117FB3F4000AABF95 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 425EDA9A17FB3F4000AABF95 /* libpng.a */; };
-		425EDAA217FB3F4000AABF95 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 425EDA9B17FB3F4000AABF95 /* libogg.a */; };
-		425EDAA317FB3F4000AABF95 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 425EDA9C17FB3F4000AABF95 /* libvorbis.a */; };
-		42A1E952195521E800C26E5C /* libBulletCollision.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A1E94F195521E800C26E5C /* libBulletCollision.a */; };
-		42A1E953195521E800C26E5C /* libBulletDynamics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A1E950195521E800C26E5C /* libBulletDynamics.a */; };
-		42A1E954195521E800C26E5C /* libLinearMath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A1E951195521E800C26E5C /* libLinearMath.a */; };
-		42B611CD16ADB01000106289 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B611C816ADAFCD00106289 /* libgameplay.a */; };
-		42B611D416ADB02B00106289 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAB3716AD8D5C0000F342 /* libz.dylib */; };
-		42B611D716ADB08A00106289 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 42B611D616ADB08A00106289 /* [email protected] */; };
-		42B7028C15B0BEE3002BB8C3 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B7028B15B0BEE3002BB8C3 /* liblua.a */; };
-		42B7028E15B0C084002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7028D15B0C084002BB8C3 /* game.config */; };
-		42B7028F15B0C084002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7028D15B0C084002BB8C3 /* game.config */; };
-		42C932C11491A0DB0098216A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C932C01491A0DB0098216A /* Cocoa.framework */; };
-		42C932EE1491A4CB0098216A /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42C932ED1491A4CB0098216A /* icon.png */; };
-		42C932F11491A5160098216A /* LuaGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C932EF1491A5160098216A /* LuaGame.cpp */; };
-		42C932F31491A53E0098216A /* res in Resources */ = {isa = PBXBuildFile; fileRef = 42C932F21491A53E0098216A /* res */; };
-		42C933171491A5EB0098216A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933161491A5EB0098216A /* OpenGL.framework */; };
-		42C9331D1491A6750098216A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9331C1491A6750098216A /* QuartzCore.framework */; };
-		42C9331F1491A67F0098216A /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9331E1491A67F0098216A /* OpenAL.framework */; };
-		42C933261491A6E50098216A /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933221491A6E50098216A /* libogg.a */; };
-		42C933271491A6E50098216A /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933231491A6E50098216A /* libvorbis.a */; };
-		42C9332C1491A7680098216A /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9332A1491A7390098216A /* libpng.a */; };
-		42C9332F1491A78D0098216A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9332D1491A7810098216A /* libz.dylib */; };
-		42DFAACC16AD8A000000F342 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAACB16AD8A000000F342 /* CoreMotion.framework */; };
-		42DFAAE016AD8B060000F342 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAADF16AD8B060000F342 /* Foundation.framework */; };
-		42DFAAEF16AD8B4E0000F342 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAAEB16AD8B4E0000F342 /* OpenAL.framework */; };
-		42DFAAF016AD8B4E0000F342 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAAEC16AD8B4E0000F342 /* OpenGLES.framework */; };
-		42DFAAF116AD8B4E0000F342 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAAED16AD8B4E0000F342 /* QuartzCore.framework */; };
-		42DFAAF216AD8B4E0000F342 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAAEE16AD8B4E0000F342 /* UIKit.framework */; };
-		5B61611614CCC24C0073B857 /* LuaGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C932EF1491A5160098216A /* LuaGame.cpp */; };
-		5B61612614CCC24C0073B857 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42C932ED1491A4CB0098216A /* icon.png */; };
-		5B61612714CCC24C0073B857 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 42C932F21491A53E0098216A /* res */; };
-		6212DAB41829D9BB006213DD /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6212DAB31829D9BB006213DD /* GameKit.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		421090ED18299F3A00761E40 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/GameKit.framework; sourceTree = DEVELOPER_DIR; };
-		422E8EDC19586791001DE81F /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletCollision.a"; sourceTree = "<group>"; };
-		422E8EDD19586791001DE81F /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletDynamics.a"; sourceTree = "<group>"; };
-		422E8EDE19586791001DE81F /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/ios/armv7s/libLinearMath.a"; sourceTree = "<group>"; };
-		42438B521491AD2000D218B8 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug/libgameplay.a"; sourceTree = "<group>"; };
-		424CC03D161FCC1700577827 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		425EDA9917FB3F4000AABF95 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/ios/armv7s/liblua.a"; sourceTree = "<absolute>"; };
-		425EDA9A17FB3F4000AABF95 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/ios/armv7s/libpng.a"; sourceTree = "<absolute>"; };
-		425EDA9B17FB3F4000AABF95 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/ios/armv7s/libogg.a"; sourceTree = "<absolute>"; };
-		425EDA9C17FB3F4000AABF95 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/ios/armv7s/libvorbis.a"; sourceTree = "<absolute>"; };
-		42A1E94F195521E800C26E5C /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletCollision.a"; sourceTree = "<group>"; };
-		42A1E950195521E800C26E5C /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletDynamics.a"; sourceTree = "<group>"; };
-		42A1E951195521E800C26E5C /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/macosx/x64/libLinearMath.a"; sourceTree = "<group>"; };
-		42B611C816ADAFCD00106289 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos/libgameplay.a"; sourceTree = "<group>"; };
-		42B611D616ADB08A00106289 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		42B7028B15B0BEE3002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/x64/liblua.a"; sourceTree = "<group>"; };
-		42B7028D15B0C084002BB8C3 /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
-		42C932BC1491A0DB0098216A /* sample-lua-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample-lua-macosx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		42C932C01491A0DB0098216A /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
-		42C932ED1491A4CB0098216A /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
-		42C932EF1491A5160098216A /* LuaGame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LuaGame.cpp; path = src/LuaGame.cpp; sourceTree = SOURCE_ROOT; };
-		42C932F01491A5160098216A /* LuaGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LuaGame.h; path = src/LuaGame.h; sourceTree = SOURCE_ROOT; };
-		42C932F21491A53E0098216A /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = res; sourceTree = "<group>"; };
-		42C933161491A5EB0098216A /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		42C9331C1491A6750098216A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		42C9331E1491A67F0098216A /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
-		42C933221491A6E50098216A /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/macosx/x64/libogg.a"; sourceTree = "<group>"; };
-		42C933231491A6E50098216A /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/macosx/x64/libvorbis.a"; sourceTree = "<group>"; };
-		42C9332A1491A7390098216A /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/macosx/x64/libpng.a"; sourceTree = "<group>"; };
-		42C9332D1491A7810098216A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		42DFAACB16AD8A000000F342 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAADF16AD8B060000F342 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAAEB16AD8B4E0000F342 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAAEC16AD8B4E0000F342 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAAED16AD8B4E0000F342 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAAEE16AD8B4E0000F342 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAB3716AD8D5C0000F342 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
-		5B61611214CCC2200073B857 /* sample-lua-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample-lua-macosx.plist"; sourceTree = "<group>"; };
-		5B61612C14CCC24C0073B857 /* sample-lua-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample-lua-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		5B61612E14CCC24D0073B857 /* sample-lua-ios.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "sample-lua-ios.plist"; sourceTree = "<group>"; };
-		6212DAB31829D9BB006213DD /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		42C932B91491A0DB0098216A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				42438B531491AD2000D218B8 /* libgameplay.a in Frameworks */,
-				42A1E953195521E800C26E5C /* libBulletDynamics.a in Frameworks */,
-				42A1E952195521E800C26E5C /* libBulletCollision.a in Frameworks */,
-				42B7028C15B0BEE3002BB8C3 /* liblua.a in Frameworks */,
-				42C9332C1491A7680098216A /* libpng.a in Frameworks */,
-				42C933261491A6E50098216A /* libogg.a in Frameworks */,
-				42C933271491A6E50098216A /* libvorbis.a in Frameworks */,
-				42C9332F1491A78D0098216A /* libz.dylib in Frameworks */,
-				6212DAB41829D9BB006213DD /* GameKit.framework in Frameworks */,
-				424CC03E161FCC1700577827 /* IOKit.framework in Frameworks */,
-				42C932C11491A0DB0098216A /* Cocoa.framework in Frameworks */,
-				42C9331D1491A6750098216A /* QuartzCore.framework in Frameworks */,
-				42A1E954195521E800C26E5C /* libLinearMath.a in Frameworks */,
-				42C933171491A5EB0098216A /* OpenGL.framework in Frameworks */,
-				42C9331F1491A67F0098216A /* OpenAL.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		5B61611714CCC24C0073B857 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				42B611CD16ADB01000106289 /* libgameplay.a in Frameworks */,
-				42B611D416ADB02B00106289 /* libz.dylib in Frameworks */,
-				422E8EE019586791001DE81F /* libBulletDynamics.a in Frameworks */,
-				42DFAACC16AD8A000000F342 /* CoreMotion.framework in Frameworks */,
-				425EDAA017FB3F4000AABF95 /* liblua.a in Frameworks */,
-				42DFAAE016AD8B060000F342 /* Foundation.framework in Frameworks */,
-				425EDAA317FB3F4000AABF95 /* libvorbis.a in Frameworks */,
-				42DFAAEF16AD8B4E0000F342 /* OpenAL.framework in Frameworks */,
-				425EDAA217FB3F4000AABF95 /* libogg.a in Frameworks */,
-				422E8EDF19586791001DE81F /* libBulletCollision.a in Frameworks */,
-				422E8EE119586791001DE81F /* libLinearMath.a in Frameworks */,
-				421090EE18299F3A00761E40 /* GameKit.framework in Frameworks */,
-				42DFAAF016AD8B4E0000F342 /* OpenGLES.framework in Frameworks */,
-				42DFAAF116AD8B4E0000F342 /* QuartzCore.framework in Frameworks */,
-				425EDAA117FB3F4000AABF95 /* libpng.a in Frameworks */,
-				42DFAAF216AD8B4E0000F342 /* UIKit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		42C932B11491A0DB0098216A = {
-			isa = PBXGroup;
-			children = (
-				42B611D616ADB08A00106289 /* [email protected] */,
-				5B61611214CCC2200073B857 /* sample-lua-macosx.plist */,
-				5B61612E14CCC24D0073B857 /* sample-lua-ios.plist */,
-				42C932ED1491A4CB0098216A /* icon.png */,
-				42B7028D15B0C084002BB8C3 /* game.config */,
-				42C932F21491A53E0098216A /* res */,
-				42C932C61491A0DB0098216A /* src */,
-				42C932DD1491A1050098216A /* Libraries */,
-				42C932BF1491A0DB0098216A /* Frameworks */,
-				42C932BD1491A0DB0098216A /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		42C932BD1491A0DB0098216A /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				42C932BC1491A0DB0098216A /* sample-lua-macosx.app */,
-				5B61612C14CCC24C0073B857 /* sample-lua-ios.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		42C932BF1491A0DB0098216A /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				5B61613A14CCC3590073B857 /* MacOSX */,
-				5B61613914CCC3560073B857 /* iOS */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		42C932C61491A0DB0098216A /* src */ = {
-			isa = PBXGroup;
-			children = (
-				42C932EF1491A5160098216A /* LuaGame.cpp */,
-				42C932F01491A5160098216A /* LuaGame.h */,
-			);
-			path = src;
-			sourceTree = "<group>";
-		};
-		42C932DD1491A1050098216A /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				42DFAB3616AD8D340000F342 /* MacOSX */,
-				42DFAB3516AD8D270000F342 /* iOS */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
-		42DFAB3516AD8D270000F342 /* iOS */ = {
-			isa = PBXGroup;
-			children = (
-				42B611C816ADAFCD00106289 /* libgameplay.a */,
-				422E8EDC19586791001DE81F /* libBulletCollision.a */,
-				422E8EDD19586791001DE81F /* libBulletDynamics.a */,
-				422E8EDE19586791001DE81F /* libLinearMath.a */,
-				425EDA9917FB3F4000AABF95 /* liblua.a */,
-				425EDA9A17FB3F4000AABF95 /* libpng.a */,
-				425EDA9B17FB3F4000AABF95 /* libogg.a */,
-				425EDA9C17FB3F4000AABF95 /* libvorbis.a */,
-				42DFAB3716AD8D5C0000F342 /* libz.dylib */,
-			);
-			name = iOS;
-			sourceTree = "<group>";
-		};
-		42DFAB3616AD8D340000F342 /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-				42438B521491AD2000D218B8 /* libgameplay.a */,
-				42A1E94F195521E800C26E5C /* libBulletCollision.a */,
-				42A1E950195521E800C26E5C /* libBulletDynamics.a */,
-				42A1E951195521E800C26E5C /* libLinearMath.a */,
-				42B7028B15B0BEE3002BB8C3 /* liblua.a */,
-				42C9332A1491A7390098216A /* libpng.a */,
-				42C933221491A6E50098216A /* libogg.a */,
-				42C933231491A6E50098216A /* libvorbis.a */,
-				42C9332D1491A7810098216A /* libz.dylib */,
-			);
-			name = MacOSX;
-			sourceTree = "<group>";
-		};
-		5B61613914CCC3560073B857 /* iOS */ = {
-			isa = PBXGroup;
-			children = (
-				421090ED18299F3A00761E40 /* GameKit.framework */,
-				42DFAACB16AD8A000000F342 /* CoreMotion.framework */,
-				42DFAADF16AD8B060000F342 /* Foundation.framework */,
-				42DFAAEB16AD8B4E0000F342 /* OpenAL.framework */,
-				42DFAAEC16AD8B4E0000F342 /* OpenGLES.framework */,
-				42DFAAED16AD8B4E0000F342 /* QuartzCore.framework */,
-				42DFAAEE16AD8B4E0000F342 /* UIKit.framework */,
-			);
-			name = iOS;
-			sourceTree = "<group>";
-		};
-		5B61613A14CCC3590073B857 /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-				6212DAB31829D9BB006213DD /* GameKit.framework */,
-				424CC03D161FCC1700577827 /* IOKit.framework */,
-				42C932C01491A0DB0098216A /* Cocoa.framework */,
-				42C9331C1491A6750098216A /* QuartzCore.framework */,
-				42C933161491A5EB0098216A /* OpenGL.framework */,
-				42C9331E1491A67F0098216A /* OpenAL.framework */,
-			);
-			name = MacOSX;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		42C932BB1491A0DB0098216A /* sample-lua-macosx */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 42C932DA1491A0DB0098216A /* Build configuration list for PBXNativeTarget "sample-lua-macosx" */;
-			buildPhases = (
-				42C932B81491A0DB0098216A /* Sources */,
-				42C932B91491A0DB0098216A /* Frameworks */,
-				42C933301491A7B50098216A /* ShellScript */,
-				42C932BA1491A0DB0098216A /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "sample-lua-macosx";
-			productName = "sample-lua";
-			productReference = 42C932BC1491A0DB0098216A /* sample-lua-macosx.app */;
-			productType = "com.apple.product-type.application";
-		};
-		5B61611414CCC24C0073B857 /* sample-lua-ios */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 5B61612914CCC24C0073B857 /* Build configuration list for PBXNativeTarget "sample-lua-ios" */;
-			buildPhases = (
-				5B61611514CCC24C0073B857 /* Sources */,
-				5B61611714CCC24C0073B857 /* Frameworks */,
-				5B61612414CCC24C0073B857 /* ShellScript */,
-				5B61612514CCC24C0073B857 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "sample-lua-ios";
-			productName = "sample-lua";
-			productReference = 5B61612C14CCC24C0073B857 /* sample-lua-ios.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		42C932B31491A0DB0098216A /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0600;
-			};
-			buildConfigurationList = 42C932B61491A0DB0098216A /* Build configuration list for PBXProject "sample-lua" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 42C932B11491A0DB0098216A;
-			productRefGroup = 42C932BD1491A0DB0098216A /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				42C932BB1491A0DB0098216A /* sample-lua-macosx */,
-				5B61611414CCC24C0073B857 /* sample-lua-ios */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		42C932BA1491A0DB0098216A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				42B7028E15B0C084002BB8C3 /* game.config in Resources */,
-				42C932EE1491A4CB0098216A /* icon.png in Resources */,
-				42C932F31491A53E0098216A /* res in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		5B61612514CCC24C0073B857 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				42B7028F15B0C084002BB8C3 /* game.config in Resources */,
-				5B61612614CCC24C0073B857 /* icon.png in Resources */,
-				5B61612714CCC24C0073B857 /* res in Resources */,
-				42B611D716ADB08A00106289 /* [email protected] in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		42C933301491A7B50098216A /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "rsync -rau ${SRCROOT}/../../gameplay/res/shaders ${SRCROOT}/res\nrsync -rau ${SRCROOT}/../../gameplay/res/ui ${SRCROOT}/res\ncp -rf ${SRCROOT}/../../gameplay/res/logo_powered_white.png ${SRCROOT}/res\ntouch -cm ${SRCROOT}/res";
-		};
-		5B61612414CCC24C0073B857 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "rsync -rau ${SRCROOT}/../../gameplay/res/shaders ${SRCROOT}/res\nrsync -rau ${SRCROOT}/../../gameplay/res/ui ${SRCROOT}/res\ncp -rf ${SRCROOT}/../../gameplay/res/logo_powered_white.png ${SRCROOT}/res\ntouch -cm ${SRCROOT}/res";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		42C932B81491A0DB0098216A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				42C932F11491A5160098216A /* LuaGame.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		5B61611514CCC24C0073B857 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				5B61611614CCC24C0073B857 /* LuaGame.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		42C932D81491A0DB0098216A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				GENERATE_PKGINFO_FILE = YES;
-				INFOPLIST_FILE = "sample-lua-macosx.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-				VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64";
-			};
-			name = Debug;
-		};
-		42C932D91491A0DB0098216A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				GENERATE_PKGINFO_FILE = YES;
-				INFOPLIST_FILE = "sample-lua-macosx.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-				VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64";
-			};
-			name = Release;
-		};
-		42C932DB1491A0DB0098216A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				COMBINE_HIDPI_IMAGES = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_UNUSED_VARIABLE = NO;
-				HEADER_SEARCH_PATHS = (
-					../../gameplay/src,
-					"../../external-deps/bullet/include",
-					"../../external-deps/lua/include",
-					"../../external-deps/png/include",
-					"../../external-deps/ogg/include",
-					"../../external-deps/vorbis/include",
-				);
-				INFOPLIST_FILE = "sample-lua-macosx.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"../../external-deps/bullet/lib/macosx/x64",
-					"../../external-deps/lua/lib/macosx/x64",
-					"../../external-deps/png/lib/macosx/x64",
-					"../../external-deps/ogg/lib/macosx/x64",
-					"../../external-deps/vorbis/lib/macosx/x64",
-					"~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = "";
-				VALID_ARCHS = x86_64;
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		42C932DC1491A0DB0098216A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				COMBINE_HIDPI_IMAGES = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_UNUSED_VARIABLE = NO;
-				HEADER_SEARCH_PATHS = (
-					../../gameplay/src,
-					"../../external-deps/bullet/include",
-					"../../external-deps/lua/include",
-					"../../external-deps/png/include",
-					"../../external-deps/ogg/include",
-					"../../external-deps/vorbis/include",
-				);
-				INFOPLIST_FILE = "sample-lua-macosx.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"../../external-deps/bullet/lib/macosx/x64",
-					"../../external-deps/lua/lib/macosx/x64",
-					"../../external-deps/png/lib/macosx/x64",
-					"../../external-deps/ogg/lib/macosx/x64",
-					"../../external-deps/vorbis/lib/macosx/x64",
-					"~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = "";
-				VALID_ARCHS = x86_64;
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-		5B61612A14CCC24C0073B857 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_UNUSED_VARIABLE = NO;
-				HEADER_SEARCH_PATHS = (
-					../../gameplay/src,
-					"../../external-deps/bullet/include",
-					"../../external-deps/lua/include",
-					"../../external-deps/png/include",
-					"../../external-deps/ogg/include",
-					"../../external-deps/vorbis/include",
-				);
-				INFOPLIST_FILE = "sample-lua-ios.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)",
-					"../../external-deps/lua/lib/ios/$(CURRENT_ARCH)",
-					"../../external-deps/png/lib/ios/$(CURRENT_ARCH)",
-					"../../external-deps/ogg/lib/ios/$(CURRENT_ARCH)",
-					"../../external-deps/vorbis/lib/ios/$(CURRENT_ARCH)",
-					"~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos",
-				);
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "";
-				VALID_ARCHS = "armv7 armv7s arm64";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		5B61612B14CCC24C0073B857 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_UNUSED_VARIABLE = NO;
-				HEADER_SEARCH_PATHS = (
-					../../gameplay/src,
-					"../../external-deps/bullet/include",
-					"../../external-deps/lua/include",
-					"../../external-deps/png/include",
-					"../../external-deps/ogg/include",
-					"../../external-deps/vorbis/include",
-				);
-				INFOPLIST_FILE = "sample-lua-ios.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"../../external-deps/bullet/lib/ios/$(CURRENT_ARCH)",
-					"../../external-deps/lua/lib/ios/$(CURRENT_ARCH)",
-					"../../external-deps/png/lib/ios/$(CURRENT_ARCH)",
-					"../../external-deps/ogg/lib/ios/$(CURRENT_ARCH)",
-					"../../external-deps/vorbis/lib/ios/$(CURRENT_ARCH)",
-					"~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos",
-				);
-				PROVISIONING_PROFILE = "";
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "";
-				VALID_ARCHS = "armv7 armv7s arm64";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		42C932B61491A0DB0098216A /* Build configuration list for PBXProject "sample-lua" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				42C932D81491A0DB0098216A /* Debug */,
-				42C932D91491A0DB0098216A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		42C932DA1491A0DB0098216A /* Build configuration list for PBXNativeTarget "sample-lua-macosx" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				42C932DB1491A0DB0098216A /* Debug */,
-				42C932DC1491A0DB0098216A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		5B61612914CCC24C0073B857 /* Build configuration list for PBXNativeTarget "sample-lua-ios" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				5B61612A14CCC24C0073B857 /* Debug */,
-				5B61612B14CCC24C0073B857 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 42C932B31491A0DB0098216A /* Project object */;
-}

+ 0 - 87
samples/lua/sample-lua.xcodeproj/xcshareddata/xcschemes/sample-lua-ios.xcscheme

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.8">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5B61611414CCC24C0073B857"
-               BuildableName = "sample-lua-ios.app"
-               BlueprintName = "sample-lua-ios"
-               ReferencedContainer = "container:sample-lua.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5B61611414CCC24C0073B857"
-            BuildableName = "sample-lua-ios.app"
-            BlueprintName = "sample-lua-ios"
-            ReferencedContainer = "container:sample-lua.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      enablesOpenGLESFrameCapture = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5B61611414CCC24C0073B857"
-            BuildableName = "sample-lua-ios.app"
-            BlueprintName = "sample-lua-ios"
-            ReferencedContainer = "container:sample-lua.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5B61611414CCC24C0073B857"
-            BuildableName = "sample-lua-ios.app"
-            BlueprintName = "sample-lua-ios"
-            ReferencedContainer = "container:sample-lua.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 86
samples/lua/sample-lua.xcodeproj/xcshareddata/xcschemes/sample-lua-macosx.xcscheme

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "42C932BB1491A0DB0098216A"
-               BuildableName = "sample-lua-macosx.app"
-               BlueprintName = "sample-lua-macosx"
-               ReferencedContainer = "container:sample-lua.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "42C932BB1491A0DB0098216A"
-            BuildableName = "sample-lua-macosx.app"
-            BlueprintName = "sample-lua-macosx"
-            ReferencedContainer = "container:sample-lua.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "42C932BB1491A0DB0098216A"
-            BuildableName = "sample-lua-macosx.app"
-            BlueprintName = "sample-lua-macosx"
-            ReferencedContainer = "container:sample-lua.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "42C932BB1491A0DB0098216A"
-            BuildableName = "sample-lua-macosx.app"
-            BlueprintName = "sample-lua-macosx"
-            ReferencedContainer = "container:sample-lua.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

+ 0 - 24
samples/lua/src/LuaGame.cpp

@@ -1,24 +0,0 @@
-#include "LuaGame.h"
-
-// Declare our game instance
-LuaGame game;
-
-LuaGame::LuaGame()
-{
-}
-
-void LuaGame::initialize()
-{
-}
-
-void LuaGame::finalize()
-{
-}
-
-void LuaGame::update(float elapsedTime)
-{
-}
-
-void LuaGame::render(float elapsedTime)
-{
-}

+ 0 - 46
samples/lua/src/LuaGame.h

@@ -1,46 +0,0 @@
-#ifndef LUAGAME_H_
-#define LUAGAME_H_
-
-#include "gameplay.h"
-
-using namespace gameplay;
-
-/**
- * Main game class.
- *
- * This game has all the implementation code done in lua.
- */
-class LuaGame: public Game
-{
-public:
-
-    /**
-     * Constructor.
-     */
-    LuaGame();
-
-protected:
-
-    /**
-     * @see Game::initialize
-     */
-    void initialize();
-
-    /**
-     * @see Game::finalize
-     */
-    void finalize();
-
-    /**
-     * @see Game::update
-     */
-    void update(float elapsedTime);
-
-    /**
-     * @see Game::render
-     */
-    void render(float elapsedTime);
-};
-
-
-#endif

+ 0 - 250
samples/mesh/.cproject

@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.349030683">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.349030683" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.349030683" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug" postannouncebuildStep="Copying Assets" postbuildStep="rsync -rau ${workspace_loc:/${ProjName}}/../../gameplay/res/shaders ${workspace_loc:/${ProjName}}/res;rsync -rau ${workspace_loc:/${ProjName}}/../../gameplay/res/ui ${workspace_loc:/${ProjName}}/res;cp -rf ${workspace_loc:/${ProjName}}/../../gameplay/res/logo_powered_white.png ${workspace_loc:/${ProjName}}/res;touch -cm ${workspace_loc:/${ProjName}}/res">
-					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.349030683." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.306691387" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
-							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.437887716" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-							<builder buildPath="${workspace_loc:/sample-mesh}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.1855946472" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
-							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1520902797" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2064560376" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
-								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1117748719" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1114187527" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.preprocessor.def.560897994" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="__linux__"/>
-									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.include.paths.1388077261" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/gameplay/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/bullet/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/lua/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/png/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/zlib/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/ogg/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/vorbis/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/openal/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/glew/include&quot;"/>
-									<listOptionValue builtIn="false" value="/usr/include/gtk-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/gtk-2.0/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/atk-1.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/cairo"/>
-									<listOptionValue builtIn="false" value="/usr/include/gdk-pixbuf-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/pango-1.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/gio-unix-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/freetype2"/>
-									<listOptionValue builtIn="false" value="/usr/include/glib-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/glib-2.0/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/pixman-1"/>
-									<listOptionValue builtIn="false" value="/usr/include/libpng12"/>
-									<listOptionValue builtIn="false" value="/usr/include/harfbuzz"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.other.other.1011647163" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++11 -lstdc++ -pthread" valueType="string"/>
-								<option id="gnu.cpp.compiler.option.warnings.allwarn.72301138" name="All warnings (-Wall)" superClass="gnu.cpp.compiler.option.warnings.allwarn" value="false" valueType="boolean"/>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.326913939" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.114474653" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
-								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.299251619" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
-								<option id="gnu.c.compiler.exe.debug.option.debugging.level.694901276" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1542797576" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.493533572" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1574466352" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
-								<option id="gnu.cpp.link.option.libs.1247748738" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value="gameplay"/>
-									<listOptionValue builtIn="false" value="m"/>
-									<listOptionValue builtIn="false" value="lua"/>
-									<listOptionValue builtIn="false" value="png"/>
-									<listOptionValue builtIn="false" value="z"/>
-									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="ogg"/>
-									<listOptionValue builtIn="false" value="BulletDynamics"/>
-									<listOptionValue builtIn="false" value="BulletCollision"/>
-									<listOptionValue builtIn="false" value="LinearMath"/>
-									<listOptionValue builtIn="false" value="openal"/>
-									<listOptionValue builtIn="false" value="GLEW"/>
-									<listOptionValue builtIn="false" value="GL"/>
-									<listOptionValue builtIn="false" value="rt"/>
-									<listOptionValue builtIn="false" value="dl"/>
-									<listOptionValue builtIn="false" value="X11"/>
-									<listOptionValue builtIn="false" value="pthread"/>
-									<listOptionValue builtIn="false" value="gtk-x11-2.0"/>
-									<listOptionValue builtIn="false" value="glib-2.0"/>
-									<listOptionValue builtIn="false" value="gobject-2.0"/>
-								</option>
-								<option id="gnu.cpp.link.option.paths.550339008" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/lua/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/zlib/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/png/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/bullet/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/ogg/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/vorbis/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/openal/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/glew/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/gameplay/${ConfigName}}"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1774954616" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1474164080" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.71067264" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.617055181">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.617055181" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.617055181" name="Release" parent="cdt.managedbuild.config.gnu.exe.release" postannouncebuildStep="Copying Assets" postbuildStep="rsync -rau ${workspace_loc:/${ProjName}}/../../gameplay/res/shaders ${workspace_loc:/${ProjName}}/res;rsync -rau ${workspace_loc:/${ProjName}}/../../gameplay/res/ui ${workspace_loc:/${ProjName}}/res;cp -rf ${workspace_loc:/${ProjName}}/../../gameplay/res/logo_powered_white.png ${workspace_loc:/${ProjName}}/res;touch -cm ${workspace_loc:/${ProjName}}/res">
-					<folderInfo id="cdt.managedbuild.config.gnu.exe.release.617055181." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1992676500" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
-							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.406307293" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-							<builder buildPath="${workspace_loc:/sample-mesh}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.641119066" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
-							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1598326511" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1063712229" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
-								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1345682018" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.414442905" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.preprocessor.def.1982059016" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="__linux__"/>
-									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.include.paths.218187428" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/gameplay/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/bullet/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/lua/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/png/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/zlib/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/ogg/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/vorbis/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/openal/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../../external-deps/glew/include&quot;"/>
-									<listOptionValue builtIn="false" value="/usr/include/gtk-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/gtk-2.0/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/atk-1.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/cairo"/>
-									<listOptionValue builtIn="false" value="/usr/include/gdk-pixbuf-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/pango-1.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/gio-unix-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/include/freetype2"/>
-									<listOptionValue builtIn="false" value="/usr/include/glib-2.0"/>
-									<listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/glib-2.0/include"/>
-									<listOptionValue builtIn="false" value="/usr/include/pixman-1"/>
-									<listOptionValue builtIn="false" value="/usr/include/libpng12"/>
-									<listOptionValue builtIn="false" value="/usr/include/harfbuzz"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.other.other.1035361425" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++11 -lstdc++ -pthread" valueType="string"/>
-								<option id="gnu.cpp.compiler.option.warnings.allwarn.1165467748" name="All warnings (-Wall)" superClass="gnu.cpp.compiler.option.warnings.allwarn" value="false" valueType="boolean"/>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.132233219" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1777813462" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
-								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.196757280" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
-								<option id="gnu.c.compiler.exe.release.option.debugging.level.1962534256" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1245555239" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1354772973" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.999807535" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
-								<option id="gnu.cpp.link.option.libs.893848113" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value="gameplay"/>
-									<listOptionValue builtIn="false" value="m"/>
-									<listOptionValue builtIn="false" value="lua"/>
-									<listOptionValue builtIn="false" value="png"/>
-									<listOptionValue builtIn="false" value="z"/>
-									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="ogg"/>
-									<listOptionValue builtIn="false" value="BulletDynamics"/>
-									<listOptionValue builtIn="false" value="BulletCollision"/>
-									<listOptionValue builtIn="false" value="LinearMath"/>
-									<listOptionValue builtIn="false" value="openal"/>
-									<listOptionValue builtIn="false" value="GLEW"/>
-									<listOptionValue builtIn="false" value="GL"/>
-									<listOptionValue builtIn="false" value="rt"/>
-									<listOptionValue builtIn="false" value="dl"/>
-									<listOptionValue builtIn="false" value="X11"/>
-									<listOptionValue builtIn="false" value="pthread"/>
-									<listOptionValue builtIn="false" value="gtk-x11-2.0"/>
-									<listOptionValue builtIn="false" value="glib-2.0"/>
-									<listOptionValue builtIn="false" value="gobject-2.0"/>
-								</option>
-								<option id="gnu.cpp.link.option.paths.725660289" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/lua/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/zlib/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/png/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/bullet/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/ogg/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/vorbis/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/openal/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}}/../../external-deps/glew/lib/linux/x64"/>
-									<listOptionValue builtIn="false" value="${workspace_loc:/gameplay/${ConfigName}}"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.487294404" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1500493024" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.577625570" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="sample-mesh.cdt.managedbuild.target.gnu.exe.710799574" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.617055181;cdt.managedbuild.config.gnu.exe.release.617055181.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1777813462;cdt.managedbuild.tool.gnu.c.compiler.input.1245555239">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.349030683;cdt.managedbuild.config.gnu.exe.debug.349030683.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.114474653;cdt.managedbuild.tool.gnu.c.compiler.input.1542797576">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.617055181;cdt.managedbuild.config.gnu.exe.release.617055181.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1063712229;cdt.managedbuild.tool.gnu.cpp.compiler.input.132233219">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.349030683;cdt.managedbuild.config.gnu.exe.debug.349030683.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2064560376;cdt.managedbuild.tool.gnu.cpp.compiler.input.326913939">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/sample-mesh"/>
-		</configuration>
-		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/sample-mesh"/>
-		</configuration>
-	</storageModule>
-</cproject>

+ 0 - 28
samples/mesh/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sample-mesh</name>
-	<comment></comment>
-	<projects>
-		<project>gameplay</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>

+ 0 - 27
samples/mesh/CMakeLists.txt

@@ -1,27 +0,0 @@
-set( GAME_NAME sample-mesh )
-
-set(GAME_SRC
-    src/MeshGame.cpp
-    src/MeshGame.h
-)
-
-add_executable(${GAME_NAME}
-    ${GAME_SRC}
-)
-
-target_link_libraries(${GAME_NAME} ${GAMEPLAY_LIBRARIES})
-
-set_target_properties(${GAME_NAME} PROPERTIES
-    OUTPUT_NAME "${GAME_NAME}"
-    CLEAN_DIRECT_OUTPUT 1
-)
-
-source_group(res FILES ${GAME_RES} ${GAMEPLAY_RES} ${GAMEPLAY_RES_SHADERS} ${GAMEPLAY_RES_UI})
-source_group(src FILES ${GAME_SRC})
-
-COPY_RES( ${GAME_NAME} )
-COPY_RES_EXTRA( ${GAME_NAME} ${CMAKE_SOURCE_DIR}/gameplay
-    res/logo_powered_white.png 
-    res/shaders/*
-    res/ui/*
-)

BIN
samples/mesh/[email protected]


+ 0 - 13
samples/mesh/android/.classpath

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="sample-mesh/src"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>

+ 0 - 57
samples/mesh/android/.cproject

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.android.toolchain.gcc.1723047999">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.1723047999" moduleId="org.eclipse.cdt.core.settings" name="Default">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.android.toolchain.gcc.1723047999" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
-					<folderInfo id="com.android.toolchain.gcc.1723047999.1769297596" name="/" resourcePath="">
-						<toolChain id="com.android.toolchain.gcc.698600898" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
-							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.42683489" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.863968597" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
-								<outputEntries>
-									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
-									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>
-								</outputEntries>
-							</builder>
-							<tool id="com.android.gcc.compiler.270981819" name="Android GCC Compiler" superClass="com.android.gcc.compiler">
-								<inputType id="com.android.gcc.inputType.942593139" superClass="com.android.gcc.inputType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="jni"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="sample-mesh.null.741876807" name="sample-mesh"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.1723047999;com.android.toolchain.gcc.1723047999.1769297596;com.android.gcc.compiler.270981819;com.android.gcc.inputType.942593139">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.android.AndroidPerProjectProfile"/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Default">
-			<resource resourceType="PROJECT" workspacePath="/sample-mesh"/>
-		</configuration>
-	</storageModule>
-</cproject>

+ 0 - 105
samples/mesh/android/.project

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sample-mesh</name>
-	<comment></comment>
-	<projects>
-		<project>gameplay</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>?children?</key>
-					<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
-				</dictionary>
-				<dictionary>
-					<key>?name?</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value>NDK_DEBUG=1 -j4</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildCommand</key>
-					<value>ndk-build</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.contents</key>
-					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>false</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>src</name>
-			<type>2</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/mesh/src</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>

+ 0 - 25
samples/mesh/android/AndroidManifest.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="org.gameplay3d.sample_mesh"
-        android:versionCode="1"
-        android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="16" />
-	<uses-feature android:glEsVersion="0x00020000"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-        <activity android:name="org.gameplay3d.GamePlayNativeActivity"
-                  android:label="@string/app_name"
-                  android:configChanges="orientation|screenSize|keyboardHidden"
-				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				  android:screenOrientation="landscape">
-            <meta-data android:name="android.app.lib_name" android:value="sample-mesh" />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest> 

+ 0 - 60
samples/mesh/android/build.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="sample-mesh" default="help">
-
-    <property file="local.properties" />
-    <property file="ant.properties" />
-
-    <loadproperties srcFile="project.properties" />
-
-    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project -t 1 -p . -s'" unless="sdk.dir" />
-	<fail message="OS not supported. Supported platforms: Windows, MacOS X or Linux.">
-	    <condition>
-	      <not>
-	        <or>
-	          <os family="unix"/>
-	          <os family="windows"/>
-	        </or>
-	      </not>
-	    </condition>
-	</fail>
-	<macrodef name="build-native">
-		<attribute name="location"/>
-	     <sequential>
-            <exec osfamily="unix" dir="@{location}/android" executable="ndk-build">
-                <arg value="-j4"/>
-            </exec>
-			<exec osfamily="windows" dir="@{location}/android" executable="cmd">
-				<arg value="/c"/>
-				<arg value="ndk-build -j4"/>
-			</exec> 
-	    </sequential>
-	</macrodef>
-    
-    <target name="-pre-build">
-		<build-native location="../../../gameplay"/>
-    	<build-native location=".."/>
-        <mkdir dir="../src/org/gameplay3d"/>
-	    <copy todir="../src/org/gameplay3d">
-            <fileset dir="../../../gameplay/src/org/gameplay3d"/>
-	    </copy>
-    </target>
-	
-    <target name="-post-compile">
-     	<copy file="../game.config" tofile="assets/game.config"/>
-        <copy file="../res/mesh.scene" tofile="assets/res/mesh.scene"/>
-        <copy file="../res/mesh.gpb" tofile="assets/res/mesh.gpb"/>
-        <copy file="../res/mesh.material" tofile="assets/res/mesh.material"/>
-        <copy file="../res/duck.png" tofile="assets/res/duck.png"/>
-        <copy file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
-        <copy todir="assets/res/shaders">
-            <fileset dir="../../../gameplay/res/shaders"/>
-        </copy>
-        <copy todir="assets/res/ui">
-            <fileset dir="../../../gameplay/res/ui"/>
-        </copy>
-    </target>
-
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>

+ 0 - 95
samples/mesh/android/jni/Android.mk

@@ -1,95 +0,0 @@
-SAMPLE_PATH := $(call my-dir)/../../src
-
-# external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
-OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
-VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
-OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
-
-# libgameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/$(TARGET_ARCH_ABI)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libgameplay
-LOCAL_SRC_FILES := libgameplay.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-# libpng
-LOCAL_PATH := $(PNG_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libpng 
-LOCAL_SRC_FILES := libpng.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libz
-LOCAL_PATH := $(ZLIB_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libz
-LOCAL_SRC_FILES := libz.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# liblua
-LOCAL_PATH := $(LUA_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := liblua
-LOCAL_SRC_FILES := liblua.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libLinearMath
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libLinearMath
-LOCAL_SRC_FILES := libLinearMath.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libBulletCollision
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libBulletCollision
-LOCAL_SRC_FILES := libBulletCollision.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libBulletDynamics
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libBulletDynamics
-LOCAL_SRC_FILES := libBulletDynamics.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libogg
-LOCAL_PATH := $(OGG_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libogg
-LOCAL_SRC_FILES := libogg.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libvorbis
-LOCAL_PATH := $(VORBIS_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libvorbis
-LOCAL_SRC_FILES := libvorbis.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libOpenAL
-LOCAL_PATH := $(OPENAL_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libOpenAL
-LOCAL_SRC_FILES := libOpenAL.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# sample-mesh
-LOCAL_PATH := $(SAMPLE_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := sample-mesh
-LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp MeshGame.cpp
-LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
-LOCAL_ARM_MODE := arm
-LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lOpenSLES
-LOCAL_CFLAGS    := -D__ANDROID__ -I"../../../external-deps/lua/include" -I"../../../external-deps/bullet/include" -I"../../../external-deps/png/include" -I"../../../external-deps/ogg/include" -I"../../../external-deps/vorbis/include" -I"../../../external-deps/openal/include" -I"../../../gameplay/src"
-LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
-LOCAL_SHARED_LIBRARIES := gameplay
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,android/native_app_glue)

+ 0 - 6
samples/mesh/android/jni/Application.mk

@@ -1,6 +0,0 @@
-NDK_TOOLCHAIN_VERSION := 4.8
-APP_CPPFLAGS += -std=c++11
-APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a x86
-APP_PLATFORM := android-16
-

+ 0 - 3
samples/mesh/android/project.properties

@@ -1,3 +0,0 @@
-target=android-16
-android.library=false
-source.dir=../src

BIN
samples/mesh/android/res/drawable/icon.png


+ 0 - 4
samples/mesh/android/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Mesh</string>
-</resources>

+ 0 - 7
samples/mesh/game.config

@@ -1,7 +0,0 @@
-window
-{
-    title = Mesh
-    width = 1280
-    height = 720
-    fullscreen = false
-}

BIN
samples/mesh/icon.png


BIN
samples/mesh/res/duck.png


BIN
samples/mesh/res/mesh.fbx


BIN
samples/mesh/res/mesh.gpb


+ 0 - 62
samples/mesh/res/mesh.material

@@ -1,62 +0,0 @@
-material duck
-{
-    technique
-    {
-        pass 0
-        {
-            // shaders
-            vertexShader = res/shaders/textured.vert
-            fragmentShader = res/shaders/textured.frag
-            defines = SPECULAR;DIRECTIONAL_LIGHT_COUNT 1
-            
-            // uniforms
-            u_worldViewProjectionMatrix = WORLD_VIEW_PROJECTION_MATRIX
-            u_inverseTransposeWorldViewMatrix = INVERSE_TRANSPOSE_WORLD_VIEW_MATRIX
-            u_cameraPosition = CAMERA_WORLD_POSITION
-            u_ambientColor = 0.2, 0.2, 0.2
-            u_specularExponent = 50
-            
-            // samplers
-            sampler u_diffuseTexture
-            {
-                path = res/duck.png
-                mipmap = true
-                wrapS = CLAMP
-                wrapT = CLAMP
-                minFilter = NEAREST_MIPMAP_LINEAR
-                magFilter = LINEAR
-            }
-
-            // render state
-            renderState
-            {
-                cullFace = true
-                depthTest = true
-            }
-        }
-    }
-}
-
-material grid
-{
-    technique
-    {
-        pass 0
-        {
-            // shaders
-            vertexShader = res/shaders/colored.vert
-            fragmentShader = res/shaders/colored.frag
-			defines = VERTEX_COLOR
-
-             // uniforms
-            u_worldViewProjectionMatrix = WORLD_VIEW_PROJECTION_MATRIX
-            
-            // render state
-            renderState
-            {
-                cullFace = true
-                depthTest = true
-            }
-        }
-    }
-}

BIN
samples/mesh/res/mesh.mb


+ 0 - 9
samples/mesh/res/mesh.scene

@@ -1,9 +0,0 @@
-scene
-{
-    path = res/mesh.gpb
-    
-    node duck
-    {
-        material = res/mesh.material#duck
-    }
-}

+ 0 - 42
samples/mesh/sample-mesh-ios.plist

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>Mesh</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.png</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.gameplay3d.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.games</string>
-	<key>UIStatusBarHidden</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
-</plist>

Some files were not shown because too many files changed in this diff