Merge branch 'next' of https://github.com/blackberry/GamePlay into next

Conflicts:
	gameplay/gameplay.vcxproj
	gameplay/gameplay.vcxproj.filters
	gameplay/src/lua/lua_Joystick.h
	gameplay/src/lua/lua_JoystickControl.cpp

CMakeLists.txt

@@ -25,6 +25,5 @@ add_subdirectory(gameplay)
 add_subdirectory(samples)
 
 # gameplay encoder
-# A pre-compiled executable can be found in 'gameplay/bin'
-# Uncomment out this line if you want to build the encoder instead of using the pre-compiled gameplay-encoder.
+# A pre-compiled executable can be found in 'gameplay/bin'. Uncomment to build yourself.
 #add_subdirectory(tools/encoder)

gameplay.sln

@@ -1,16 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio Express 2013 for Windows Desktop
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-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}"
+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}") = "sample-mesh", "samples\mesh\sample-mesh.vcxproj", "{D672DC66-3CE0-4878-B0D2-813CA731012F}"
+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}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 	EndProjectSection
@@ -50,6 +50,18 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|Win32.Build.0 = Debug|Win32
+		{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|Win32.ActiveCfg = DebugMem|Win32
+		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{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|Win32.ActiveCfg = Release|Win32
+		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|Win32.Build.0 = Release|Win32
+		{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|Win32.ActiveCfg = Debug|Win32
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|Win32.Build.0 = Debug|Win32
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|x64.ActiveCfg = Debug|x64
@@ -74,18 +86,6 @@ Global
 		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|Win32.Build.0 = Release|Win32
 		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|x64.ActiveCfg = Release|x64
 		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|x64.Build.0 = Release|x64
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|Win32.Build.0 = Debug|Win32
-		{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|Win32.ActiveCfg = DebugMem|Win32
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|Win32.Build.0 = DebugMem|Win32
-		{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|Win32.ActiveCfg = Release|Win32
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|Win32.Build.0 = Release|Win32
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|x64.ActiveCfg = Release|x64
-		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|x64.Build.0 = Release|x64
 		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|Win32.Build.0 = Debug|Win32
 		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|x64.ActiveCfg = Debug|x64

gameplay/.cproject

@@ -1,224 +1,224 @@
-<?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.qnx.qcc.configuration.staticLib.debug.17111725">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.staticLib.debug.17111725" moduleId="org.eclipse.cdt.core.settings" name="Device-Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" 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.staticLib" description="" id="com.qnx.qcc.configuration.staticLib.debug.17111725" name="Device-Debug" parent="com.qnx.qcc.configuration.staticLib.debug">
-					<folderInfo id="com.qnx.qcc.configuration.staticLib.debug.17111725." name="/" resourcePath="">
-						<toolChain id="com.qnx.qcc.toolChain.staticLib.debug.1686166742" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
-							<option id="com.qnx.qcc.option.cpu.545743487" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/>
-							<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.158841187" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/gameplay/Device-Debug}" id="org.eclipse.cdt.build.core.internal.builder.159190287" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
-							<tool id="com.qnx.qcc.tool.compiler.96907942" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
-								<option id="com.qnx.qcc.option.compile.debug.1765481355" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.compiler.security.311918799" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.compiler.defines.1481323494" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
-									<listOptionValue builtIn="false" value="BT_USE_NEON"/>
-									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
-								</option>
-								<option id="com.qnx.qcc.option.compiler.includePath.2133604142" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/lua/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/bullet/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/oggvorbis/include&quot;"/>
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
-								</option>
-								<option id="com.qnx.qcc.option.compiler.qccoptions.1968057343" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-psabi"/>
-								</option>
-								<option id="com.qnx.qcc.option.compiler.ccoptions.1078137668" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
-									<listOptionValue builtIn="false" value="-mfpu=neon"/>
-								</option>
-								<inputType id="com.qnx.qcc.inputType.compiler.997142816" superClass="com.qnx.qcc.inputType.compiler"/>
-							</tool>
-							<tool id="com.qnx.qcc.tool.assembler.1988140188" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
-								<option id="com.qnx.qcc.option.assembler.debug.1929307156" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.assembler.defines.1866459653" name="Defines (-D)" superClass="com.qnx.qcc.option.assembler.defines"/>
-								<inputType id="com.qnx.qcc.inputType.assembler.1944074393" superClass="com.qnx.qcc.inputType.assembler"/>
-							</tool>
-							<tool id="com.qnx.qcc.tool.linker.85592747" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
-								<option id="com.qnx.qcc.option.linker.debug.1489037662" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.linker.langcpp.1824441870" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.linker.security.908036009" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.linker.libraryPaths.821495066" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/armle-v7/lib"/>
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/armle-v7/usr/lib"/>
-								</option>
-							</tool>
-							<tool id="com.qnx.qcc.tool.archiver.1650721640" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="com.qnx.qcc.configuration.staticLib.release.936504809">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.staticLib.release.936504809" moduleId="org.eclipse.cdt.core.settings" name="Device-Release">
-				<externalSettings/>
-				<extensions>
-					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" 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"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" 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.staticLib" description="" id="com.qnx.qcc.configuration.staticLib.release.936504809" name="Device-Release" parent="com.qnx.qcc.configuration.staticLib.release">
-					<folderInfo id="com.qnx.qcc.configuration.staticLib.release.936504809." name="/" resourcePath="">
-						<toolChain id="com.qnx.qcc.toolChain.staticLib.release.11990035" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
-							<option id="com.qnx.qcc.option.cpu.33079389" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/>
-							<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.1117051584" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/gameplay/Device-Release}" id="cdt.managedbuild.target.gnu.builder.base.1199322737" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
-							<tool id="com.qnx.qcc.tool.compiler.1345567866" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
-								<option id="com.qnx.qcc.option.compiler.optlevel.1056793982" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.1" valueType="enumerated"/>
-								<option id="com.qnx.qcc.option.compiler.security.324540233" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.compiler.defines.398688299" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
-									<listOptionValue builtIn="false" value="BT_USE_NEON"/>
-									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
-								</option>
-								<option id="com.qnx.qcc.option.compiler.includePath.1670164593" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/bullet/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/lua/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/oggvorbis/include&quot;"/>
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
-								</option>
-								<option id="com.qnx.qcc.option.compiler.ccoptions.1122311163" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
-									<listOptionValue builtIn="false" value="-mfpu=neon"/>
-								</option>
-								<option id="com.qnx.qcc.option.compiler.qccoptions.1770609643" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-psabi"/>
-								</option>
-								<inputType id="com.qnx.qcc.inputType.compiler.1380846613" superClass="com.qnx.qcc.inputType.compiler"/>
-							</tool>
-							<tool id="com.qnx.qcc.tool.assembler.855139060" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
-								<inputType id="com.qnx.qcc.inputType.assembler.590404074" superClass="com.qnx.qcc.inputType.assembler"/>
-							</tool>
-							<tool id="com.qnx.qcc.tool.linker.2038455782" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
-								<option id="com.qnx.qcc.option.linker.langcpp.868659975" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.linker.security.1604612317" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.linker.libraryPaths.823080047" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/armle-v7/lib"/>
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/armle-v7/usr/lib"/>
-								</option>
-							</tool>
-							<tool id="com.qnx.qcc.tool.archiver.97765823" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="com.qnx.qcc.configuration.staticLib.debug.559445444">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.staticLib.debug.559445444" moduleId="org.eclipse.cdt.core.settings" name="Simulator">
-				<externalSettings/>
-				<extensions>
-					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" 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"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" 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.staticLib" description="" id="com.qnx.qcc.configuration.staticLib.debug.559445444" name="Simulator" parent="com.qnx.qcc.configuration.staticLib.debug">
-					<folderInfo id="com.qnx.qcc.configuration.staticLib.debug.559445444." name="/" resourcePath="">
-						<toolChain id="com.qnx.qcc.toolChain.staticLib.debug.1260117207" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
-							<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.795462400" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/gameplay/Simulator}" id="cdt.managedbuild.target.gnu.builder.base.10075032" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
-							<tool id="com.qnx.qcc.tool.compiler.1004416224" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
-								<option id="com.qnx.qcc.option.compile.debug.1122485646" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.compiler.security.1671403331" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.compiler.defines.1863269886" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
-									<listOptionValue builtIn="false" value="BT_USE_NEON"/>
-									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
-								</option>
-								<option id="com.qnx.qcc.option.compiler.includePath.847642559" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/bullet/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/lua/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../../external-deps/oggvorbis/include&quot;"/>
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
-								</option>
-								<option id="com.qnx.qcc.option.compiler.ccoptions.1432778691" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions"/>
-								<option id="com.qnx.qcc.option.compiler.qccoptions.245518255" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-psabi"/>
-								</option>
-								<inputType id="com.qnx.qcc.inputType.compiler.1038720310" superClass="com.qnx.qcc.inputType.compiler"/>
-							</tool>
-							<tool id="com.qnx.qcc.tool.assembler.521146732" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
-								<option id="com.qnx.qcc.option.assembler.debug.180925874" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
-								<inputType id="com.qnx.qcc.inputType.assembler.1284236061" superClass="com.qnx.qcc.inputType.assembler"/>
-							</tool>
-							<tool id="com.qnx.qcc.tool.linker.1609792323" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
-								<option id="com.qnx.qcc.option.linker.debug.1885061957" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.linker.langcpp.538911746" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.linker.security.1731404314" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
-								<option id="com.qnx.qcc.option.linker.libraryPaths.1915056460" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/x86/lib"/>
-									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/x86/usr/lib"/>
-								</option>
-							</tool>
-							<tool id="com.qnx.qcc.tool.archiver.1201481995" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="gameplay.null.436970955" name="gameplay"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
-		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.coverage.796584174">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.profile.191203500">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.debug.559445444">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.release.936504809">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.profile.851611337">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.coverage.304786667">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.debug.17111725">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="1">
-		<resource resourceType="PROJECT" workspacePath="/gameplay"/>
-	</storageModule>
-	<storageModule moduleId="com.qnx.tools.ide.qde.core.QNXProjectProperties"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cproject>
+<?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.qnx.qcc.configuration.staticLib.debug.17111725">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.staticLib.debug.17111725" moduleId="org.eclipse.cdt.core.settings" name="Device-Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" 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.staticLib" description="" id="com.qnx.qcc.configuration.staticLib.debug.17111725" name="Device-Debug" parent="com.qnx.qcc.configuration.staticLib.debug">
+					<folderInfo id="com.qnx.qcc.configuration.staticLib.debug.17111725." name="/" resourcePath="">
+						<toolChain id="com.qnx.qcc.toolChain.staticLib.debug.1686166742" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
+							<option id="com.qnx.qcc.option.cpu.545743487" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/>
+							<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.158841187" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
+							<builder buildPath="${workspace_loc:/gameplay/Device-Debug}" id="org.eclipse.cdt.build.core.internal.builder.159190287" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<tool id="com.qnx.qcc.tool.compiler.96907942" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
+								<option id="com.qnx.qcc.option.compile.debug.1765481355" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.compiler.security.311918799" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.compiler.defines.1481323494" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
+									<listOptionValue builtIn="false" value="BT_USE_NEON"/>
+									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
+								</option>
+								<option id="com.qnx.qcc.option.compiler.includePath.2133604142" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/lua/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/bullet/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/oggvorbis/include&quot;"/>
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+								</option>
+								<option id="com.qnx.qcc.option.compiler.qccoptions.1968057343" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-psabi"/>
+								</option>
+								<option id="com.qnx.qcc.option.compiler.ccoptions.1078137668" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+									<listOptionValue builtIn="false" value="-mfpu=neon"/>
+								</option>
+								<inputType id="com.qnx.qcc.inputType.compiler.997142816" superClass="com.qnx.qcc.inputType.compiler"/>
+							</tool>
+							<tool id="com.qnx.qcc.tool.assembler.1988140188" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
+								<option id="com.qnx.qcc.option.assembler.debug.1929307156" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.assembler.defines.1866459653" name="Defines (-D)" superClass="com.qnx.qcc.option.assembler.defines"/>
+								<inputType id="com.qnx.qcc.inputType.assembler.1944074393" superClass="com.qnx.qcc.inputType.assembler"/>
+							</tool>
+							<tool id="com.qnx.qcc.tool.linker.85592747" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
+								<option id="com.qnx.qcc.option.linker.debug.1489037662" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.linker.langcpp.1824441870" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.linker.security.908036009" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.linker.libraryPaths.821495066" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/armle-v7/lib"/>
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/armle-v7/usr/lib"/>
+								</option>
+							</tool>
+							<tool id="com.qnx.qcc.tool.archiver.1650721640" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="com.qnx.qcc.configuration.staticLib.release.936504809">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.staticLib.release.936504809" moduleId="org.eclipse.cdt.core.settings" name="Device-Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" 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"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" 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.staticLib" description="" id="com.qnx.qcc.configuration.staticLib.release.936504809" name="Device-Release" parent="com.qnx.qcc.configuration.staticLib.release">
+					<folderInfo id="com.qnx.qcc.configuration.staticLib.release.936504809." name="/" resourcePath="">
+						<toolChain id="com.qnx.qcc.toolChain.staticLib.release.11990035" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
+							<option id="com.qnx.qcc.option.cpu.33079389" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/>
+							<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.1117051584" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
+							<builder buildPath="${workspace_loc:/gameplay/Device-Release}" id="cdt.managedbuild.target.gnu.builder.base.1199322737" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<tool id="com.qnx.qcc.tool.compiler.1345567866" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
+								<option id="com.qnx.qcc.option.compiler.optlevel.1056793982" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.1" valueType="enumerated"/>
+								<option id="com.qnx.qcc.option.compiler.security.324540233" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.compiler.defines.398688299" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
+									<listOptionValue builtIn="false" value="BT_USE_NEON"/>
+									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
+								</option>
+								<option id="com.qnx.qcc.option.compiler.includePath.1670164593" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/bullet/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/lua/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/oggvorbis/include&quot;"/>
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+								</option>
+								<option id="com.qnx.qcc.option.compiler.ccoptions.1122311163" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+									<listOptionValue builtIn="false" value="-mfpu=neon"/>
+								</option>
+								<option id="com.qnx.qcc.option.compiler.qccoptions.1770609643" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-psabi"/>
+								</option>
+								<inputType id="com.qnx.qcc.inputType.compiler.1380846613" superClass="com.qnx.qcc.inputType.compiler"/>
+							</tool>
+							<tool id="com.qnx.qcc.tool.assembler.855139060" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
+								<inputType id="com.qnx.qcc.inputType.assembler.590404074" superClass="com.qnx.qcc.inputType.assembler"/>
+							</tool>
+							<tool id="com.qnx.qcc.tool.linker.2038455782" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
+								<option id="com.qnx.qcc.option.linker.langcpp.868659975" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.linker.security.1604612317" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.linker.libraryPaths.823080047" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/armle-v7/lib"/>
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/armle-v7/usr/lib"/>
+								</option>
+							</tool>
+							<tool id="com.qnx.qcc.tool.archiver.97765823" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="com.qnx.qcc.configuration.staticLib.debug.559445444">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.staticLib.debug.559445444" moduleId="org.eclipse.cdt.core.settings" name="Simulator">
+				<externalSettings/>
+				<extensions>
+					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" 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"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" 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.staticLib" description="" id="com.qnx.qcc.configuration.staticLib.debug.559445444" name="Simulator" parent="com.qnx.qcc.configuration.staticLib.debug">
+					<folderInfo id="com.qnx.qcc.configuration.staticLib.debug.559445444." name="/" resourcePath="">
+						<toolChain id="com.qnx.qcc.toolChain.staticLib.debug.1260117207" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
+							<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.795462400" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
+							<builder buildPath="${workspace_loc:/gameplay/Simulator}" id="cdt.managedbuild.target.gnu.builder.base.10075032" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<tool id="com.qnx.qcc.tool.compiler.1004416224" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
+								<option id="com.qnx.qcc.option.compile.debug.1122485646" name="Debug (-g)" superClass="com.qnx.qcc.option.compile.debug" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.compiler.security.1671403331" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.compiler.defines.1863269886" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
+									<listOptionValue builtIn="false" value="BT_USE_NEON"/>
+									<listOptionValue builtIn="false" value="GP_USE_GAMEPAD"/>
+								</option>
+								<option id="com.qnx.qcc.option.compiler.includePath.847642559" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/bullet/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/lua/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../../external-deps/oggvorbis/include&quot;"/>
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+								</option>
+								<option id="com.qnx.qcc.option.compiler.ccoptions.1432778691" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions"/>
+								<option id="com.qnx.qcc.option.compiler.qccoptions.245518255" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-psabi"/>
+								</option>
+								<inputType id="com.qnx.qcc.inputType.compiler.1038720310" superClass="com.qnx.qcc.inputType.compiler"/>
+							</tool>
+							<tool id="com.qnx.qcc.tool.assembler.521146732" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
+								<option id="com.qnx.qcc.option.assembler.debug.180925874" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
+								<inputType id="com.qnx.qcc.inputType.assembler.1284236061" superClass="com.qnx.qcc.inputType.assembler"/>
+							</tool>
+							<tool id="com.qnx.qcc.tool.linker.1609792323" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
+								<option id="com.qnx.qcc.option.linker.debug.1885061957" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.linker.langcpp.538911746" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.linker.security.1731404314" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
+								<option id="com.qnx.qcc.option.linker.libraryPaths.1915056460" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/x86/lib"/>
+									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/x86/usr/lib"/>
+								</option>
+							</tool>
+							<tool id="com.qnx.qcc.tool.archiver.1201481995" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="gameplay.null.436970955" name="gameplay"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
+		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.coverage.796584174">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.profile.191203500">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.debug.559445444">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.release.936504809">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.profile.851611337">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.coverage.304786667">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.staticLib.debug.17111725">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope" versionNumber="1">
+		<resource resourceType="PROJECT" workspacePath="/gameplay"/>
+	</storageModule>
+	<storageModule moduleId="com.qnx.tools.ide.qde.core.QNXProjectProperties"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+</cproject>

gameplay/CMakeLists.txt

@@ -90,9 +90,8 @@ set(GAMEPLAY_SRC
     src/ImageControl.h
     src/Joint.cpp
     src/Joint.h
-    src/Joystick.cpp
-    src/Joystick.h
-    src/Joystick.inl
+    src/JoystickControl.cpp
+    src/JoystickControl.h
     src/Label.cpp
     src/Label.h
     src/Layout.cpp
@@ -367,8 +366,8 @@ set(GAMEPLAY_LUA
     src/lua/lua_ImageFormat.h
     src/lua/lua_Joint.cpp
     src/lua/lua_Joint.h
-    src/lua/lua_Joystick.cpp
-    src/lua/lua_Joystick.h
+    src/lua/lua_JoystickControl.cpp
+    src/lua/lua_JoystickControl.h
     src/lua/lua_Keyboard.cpp
     src/lua/lua_Keyboard.h
     src/lua/lua_KeyboardKey.cpp

gameplay/android/jni/Android.mk

@@ -44,7 +44,7 @@ LOCAL_SRC_FILES := \
     Image.cpp \
     ImageControl.cpp \
     Joint.cpp \
-    Joystick.cpp \
+    JoystickControl.cpp \
     Label.cpp \
     Layout.cpp \
     Light.cpp \
@@ -174,7 +174,7 @@ LOCAL_SRC_FILES := \
     lua/lua_ImageControl.cpp \
     lua/lua_ImageFormat.cpp \
     lua/lua_Joint.cpp \
-    lua/lua_Joystick.cpp \
+    lua/lua_JoystickControl.cpp \
     lua/lua_Keyboard.cpp \
     lua/lua_KeyboardKey.cpp \
     lua/lua_KeyboardKeyEvent.cpp \

gameplay/gameplay.vcxproj

@@ -70,7 +70,7 @@
     <ClCompile Include="src\Image.cpp" />
     <ClCompile Include="src\ImageControl.cpp" />
     <ClCompile Include="src\Joint.cpp" />
-    <ClCompile Include="src\Joystick.cpp" />
+    <ClCompile Include="src\JoystickControl.cpp" />
     <ClCompile Include="src\Label.cpp" />
     <ClCompile Include="src\Layout.cpp" />
     <ClCompile Include="src\Light.cpp" />
@@ -142,7 +142,7 @@
     <ClCompile Include="src\lua\lua_ImageControl.cpp" />
     <ClCompile Include="src\lua\lua_ImageFormat.cpp" />
     <ClCompile Include="src\lua\lua_Joint.cpp" />
-    <ClCompile Include="src\lua\lua_Joystick.cpp" />
+    <ClCompile Include="src\lua\lua_JoystickControl.cpp" />
     <ClCompile Include="src\lua\lua_Keyboard.cpp" />
     <ClCompile Include="src\lua\lua_KeyboardKey.cpp" />
     <ClCompile Include="src\lua\lua_KeyboardKeyEvent.cpp" />
@@ -357,7 +357,7 @@
     <ClInclude Include="src\Image.h" />
     <ClInclude Include="src\ImageControl.h" />
     <ClInclude Include="src\Joint.h" />
-    <ClInclude Include="src\Joystick.h" />
+    <ClInclude Include="src\JoystickControl.h" />
     <ClInclude Include="src\Keyboard.h" />
     <ClInclude Include="src\Label.h" />
     <ClInclude Include="src\Layout.h" />
@@ -430,7 +430,7 @@
     <ClInclude Include="src\lua\lua_ImageControl.h" />
     <ClInclude Include="src\lua\lua_ImageFormat.h" />
     <ClInclude Include="src\lua\lua_Joint.h" />
-    <ClInclude Include="src\lua\lua_Joystick.h" />
+    <ClInclude Include="src\lua\lua_JoystickControl.h" />
     <ClInclude Include="src\lua\lua_Keyboard.h" />
     <ClInclude Include="src\lua\lua_KeyboardKey.h" />
     <ClInclude Include="src\lua\lua_KeyboardKeyEvent.h" />
@@ -627,7 +627,6 @@
     <None Include="src\Image.inl" />
     <None Include="src\MathUtil.inl" />
     <None Include="src\MathUtilNeon.inl" />
-    <None Include="src\Joystick.inl" />
     <None Include="src\Matrix.inl" />
     <None Include="src\MeshBatch.inl" />
     <None Include="src\Plane.inl" />

gameplay/gameplay.vcxproj.filters

@@ -300,9 +300,6 @@
     <ClCompile Include="src\Joint.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\Joystick.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="src\Label.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -549,9 +546,6 @@
     <ClCompile Include="src\lua\lua_Joint.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_Joystick.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Keyboard.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -879,6 +873,12 @@
     <ClCompile Include="src\lua\lua_CameraListener.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
+    <ClCompile Include="src\JoystickControl.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\lua\lua_JoystickControl.cpp">
+      <Filter>src\lua</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Plane.h">
@@ -1157,9 +1157,6 @@
     <ClInclude Include="src\Joint.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="src\Joystick.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="src\Keyboard.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -1409,9 +1406,6 @@
     <ClInclude Include="src\lua\lua_Joint.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_Joystick.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Keyboard.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1739,6 +1733,12 @@
     <ClInclude Include="src\lua\lua_CameraListener.h">
       <Filter>src\lua</Filter>
     </ClInclude>
+    <ClInclude Include="src\JoystickControl.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\lua\lua_JoystickControl.h">
+      <Filter>src\lua</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\ScriptController.inl">
@@ -1756,9 +1756,6 @@
     <None Include="src\Image.inl">
       <Filter>src</Filter>
     </None>
-    <None Include="src\Joystick.inl">
-      <Filter>src</Filter>
-    </None>
     <None Include="src\MathUtil.inl">
       <Filter>src</Filter>
     </None>

gameplay/gameplay.xcodeproj/project.pbxproj

@@ -141,8 +141,6 @@
 		420BBD131817416F00C7B720 /* lua_ImageFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB261817416E00C7B720 /* lua_ImageFormat.cpp */; };
 		420BBD161817416F00C7B720 /* lua_Joint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB281817416E00C7B720 /* lua_Joint.cpp */; };
 		420BBD171817416F00C7B720 /* lua_Joint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB281817416E00C7B720 /* lua_Joint.cpp */; };
-		420BBD1A1817416F00C7B720 /* lua_Joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB2A1817416E00C7B720 /* lua_Joystick.cpp */; };
-		420BBD1B1817416F00C7B720 /* lua_Joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB2A1817416E00C7B720 /* lua_Joystick.cpp */; };
 		420BBD1E1817416F00C7B720 /* lua_Keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB2C1817416E00C7B720 /* lua_Keyboard.cpp */; };
 		420BBD1F1817416F00C7B720 /* lua_Keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB2C1817416E00C7B720 /* lua_Keyboard.cpp */; };
 		420BBD221817416F00C7B720 /* lua_KeyboardKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB2E1817416E00C7B720 /* lua_KeyboardKey.cpp */; };
@@ -362,6 +360,10 @@
 		42252DD01828145B00EE234B /* lua_TerrainPatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42252DCA1828145B00EE234B /* lua_TerrainPatch.cpp */; };
 		42252DD11828145B00EE234B /* lua_TerrainPatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42252DCA1828145B00EE234B /* lua_TerrainPatch.cpp */; };
 		4234D99E14686C52003031B3 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4234D99D14686C52003031B3 /* Cocoa.framework */; };
+		426F8317187F72A700640CBA /* JoystickControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 426F8315187F72A700640CBA /* JoystickControl.cpp */; };
+		426F8318187F72A700640CBA /* JoystickControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 426F8315187F72A700640CBA /* JoystickControl.cpp */; };
+		426F831B187F72DF00640CBA /* lua_JoystickControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 426F8319187F72DF00640CBA /* lua_JoystickControl.cpp */; };
+		426F831C187F72DF00640CBA /* lua_JoystickControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 426F8319187F72DF00640CBA /* lua_JoystickControl.cpp */; };
 		42CC556C1809A4EF00AAD8AD /* AbsoluteLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC52F71809A4EB00AAD8AD /* AbsoluteLayout.cpp */; };
 		42CC556D1809A4EF00AAD8AD /* AbsoluteLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC52F71809A4EB00AAD8AD /* AbsoluteLayout.cpp */; };
 		42CC55701809A4EF00AAD8AD /* AIAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC52F91809A4EB00AAD8AD /* AIAgent.cpp */; };
@@ -450,8 +452,6 @@
 		42CC56131809A4EF00AAD8AD /* ImageControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC534E1809A4EC00AAD8AD /* ImageControl.cpp */; };
 		42CC56161809A4EF00AAD8AD /* Joint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC53501809A4EC00AAD8AD /* Joint.cpp */; };
 		42CC56171809A4EF00AAD8AD /* Joint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC53501809A4EC00AAD8AD /* Joint.cpp */; };
-		42CC561A1809A4EF00AAD8AD /* Joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC53521809A4EC00AAD8AD /* Joystick.cpp */; };
-		42CC561B1809A4EF00AAD8AD /* Joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC53521809A4EC00AAD8AD /* Joystick.cpp */; };
 		42CC56201809A4EF00AAD8AD /* Label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC53561809A4EC00AAD8AD /* Label.cpp */; };
 		42CC56211809A4EF00AAD8AD /* Label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC53561809A4EC00AAD8AD /* Label.cpp */; };
 		42CC56241809A4EF00AAD8AD /* Layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CC53581809A4EC00AAD8AD /* Layout.cpp */; };
@@ -734,8 +734,6 @@
 		420BBB271817416E00C7B720 /* lua_ImageFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_ImageFormat.h; sourceTree = "<group>"; };
 		420BBB281817416E00C7B720 /* lua_Joint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_Joint.cpp; sourceTree = "<group>"; };
 		420BBB291817416E00C7B720 /* lua_Joint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_Joint.h; sourceTree = "<group>"; };
-		420BBB2A1817416E00C7B720 /* lua_Joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_Joystick.cpp; sourceTree = "<group>"; };
-		420BBB2B1817416E00C7B720 /* lua_Joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_Joystick.h; sourceTree = "<group>"; };
 		420BBB2C1817416E00C7B720 /* lua_Keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_Keyboard.cpp; sourceTree = "<group>"; };
 		420BBB2D1817416E00C7B720 /* lua_Keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_Keyboard.h; sourceTree = "<group>"; };
 		420BBB2E1817416E00C7B720 /* lua_KeyboardKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_KeyboardKey.cpp; sourceTree = "<group>"; };
@@ -956,6 +954,10 @@
 		42252DCB1828145B00EE234B /* lua_TerrainPatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_TerrainPatch.h; sourceTree = "<group>"; };
 		4234D99A14686C52003031B3 /* libgameplay.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgameplay.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4234D99D14686C52003031B3 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		426F8315187F72A700640CBA /* JoystickControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JoystickControl.cpp; path = src/JoystickControl.cpp; sourceTree = SOURCE_ROOT; };
+		426F8316187F72A700640CBA /* JoystickControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickControl.h; path = src/JoystickControl.h; sourceTree = SOURCE_ROOT; };
+		426F8319187F72DF00640CBA /* lua_JoystickControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_JoystickControl.cpp; sourceTree = "<group>"; };
+		426F831A187F72DF00640CBA /* lua_JoystickControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_JoystickControl.h; sourceTree = "<group>"; };
 		42B701F615B08177002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../external-deps/lua/lib/macosx/liblua.a"; sourceTree = "<group>"; };
 		42B701F815B081B6002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../external-deps/lua/lib/ios/armv7s/liblua.a"; sourceTree = "<group>"; };
 		42CC52F71809A4EB00AAD8AD /* AbsoluteLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AbsoluteLayout.cpp; path = src/AbsoluteLayout.cpp; sourceTree = SOURCE_ROOT; };
@@ -1049,9 +1051,6 @@
 		42CC534F1809A4EC00AAD8AD /* ImageControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageControl.h; path = src/ImageControl.h; sourceTree = SOURCE_ROOT; };
 		42CC53501809A4EC00AAD8AD /* Joint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Joint.cpp; path = src/Joint.cpp; sourceTree = SOURCE_ROOT; };
 		42CC53511809A4EC00AAD8AD /* Joint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Joint.h; path = src/Joint.h; sourceTree = SOURCE_ROOT; };
-		42CC53521809A4EC00AAD8AD /* Joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Joystick.cpp; path = src/Joystick.cpp; sourceTree = SOURCE_ROOT; };
-		42CC53531809A4EC00AAD8AD /* Joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Joystick.h; path = src/Joystick.h; sourceTree = SOURCE_ROOT; };
-		42CC53541809A4EC00AAD8AD /* Joystick.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Joystick.inl; path = src/Joystick.inl; sourceTree = SOURCE_ROOT; };
 		42CC53551809A4EC00AAD8AD /* Keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Keyboard.h; path = src/Keyboard.h; sourceTree = SOURCE_ROOT; };
 		42CC53561809A4EC00AAD8AD /* Label.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Label.cpp; path = src/Label.cpp; sourceTree = SOURCE_ROOT; };
 		42CC53571809A4EC00AAD8AD /* Label.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Label.h; path = src/Label.h; sourceTree = SOURCE_ROOT; };
@@ -1396,8 +1395,8 @@
 				420BBB271817416E00C7B720 /* lua_ImageFormat.h */,
 				420BBB281817416E00C7B720 /* lua_Joint.cpp */,
 				420BBB291817416E00C7B720 /* lua_Joint.h */,
-				420BBB2A1817416E00C7B720 /* lua_Joystick.cpp */,
-				420BBB2B1817416E00C7B720 /* lua_Joystick.h */,
+				426F8319187F72DF00640CBA /* lua_JoystickControl.cpp */,
+				426F831A187F72DF00640CBA /* lua_JoystickControl.h */,
 				420BBB2C1817416E00C7B720 /* lua_Keyboard.cpp */,
 				420BBB2D1817416E00C7B720 /* lua_Keyboard.h */,
 				420BBB2E1817416E00C7B720 /* lua_KeyboardKey.cpp */,
@@ -1736,9 +1735,8 @@
 				42CC534F1809A4EC00AAD8AD /* ImageControl.h */,
 				42CC53501809A4EC00AAD8AD /* Joint.cpp */,
 				42CC53511809A4EC00AAD8AD /* Joint.h */,
-				42CC53521809A4EC00AAD8AD /* Joystick.cpp */,
-				42CC53531809A4EC00AAD8AD /* Joystick.h */,
-				42CC53541809A4EC00AAD8AD /* Joystick.inl */,
+				426F8315187F72A700640CBA /* JoystickControl.cpp */,
+				426F8316187F72A700640CBA /* JoystickControl.h */,
 				42CC53551809A4EC00AAD8AD /* Keyboard.h */,
 				42CC53561809A4EC00AAD8AD /* Label.cpp */,
 				42CC53571809A4EC00AAD8AD /* Label.h */,
@@ -2056,6 +2054,7 @@
 				42CC598E1809A4EF00AAD8AD /* Rectangle.cpp in Sources */,
 				42CC55DE1809A4EF00AAD8AD /* FlowLayout.cpp in Sources */,
 				420BBE861817416F00C7B720 /* lua_TextureFormat.cpp in Sources */,
+				426F831B187F72DF00640CBA /* lua_JoystickControl.cpp in Sources */,
 				42CC59F61809A4EF00AAD8AD /* Texture.cpp in Sources */,
 				42CC55CA1809A4EF00AAD8AD /* Curve.cpp in Sources */,
 				420BBDAE1817416F00C7B720 /* lua_PhysicsCollisionShapeDefinition.cpp in Sources */,
@@ -2115,12 +2114,12 @@
 				420BBD0E1817416F00C7B720 /* lua_ImageControl.cpp in Sources */,
 				420BBE9E1817416F00C7B720 /* lua_ThemeThemeImage.cpp in Sources */,
 				420BBE6E1817416F00C7B720 /* lua_TerrainFlags.cpp in Sources */,
+				426F8317187F72A700640CBA /* JoystickControl.cpp in Sources */,
 				42CC5A1E1809A4EF00AAD8AD /* VerticalLayout.cpp in Sources */,
 				42252DD01828145B00EE234B /* lua_TerrainPatch.cpp in Sources */,
 				420BBCB21817416F00C7B720 /* lua_DepthStencilTargetFormat.cpp in Sources */,
 				420BBCAE1817416F00C7B720 /* lua_DepthStencilTarget.cpp in Sources */,
 				42CC59821809A4EF00AAD8AD /* Quaternion.cpp in Sources */,
-				42CC561A1809A4EF00AAD8AD /* Joystick.cpp in Sources */,
 				42CC59E01809A4EF00AAD8AD /* SpriteBatch.cpp in Sources */,
 				420BBE021817416F00C7B720 /* lua_PropertiesType.cpp in Sources */,
 				420BBD221817416F00C7B720 /* lua_KeyboardKey.cpp in Sources */,
@@ -2194,7 +2193,6 @@
 				420BBC2E1817416F00C7B720 /* lua_AIStateListener.cpp in Sources */,
 				420BBD0A1817416F00C7B720 /* lua_Image.cpp in Sources */,
 				420BBD1E1817416F00C7B720 /* lua_Keyboard.cpp in Sources */,
-				420BBD1A1817416F00C7B720 /* lua_Joystick.cpp in Sources */,
 				42CC592A1809A4EF00AAD8AD /* ParticleEmitter.cpp in Sources */,
 				420BBC461817416F00C7B720 /* lua_AnimationClipListenerEventType.cpp in Sources */,
 				42CC55FC1809A4EF00AAD8AD /* gameplay-main-blackberry.cpp in Sources */,
@@ -2351,6 +2349,7 @@
 				42CC598F1809A4EF00AAD8AD /* Rectangle.cpp in Sources */,
 				42CC55DF1809A4EF00AAD8AD /* FlowLayout.cpp in Sources */,
 				420BBE871817416F00C7B720 /* lua_TextureFormat.cpp in Sources */,
+				426F831C187F72DF00640CBA /* lua_JoystickControl.cpp in Sources */,
 				42CC59F71809A4EF00AAD8AD /* Texture.cpp in Sources */,
 				42CC55CB1809A4EF00AAD8AD /* Curve.cpp in Sources */,
 				420BBDAF1817416F00C7B720 /* lua_PhysicsCollisionShapeDefinition.cpp in Sources */,
@@ -2410,13 +2409,13 @@
 				420BBD0F1817416F00C7B720 /* lua_ImageControl.cpp in Sources */,
 				420BBE9F1817416F00C7B720 /* lua_ThemeThemeImage.cpp in Sources */,
 				420BBE6F1817416F00C7B720 /* lua_TerrainFlags.cpp in Sources */,
+				426F8318187F72A700640CBA /* JoystickControl.cpp in Sources */,
 				42CC59011809A4EF00AAD8AD /* Material.cpp in Sources */,
 				42252DD11828145B00EE234B /* lua_TerrainPatch.cpp in Sources */,
 				420BBCB31817416F00C7B720 /* lua_DepthStencilTargetFormat.cpp in Sources */,
 				420BBCAF1817416F00C7B720 /* lua_DepthStencilTarget.cpp in Sources */,
 				42CC5A1F1809A4EF00AAD8AD /* VerticalLayout.cpp in Sources */,
 				42CC59831809A4EF00AAD8AD /* Quaternion.cpp in Sources */,
-				42CC561B1809A4EF00AAD8AD /* Joystick.cpp in Sources */,
 				42CC59E11809A4EF00AAD8AD /* SpriteBatch.cpp in Sources */,
 				420BBE031817416F00C7B720 /* lua_PropertiesType.cpp in Sources */,
 				420BBD231817416F00C7B720 /* lua_KeyboardKey.cpp in Sources */,
@@ -2490,7 +2489,6 @@
 				420BBC2F1817416F00C7B720 /* lua_AIStateListener.cpp in Sources */,
 				420BBD0B1817416F00C7B720 /* lua_Image.cpp in Sources */,
 				420BBD1F1817416F00C7B720 /* lua_Keyboard.cpp in Sources */,
-				420BBD1B1817416F00C7B720 /* lua_Joystick.cpp in Sources */,
 				420BBC471817416F00C7B720 /* lua_AnimationClipListenerEventType.cpp in Sources */,
 				42CC592B1809A4EF00AAD8AD /* ParticleEmitter.cpp in Sources */,
 				42CC55FD1809A4EF00AAD8AD /* gameplay-main-blackberry.cpp in Sources */,
@@ -2811,6 +2809,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = gameplay;

gameplay/res/shaders/lighting.frag

@@ -46,9 +46,9 @@ vec3 getLitPixel()
     for (int i = 0; i < DIRECTIONAL_LIGHT_COUNT; ++i)
     {
         #if defined(BUMPED)
-        vec3 lightDirection = normalize(v_directionalLightDirection[i]);
+        vec3 lightDirection = normalize(v_directionalLightDirection[i] * 2.0);
         #else
-        vec3 lightDirection = normalize(u_directionalLightDirection[i]);
+        vec3 lightDirection = normalize(u_directionalLightDirection[i] * 2.0);
         #endif 
         combinedColor += computeLighting(normalVector, -lightDirection, u_directionalLightColor[i], 1.0);
     }
@@ -73,11 +73,10 @@ vec3 getLitPixel()
         float attenuation = clamp(1.0 - dot(ldir, ldir), 0.0, 1.0);
         vec3 vertexToSpotLightDirection = normalize(v_vertexToSpotLightDirection[i]);
 
-        // TODO: Let app normalize this! Need Node::getForwardVectorViewNorm
         #if defined(BUMPED)
-            vec3 spotLightDirection = normalize(v_spotLightDirection[i]);
+            vec3 spotLightDirection = normalize(v_spotLightDirection[i] * 2.0f);
         #else
-            vec3 spotLightDirection = normalize(u_spotLightDirection[i]);
+            vec3 spotLightDirection = normalize(u_spotLightDirection[i] * 2.0f);
         #endif
 
         // "-lightDirection" is used because light direction points in opposite direction to spot direction.

gameplay/src/Container.cpp

@@ -10,7 +10,7 @@
 #include "RadioButton.h"
 #include "Slider.h"
 #include "TextBox.h"
-#include "Joystick.h"
+#include "JoystickControl.h"
 #include "ImageControl.h"
 #include "Form.h"
 #include "Game.h"

gameplay/src/Control.h

@@ -169,16 +169,6 @@ public:
              */
             RIGHT_CLICK     = 0x40,
 
-            /**
-             * Event triggered when a mouse cursor enters a control.
-             */
-            ENTER           = 0x80,
-
-            /**
-             * Event triggered when a mouse cursor leaves a control.
-             */
-            LEAVE           = 0x100,
-
             /**
              * Event triggered when a control gains focus.
              */

gameplay/src/ControlFactory.cpp

@@ -7,7 +7,7 @@
 #include "Container.h"
 #include "Slider.h"
 #include "TextBox.h"
-#include "Joystick.h"
+#include "JoystickControl.h"
 #include "ImageControl.h"
 
 namespace gameplay
@@ -85,7 +85,7 @@ void ControlFactory::registerStandardControls()
     registerCustomControl("CONTAINER", &Container::create);
     registerCustomControl("SLIDER", &Slider::create);
     registerCustomControl("TEXTBOX", &TextBox::create);
-    registerCustomControl("JOYSTICK", &Joystick::create);
+    registerCustomControl("JOYSTICK", &JoystickControl::create);
     registerCustomControl("IMAGE", &ImageControl::create);
 }
 

gameplay/src/Form.cpp

@@ -50,20 +50,18 @@ Form* Form::create(const char* url)
 
     // Load Form from .form file.
     Properties* properties = Properties::create(url);
-    Properties* formProperties = NULL;
-    if (properties)
-    {
-        // Check if the Properties is valid and has a valid namespace.
-        formProperties = (strlen(properties->getNamespace()) > 0) ? properties : properties->getNextNamespace();
-        if (!formProperties || !(strcmpnocase(formProperties->getNamespace(), "form") == 0))
-        {
-            GP_WARN("Invalid properties file for form: %s", url);
-            SAFE_DELETE(properties);
-        }
-    }
     if (!properties)
     {
         GP_WARN("Failed to load properties file for Form.");
+        return NULL;
+    }
+    // Check if the Properties is valid and has a valid namespace.
+    Properties* formProperties = (strlen(properties->getNamespace()) > 0) ? properties : properties->getNextNamespace();
+    if (!formProperties || !(strcmpnocase(formProperties->getNamespace(), "form") == 0))
+    {
+        GP_WARN("Invalid properties file for form: %s", url);
+        SAFE_DELETE(properties);
+        return NULL;
     }
 
     // Load the form's theme style.

gameplay/src/Form.h

@@ -37,6 +37,8 @@ public:
      * Creates a form from a .form properties file.
      * 
      * @param url The URL pointing to the Properties object defining the form. 
+     * 
+     * @return The new form or NULL if there was an error.
      * @script{create}
      */
     static Form* create(const char* url);

gameplay/src/Gamepad.cpp

@@ -4,7 +4,7 @@
 #include "Button.h"
 #include "Platform.h"
 #include "Form.h"
-#include "Joystick.h"
+#include "JoystickControl.h"
 
 namespace gameplay
 {
@@ -139,7 +139,7 @@ void Gamepad::bindGamepadControls(Container* container)
         }
         else if (std::strcmp("joystick", control->getType()) == 0)
         {
-            Joystick* joystick = (Joystick*)control;
+            JoystickControl* joystick = (JoystickControl*)control;
             joystick->setConsumeInputEvents(true);
             _uiJoysticks[joystick->getIndex()] = joystick;
             _joystickCount++;
@@ -336,7 +336,7 @@ void Gamepad::getJoystickValues(unsigned int joystickId, Vector2* outValue) cons
 
     if (_form)
     {
-        Joystick* joystick = _uiJoysticks[joystickId];
+        JoystickControl* joystick = _uiJoysticks[joystickId];
         if (joystick)
         {
             const Vector2& value = joystick->getValue();

gameplay/src/Gamepad.h

@@ -9,7 +9,7 @@ namespace gameplay
 class Button;
 class Container;
 class Form;
-class Joystick;
+class JoystickControl;
 class Platform;
 
 /**
@@ -243,7 +243,7 @@ private:
     std::string _vendorString;
     std::string _productString;
     Form* _form;
-    Joystick* _uiJoysticks[2];
+    JoystickControl* _uiJoysticks[2];
     Button* _uiButtons[20];
     unsigned int _buttons;
     Vector2 _joysticks[2];

gameplay/src/Joystick.inl

@@ -1,54 +0,0 @@
-#include "Joystick.h"
-
-namespace gameplay
-{
-
-inline const Vector2& Joystick::getValue() const
-{
-    return _value;
-}
-
-inline void Joystick::setInnerRegionSize(const Vector2& size)
-{
-    if (_innerSize)
-        _innerSize->set(size);
-}
-
-inline const Vector2& Joystick::getInnerRegionSize() const
-{
-    if (_innerSize)
-        return *_innerSize;
-    else
-        return Vector2::zero();
-}
-
-inline void Joystick::setOuterRegionSize(const Vector2& size)
-{
-    if (_outerSize)
-        _outerSize->set(size);
-}
-
-inline const Vector2& Joystick::getOuterRegionSize() const
-{
-    if (_outerSize)
-        return *_outerSize;
-    else
-        return Vector2::zero();
-}
-
-inline void Joystick::setRelative(bool relative)
-{
-    _relative = relative;
-}
-
-inline bool Joystick::isRelative() const
-{
-    return _relative;
-}
-
-inline const unsigned int Joystick::getIndex() const
-{
-    return _index;
-}
-
-}

gameplay/src/Joystick.cpp → gameplay/src/JoystickControl.cpp

@@ -1,14 +1,14 @@
 #include "Base.h"
-#include "Joystick.h"
+#include "JoystickControl.h"
 
 namespace gameplay
 {
 
-Joystick::Joystick() : _radius(1.0f), _relative(true), _innerSize(NULL), _outerSize(NULL), _index(0)
+JoystickControl::JoystickControl() : _radius(1.0f), _relative(true), _innerSize(NULL), _outerSize(NULL), _index(0)
 {
 }
 
-Joystick::~Joystick()
+JoystickControl::~JoystickControl()
 {
     if (_innerSize)
         SAFE_DELETE(_innerSize);
@@ -16,28 +16,77 @@ Joystick::~Joystick()
         SAFE_DELETE(_outerSize);
 }
 
-Joystick* Joystick::create(const char* id, Theme::Style* style)
+JoystickControl* JoystickControl::create(const char* id, Theme::Style* style)
 {
-    Joystick* joystick = new Joystick();
-    joystick->_id = id ? id : "";
-    joystick->initialize("Joystick", style, NULL);
-    return joystick;
+    JoystickControl* joystickControl = new JoystickControl();
+    joystickControl->_id = id ? id : "";
+    joystickControl->initialize("Joystick", style, NULL);
+    return joystickControl;
 }
 
-Control* Joystick::create(Theme::Style* style, Properties* properties)
+Control* JoystickControl::create(Theme::Style* style, Properties* properties)
 {
-    Joystick* joystick = new Joystick();
-    joystick->initialize("Joystick", style, properties);
-    return joystick;
+    JoystickControl* joystickControl = new JoystickControl();
+    joystickControl->initialize("Joystick", style, properties);
+    return joystickControl;
 }
 
-void Joystick::initialize(const char* typeName, Theme::Style* style, Properties* properties)
+const Vector2& JoystickControl::getValue() const
+{
+    return _value;
+}
+
+void JoystickControl::setInnerRegionSize(const Vector2& size)
+{
+    if (_innerSize)
+        _innerSize->set(size);
+}
+
+const Vector2& JoystickControl::getInnerRegionSize() const
+{
+    if (_innerSize)
+        return *_innerSize;
+    else
+        return Vector2::zero();
+}
+
+void JoystickControl::setOuterRegionSize(const Vector2& size)
+{
+    if (_outerSize)
+        _outerSize->set(size);
+}
+
+const Vector2& JoystickControl::getOuterRegionSize() const
+{
+    if (_outerSize)
+        return *_outerSize;
+    else
+        return Vector2::zero();
+}
+
+void JoystickControl::setRelative(bool relative)
+{
+    _relative = relative;
+}
+
+bool JoystickControl::isRelative() const
+{
+    return _relative;
+}
+
+unsigned int JoystickControl::getIndex() const
+{
+    return _index;
+}
+
+
+void JoystickControl::initialize(const char* typeName, Theme::Style* style, Properties* properties)
 {
     Control::initialize(typeName, style, properties);
 
 	if (!properties)
 	{
-		GP_WARN("Joystick creation without properties object is unsupported.");
+		GP_WARN("JoystickControl creation without properties object is unsupported.");
 		return;
 	}
 
@@ -45,7 +94,7 @@ void Joystick::initialize(const char* typeName, Theme::Style* style, Properties*
 
 	if (!properties->exists("radius"))
 	{
-		GP_WARN("Joystick: required attribute 'radius' is missing.");
+		GP_WARN("JoystickControl: required attribute 'radius' is missing.");
 	}
 	else
 	{
@@ -114,7 +163,7 @@ void Joystick::initialize(const char* typeName, Theme::Style* style, Properties*
 	_index = properties->getInt("index");
 }
 
-void Joystick::addListener(Control::Listener* listener, int eventFlags)
+void JoystickControl::addListener(Control::Listener* listener, int eventFlags)
 {
     if ((eventFlags & Control::Listener::TEXT_CHANGED) == Control::Listener::TEXT_CHANGED)
     {
@@ -124,7 +173,7 @@ void Joystick::addListener(Control::Listener* listener, int eventFlags)
     Control::addListener(listener, eventFlags);
 }
 
-bool Joystick::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex)
+bool JoystickControl::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex)
 {
     switch (evt)
     {
@@ -238,13 +287,13 @@ bool Joystick::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int cont
     return Control::touchEvent(evt, x, y, contactIndex);
 }
 
-unsigned int Joystick::drawImages(Form* form, const Rectangle& clip)
+unsigned int JoystickControl::drawImages(Form* form, const Rectangle& clip)
 {
     Control::State state = getState();
 
     unsigned int drawCalls = 0;
 
-    // If the joystick is not absolute, then only draw if it is active.
+    // If the JoystickControl is not absolute, then only draw if it is active.
     if (!_relative || (_relative && state == ACTIVE))
     {
         if (!_relative)
@@ -295,7 +344,7 @@ unsigned int Joystick::drawImages(Form* form, const Rectangle& clip)
     return drawCalls;
 }
 
-const char* Joystick::getType() const
+const char* JoystickControl::getType() const
 {
     return "joystick";
 }

gameplay/src/Joystick.h → gameplay/src/JoystickControl.h

@@ -1,5 +1,5 @@
-#ifndef JOYSTICK_H_
-#define JOYSTICK_H_
+#ifndef JOYSTICKCONTROL_H_
+#define JOYSTICKCONTROL_H_
 
 #include "Control.h"
 
@@ -13,7 +13,7 @@ namespace gameplay
  *
  * @see http://blackberry.github.io/GamePlay/docs/file-formats.html#wiki-UI_Forms
  */
-class Joystick : public Control
+class JoystickControl : public Control
 {
     friend class Container;
     friend class Gamepad;
@@ -22,7 +22,7 @@ class Joystick : public Control
 public:
 
     /**
-     * Creates a new Joystick.
+     * Creates a new Joystick control.
      *
      * @param id The joystick ID.
      * @param style The joystick style.
@@ -30,7 +30,7 @@ public:
      * @return The new joystick.
      * @script{create}
      */
-    static Joystick* create(const char* id, Theme::Style* style = NULL);
+    static JoystickControl* create(const char* id, Theme::Style* style = NULL);
 
     /**
      * Add a listener to be notified of specific events affecting
@@ -45,11 +45,11 @@ public:
     void addListener(Control::Listener* listener, int eventFlags);
 
     /**
-     * Retrieves the value (2-dimensional direction) of the joystick.
+     * Gets the value (2-dimensional direction) of the joystick.
      * 
      * @return The value of the joystick.
      */
-    inline const Vector2& getValue() const;
+    const Vector2& getValue() const;
 
     /**
      * Sets the image size of the inner region of the joystick. Does not do anything if there is no
@@ -57,7 +57,7 @@ public:
      * 
      * @param size The size of the inner region of the joystick. (x, y) == (width, height)
      */
-    inline void setInnerRegionSize(const Vector2& size);
+    void setInnerRegionSize(const Vector2& size);
 
     /**
      * Gets the image size of the inner region of the joystick. Returns (0,0) if there is no inner image
@@ -65,7 +65,7 @@ public:
      * 
      * @return The image size of the inner region of the joystick. (x, y) == (width, height)
      */
-    inline const Vector2& getInnerRegionSize() const;
+    const Vector2& getInnerRegionSize() const;
 
     /**
      * Sets the image size of the outer region of the joystick. Does not do anything if there is no
@@ -73,7 +73,7 @@ public:
      * 
      * @param size The size of the outer region of the joystick. (x, y) == (width, height)
      */
-    inline void setOuterRegionSize(const Vector2& size);
+    void setOuterRegionSize(const Vector2& size);
 
     /**
      * Gets the image size of the outer region of the joystick. Returns (0,0) if there is no outer image
@@ -81,7 +81,7 @@ public:
      * 
      * @return The image size of the outer region of the joystick. (x, y) == (width, height)
      */
-    inline const Vector2& getOuterRegionSize() const;
+    const Vector2& getOuterRegionSize() const;
 
     /**
      * Sets whether relative positioning is enabled or not.
@@ -90,43 +90,43 @@ public:
      *
      * @param relative Whether relative positioning should be enabled or not.
      */
-    inline void setRelative(bool relative);
+    void setRelative(bool relative);
 
     /**
-     * Retrieves whether absolute positioning is enabled or not.
+     * Gets whether absolute positioning is enabled or not.
      * 
      * Note: The default behavior is absolute positioning, and not relative.
      *
      * @return <code>true</code> if relative positioning is enabled; <code>false</code> otherwise.
      */
-    inline bool isRelative() const;
-
-    /**
-     * @see Control::getType
-     */
-    const char* getType() const;
+    bool isRelative() const;
 
     /**
      * Gets the index of this joystick across all joysticks on a form.
      *
      * @return The index of this joystick on a form.
      */
-    inline const unsigned int getIndex() const;
+    unsigned int getIndex() const;
+    
+    /**
+     * @see Control::getType
+     */
+    const char* getType() const;
 
 protected:
     
     /**
      * Constructor.
      */
-    Joystick();
+    JoystickControl();
 
     /**
      * Destructor.
      */
-    virtual ~Joystick();
+    virtual ~JoystickControl();
 
     /**
-     * Create a joystick with a given style and properties.
+     * Create a joystick control with a given style and properties.
      *
      * @param style The style to apply to this joystick.
      * @param properties A properties object containing a definition of the joystick (optional).
@@ -164,7 +164,7 @@ private:
     /**
      * Copy constructor.
      */
-    Joystick(const Joystick& copy);
+    JoystickControl(const JoystickControl& copy);
 
     float _radius; 
     bool _relative;
@@ -178,6 +178,4 @@ private:
 
 }
 
-#include "Joystick.inl"
-
 #endif

gameplay/src/Texture.cpp

@@ -85,7 +85,7 @@ Texture* Texture::create(const char* path, bool generateMipmaps)
         GP_ASSERT(t);
         if (t->_path == path)
         {
-            // If 'generateMipmaps' is true, call Texture::generateMipamps() to force the 
+            // If 'generateMipmaps' is true, call Texture::generateMipamps() to force the
             // texture to generate its mipmap chain if it hasn't already done so.
             if (generateMipmaps)
             {
@@ -168,7 +168,7 @@ Texture* Texture::create(Format format, unsigned int width, unsigned int height,
     GL_ASSERT( glBindTexture(GL_TEXTURE_2D, textureId) );
     GL_ASSERT( glPixelStorei(GL_UNPACK_ALIGNMENT, 1) );
 #ifndef OPENGL_ES
-    // glGenerateMipmap is new in OpenGL 3.0. For OpenGL 2.0 we must fallback to use glTexParameteri 
+    // glGenerateMipmap is new in OpenGL 3.0. For OpenGL 2.0 we must fallback to use glTexParameteri
     // with GL_GENERATE_MIPMAP prior to actual texture creation (glTexImage2D)
     if ( generateMipmaps && glGenerateMipmap == NULL )
         GL_ASSERT( glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE) );
@@ -651,7 +651,7 @@ Texture* Texture::createCompressedDDS(const char* path)
             if (stream->read(level.data, 1, level.size) != (unsigned int)level.size)
             {
                 GP_ERROR("Failed to load dds compressed texture bytes for texture: %s", path);
-                
+
                 // Cleanup mip data.
                 for (unsigned int i = 0; i < header.dwMipMapCount; ++i)
                     SAFE_DELETE_ARRAY(level.data);
@@ -854,7 +854,7 @@ void Texture::generateMipmaps()
     {
         GL_ASSERT( glBindTexture(GL_TEXTURE_2D, _handle) );
         GL_ASSERT( glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST) );
-        if( glGenerateMipmap != NULL )
+        if (glGenerateMipmap)
             GL_ASSERT( glGenerateMipmap(GL_TEXTURE_2D) );
 
         _mipmapped = true;

gameplay/src/gameplay.h

@@ -90,7 +90,7 @@
 #include "AIState.h"
 #include "AIStateMachine.h"
 
-// Forms UI
+// UI
 #include "Theme.h"
 #include "Control.h"
 #include "ControlFactory.h"
@@ -103,7 +103,7 @@
 #include "RadioButton.h"
 #include "Slider.h"
 #include "ImageControl.h"
-#include "Joystick.h"
+#include "JoystickControl.h"
 #include "Layout.h"
 #include "AbsoluteLayout.h"
 #include "VerticalLayout.h"

gameplay/src/lua/lua_Container.cpp

@@ -14,7 +14,7 @@
 #include "Form.h"
 #include "Game.h"
 #include "ImageControl.h"
-#include "Joystick.h"
+#include "JoystickControl.h"
 #include "Label.h"
 #include "Layout.h"
 #include "Node.h"

gameplay/src/lua/lua_ControlListenerEventType.cpp

@@ -13,8 +13,6 @@ static const char* luaEnumString_ControlListenerEventType_VALUE_CHANGED = "VALUE
 static const char* luaEnumString_ControlListenerEventType_TEXT_CHANGED = "TEXT_CHANGED";
 static const char* luaEnumString_ControlListenerEventType_MIDDLE_CLICK = "MIDDLE_CLICK";
 static const char* luaEnumString_ControlListenerEventType_RIGHT_CLICK = "RIGHT_CLICK";
-static const char* luaEnumString_ControlListenerEventType_ENTER = "ENTER";
-static const char* luaEnumString_ControlListenerEventType_LEAVE = "LEAVE";
 static const char* luaEnumString_ControlListenerEventType_FOCUS_GAINED = "FOCUS_GAINED";
 static const char* luaEnumString_ControlListenerEventType_FOCUS_LOST = "FOCUS_LOST";
 
@@ -34,10 +32,6 @@ Control::Listener::EventType lua_enumFromString_ControlListenerEventType(const c
         return Control::Listener::MIDDLE_CLICK;
     if (strcmp(s, luaEnumString_ControlListenerEventType_RIGHT_CLICK) == 0)
         return Control::Listener::RIGHT_CLICK;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_ENTER) == 0)
-        return Control::Listener::ENTER;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_LEAVE) == 0)
-        return Control::Listener::LEAVE;
     if (strcmp(s, luaEnumString_ControlListenerEventType_FOCUS_GAINED) == 0)
         return Control::Listener::FOCUS_GAINED;
     if (strcmp(s, luaEnumString_ControlListenerEventType_FOCUS_LOST) == 0)
@@ -61,10 +55,6 @@ const char* lua_stringFromEnum_ControlListenerEventType(Control::Listener::Event
         return luaEnumString_ControlListenerEventType_MIDDLE_CLICK;
     if (e == Control::Listener::RIGHT_CLICK)
         return luaEnumString_ControlListenerEventType_RIGHT_CLICK;
-    if (e == Control::Listener::ENTER)
-        return luaEnumString_ControlListenerEventType_ENTER;
-    if (e == Control::Listener::LEAVE)
-        return luaEnumString_ControlListenerEventType_LEAVE;
     if (e == Control::Listener::FOCUS_GAINED)
         return luaEnumString_ControlListenerEventType_FOCUS_GAINED;
     if (e == Control::Listener::FOCUS_LOST)

gameplay/src/lua/lua_Form.cpp

@@ -14,7 +14,7 @@
 #include "Form.h"
 #include "Game.h"
 #include "ImageControl.h"
-#include "Joystick.h"
+#include "JoystickControl.h"
 #include "Label.h"
 #include "Layout.h"
 #include "Node.h"

gameplay/src/lua/lua_Gamepad.cpp

@@ -6,7 +6,7 @@
 #include "Form.h"
 #include "Game.h"
 #include "Gamepad.h"
-#include "Joystick.h"
+#include "JoystickControl.h"
 #include "Platform.h"
 #include "lua_GamepadButtonMapping.h"
 

gameplay/src/lua/lua_Global.cpp

@@ -14,7 +14,7 @@ void luaRegister_lua_Global()
     gameplay::ScriptUtil::setGlobalHierarchyPair("AnimationTarget", "Form");
     gameplay::ScriptUtil::setGlobalHierarchyPair("AnimationTarget", "ImageControl");
     gameplay::ScriptUtil::setGlobalHierarchyPair("AnimationTarget", "Joint");
-    gameplay::ScriptUtil::setGlobalHierarchyPair("AnimationTarget", "Joystick");
+    gameplay::ScriptUtil::setGlobalHierarchyPair("AnimationTarget", "JoystickControl");
     gameplay::ScriptUtil::setGlobalHierarchyPair("AnimationTarget", "Label");
     gameplay::ScriptUtil::setGlobalHierarchyPair("AnimationTarget", "MaterialParameter");
     gameplay::ScriptUtil::setGlobalHierarchyPair("AnimationTarget", "Node");
@@ -32,7 +32,7 @@ void luaRegister_lua_Global()
     gameplay::ScriptUtil::setGlobalHierarchyPair("Control", "Container");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Control", "Form");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Control", "ImageControl");
-    gameplay::ScriptUtil::setGlobalHierarchyPair("Control", "Joystick");
+    gameplay::ScriptUtil::setGlobalHierarchyPair("Control", "JoystickControl");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Control", "Label");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Control", "RadioButton");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Control", "Slider");
@@ -83,7 +83,7 @@ void luaRegister_lua_Global()
     gameplay::ScriptUtil::setGlobalHierarchyPair("Ref", "Image");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Ref", "ImageControl");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Ref", "Joint");
-    gameplay::ScriptUtil::setGlobalHierarchyPair("Ref", "Joystick");
+    gameplay::ScriptUtil::setGlobalHierarchyPair("Ref", "JoystickControl");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Ref", "Label");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Ref", "Layout");
     gameplay::ScriptUtil::setGlobalHierarchyPair("Ref", "Light");
@@ -122,7 +122,7 @@ void luaRegister_lua_Global()
     gameplay::ScriptUtil::setGlobalHierarchyPair("ScriptTarget", "Form");
     gameplay::ScriptUtil::setGlobalHierarchyPair("ScriptTarget", "ImageControl");
     gameplay::ScriptUtil::setGlobalHierarchyPair("ScriptTarget", "Joint");
-    gameplay::ScriptUtil::setGlobalHierarchyPair("ScriptTarget", "Joystick");
+    gameplay::ScriptUtil::setGlobalHierarchyPair("ScriptTarget", "JoystickControl");
     gameplay::ScriptUtil::setGlobalHierarchyPair("ScriptTarget", "Label");
     gameplay::ScriptUtil::setGlobalHierarchyPair("ScriptTarget", "Node");
     gameplay::ScriptUtil::setGlobalHierarchyPair("ScriptTarget", "PhysicsController");
@@ -235,8 +235,6 @@ void luaRegister_lua_Global()
         gameplay::ScriptUtil::registerConstantString("TEXT_CHANGED", "TEXT_CHANGED", scopePath);
         gameplay::ScriptUtil::registerConstantString("MIDDLE_CLICK", "MIDDLE_CLICK", scopePath);
         gameplay::ScriptUtil::registerConstantString("RIGHT_CLICK", "RIGHT_CLICK", scopePath);
-        gameplay::ScriptUtil::registerConstantString("ENTER", "ENTER", scopePath);
-        gameplay::ScriptUtil::registerConstantString("LEAVE", "LEAVE", scopePath);
         gameplay::ScriptUtil::registerConstantString("FOCUS_GAINED", "FOCUS_GAINED", scopePath);
         gameplay::ScriptUtil::registerConstantString("FOCUS_LOST", "FOCUS_LOST", scopePath);
     }

gameplay/src/lua/lua_Joystick.h

@@ -1,127 +0,0 @@
-#ifndef LUA_JOYSTICK_H_
-#define LUA_JOYSTICK_H_
-
-namespace gameplay
-{
-
-// Lua bindings for Joystick.
-int lua_Joystick__gc(lua_State* state);
-int lua_Joystick_addListener(lua_State* state);
-int lua_Joystick_addRef(lua_State* state);
-int lua_Joystick_addScriptCallback(lua_State* state);
-int lua_Joystick_canFocus(lua_State* state);
-int lua_Joystick_createAnimation(lua_State* state);
-int lua_Joystick_createAnimationFromBy(lua_State* state);
-int lua_Joystick_createAnimationFromTo(lua_State* state);
-int lua_Joystick_destroyAnimation(lua_State* state);
-int lua_Joystick_getAbsoluteBounds(lua_State* state);
-int lua_Joystick_getAlignment(lua_State* state);
-int lua_Joystick_getAnimation(lua_State* state);
-int lua_Joystick_getAnimationPropertyComponentCount(lua_State* state);
-int lua_Joystick_getAnimationPropertyValue(lua_State* state);
-int lua_Joystick_getAutoSize(lua_State* state);
-int lua_Joystick_getBorder(lua_State* state);
-int lua_Joystick_getBounds(lua_State* state);
-int lua_Joystick_getClip(lua_State* state);
-int lua_Joystick_getClipBounds(lua_State* state);
-int lua_Joystick_getConsumeInputEvents(lua_State* state);
-int lua_Joystick_getCursorColor(lua_State* state);
-int lua_Joystick_getCursorRegion(lua_State* state);
-int lua_Joystick_getCursorUVs(lua_State* state);
-int lua_Joystick_getFocusIndex(lua_State* state);
-int lua_Joystick_getFont(lua_State* state);
-int lua_Joystick_getFontSize(lua_State* state);
-int lua_Joystick_getHeight(lua_State* state);
-int lua_Joystick_getId(lua_State* state);
-int lua_Joystick_getImageColor(lua_State* state);
-int lua_Joystick_getImageRegion(lua_State* state);
-int lua_Joystick_getImageUVs(lua_State* state);
-int lua_Joystick_getIndex(lua_State* state);
-int lua_Joystick_getInnerRegionSize(lua_State* state);
-int lua_Joystick_getMargin(lua_State* state);
-int lua_Joystick_getOpacity(lua_State* state);
-int lua_Joystick_getOuterRegionSize(lua_State* state);
-int lua_Joystick_getPadding(lua_State* state);
-int lua_Joystick_getParent(lua_State* state);
-int lua_Joystick_getRefCount(lua_State* state);
-int lua_Joystick_getSkinColor(lua_State* state);
-int lua_Joystick_getSkinRegion(lua_State* state);
-int lua_Joystick_getState(lua_State* state);
-int lua_Joystick_getStyle(lua_State* state);
-int lua_Joystick_getTextAlignment(lua_State* state);
-int lua_Joystick_getTextColor(lua_State* state);
-int lua_Joystick_getTextRightToLeft(lua_State* state);
-int lua_Joystick_getTheme(lua_State* state);
-int lua_Joystick_getTopLevelForm(lua_State* state);
-int lua_Joystick_getType(lua_State* state);
-int lua_Joystick_getValue(lua_State* state);
-int lua_Joystick_getWidth(lua_State* state);
-int lua_Joystick_getX(lua_State* state);
-int lua_Joystick_getY(lua_State* state);
-int lua_Joystick_getZIndex(lua_State* state);
-int lua_Joystick_hasFocus(lua_State* state);
-int lua_Joystick_isChild(lua_State* state);
-int lua_Joystick_isContainer(lua_State* state);
-int lua_Joystick_isEnabled(lua_State* state);
-int lua_Joystick_isEnabledInHierarchy(lua_State* state);
-int lua_Joystick_isHeightPercentage(lua_State* state);
-int lua_Joystick_isRelative(lua_State* state);
-int lua_Joystick_isVisible(lua_State* state);
-int lua_Joystick_isVisibleInHierarchy(lua_State* state);
-int lua_Joystick_isWidthPercentage(lua_State* state);
-int lua_Joystick_isXPercentage(lua_State* state);
-int lua_Joystick_isYPercentage(lua_State* state);
-int lua_Joystick_release(lua_State* state);
-int lua_Joystick_removeListener(lua_State* state);
-int lua_Joystick_removeScriptCallback(lua_State* state);
-int lua_Joystick_setAlignment(lua_State* state);
-int lua_Joystick_setAnimationPropertyValue(lua_State* state);
-int lua_Joystick_setAutoSize(lua_State* state);
-int lua_Joystick_setBorder(lua_State* state);
-int lua_Joystick_setBounds(lua_State* state);
-int lua_Joystick_setCanFocus(lua_State* state);
-int lua_Joystick_setConsumeInputEvents(lua_State* state);
-int lua_Joystick_setCursorColor(lua_State* state);
-int lua_Joystick_setCursorRegion(lua_State* state);
-int lua_Joystick_setEnabled(lua_State* state);
-int lua_Joystick_setFocus(lua_State* state);
-int lua_Joystick_setFocusIndex(lua_State* state);
-int lua_Joystick_setFont(lua_State* state);
-int lua_Joystick_setFontSize(lua_State* state);
-int lua_Joystick_setHeight(lua_State* state);
-int lua_Joystick_setId(lua_State* state);
-int lua_Joystick_setImageColor(lua_State* state);
-int lua_Joystick_setImageRegion(lua_State* state);
-int lua_Joystick_setInnerRegionSize(lua_State* state);
-int lua_Joystick_setMargin(lua_State* state);
-int lua_Joystick_setOpacity(lua_State* state);
-int lua_Joystick_setOuterRegionSize(lua_State* state);
-int lua_Joystick_setPadding(lua_State* state);
-int lua_Joystick_setPosition(lua_State* state);
-int lua_Joystick_setRelative(lua_State* state);
-int lua_Joystick_setSize(lua_State* state);
-int lua_Joystick_setSkinColor(lua_State* state);
-int lua_Joystick_setSkinRegion(lua_State* state);
-int lua_Joystick_setStyle(lua_State* state);
-int lua_Joystick_setTextAlignment(lua_State* state);
-int lua_Joystick_setTextColor(lua_State* state);
-int lua_Joystick_setTextRightToLeft(lua_State* state);
-int lua_Joystick_setVisible(lua_State* state);
-int lua_Joystick_setWidth(lua_State* state);
-int lua_Joystick_setX(lua_State* state);
-int lua_Joystick_setY(lua_State* state);
-int lua_Joystick_setZIndex(lua_State* state);
-int lua_Joystick_static_ANIMATE_OPACITY(lua_State* state);
-int lua_Joystick_static_ANIMATE_POSITION(lua_State* state);
-int lua_Joystick_static_ANIMATE_POSITION_X(lua_State* state);
-int lua_Joystick_static_ANIMATE_POSITION_Y(lua_State* state);
-int lua_Joystick_static_ANIMATE_SIZE(lua_State* state);
-int lua_Joystick_static_ANIMATE_SIZE_HEIGHT(lua_State* state);
-int lua_Joystick_static_ANIMATE_SIZE_WIDTH(lua_State* state);
-int lua_Joystick_static_create(lua_State* state);
-
-void luaRegister_Joystick();
-
-}
-
-#endif

gameplay/src/lua/lua_JoystickControl.h

@@ -0,0 +1,127 @@
+#ifndef LUA_JOYSTICKCONTROL_H_
+#define LUA_JOYSTICKCONTROL_H_
+
+namespace gameplay
+{
+
+// Lua bindings for JoystickControl.
+int lua_JoystickControl__gc(lua_State* state);
+int lua_JoystickControl_addListener(lua_State* state);
+int lua_JoystickControl_addRef(lua_State* state);
+int lua_JoystickControl_addScriptCallback(lua_State* state);
+int lua_JoystickControl_canFocus(lua_State* state);
+int lua_JoystickControl_createAnimation(lua_State* state);
+int lua_JoystickControl_createAnimationFromBy(lua_State* state);
+int lua_JoystickControl_createAnimationFromTo(lua_State* state);
+int lua_JoystickControl_destroyAnimation(lua_State* state);
+int lua_JoystickControl_getAbsoluteBounds(lua_State* state);
+int lua_JoystickControl_getAlignment(lua_State* state);
+int lua_JoystickControl_getAnimation(lua_State* state);
+int lua_JoystickControl_getAnimationPropertyComponentCount(lua_State* state);
+int lua_JoystickControl_getAnimationPropertyValue(lua_State* state);
+int lua_JoystickControl_getAutoSize(lua_State* state);
+int lua_JoystickControl_getBorder(lua_State* state);
+int lua_JoystickControl_getBounds(lua_State* state);
+int lua_JoystickControl_getClip(lua_State* state);
+int lua_JoystickControl_getClipBounds(lua_State* state);
+int lua_JoystickControl_getConsumeInputEvents(lua_State* state);
+int lua_JoystickControl_getCursorColor(lua_State* state);
+int lua_JoystickControl_getCursorRegion(lua_State* state);
+int lua_JoystickControl_getCursorUVs(lua_State* state);
+int lua_JoystickControl_getFocusIndex(lua_State* state);
+int lua_JoystickControl_getFont(lua_State* state);
+int lua_JoystickControl_getFontSize(lua_State* state);
+int lua_JoystickControl_getHeight(lua_State* state);
+int lua_JoystickControl_getId(lua_State* state);
+int lua_JoystickControl_getImageColor(lua_State* state);
+int lua_JoystickControl_getImageRegion(lua_State* state);
+int lua_JoystickControl_getImageUVs(lua_State* state);
+int lua_JoystickControl_getIndex(lua_State* state);
+int lua_JoystickControl_getInnerRegionSize(lua_State* state);
+int lua_JoystickControl_getMargin(lua_State* state);
+int lua_JoystickControl_getOpacity(lua_State* state);
+int lua_JoystickControl_getOuterRegionSize(lua_State* state);
+int lua_JoystickControl_getPadding(lua_State* state);
+int lua_JoystickControl_getParent(lua_State* state);
+int lua_JoystickControl_getRefCount(lua_State* state);
+int lua_JoystickControl_getSkinColor(lua_State* state);
+int lua_JoystickControl_getSkinRegion(lua_State* state);
+int lua_JoystickControl_getState(lua_State* state);
+int lua_JoystickControl_getStyle(lua_State* state);
+int lua_JoystickControl_getTextAlignment(lua_State* state);
+int lua_JoystickControl_getTextColor(lua_State* state);
+int lua_JoystickControl_getTextRightToLeft(lua_State* state);
+int lua_JoystickControl_getTheme(lua_State* state);
+int lua_JoystickControl_getTopLevelForm(lua_State* state);
+int lua_JoystickControl_getType(lua_State* state);
+int lua_JoystickControl_getValue(lua_State* state);
+int lua_JoystickControl_getWidth(lua_State* state);
+int lua_JoystickControl_getX(lua_State* state);
+int lua_JoystickControl_getY(lua_State* state);
+int lua_JoystickControl_getZIndex(lua_State* state);
+int lua_JoystickControl_hasFocus(lua_State* state);
+int lua_JoystickControl_isChild(lua_State* state);
+int lua_JoystickControl_isContainer(lua_State* state);
+int lua_JoystickControl_isEnabled(lua_State* state);
+int lua_JoystickControl_isEnabledInHierarchy(lua_State* state);
+int lua_JoystickControl_isHeightPercentage(lua_State* state);
+int lua_JoystickControl_isRelative(lua_State* state);
+int lua_JoystickControl_isVisible(lua_State* state);
+int lua_JoystickControl_isVisibleInHierarchy(lua_State* state);
+int lua_JoystickControl_isWidthPercentage(lua_State* state);
+int lua_JoystickControl_isXPercentage(lua_State* state);
+int lua_JoystickControl_isYPercentage(lua_State* state);
+int lua_JoystickControl_release(lua_State* state);
+int lua_JoystickControl_removeListener(lua_State* state);
+int lua_JoystickControl_removeScriptCallback(lua_State* state);
+int lua_JoystickControl_setAlignment(lua_State* state);
+int lua_JoystickControl_setAnimationPropertyValue(lua_State* state);
+int lua_JoystickControl_setAutoSize(lua_State* state);
+int lua_JoystickControl_setBorder(lua_State* state);
+int lua_JoystickControl_setBounds(lua_State* state);
+int lua_JoystickControl_setCanFocus(lua_State* state);
+int lua_JoystickControl_setConsumeInputEvents(lua_State* state);
+int lua_JoystickControl_setCursorColor(lua_State* state);
+int lua_JoystickControl_setCursorRegion(lua_State* state);
+int lua_JoystickControl_setEnabled(lua_State* state);
+int lua_JoystickControl_setFocus(lua_State* state);
+int lua_JoystickControl_setFocusIndex(lua_State* state);
+int lua_JoystickControl_setFont(lua_State* state);
+int lua_JoystickControl_setFontSize(lua_State* state);
+int lua_JoystickControl_setHeight(lua_State* state);
+int lua_JoystickControl_setId(lua_State* state);
+int lua_JoystickControl_setImageColor(lua_State* state);
+int lua_JoystickControl_setImageRegion(lua_State* state);
+int lua_JoystickControl_setInnerRegionSize(lua_State* state);
+int lua_JoystickControl_setMargin(lua_State* state);
+int lua_JoystickControl_setOpacity(lua_State* state);
+int lua_JoystickControl_setOuterRegionSize(lua_State* state);
+int lua_JoystickControl_setPadding(lua_State* state);
+int lua_JoystickControl_setPosition(lua_State* state);
+int lua_JoystickControl_setRelative(lua_State* state);
+int lua_JoystickControl_setSize(lua_State* state);
+int lua_JoystickControl_setSkinColor(lua_State* state);
+int lua_JoystickControl_setSkinRegion(lua_State* state);
+int lua_JoystickControl_setStyle(lua_State* state);
+int lua_JoystickControl_setTextAlignment(lua_State* state);
+int lua_JoystickControl_setTextColor(lua_State* state);
+int lua_JoystickControl_setTextRightToLeft(lua_State* state);
+int lua_JoystickControl_setVisible(lua_State* state);
+int lua_JoystickControl_setWidth(lua_State* state);
+int lua_JoystickControl_setX(lua_State* state);
+int lua_JoystickControl_setY(lua_State* state);
+int lua_JoystickControl_setZIndex(lua_State* state);
+int lua_JoystickControl_static_ANIMATE_OPACITY(lua_State* state);
+int lua_JoystickControl_static_ANIMATE_POSITION(lua_State* state);
+int lua_JoystickControl_static_ANIMATE_POSITION_X(lua_State* state);
+int lua_JoystickControl_static_ANIMATE_POSITION_Y(lua_State* state);
+int lua_JoystickControl_static_ANIMATE_SIZE(lua_State* state);
+int lua_JoystickControl_static_ANIMATE_SIZE_HEIGHT(lua_State* state);
+int lua_JoystickControl_static_ANIMATE_SIZE_WIDTH(lua_State* state);
+int lua_JoystickControl_static_create(lua_State* state);
+
+void luaRegister_JoystickControl();
+
+}
+
+#endif

gameplay/src/lua/lua_all_bindings.cpp

@@ -51,7 +51,7 @@ void lua_RegisterAllBindings()
     luaRegister_Image();
     luaRegister_ImageControl();
     luaRegister_Joint();
-    luaRegister_Joystick();
+    luaRegister_JoystickControl();
     luaRegister_Keyboard();
     luaRegister_Label();
     luaRegister_Layout();

gameplay/src/lua/lua_all_bindings.h

@@ -46,7 +46,7 @@
 #include "lua_Image.h"
 #include "lua_ImageControl.h"
 #include "lua_Joint.h"
-#include "lua_Joystick.h"
+#include "lua_JoystickControl.h"
 #include "lua_Keyboard.h"
 #include "lua_Label.h"
 #include "lua_Layout.h"

samples/browser/.cproject

@@ -73,7 +73,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.objectFiles.782983295" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
@@ -162,7 +161,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.objectFiles.661413139" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
@@ -250,7 +248,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.objectFiles.901324184" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">

samples/browser/android/build.xml

@@ -1,98 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="sample-browser" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var" unless="sdk.dir" />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-
-    <target name="-pre-build">
-		<mkdir dir="src"/>
-    </target>
-	
-<!--
-    <target name="-pre-compile">
-    </target>
-
-    /* This is typically used for code obfuscation.
-       Compiled code location: ${out.classes.absolute.dir}
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
-       -->
-    <target name="-post-compile">
-	    <copy file="../game.config" tofile="assets/game.config"/>
-        <copy todir="assets/res/common">
-            <fileset dir="../res/common"/>
-        </copy>
-		<copy todir="assets/res/png">
-            <fileset dir="../res/png"/>
-        </copy>
-		<copy todir="assets/res/shaders">
-            <fileset dir="../../../gameplay/res/shaders"/>
-        </copy>
-        <copy todir="assets/res/ui">
-            <fileset dir="../../../gameplay/res/ui"/>
-        </copy>
-    </target>
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="sample-browser" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var" unless="sdk.dir" />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+
+    <target name="-pre-build">
+		<mkdir dir="src"/>
+	    <copy file="../game.config" tofile="assets/game.config"/>
+        <copy todir="assets/res/common">
+            <fileset dir="../res/common"/>
+        </copy>
+		<copy todir="assets/res/png">
+            <fileset dir="../res/png"/>
+        </copy>
+        <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>
+	
+<!--
+    <target name="-pre-compile">
+    </target>
+
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+       -->
+    <target name="-post-compile">
+    </target>
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

samples/browser/bar-descriptor.xml

@@ -1,75 +1,76 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
-
-<!-- BlackBerry OS application descriptor file.
-    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
--->
-
-    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
-         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
-    <id>org.gameplay3d.sample_browser</id>
-
-    <!-- The name that is displayed in the BlackBerry OS application installer. 
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <name>Samples</name>
-
-    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
-         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
-         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
-    <versionNumber>2.0.0</versionNumber>
-
-    <!-- Fourth digit segment of the package version. First three segments are taken from the 
-         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
-    <buildId>1</buildId>
-
-    <!-- Description, displayed in the BlackBerry OS application installer.
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <description>Samples</description>
-
-    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
-    <author>RIM Canada</author>
-
-    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
-
-    <initialWindow>
-        <aspectRatio>landscape</aspectRatio>
-        <autoOrients>false</autoOrients>
-        <systemChrome>none</systemChrome>
-        <transparent>false</transparent>
-    </initialWindow>
-
-    <category>core.games</category>
-
-    <asset path="icon.png">icon.png</asset>
-	<asset path="game.config">game.config</asset>
-    <asset path="../../gameplay/res/shaders">res/shaders</asset>
-    <asset path="../../gameplay/res/ui">res/ui</asset>
-	<asset path="res/common">res/common</asset>
-	<asset path="res/png">res/png</asset>
-
-    <configuration name="Device-Debug">
-       <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="Device-Debug/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
-    </configuration>
-    <configuration name="Device-Release">
-       <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="Device-Release/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
-    </configuration>
-    <configuration name="Simulator">
-        <platformArchitecture>x86</platformArchitecture>
-       <asset path="Simulator/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
-    </configuration>
-
-    <!-- The icon for the application, which should be 114x114. -->
-    <icon>
-        <image>icon.png</image>
-    </icon>
-
-    <!-- The splash screen that will appear when your application is launching, which should be 1280x720. -->
-    <!-- <splashscreen></splashscreen> -->
-
-    <!-- Ensure that shared libraries in the package are found at run-time. -->
-    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
-
-</qnx>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
+
+<!-- BlackBerry OS application descriptor file.
+    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
+-->
+
+    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
+         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+    <id>org.gameplay3d.sample_browser</id>
+
+    <!-- The name that is displayed in the BlackBerry OS application installer. 
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <name>Samples</name>
+
+    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
+         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
+         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
+    <versionNumber>2.0.0</versionNumber>
+
+    <!-- Fourth digit segment of the package version. First three segments are taken from the 
+         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
+    <buildId>1</buildId>
+
+    <!-- Description, displayed in the BlackBerry OS application installer.
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <description>Samples</description>
+
+    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
+    <author>RIM Canada</author>
+
+    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
+
+    <initialWindow>
+        <aspectRatio>landscape</aspectRatio>
+        <autoOrients>false</autoOrients>
+        <systemChrome>none</systemChrome>
+        <transparent>false</transparent>
+    </initialWindow>
+
+    <category>core.games</category>
+
+    <asset path="icon.png">icon.png</asset>
+	<asset path="game.config">game.config</asset>
+	<asset path="res/common">res/common</asset>
+	<asset path="res/png">res/png</asset>
+    <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
+    <asset path="../../gameplay/res/shaders">res/shaders</asset>
+    <asset path="../../gameplay/res/ui">res/ui</asset>
+    
+    <configuration name="Device-Debug">
+       <platformArchitecture>armle-v7</platformArchitecture>
+       <asset path="Device-Debug/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
+    </configuration>
+    <configuration name="Device-Release">
+       <platformArchitecture>armle-v7</platformArchitecture>
+       <asset path="Device-Release/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
+    </configuration>
+    <configuration name="Simulator">
+        <platformArchitecture>x86</platformArchitecture>
+       <asset path="Simulator/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
+    </configuration>
+
+    <!-- The icon for the application, which should be 114x114. -->
+    <icon>
+        <image>icon.png</image>
+    </icon>
+
+    <!-- The splash screen that will appear when your application is launching, which should be 1280x720. -->
+    <!-- <splashscreen></splashscreen> -->
+
+    <!-- Ensure that shared libraries in the package are found at run-time. -->
+    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
+
+</qnx>

samples/character/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.2129662816" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -163,7 +162,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.176990175" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -251,7 +249,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.994108925" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/character/android/build.xml

@@ -1,128 +1,129 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="sample-character" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-          unless="sdk.dir" />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-
-    <target name="-pre-build">
-		<mkdir dir="src"/>
-    </target>
-	
-<!--
-    <target name="-pre-compile">
-    </target>
-
-    /* This is typically used for code obfuscation.
-       Compiled code location: ${out.classes.absolute.dir}
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
-       -->
-    <target name="-post-compile">
-        <copy file="../game.png.config" tofile="assets/game.config"/>
-        <copy file="../res/design/backboard.png" tofile="assets/res/png/backboard.png"/>
-        <copy file="../res/design/basketball.png" tofile="assets/res/png/basketball.png"/>
-        <copy file="../res/design/basketballnet.png" tofile="assets/res/png/basketballnet.png"/>
-        <copy file="../res/design/book.png" tofile="assets/res/png/book.png"/>
-        <copy file="../res/design/bookshelf.png" tofile="assets/res/png/bookshelf.png"/>
-        <copy file="../res/design/boy.png" tofile="assets/res/png/boy.png"/>
-        <copy file="../res/design/decals.png" tofile="assets/res/png/decals.png"/>
-        <copy file="../res/design/door.png" tofile="assets/res/png/door.png"/>
-        <copy file="../res/design/doorframe.png" tofile="assets/res/png/doorframe.png"/>
-        <copy file="../res/design/easel.png" tofile="assets/res/png/easel.png"/>
-        <copy file="../res/design/floor.png" tofile="assets/res/png/floor.png"/>
-        <copy file="../res/design/floortiles.png" tofile="assets/res/png/floortiles.png"/>
-        <copy file="../res/design/playtable.png" tofile="assets/res/png/playtable.png"/>
-        <copy file="../res/design/gamepad.png" tofile="assets/res/png/gamepad.png"/>
-        <copy file="../res/design/playtable.png" tofile="assets/res/png/playtable.png"/>
-        <copy file="../res/design/shadow.png" tofile="assets/res/png/shadow.png"/>
-        <copy file="../res/design/storageorganizer.png" tofile="assets/res/png/storageorganizer.png"/>
-        <copy file="../res/design/tableleg1.png" tofile="assets/res/png/tableleg1.png"/>
-        <copy file="../res/design/tableleg2.png" tofile="assets/res/png/tableleg2.png"/>
-        <copy file="../res/design/tableleg3.png" tofile="assets/res/png/tableleg3.png"/>
-        <copy file="../res/design/tableleg4.png" tofile="assets/res/png/tableleg4.png"/>
-        <copy file="../res/design/tabletop.png" tofile="assets/res/png/tabletop.png"/>
-        <copy file="../res/design/tiles.png" tofile="assets/res/png/tiles.png"/>
-        <copy file="../res/design/tilesn.png" tofile="assets/res/png/tilesn.png"/>
-        <copy file="../res/design/toybox.png" tofile="assets/res/png/toybox.png"/>
-        <copy file="../res/design/walleast.png" tofile="assets/res/png/walleast.png"/>
-        <copy file="../res/design/wallnorth.png" tofile="assets/res/png/wallnorth.png"/>
-        <copy file="../res/design/walloverhang.png" tofile="assets/res/png/walloverhang.png"/>
-        <copy file="../res/design/wallsouth.png" tofile="assets/res/png/wallsouth.png"/>
-        <copy file="../res/design/wallwest.png" tofile="assets/res/png/wallwest.png"/>
-        <copy file="../res/design/windowledge.png" tofile="assets/res/png/windowledge.png"/>
-        <copy file="../res/design/wood.png" tofile="assets/res/png/wood.png"/>
-        <copy file="../res/design/woodn.png" tofile="assets/res/png/woodn.png"/>
-        <copy todir="assets/res/common">
-            <fileset dir="../res/common"/>
-        </copy>
-        <copy todir="assets/res/shaders">
-            <fileset dir="../../../gameplay/res/shaders"/>
-        </copy>
-        <copy file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
-    </target>
-
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="sample-character" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+          unless="sdk.dir" />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+    <target name="-pre-build">
+		<mkdir dir="src"/>
+        <copy file="../game.png.config" tofile="assets/game.config"/>
+        <copy file="../res/design/backboard.png" tofile="assets/res/png/backboard.png"/>
+        <copy file="../res/design/basketball.png" tofile="assets/res/png/basketball.png"/>
+        <copy file="../res/design/basketballnet.png" tofile="assets/res/png/basketballnet.png"/>
+        <copy file="../res/design/book.png" tofile="assets/res/png/book.png"/>
+        <copy file="../res/design/bookshelf.png" tofile="assets/res/png/bookshelf.png"/>
+        <copy file="../res/design/boy.png" tofile="assets/res/png/boy.png"/>
+        <copy file="../res/design/decals.png" tofile="assets/res/png/decals.png"/>
+        <copy file="../res/design/door.png" tofile="assets/res/png/door.png"/>
+        <copy file="../res/design/doorframe.png" tofile="assets/res/png/doorframe.png"/>
+        <copy file="../res/design/easel.png" tofile="assets/res/png/easel.png"/>
+        <copy file="../res/design/floor.png" tofile="assets/res/png/floor.png"/>
+        <copy file="../res/design/floortiles.png" tofile="assets/res/png/floortiles.png"/>
+        <copy file="../res/design/playtable.png" tofile="assets/res/png/playtable.png"/>
+        <copy file="../res/design/gamepad.png" tofile="assets/res/png/gamepad.png"/>
+        <copy file="../res/design/playtable.png" tofile="assets/res/png/playtable.png"/>
+        <copy file="../res/design/shadow.png" tofile="assets/res/png/shadow.png"/>
+        <copy file="../res/design/storageorganizer.png" tofile="assets/res/png/storageorganizer.png"/>
+        <copy file="../res/design/tableleg1.png" tofile="assets/res/png/tableleg1.png"/>
+        <copy file="../res/design/tableleg2.png" tofile="assets/res/png/tableleg2.png"/>
+        <copy file="../res/design/tableleg3.png" tofile="assets/res/png/tableleg3.png"/>
+        <copy file="../res/design/tableleg4.png" tofile="assets/res/png/tableleg4.png"/>
+        <copy file="../res/design/tabletop.png" tofile="assets/res/png/tabletop.png"/>
+        <copy file="../res/design/tiles.png" tofile="assets/res/png/tiles.png"/>
+        <copy file="../res/design/tilesn.png" tofile="assets/res/png/tilesn.png"/>
+        <copy file="../res/design/toybox.png" tofile="assets/res/png/toybox.png"/>
+        <copy file="../res/design/walleast.png" tofile="assets/res/png/walleast.png"/>
+        <copy file="../res/design/wallnorth.png" tofile="assets/res/png/wallnorth.png"/>
+        <copy file="../res/design/walloverhang.png" tofile="assets/res/png/walloverhang.png"/>
+        <copy file="../res/design/wallsouth.png" tofile="assets/res/png/wallsouth.png"/>
+        <copy file="../res/design/wallwest.png" tofile="assets/res/png/wallwest.png"/>
+        <copy file="../res/design/windowledge.png" tofile="assets/res/png/windowledge.png"/>
+        <copy file="../res/design/wood.png" tofile="assets/res/png/wood.png"/>
+        <copy file="../res/design/woodn.png" tofile="assets/res/png/woodn.png"/>
+        <copy file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
+        <copy todir="assets/res/common">
+            <fileset dir="../res/common"/>
+        </copy>
+        <copy todir="assets/res/shaders">
+            <fileset dir="../../../gameplay/res/shaders"/>
+        </copy>
+         <copy todir="assets/res/ui">
+            <fileset dir="../../../gameplay/res/ui"/>
+        </copy>
+    </target>
+	
+<!--
+    <target name="-pre-compile">
+    </target>
+
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+       -->
+    <target name="-post-compile">
+    </target>
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

samples/character/bar-descriptor.xml

@@ -1,119 +1,118 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
-
-<!-- BlackBerry OS application descriptor file.
-    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
--->
-
-    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
-         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
-    <id>org.gameplay3d.sample_character</id>
-
-    <!-- The name that is displayed in the BlackBerry OS application installer. 
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <name>Character</name>
-    
-    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
-         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
-         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
-    <versionNumber>2.0.0</versionNumber>
-
-    <!-- Fourth digit segment of the package version. First three segments are taken from the 
-         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
-    <buildId>1</buildId>
-
-    <!-- Description, displayed in the BlackBerry OS application installer.
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <description>Character</description>
-
-    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
-    <author>RIM Canada</author>
-
-    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
-
-    <initialWindow>
-        <aspectRatio>landscape</aspectRatio>
-        <autoOrients>false</autoOrients>
-        <systemChrome>none</systemChrome>
-        <transparent>false</transparent>
-    </initialWindow>
-
-    <category>core.games</category>
-    
-    <asset path="icon.png">icon.png</asset>
-    <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
-    <asset path="../../gameplay/res/shaders">res/shaders</asset>
-    <asset path="../../gameplay/res/ui">res/ui</asset>
-    <asset path="res/common">res/common</asset>
-
-    <asset path="res/design/backboard.png">res/png/backboard.png</asset>
-    <asset path="res/design/basketball.png">res/png/basketball.png</asset>
-    <asset path="res/design/basketballnet.png">res/png/basketballnet.png</asset>
-    <asset path="res/design/book.png">res/png/book.png</asset>
-    <asset path="res/design/bookshelf.png">res/png/bookshelf.png</asset>
-    <asset path="res/design/boy.png">res/png/boy.png</asset>
-    <asset path="res/design/decals.png">res/png/decals.png</asset>
-    <asset path="res/design/door.png">res/png/door.png</asset>
-    <asset path="res/design/doorframe.png">res/png/doorframe.png</asset>
-    <asset path="res/design/easel.png">res/png/easel.png</asset>
-    <asset path="res/design/floor.png">res/png/floor.png</asset>
-    <asset path="res/design/floortiles.png">res/png/floortiles.png</asset>
-    <asset path="res/design/gamepad.png">res/png/gamepad.png</asset>
-    <asset path="res/design/playtable.png">res/png/playtable.png</asset>
-    <asset path="res/design/shadow.png">res/png/shadow.png</asset>
-    <asset path="res/design/storageorganizer.png">res/png/storageorganizer.png</asset>
-    <asset path="res/design/tableleg1.png">res/png/tableleg1.png</asset>
-    <asset path="res/design/tableleg2.png">res/png/tableleg2.png</asset>
-    <asset path="res/design/tableleg3.png">res/png/tableleg3.png</asset>
-    <asset path="res/design/tableleg4.png">res/png/tableleg4.png</asset>
-    <asset path="res/design/tabletop.png">res/png/tabletop.png</asset>
-    <asset path="res/design/tiles.png">res/png/tiles.png</asset>
-    <asset path="res/design/tilesn.png">res/png/tilesn.png</asset>
-    <asset path="res/design/toybox.png">res/png/toybox.png</asset>
-    <asset path="res/design/walleast.png">res/png/walleast.png</asset>
-    <asset path="res/design/wallnorth.png">res/png/wallnorth.png</asset>
-    <asset path="res/design/walloverhang.png">res/png/walloverhang.png</asset>
-    <asset path="res/design/wallsouth.png">res/png/wallsouth.png</asset>
-    <asset path="res/design/wallwest.png">res/png/wallwest.png</asset>
-    <asset path="res/design/windowledge.png">res/png/windowledge.png</asset>
-    <asset path="res/design/wood.png">res/png/wood.png</asset>
-    <asset path="res/design/woodn.png">res/png/woodn.png</asset>
-    <asset path="game.png.config">game.config</asset>
-   
-    <configuration name="Device-Debug">
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
+
+<!-- BlackBerry OS application descriptor file.
+    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
+-->
+
+    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
+         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+    <id>org.gameplay3d.sample_character</id>
+
+    <!-- The name that is displayed in the BlackBerry OS application installer. 
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <name>Character</name>
+    
+    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
+         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
+         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
+    <versionNumber>2.0.0</versionNumber>
+
+    <!-- Fourth digit segment of the package version. First three segments are taken from the 
+         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
+    <buildId>1</buildId>
+
+    <!-- Description, displayed in the BlackBerry OS application installer.
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <description>Character</description>
+
+    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
+    <author>RIM Canada</author>
+
+    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
+
+    <initialWindow>
+        <aspectRatio>landscape</aspectRatio>
+        <autoOrients>false</autoOrients>
+        <systemChrome>none</systemChrome>
+        <transparent>false</transparent>
+    </initialWindow>
+
+    <category>core.games</category>
+    
+    <asset path="icon.png">icon.png</asset>
+    <asset path="res/common">res/common</asset>
+    <asset path="res/design/backboard.png">res/png/backboard.png</asset>
+    <asset path="res/design/basketball.png">res/png/basketball.png</asset>
+    <asset path="res/design/basketballnet.png">res/png/basketballnet.png</asset>
+    <asset path="res/design/book.png">res/png/book.png</asset>
+    <asset path="res/design/bookshelf.png">res/png/bookshelf.png</asset>
+    <asset path="res/design/boy.png">res/png/boy.png</asset>
+    <asset path="res/design/decals.png">res/png/decals.png</asset>
+    <asset path="res/design/door.png">res/png/door.png</asset>
+    <asset path="res/design/doorframe.png">res/png/doorframe.png</asset>
+    <asset path="res/design/easel.png">res/png/easel.png</asset>
+    <asset path="res/design/floor.png">res/png/floor.png</asset>
+    <asset path="res/design/floortiles.png">res/png/floortiles.png</asset>
+    <asset path="res/design/gamepad.png">res/png/gamepad.png</asset>
+    <asset path="res/design/playtable.png">res/png/playtable.png</asset>
+    <asset path="res/design/shadow.png">res/png/shadow.png</asset>
+    <asset path="res/design/storageorganizer.png">res/png/storageorganizer.png</asset>
+    <asset path="res/design/tableleg1.png">res/png/tableleg1.png</asset>
+    <asset path="res/design/tableleg2.png">res/png/tableleg2.png</asset>
+    <asset path="res/design/tableleg3.png">res/png/tableleg3.png</asset>
+    <asset path="res/design/tableleg4.png">res/png/tableleg4.png</asset>
+    <asset path="res/design/tabletop.png">res/png/tabletop.png</asset>
+    <asset path="res/design/tiles.png">res/png/tiles.png</asset>
+    <asset path="res/design/tilesn.png">res/png/tilesn.png</asset>
+    <asset path="res/design/toybox.png">res/png/toybox.png</asset>
+    <asset path="res/design/walleast.png">res/png/walleast.png</asset>
+    <asset path="res/design/wallnorth.png">res/png/wallnorth.png</asset>
+    <asset path="res/design/walloverhang.png">res/png/walloverhang.png</asset>
+    <asset path="res/design/wallsouth.png">res/png/wallsouth.png</asset>
+    <asset path="res/design/wallwest.png">res/png/wallwest.png</asset>
+    <asset path="res/design/windowledge.png">res/png/windowledge.png</asset>
+    <asset path="res/design/wood.png">res/png/wood.png</asset>
+    <asset path="res/design/woodn.png">res/png/woodn.png</asset>
+    <asset path="game.png.config">game.config</asset>
+    <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
+    <asset path="../../gameplay/res/shaders">res/shaders</asset>
+    <asset path="../../gameplay/res/ui">res/ui</asset>
+    
+    <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="Device-Debug/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
+       <asset path="Device-Debug/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
     </configuration>
-    <configuration name="Device-Release">
+    <configuration name="Device-Release">
        <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="Device-Release/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
+       <asset path="Device-Release/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
     </configuration>
-    <configuration name="Simulator">
+    <configuration name="Simulator">
        <platformArchitecture>x86</platformArchitecture>
-       <asset path="Simulator/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
+       <asset path="Simulator/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
     </configuration>
-  
-    <!-- The icon for the application, which should be 114x114. -->
-    <icon>
-        <image>icon.png</image>
-    </icon>
-    
-    <!-- The splash screen that will appear when your application is launching. Should be 1280x720. -->
-    <!-- <splashscreen></splashscreen> -->
-    
-    <!-- The permissions requested by your application. -->
-    <!--  <action>access_shared</action> -->
-    <!--  <action>record_audio</action> -->
-    <!--  <action>read_geolocation</action> -->
-    <!--  <action>use_camera</action> -->
-    <!--  <action>access_internet</action> -->
-    <!--  <action>play_audio</action> -->
-    <!--  <action>post_notification</action> -->
-    <!--  <action>set_audio_volume</action> -->
-    <!--  <action>read_device_identifying_information</action> -->
-    
-    <!-- Ensure that shared libraries in the package are found at run-time. -->
-    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
-
-</qnx>
+  
+    <!-- The icon for the application, which should be 114x114. -->
+    <icon>
+        <image>icon.png</image>
+    </icon>
+    
+    <!-- The splash screen that will appear when your application is launching. Should be 1280x720. -->
+    <!-- <splashscreen></splashscreen> -->
+    
+    <!-- The permissions requested by your application. -->
+    <!--  <action>access_shared</action> -->
+    <!--  <action>record_audio</action> -->
+    <!--  <action>read_geolocation</action> -->
+    <!--  <action>use_camera</action> -->
+    <!--  <action>access_internet</action> -->
+    <!--  <action>play_audio</action> -->
+    <!--  <action>post_notification</action> -->
+    <!--  <action>set_audio_volume</action> -->
+    <!--  <action>read_device_identifying_information</action> -->
+    
+    <!-- Ensure that shared libraries in the package are found at run-time. -->
+    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
+
+</qnx>

samples/lua/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -161,7 +160,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -249,7 +247,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/lua/android/build.xml

@@ -48,6 +48,20 @@
 
     <target name="-pre-build">
 		<mkdir dir="src"/>
+        <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>
 	
 <!--
@@ -59,18 +73,6 @@
        If this is not done in place, override ${out.dex.input.absolute.dir} */
        -->
     <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/arial.gpb" tofile="assets/res/arial.gpb"/>
-        <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 todir="assets/res/shaders">
-            <fileset dir="../../../gameplay/res/shaders"/>
-        </copy>
-        <copy file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
     </target>
 
     <!-- Import the actual build file.

samples/lua/bar-descriptor.xml

@@ -30,7 +30,7 @@
     <author>RIM Canada</author>
 
     <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
 
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>
@@ -43,15 +43,15 @@
 
     <asset path="icon.png">icon.png</asset>
     <asset path="game.config">game.config</asset>
-   	<asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
-    <asset path="../../gameplay/res/shaders">res/shaders</asset>
-    <asset path="../../gameplay/res/ui">res/ui</asset>
     <asset path="res/ai.lua">res/ai.lua</asset>
     <asset path="res/game.lua">res/game.lua</asset>
     <asset path="res/lua.gpb">res/lua.gpb</asset>
     <asset path="res/lua.material">res/lua.material</asset>
     <asset path="res/lua.scene">res/lua.scene</asset>
     <asset path="res/lua-logo.png">res/lua-logo.png</asset>
+    <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
+    <asset path="../../gameplay/res/shaders">res/shaders</asset>
+    <asset path="../../gameplay/res/ui">res/ui</asset>
 
     <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>

samples/mesh/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -163,7 +162,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -253,7 +251,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/mesh/android/build.xml

@@ -50,6 +50,18 @@
 
     <target name="-pre-build">
 		<mkdir dir="src"/>
+        <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>
 	
 <!--
@@ -61,16 +73,6 @@
        If this is not done in place, override ${out.dex.input.absolute.dir} */
        -->
     <target name="-post-compile">
-        <copy file="../game.config" tofile="assets/game.config"/>
-        <copy file="../res/arial.gpb" tofile="assets/res/arial.gpb"/>
-        <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>
     </target>
 
     <!-- Import the actual build file.

samples/mesh/bar-descriptor.xml

@@ -30,7 +30,7 @@
     <author>RIM Canada</author>
 
     <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
 
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>
@@ -46,10 +46,10 @@
     <asset path="res/mesh.scene">res/mesh.scene</asset>
     <asset path="res/mesh.gpb">res/mesh.gpb</asset>
     <asset path="res/mesh.material">res/mesh.material</asset>
+    <asset path="game.config">game.config</asset>
     <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
     <asset path="../../gameplay/res/shaders">res/shaders</asset>
     <asset path="../../gameplay/res/ui">res/ui</asset>
-    <asset path="game.config">game.config</asset>
     
     <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>

samples/particles/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -151,7 +150,7 @@
 									<listOptionValue builtIn="false" value="EGL"/>
 									<listOptionValue builtIn="false" value="screen"/>
 									<listOptionValue builtIn="false" value="m"/>
-									<listOptionValue builtIn="false" value="png16"/>
+									<listOptionValue builtIn="false" value="png"/>
 									<listOptionValue builtIn="false" value="pps"/>
 									<listOptionValue builtIn="false" value="bps"/>
 									<listOptionValue builtIn="false" value="gestures"/>
@@ -161,7 +160,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -239,7 +237,7 @@
 									<listOptionValue builtIn="false" value="EGL"/>
 									<listOptionValue builtIn="false" value="screen"/>
 									<listOptionValue builtIn="false" value="m"/>
-									<listOptionValue builtIn="false" value="png16"/>
+									<listOptionValue builtIn="false" value="png"/>
 									<listOptionValue builtIn="false" value="pps"/>
 									<listOptionValue builtIn="false" value="bps"/>
 									<listOptionValue builtIn="false" value="gestures"/>
@@ -249,7 +247,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/particles/android/build.xml

@@ -59,7 +59,6 @@
        If this is not done in place, override ${out.dex.input.absolute.dir} */
        -->
     <target name="-post-compile">
-        <copy file="../res/arial.gpb" tofile="assets/res/arial.gpb"/>
         <copy file="../res/editor.form" tofile="assets/res/editor.form"/>
         <copy file="../res/editor.png" tofile="assets/res/editor.png"/>
         <copy file="../res/editor.theme" tofile="assets/res/editor.theme"/>
@@ -70,10 +69,13 @@
         <copy file="../res/grid.material" tofile="assets/res/grid.material"/>
         <copy file="../res/smoke.particle" tofile="assets/res/smoke.particle"/>
         <copy file="../res/smoke.png" tofile="assets/res/smoke.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 file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
+        <copy todir="assets/res/ui">
+          <fileset dir="../../../gameplay/res/ui"/>
+        </copy>
     </target>
 
     <!-- Import the actual build file.

samples/particles/bar-descriptor.xml

@@ -30,7 +30,7 @@
     <author>RIM Canada</author>
 
     <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
 
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>

samples/particles/src/ParticlesGame.cpp

@@ -9,7 +9,7 @@ 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 INITIAL_ZOOM = 6.0f;
+const float ZOOM_DEFAULT = 6.0f;
 
 ParticlesGame::ParticlesGame() : _scene(NULL), _panning(false), _rotating(false), _zooming(false)
 {
@@ -124,7 +124,7 @@ void ParticlesGame::initialize()
     _cameraParent->addChild(cameraNode);
     Camera* camera = Camera::createPerspective(45.0f, (float)getWidth() / (float)getHeight(), 0.25f, 1000.0f);
     cameraNode->setCamera(camera);
-    cameraNode->setTranslation(0.0f, 0.0f, INITIAL_ZOOM);
+    cameraNode->setTranslation(0.0f, 0.0f, ZOOM_DEFAULT);
     _scene->setActiveCamera(camera);
     SAFE_RELEASE(camera);
 

samples/racer/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -161,7 +160,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -249,7 +247,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/racer/android/build.xml

@@ -1,101 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="sample-racer" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-          unless="sdk.dir" />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-
-    <target name="-pre-build">
-		<mkdir dir="src"/>
-    </target>
-	
-<!--
-    <target name="-pre-compile">
-    </target>
-
-    /* This is typically used for code obfuscation.
-       Compiled code location: ${out.classes.absolute.dir}
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
-       -->
-    <target name="-post-compile">
-	    <copy file="../game.png.config" tofile="assets/game.config"/>
-		
-        <copy todir="assets/res/common">
-            <fileset dir="../res/common"/>
-        </copy>
-		
-        <copy todir="assets/res/png">
-            <fileset dir="../res/png"/>
-        </copy>
-		
-		<copy todir="assets/res/shaders">
-            <fileset dir="../../../gameplay/res/shaders"/>
-        </copy>
-		
-		<copy file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
-    </target>
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="sample-racer" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+          unless="sdk.dir" />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+
+    <target name="-pre-build">
+		<mkdir dir="src"/>
+    </target>
+	
+<!--
+    <target name="-pre-compile">
+    </target>
+
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+       -->
+    <target name="-post-compile">
+	    <copy file="../game.png.config" tofile="assets/game.config"/>
+		
+        <copy todir="assets/res/common">
+            <fileset dir="../res/common"/>
+        </copy>
+		
+        <copy todir="assets/res/png">
+            <fileset dir="../res/png"/>
+        </copy>
+        <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>
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

samples/racer/bar-descriptor.xml

@@ -30,7 +30,7 @@
     <author>RIM Canada</author>
 
     <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
 
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>
@@ -42,11 +42,11 @@
     <category>core.games</category>
 
     <asset path="icon.png">icon.png</asset>
+    <asset path="res/common">res/common</asset>
     <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
     <asset path="../../gameplay/res/shaders">res/shaders</asset>
     <asset path="../../gameplay/res/ui">res/ui</asset>
-    <asset path="res/common">res/common</asset>
-        
+    
     <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="Device-Debug/sample-racer" entry="true" type="Qnx/Elf">sample-racer</asset>

samples/spaceship/.cproject

@@ -73,7 +73,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1645280653" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -161,7 +160,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.534133606" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -250,7 +248,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1805822171" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/spaceship/android/build.xml

@@ -70,10 +70,13 @@
         <copy file="../res/propulsion_glow.png" tofile="assets/res/propulsion_glow.png"/>
         <copy file="../res/spaceship.gpb" tofile="assets/res/spaceship.gpb"/>
         <copy file="../res/spaceship.wav" tofile="assets/res/spaceship.wav"/>
+        <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 file="../../../gameplay/res/logo_powered_white.png" tofile="assets/res/logo_powered_white.png"/>
+        <copy todir="assets/res/ui">
+            <fileset dir="../../../gameplay/res/ui"/>
+        </copy>
     </target>
 
 

samples/spaceship/bar-descriptor.xml

@@ -1,44 +1,90 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<qnx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.qnx.com/schemas/application/1.0">
-  <id>org.gameplay3d.sample_spaceship</id>
-  <name>Spaceship</name>
-  <versionNumber>2.0.0</versionNumber>
-  <buildId>1</buildId>
-  <description>Spaceship</description>
-  <author>RIM Canada</author>
-  <category>core.games</category>
-  <initialWindow>
-    <autoOrients>false</autoOrients>
-    <aspectRatio>landscape</aspectRatio>
-    <systemChrome>none</systemChrome>
-    <transparent>false</transparent>
-  </initialWindow>
-  <asset path="icon.png">icon.png</asset>
-  <asset path="res/airstrip.gpb">res/airstrip.gpb</asset>
-  <asset path="res/spaceship.gpb">res/spaceship.gpb</asset>
-  <asset path="res/spaceship.wav">res/spaceship.wav</asset>
-  <asset path="res//background.ogg">res/background.ogg</asset>
-  <asset path="res/background.png">res/background.png</asset>
-  <asset path="res/propulsion_glow.png">res/propulsion_glow.png</asset>
-  <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
-  <asset path="../../gameplay/res/shaders">res/shaders</asset>
-  <asset path="../../gameplay/res/ui">res/ui</asset>
-  <asset path="game.config">game.config</asset>
-  <configuration name="Device-Debug">
-    <platformArchitecture>armle-v7</platformArchitecture>
-    <asset path="Device-Debug/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
-  </configuration>
-  <configuration name="Device-Release">
-    <platformArchitecture>armle-v7</platformArchitecture>
-    <asset path="Device-Release/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
-  </configuration>
-  <configuration name="Simulator">
-    <platformArchitecture>x86</platformArchitecture>
-    <asset path="Simulator/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
-  </configuration>
-  <permission>read_device_identifying_information</permission>
-  <icon>
-    <image>icon.png</image>
-  </icon>
-  <env var="LD_LIBRARY_PATH" value="app/native/lib" />
+<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
+
+<!-- BlackBerry OS application descriptor file.
+    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
+-->
+
+    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
+         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+    <id>org.gameplay3d.sample_spaceship</id>
+
+    <!-- The name that is displayed in the BlackBerry OS application installer. 
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <name>Spaceship</name>
+
+    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
+         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
+         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
+    <versionNumber>2.0.0</versionNumber>
+
+    <!-- Fourth digit segment of the package version. First three segments are taken from the 
+         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
+    <buildId>1</buildId>
+
+    <!-- Description, displayed in the BlackBerry OS application installer.
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <description>Spaceship</description>
+
+    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
+    <author>RIM Canada</author>
+
+    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
+
+    <initialWindow>
+        <aspectRatio>landscape</aspectRatio>
+        <autoOrients>false</autoOrients>
+        <systemChrome>none</systemChrome>
+        <transparent>false</transparent>
+    </initialWindow>
+
+    <category>core.games</category>
+  
+	<asset path="icon.png">icon.png</asset>
+	<asset path="res/airstrip.gpb">res/airstrip.gpb</asset>  
+	<asset path="res/spaceship.gpb">res/spaceship.gpb</asset>
+	<asset path="res/spaceship.wav">res/spaceship.wav</asset>
+	<asset path="res//background.ogg">res/background.ogg</asset>
+	<asset path="res/background.png">res/background.png</asset>
+	<asset path="res/propulsion_glow.png">res/propulsion_glow.png</asset>
+	<asset path="game.config">game.config</asset>
+	<asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
+	<asset path="../../gameplay/res/shaders">res/shaders</asset>
+	<asset path="../../gameplay/res/ui">res/ui</asset>
+	  
+	<configuration name="Device-Debug">
+	  <platformArchitecture>armle-v7</platformArchitecture>
+	  <asset path="Device-Debug/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
+	</configuration>
+	<configuration name="Device-Release">
+	  <platformArchitecture>armle-v7</platformArchitecture>
+	  <asset path="Device-Release/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
+	</configuration>
+	<configuration name="Simulator">
+	  <platformArchitecture>x86</platformArchitecture>
+	  <asset path="Simulator/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
+	</configuration>
+
+    <!-- The icon for the application, which should be 114x114. -->
+    <icon>
+        <image>icon.png</image>
+    </icon>
+
+    <!-- The splash screen that will appear when your application is launching. Should be 1280x720. -->
+    <!-- <splashscreen></splashscreen> -->
+
+    <!-- The permissions requested by your application. -->
+    <!--  <action>access_shared</action> -->
+    <!--  <action>record_audio</action> -->
+    <!--  <action>read_geolocation</action> -->
+    <!--  <action>use_camera</action> -->
+    <!--  <action>access_internet</action> -->
+    <!--  <action>play_audio</action> -->
+    <!--  <action>post_notification</action> -->
+    <!--  <action>set_audio_volume</action> -->
+    <!--  <action>read_device_identifying_information</action> -->
+
+    <!-- Ensure that shared libraries in the package are found at run-time. -->
+    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
 </qnx>

template/android/template.build.xml

@@ -51,6 +51,15 @@
 
     <target name="-pre-build">
 		<mkdir dir="src"/>
+        <copy todir="assets/res">
+            <fileset dir="../res" />
+        </copy>
+        <copy todir="assets/res/shaders">
+            <fileset dir="../GAMEPLAY_PATH/gameplay/res/shaders" />
+       </copy>
+        <copy todir="assets/res/ui">
+            <fileset dir="../GAMEPLAY_PATH/gameplay/res/ui" />
+       </copy>
     </target>
 	
 <!--
@@ -62,13 +71,6 @@
        If this is not done in place, override ${out.dex.input.absolute.dir} */
        -->
     <target name="-post-compile">
-    	<delete dir="assets/res"/>
-        <copy todir="assets/res">
-            <fileset dir="../res" />
-        </copy>
-        <copy todir="assets/res/shaders">
-            <fileset dir="../GAMEPLAY_PATH/gameplay/res/shaders" />
-       </copy>
     </target>
 
     <!-- Import the actual build file.

template/template.cproject

@@ -76,7 +76,6 @@
                                     <listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-								    <listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -164,7 +163,6 @@
                                     <listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-          							<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -253,7 +251,6 @@
                                     <listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-								    <listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

template/template.xcodeproj/project.pbxproj

@@ -28,7 +28,6 @@
 		421090FA1829A5AE00761E40 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 421090F91829A5AE00761E40 /* GameKit.framework */; };
 		421090FC1829A5BF00761E40 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 421090FB1829A5BF00761E40 /* GameKit.framework */; };
 		421539CA16ADC583001308A3 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 421539C916ADC583001308A3 /* libgameplay.a */; };
-		421539CD16ADC592001308A3 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 421539CC16ADC592001308A3 /* libgameplay.a */; };
 		424CC03C161FCBDD00577827 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424CC03B161FCBDD00577827 /* IOKit.framework */; };
 		428F7BDE15CB131A009ED24C /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 428F7BDD15CB131A009ED24C /* game.config */; };
 		42C932C11491A0DB0098216A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C932C01491A0DB0098216A /* Cocoa.framework */; };
@@ -42,8 +41,33 @@
 		5B61611614CCC24C0073B857 /* TemplateGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C932EF1491A5160098216A /* TemplateGame.cpp */; };
 		5B61612614CCC24C0073B857 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42C932ED1491A4CB0098216A /* icon.png */; };
 		5B61612714CCC24C0073B857 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 42C932F21491A53E0098216A /* res */; };
+		BDBFA8611883491700342B78 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BDBFA85E188347B000342B78 /* libgameplay.a */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		BDBFA85B188347B000342B78 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5BC4E77F150F879E00CBE1C0 /* gameplay.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4234D99A14686C52003031B3;
+			remoteInfo = "gameplay-macosx";
+		};
+		BDBFA85D188347B000342B78 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5BC4E77F150F879E00CBE1C0 /* gameplay.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5B04C5CA14BFCFE100EB0071;
+			remoteInfo = "gameplay-ios";
+		};
+		BDBFA85F1883490A00342B78 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5BC4E77F150F879E00CBE1C0 /* gameplay.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 5B04C52B14BFCFE100EB0071;
+			remoteInfo = "gameplay-ios";
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXFileReference section */
 		42049B5216ADBB61005DD1F9 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
 		42049B5316ADBB61005DD1F9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
@@ -111,7 +135,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				421539CD16ADC592001308A3 /* libgameplay.a in Frameworks */,
+				BDBFA8611883491700342B78 /* libgameplay.a in Frameworks */,
 				42049B6116ADBC0F005DD1F9 /* libbullet.a in Frameworks */,
 				42049B7316ADBCAB005DD1F9 /* liblua.a in Frameworks */,
 				42049B7116ADBC8B005DD1F9 /* libpng.a in Frameworks */,
@@ -220,6 +244,15 @@
 			name = GamePlay;
 			sourceTree = "<group>";
 		};
+		BDBFA857188347B000342B78 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				BDBFA85C188347B000342B78 /* libgameplay.a */,
+				BDBFA85E188347B000342B78 /* libgameplay.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		F1F49B8516AD8C22008715A2 /* MacOSX */ = {
 			isa = PBXGroup;
 			children = (
@@ -281,6 +314,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				BDBFA8601883490A00342B78 /* PBXTargetDependency */,
 			);
 			name = "TEMPLATE_PROJECT-ios";
 			productName = TEMPLATE_PROJECT;
@@ -305,6 +339,12 @@
 			mainGroup = 42C932B11491A0DB0098216A;
 			productRefGroup = 42C932BD1491A0DB0098216A /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = BDBFA857188347B000342B78 /* Products */;
+					ProjectRef = 5BC4E77F150F879E00CBE1C0 /* gameplay.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				42C932BB1491A0DB0098216A /* TEMPLATE_PROJECT-macosx */,
@@ -313,6 +353,23 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		BDBFA85C188347B000342B78 /* libgameplay.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libgameplay.a;
+			remoteRef = BDBFA85B188347B000342B78 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		BDBFA85E188347B000342B78 /* libgameplay.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libgameplay.a;
+			remoteRef = BDBFA85D188347B000342B78 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		42C932BA1491A0DB0098216A /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -384,6 +441,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		BDBFA8601883490A00342B78 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "gameplay-ios";
+			targetProxy = BDBFA85F1883490A00342B78 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		42C932D81491A0DB0098216A /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -460,7 +525,6 @@
 					"GAMEPLAY_PATH/external-deps/lua/lib/macosx",
 					"GAMEPLAY_PATH/external-deps/png/lib/macosx",
 					"GAMEPLAY_PATH/external-deps/oggvorbis/lib/macosx",
-					"~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "";
@@ -491,7 +555,6 @@
 					"GAMEPLAY_PATH/external-deps/lua/lib/macosx",
 					"GAMEPLAY_PATH/external-deps/png/lib/macosx",
 					"GAMEPLAY_PATH/external-deps/oggvorbis/lib/macosx",
-					"~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "";
@@ -503,7 +566,7 @@
 		5B61612A14CCC24C0073B857 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++98";
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -525,7 +588,6 @@
 					"\"GAMEPLAY_PATH/external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
 					"\"GAMEPLAY_PATH/external-deps/png/lib/ios/$(CURRENT_ARCH)\"",
 					"\"GAMEPLAY_PATH/external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
-					"\"~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos\"",
 				);
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -538,7 +600,7 @@
 		5B61612B14CCC24C0073B857 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++98";
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -560,7 +622,6 @@
 					"GAMEPLAY_PATH/external-deps/lua/lib/ios/$(CURRENT_ARCH)",
 					"GAMEPLAY_PATH/external-deps/png/lib/ios/$(CURRENT_ARCH)",
 					"GAMEPLAY_PATH/external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)",
-					"~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos",
 				);
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

tools/encoder/CMakeLists.txt

@@ -8,7 +8,7 @@ include_directories(
 )
 
 add_definitions(-D_DEBUG)
-add_definitions(-D__linux__ -DNO_BOOST -DNO_ZAE -DUSE_FBX)
+add_definitions(-D__linux__ -DUSE_FBX)
 
 link_directories(
     ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux/${ARCH_DIR}

tools/encoder/README.md

@@ -1,8 +1,8 @@
 ## gameplay-encoder
 Command-line tool for encoding games assets like true-type fonts and 3D scene files
 into a simple binary-based bundle file format for the gameplay 3D game framework runtime. 
-The 'bin' folder contains pre-built versions of the gameplay-encoder executables for 
-Windows 7, MacOS X and Linux Ubuntu (32-bit) with support built-in support for:
+The 'bin' folder contains pre-built 32-bit versions of the gameplay-encoder executables for 
+Windows 7, MacOS X and Linux Ubuntu with support built-in support for:
 
 ## TrueType Font
 TrueType Fonts represent a standard in defining outline fonts and has become the 

tools/encoder/gameplay-encoder.vcxproj

@@ -160,14 +160,14 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=2;USE_FBX;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:/Program Files/Autodesk/FBX/FBX SDK/2014.2/include;../../external-deps/freetype2/include;../../external-deps/png/include;../../external-deps/zlib/include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:/Program Files/Autodesk/FBX/FBX SDK/2014.2.1/include;../../external-deps/freetype2/include;../../external-deps/png/include;../../external-deps/zlib/include</AdditionalIncludeDirectories>
       <DisableLanguageExtensions>
       </DisableLanguageExtensions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>C:/Program Files/Autodesk/FBX/FBX SDK/2014.2/lib/vs2012/x86/debug;../../external-deps/freetype2/lib/windows/x86;../../external-deps/png/lib/windows/x86;../../external-deps/zlib/lib/windows/x86</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:/Program Files/Autodesk/FBX/FBX SDK/2014.2.1/lib/vs2012/x86/debug;../../external-deps/freetype2/lib/windows/x86;../../external-deps/png/lib/windows/x86;../../external-deps/zlib/lib/windows/x86</AdditionalLibraryDirectories>
       <AdditionalDependencies>libfbxsdk-md.lib;freetype245.lib;libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>MSVCRT</IgnoreSpecificDefaultLibraries>
     </Link>
@@ -185,7 +185,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;USE_FBX;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:/Program Files/Autodesk/FBX/FBX SDK/2014.2/include;../../external-deps/freetype2/include;../../external-deps/png/include;../../external-deps/zlib/include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:/Program Files/Autodesk/FBX/FBX SDK/2014.2.1/include;../../external-deps/freetype2/include;../../external-deps/png/include;../../external-deps/zlib/include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -193,7 +193,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>libfbxsdk-md.lib;freetype245.lib;libpng.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:/Program Files/Autodesk/FBX/FBX SDK/2014.2/lib/vs2012/x86/release;../../external-deps/freetype2/lib/windows/x86;../../external-deps/png/lib/windows/x86;../../external-deps/zlib/lib/windows/x86</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:/Program Files/Autodesk/FBX/FBX SDK/2014.2.1/lib/vs2012/x86/release;../../external-deps/freetype2/lib/windows/x86;../../external-deps/png/lib/windows/x86;../../external-deps/zlib/lib/windows/x86</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
     </Link>

tools/encoder/gameplay-encoder.xcodeproj/project.pbxproj

@@ -85,7 +85,7 @@
 		422BF0851804C16E0028D009 /* libm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libm.dylib; path = ../../../../../../usr/lib/libm.dylib; sourceTree = "<group>"; };
 		422BF0871804C1E40028D009 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = ../../../../../../usr/lib/libbz2.dylib; sourceTree = "<group>"; };
 		422BF08F1804C5230028D009 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "../../../../../../usr/lib/libstdc++.dylib"; sourceTree = "<group>"; };
-		422BF0911804C7060028D009 /* libfbxsdk-static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfbxsdk-static.a"; path = "../../../../../../Applications/Autodesk/FBX SDK/2014.2/lib/gcc4/ub/release/libfbxsdk-static.a"; sourceTree = "<group>"; };
+		422BF0911804C7060028D009 /* libfbxsdk-static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfbxsdk-static.a"; path = "../../../../../../Applications/Autodesk/FBX SDK/2014.2.1/lib/gcc4/ub/release/libfbxsdk-static.a"; sourceTree = "<group>"; };
 		42475CE6147208A000610A6A /* gameplay-encoder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gameplay-encoder"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4251B128152D044B002F6199 /* Curve.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Curve.cpp; path = src/Curve.cpp; sourceTree = SOURCE_ROOT; };
 		4251B129152D044B002F6199 /* Curve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Curve.h; path = src/Curve.h; sourceTree = SOURCE_ROOT; };
@@ -495,13 +495,13 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					"\"/Applications/Autodesk/FBX SDK/2014.2/include\"",
+					"\"/Applications/Autodesk/FBX SDK/2014.2.1/include\"",
 					"../../external-deps/png/include",
 					"../../external-deps/freetype2/include",
 				);
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
 				LIBRARY_SEARCH_PATHS = (
-					"\"/Applications/Autodesk/FBX SDK/2014.2/lib/gcc4/ub/release\"",
+					"\"/Applications/Autodesk/FBX SDK/2014.2.1/lib/gcc4/ub/release\"",
 					"../../external-deps/png/lib/macosx",
 					"../../external-deps/freetype2/lib/macosx",
 				);
@@ -543,13 +543,13 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					"\"/Applications/Autodesk/FBX SDK/2014.2/include\"",
+					"\"/Applications/Autodesk/FBX SDK/2014.2.1/include\"",
 					"../../external-deps/png/include",
 					"../../external-deps/freetype2/include",
 				);
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
 				LIBRARY_SEARCH_PATHS = (
-					"\"/Applications/Autodesk/FBX SDK/2014.2/lib/gcc4/ub/release\"",
+					"\"/Applications/Autodesk/FBX SDK/2014.2.1/lib/gcc4/ub/release\"",
 					"../../external-deps/png/lib/macosx",
 					"../../external-deps/freetype2/lib/macosx",
 				);
@@ -578,8 +578,8 @@
 					"$(inherited)",
 					"../../external-deps/freetype2/lib/macosx",
 					"../../external-deps/png/lib/macosx",
-					"/Applications/Autodesk/FBX\\ SDK/2014.2/lib/gcc4/ub/release",
-					"$(SYSTEM_APPS_DIR)/Autodesk/FBX\\ SDK/2014.2/lib/gcc4/ub/release",
+					"/Applications/Autodesk/FBX\\ SDK/2014.2.1/lib/gcc4/ub/release",
+					"$(SYSTEM_APPS_DIR)/Autodesk/FBX\\ SDK/2014.2.1/lib/gcc4/ub/release",
 				);
 				MACH_O_TYPE = mh_execute;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -603,8 +603,8 @@
 					"../../external-deps/freetype2/lib/macosx",
 					"../../external-deps/png/lib/macosx",
 					/Applications/Autodesk/FBX,
-					SDK/2014.2/lib/gcc4/ub/release,
-					"$(SYSTEM_APPS_DIR)/Autodesk/FBX\\ SDK/2014.2/lib/gcc4/ub/release",
+					SDK/2014.2.1/lib/gcc4/ub/release,
+					"$(SYSTEM_APPS_DIR)/Autodesk/FBX\\ SDK/2014.2.1/lib/gcc4/ub/release",
 				);
 				MACH_O_TYPE = mh_execute;
 				PRODUCT_NAME = "$(TARGET_NAME)";

tools/encoder/src/FBXSceneEncoder.cpp

@@ -442,10 +442,10 @@ void FBXSceneEncoder::loadAnimationLayer(FbxAnimLayer* fbxAnimLayer, FbxNode* fb
 
 void FBXSceneEncoder::loadAnimations(FbxScene* fbxScene, const EncoderArguments& arguments)
 {
-    FbxAnimEvaluator* evaluator = fbxScene->GetEvaluator();
+    FbxAnimEvaluator* evaluator = fbxScene->GetAnimationEvaluator();
     if (!evaluator)
         return;
-    FbxAnimStack* animStack = evaluator->GetContext();
+    FbxAnimStack* animStack = fbxScene->GetCurrentAnimationStack();
     if (!animStack)
         return;