Kaynağa Gözat

Added 64-bit Windows support.
Updated existing windows sample projects and new project template to have x64 targets in addition to x86/Win32.
Rebuilt all windows dependency libs and removed zlib.dll as zlib is now built as a static library.
Note that any Windows projects generated with the old "new project script" will no longer link correctly with these changes since library paths have changed. Old projects will need to append /x86 to their windows lib paths.

Fixes #215

Steve Grenier 13 yıl önce
ebeveyn
işleme
2e7fcf3ca1
67 değiştirilmiş dosya ile 1777 ekleme ve 1069 silme
  1. 2 2
      gameplay-encoder/gameplay-encoder.vcxproj
  2. 4 2
      gameplay-encoder/gameplay-encoder.vcxproj.user
  3. 5 0
      gameplay-luagen/src/FunctionBinding.cpp
  4. 153 5
      gameplay-template/gameplay-template.vcxproj
  5. 15 3
      gameplay-template/gameplay-template.vcxproj.user
  6. 132 75
      gameplay.sln
  7. 126 6
      gameplay/gameplay.vcxproj
  8. 1 2
      gameplay/src/AbsoluteLayout.cpp
  9. 1 1
      gameplay/src/Animation.cpp
  10. 2 3
      gameplay/src/AnimationClip.cpp
  11. 8 9
      gameplay/src/Bundle.cpp
  12. 3 4
      gameplay/src/Container.cpp
  13. 1 1
      gameplay/src/Effect.cpp
  14. 1 2
      gameplay/src/FlowLayout.cpp
  15. 21 21
      gameplay/src/Font.cpp
  16. 1 1
      gameplay/src/Font.h
  17. 1 1
      gameplay/src/Game.cpp
  18. 1 1
      gameplay/src/Game.inl
  19. 1 1
      gameplay/src/Image.cpp
  20. 3 3
      gameplay/src/Material.cpp
  21. 6 7
      gameplay/src/MeshSkin.cpp
  22. 1 1
      gameplay/src/Node.cpp
  23. 5 5
      gameplay/src/PhysicsController.cpp
  24. 2 2
      gameplay/src/PhysicsVehicle.cpp
  25. 1 1
      gameplay/src/PlatformWindows.cpp
  26. 5 8
      gameplay/src/Properties.cpp
  27. 9 3
      gameplay/src/RenderState.cpp
  28. 1 1
      gameplay/src/RenderState.h
  29. 1 0
      gameplay/src/RenderTarget.h
  30. 8 8
      gameplay/src/SceneLoader.cpp
  31. 4 4
      gameplay/src/ScriptController.cpp
  32. 2 2
      gameplay/src/ScriptController.inl
  33. 3 3
      gameplay/src/Technique.cpp
  34. 1 1
      gameplay/src/TextBox.cpp
  35. 4 4
      gameplay/src/Texture.cpp
  36. 6 6
      gameplay/src/Theme.cpp
  37. 3 3
      gameplay/src/Transform.cpp
  38. 1 1
      gameplay/src/VertexAttributeBinding.cpp
  39. 2 2
      gameplay/src/VertexFormat.cpp
  40. 3 3
      gameplay/src/VerticalLayout.cpp
  41. 6 6
      gameplay/src/lua/lua_AnimationTarget.cpp
  42. 55 55
      gameplay/src/lua/lua_Button.cpp
  43. 57 57
      gameplay/src/lua/lua_CheckBox.cpp
  44. 60 60
      gameplay/src/lua/lua_Container.cpp
  45. 54 54
      gameplay/src/lua/lua_Control.cpp
  46. 76 0
      gameplay/src/lua/lua_DepthStencilTarget.cpp
  47. 2 0
      gameplay/src/lua/lua_DepthStencilTarget.h
  48. 63 63
      gameplay/src/lua/lua_Form.cpp
  49. 31 1
      gameplay/src/lua/lua_FrameBuffer.cpp
  50. 38 0
      gameplay/src/lua/lua_Game.cpp
  51. 1 0
      gameplay/src/lua/lua_Game.h
  52. 1 0
      gameplay/src/lua/lua_Global.cpp
  53. 88 88
      gameplay/src/lua/lua_Joint.cpp
  54. 57 57
      gameplay/src/lua/lua_Joystick.cpp
  55. 55 55
      gameplay/src/lua/lua_Label.cpp
  56. 30 30
      gameplay/src/lua/lua_MaterialParameter.cpp
  57. 88 88
      gameplay/src/lua/lua_Node.cpp
  58. 29 0
      gameplay/src/lua/lua_Platform.cpp
  59. 1 0
      gameplay/src/lua/lua_Platform.h
  60. 58 58
      gameplay/src/lua/lua_RadioButton.cpp
  61. 111 1
      gameplay/src/lua/lua_RenderTarget.cpp
  62. 2 0
      gameplay/src/lua/lua_RenderTarget.h
  63. 59 59
      gameplay/src/lua/lua_Slider.cpp
  64. 55 55
      gameplay/src/lua/lua_TextBox.cpp
  65. 72 1
      gameplay/src/lua/lua_Texture.cpp
  66. 6 1
      gameplay/src/lua/lua_TextureFormat.cpp
  67. 72 72
      gameplay/src/lua/lua_Transform.cpp

+ 2 - 2
gameplay-encoder/gameplay-encoder.vcxproj

@@ -159,7 +159,7 @@
     <Link>
     <Link>
       <SubSystem>Console</SubSystem>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>../external-deps/freetype2/lib/windows;../external-deps/collada-dom/lib/windows;../external-deps/libpng/lib/windows;../external-deps/zlib/lib/windows</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../external-deps/freetype2/lib/windows/x86;../external-deps/collada-dom/lib/windows/x86;../external-deps/libpng/lib/windows/x86;../external-deps/zlib/lib/windows/x86</AdditionalLibraryDirectories>
       <AdditionalDependencies>freetype245.lib;libcollada14dom22-d.lib;libpng14.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies>freetype245.lib;libcollada14dom22-d.lib;libpng14.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>MSVCRT</IgnoreSpecificDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>MSVCRT</IgnoreSpecificDefaultLibraries>
     </Link>
     </Link>
@@ -184,7 +184,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>freetype245.lib;libcollada14dom22-d.lib;libpng14.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies>freetype245.lib;libcollada14dom22-d.lib;libpng14.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../external-deps/freetype2/lib/windows;../external-deps/collada-dom/lib/windows;../external-deps/libpng/lib/windows;../external-deps/zlib/lib/windows</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../external-deps/freetype2/lib/windows/x86;../external-deps/collada-dom/lib/windows/x86;../external-deps/libpng/lib/windows/x86;../external-deps/zlib/lib/windows/x86</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
     </Link>
     </Link>

+ 4 - 2
gameplay-encoder/gameplay-encoder.vcxproj.user

@@ -4,10 +4,12 @@
     <LocalDebuggerCommandArguments>
     <LocalDebuggerCommandArguments>
     </LocalDebuggerCommandArguments>
     </LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerEnvironment>PATH=%PATH%;../bin/windows;</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>
+    </LocalDebuggerEnvironment>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;../bin/windows;</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>
+    </LocalDebuggerEnvironment>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   </PropertyGroup>
 </Project>
 </Project>

+ 5 - 0
gameplay-luagen/src/FunctionBinding.cpp

@@ -76,6 +76,11 @@ void FunctionBinding::write(ostream& o, const vector<FunctionBinding>& bindings)
 {
 {
     GP_ASSERT(bindings.size() > 0);
     GP_ASSERT(bindings.size() > 0);
 
 
+    if (bindings[0].getFunctionName() == "lua_AudioListener_static_getInstance")
+    {
+        int i = 0;
+    }
+
     // Print the function signature.
     // Print the function signature.
     o << "int " << bindings[0].getFunctionName() << "(lua_State* state)\n";
     o << "int " << bindings[0].getFunctionName() << "(lua_State* state)\n";
     o << "{\n";
     o << "{\n";

+ 153 - 5
gameplay-template/gameplay-template.vcxproj

@@ -5,14 +5,26 @@
       <Configuration>DebugMem</Configuration>
       <Configuration>DebugMem</Configuration>
       <Platform>Win32</Platform>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugMem|x64">
+      <Configuration>DebugMem</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   </ItemGroup>
   <PropertyGroup Label="Globals">
   <PropertyGroup Label="Globals">
     <Keyword>Win32Proj</Keyword>
     <Keyword>Win32Proj</Keyword>
@@ -24,29 +36,54 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'" Label="Configuration">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'" Label="PropertySheets">
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <LinkIncremental>true</LinkIncremental>
@@ -55,18 +92,35 @@
     <CustomBuildBeforeTargets>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(Configuration)\</OutDir>
+    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+    <CustomBuildBeforeTargets />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(Configuration)\</OutDir>
     <OutDir>$(Configuration)\</OutDir>
     <ExecutablePath>$(ExecutablePath)</ExecutablePath>
     <ExecutablePath>$(ExecutablePath)</ExecutablePath>
     <CustomBuildBeforeTargets />
     <CustomBuildBeforeTargets />
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(Configuration)\</OutDir>
+    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+    <CustomBuildBeforeTargets />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(Configuration)\</OutDir>
     <OutDir>$(Configuration)\</OutDir>
     <CustomBuildBeforeTargets>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(Configuration)\</OutDir>
+    <CustomBuildBeforeTargets />
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
     <ClCompile>
       <PrecompiledHeader>
       <PrecompiledHeader>
@@ -82,7 +136,37 @@
       <SubSystem>Windows</SubSystem>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>lua.lib;OpenAL32.lib;OpenGL32.lib;GLU32.lib;glew32.lib;libpng14.lib;zlib.lib;gameplay.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies>lua.lib;OpenAL32.lib;OpenGL32.lib;GLU32.lib;glew32.lib;libpng14.lib;zlib.lib;gameplay.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>GAMEPLAY_PATH/external-deps/lua/lib/windows;GAMEPLAY_PATH/external-deps/bullet/lib/windows;GAMEPLAY_PATH/external-deps/openal/lib/windows;GAMEPLAY_PATH/external-deps/oggvorbis/lib/windows;GAMEPLAY_PATH/external-deps/glew/lib/windows;GAMEPLAY_PATH/external-deps/libpng/lib/windows;GAMEPLAY_PATH/external-deps/zlib/lib/windows;GAMEPLAY_PATH/gameplay/$(Configuration)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>GAMEPLAY_PATH/external-deps/lua/lib/windows/x86;GAMEPLAY_PATH/external-deps/bullet/lib/windows/x86;GAMEPLAY_PATH/external-deps/openal/lib/windows/x86;GAMEPLAY_PATH/external-deps/oggvorbis/lib/windows/x86;GAMEPLAY_PATH/external-deps/glew/lib/windows/x86;GAMEPLAY_PATH/external-deps/libpng/lib/windows/x86;GAMEPLAY_PATH/external-deps/zlib/lib/windows/x86;GAMEPLAY_PATH/gameplay/windows/x86/$(Configuration)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+      <Message>
+      </Message>
+      <Outputs>
+      </Outputs>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>GAMEPLAY_PATH/external-deps/lua/include;GAMEPLAY_PATH/external-deps/bullet/include;GAMEPLAY_PATH/gameplay/src;GAMEPLAY_PATH/external-deps/openal/include/AL;GAMEPLAY_PATH/external-deps/oggvorbis/include;GAMEPLAY_PATH/external-deps/libpng/include;GAMEPLAY_PATH/external-deps/zlib/include;GAMEPLAY_PATH/external-deps/glew/include</AdditionalIncludeDirectories>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>lua.lib;OpenAL32.lib;OpenGL32.lib;GLU32.lib;glew32.lib;libpng14.lib;zlib.lib;gameplay.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>GAMEPLAY_PATH/external-deps/lua/lib/windows/x64;GAMEPLAY_PATH/external-deps/bullet/lib/windows/x64;GAMEPLAY_PATH/external-deps/openal/lib/windows/x64;GAMEPLAY_PATH/external-deps/oggvorbis/lib/windows/x64;GAMEPLAY_PATH/external-deps/glew/lib/windows/x64;GAMEPLAY_PATH/external-deps/libpng/lib/windows/x64;GAMEPLAY_PATH/external-deps/zlib/lib/windows/x64;GAMEPLAY_PATH/gameplay/windows/x64/$(Configuration)</AdditionalLibraryDirectories>
     </Link>
     </Link>
     <PostBuildEvent>
     <PostBuildEvent>
       <Command>
       <Command>
@@ -129,6 +213,38 @@
       </Outputs>
       </Outputs>
     </CustomBuildStep>
     </CustomBuildStep>
   </ItemDefinitionGroup>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;GAMEPLAY_MEM_LEAK_DETECTION;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>GAMEPLAY_PATH/external-deps/lua/include;GAMEPLAY_PATH/external-deps/bullet/include;GAMEPLAY_PATH/gameplay/src;GAMEPLAY_PATH/external-deps/openal/include/AL;GAMEPLAY_PATH/external-deps/oggvorbis/include;GAMEPLAY_PATH/external-deps/libpng/include;GAMEPLAY_PATH/external-deps/zlib/include;GAMEPLAY_PATH/external-deps/glew/include</AdditionalIncludeDirectories>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ShowIncludes>false</ShowIncludes>
+      <PreprocessToFile>false</PreprocessToFile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>lua.lib;OpenAL32.lib;OpenGL32.lib;GLU32.lib;glew32.lib;libpng14.lib;zlib.lib;gameplay.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>GAMEPLAY_PATH/external-deps/lua/lib/windows;GAMEPLAY_PATH/external-deps/bullet/lib/windows;GAMEPLAY_PATH/external-deps/openal/lib/windows;GAMEPLAY_PATH/external-deps/oggvorbis/lib/windows;GAMEPLAY_PATH/external-deps/glew/lib/windows;GAMEPLAY_PATH/external-deps/libpng/lib/windows;GAMEPLAY_PATH/external-deps/zlib/lib/windows;GAMEPLAY_PATH/gameplay/$(Configuration)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+      <Message>
+      </Message>
+      <Outputs>
+      </Outputs>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <WarningLevel>Level3</WarningLevel>
@@ -161,18 +277,50 @@
       </Outputs>
       </Outputs>
     </CustomBuildStep>
     </CustomBuildStep>
   </ItemDefinitionGroup>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>GAMEPLAY_PATH/external-deps/lua/include;GAMEPLAY_PATH/external-deps/bullet/include;GAMEPLAY_PATH/gameplay/src;GAMEPLAY_PATH/external-deps/openal/include/AL;GAMEPLAY_PATH/external-deps/oggvorbis/include;GAMEPLAY_PATH/external-deps/libpng/include;GAMEPLAY_PATH/external-deps/zlib/include;GAMEPLAY_PATH/external-deps/glew/include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>lua.lib;OpenAL32.lib;OpenGL32.lib;GLU32.lib;glew32.lib;libpng14.lib;zlib.lib;gameplay.lib;BulletDynamics.lib;BulletCollision.lib;LinearMath.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>GAMEPLAY_PATH/external-deps/lua/lib/windows;GAMEPLAY_PATH/external-deps/bullet/lib/windows;GAMEPLAY_PATH/external-deps/openal/lib/windows;GAMEPLAY_PATH/external-deps/oggvorbis/lib/windows;GAMEPLAY_PATH/external-deps/glew/lib/windows;GAMEPLAY_PATH/external-deps/libpng/lib/windows;GAMEPLAY_PATH/external-deps/zlib/lib/windows;GAMEPLAY_PATH/gameplay/$(Configuration)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+      <Message>
+      </Message>
+      <Outputs>
+      </Outputs>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
   <ItemGroup>
   <ItemGroup>
-    <None Include="bar-descriptor.xml" >
-        <SubType>Designer</SubType>
+    <None Include="bar-descriptor.xml">
+      <SubType>Designer</SubType>
     </None>
     </None>
     <None Include="game.config" />
     <None Include="game.config" />
-	<None Include="icon.png" />
+    <None Include="icon.png" />
     <None Include="res\box.dae" />
     <None Include="res\box.dae" />
     <None Include="res\box.gpb" />
     <None Include="res\box.gpb" />
     <None Include="res\box.material" />
     <None Include="res\box.material" />
     <None Include="res\colored.frag" />
     <None Include="res\colored.frag" />
     <None Include="res\colored.vert" />
     <None Include="res\colored.vert" />
-  </ItemGroup> 
+  </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\TemplateGame.cpp" />
     <ClCompile Include="src\TemplateGame.cpp" />
   </ItemGroup>
   </ItemGroup>

+ 15 - 3
gameplay-template/gameplay-template.vcxproj.user

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

+ 132 - 75
gameplay.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gameplay", "gameplay\gameplay.vcxproj", "{1032BA4B-57EB-4348-9E03-29DD63E80E4A}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gameplay", "gameplay\gameplay.vcxproj", "{1032BA4B-57EB-4348-9E03-29DD63E80E4A}"
 EndProject
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gameplay-tests", "gameplay-tests\gameplay-tests.vcxproj", "{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gameplay-tests", "gameplay-tests\gameplay-tests.vcxproj", "{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}"
 	ProjectSection(ProjectDependencies) = postProject
 	ProjectSection(ProjectDependencies) = postProject
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 	EndProjectSection
 	EndProjectSection
@@ -33,12 +33,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample04-particles", "gamep
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 	EndProjectSection
 	EndProjectSection
 EndProject
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample05-lua", "gameplay-samples\sample05-lua\sample05-lua.vcxproj", "{C6121A62-AA46-BA6D-A1CE-8000544456AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample05-lua", "gameplay-samples\sample05-lua\sample05-lua.vcxproj", "{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}"
 	ProjectSection(ProjectDependencies) = postProject
 	ProjectSection(ProjectDependencies) = postProject
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 	EndProjectSection
 	EndProjectSection
 EndProject
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample06-racer", "gameplay-samples\sample06-racer\sample06-racer.vcxproj", "{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample06-racer", "gameplay-samples\sample06-racer\sample06-racer.vcxproj", "{82522888-E09A-ED48-AD7D-247237B37B3A}"
 	ProjectSection(ProjectDependencies) = postProject
 	ProjectSection(ProjectDependencies) = postProject
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
 	EndProjectSection
 	EndProjectSection
@@ -48,12 +48,15 @@ Global
 		Debug|BlackBerry = Debug|BlackBerry
 		Debug|BlackBerry = Debug|BlackBerry
 		Debug|BlackBerrySimulator = Debug|BlackBerrySimulator
 		Debug|BlackBerrySimulator = Debug|BlackBerrySimulator
 		Debug|Win32 = Debug|Win32
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		DebugMem|BlackBerry = DebugMem|BlackBerry
 		DebugMem|BlackBerry = DebugMem|BlackBerry
 		DebugMem|BlackBerrySimulator = DebugMem|BlackBerrySimulator
 		DebugMem|BlackBerrySimulator = DebugMem|BlackBerrySimulator
 		DebugMem|Win32 = DebugMem|Win32
 		DebugMem|Win32 = DebugMem|Win32
+		DebugMem|x64 = DebugMem|x64
 		Release|BlackBerry = Release|BlackBerry
 		Release|BlackBerry = Release|BlackBerry
 		Release|BlackBerrySimulator = Release|BlackBerrySimulator
 		Release|BlackBerrySimulator = Release|BlackBerrySimulator
 		Release|Win32 = Release|Win32
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
@@ -64,6 +67,8 @@ Global
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{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|Win32.Build.0 = Debug|Win32
+		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|x64.ActiveCfg = Debug|x64
+		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|x64.Build.0 = Debug|x64
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
@@ -72,6 +77,8 @@ Global
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|Win32.Build.0 = DebugMem|Win32
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|x64.ActiveCfg = DebugMem|x64
+		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|x64.Build.0 = DebugMem|x64
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
@@ -80,30 +87,38 @@ Global
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|Win32.ActiveCfg = Release|Win32
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|Win32.ActiveCfg = Release|Win32
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|Win32.Build.0 = Release|Win32
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|Win32.Build.0 = Release|Win32
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Debug|BlackBerrySimulator.ActiveCfg = Debug|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Debug|BlackBerrySimulator.Build.0 = Debug|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Debug|Win32.Build.0 = Debug|Win32
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.DebugMem|BlackBerrySimulator.ActiveCfg = DebugMem|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.DebugMem|BlackBerrySimulator.Build.0 = DebugMem|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.DebugMem|Win32.Build.0 = DebugMem|Win32
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Release|BlackBerry.Build.0 = Release|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Release|BlackBerrySimulator.ActiveCfg = Release|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Release|BlackBerrySimulator.Build.0 = Release|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Release|Win32.ActiveCfg = Release|Win32
-		{D70B295E-A2FF-2CBB-737E-3876E8AF77F6}.Release|Win32.Build.0 = Release|Win32
+		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|x64.ActiveCfg = Release|x64
+		{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Release|x64.Build.0 = Release|x64
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|BlackBerrySimulator.ActiveCfg = Debug|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|BlackBerrySimulator.Build.0 = Debug|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|Win32.Build.0 = Debug|Win32
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|x64.ActiveCfg = Debug|x64
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Debug|x64.Build.0 = Debug|x64
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|BlackBerrySimulator.ActiveCfg = DebugMem|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|BlackBerrySimulator.Build.0 = DebugMem|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|x64.ActiveCfg = DebugMem|x64
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|x64.Build.0 = DebugMem|x64
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|BlackBerry.Build.0 = Release|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|BlackBerrySimulator.ActiveCfg = Release|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|BlackBerrySimulator.Build.0 = Release|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
+		{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|Win32.ActiveCfg = Release|Win32
+		{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|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
@@ -112,6 +127,8 @@ Global
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{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|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|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
@@ -120,6 +137,8 @@ Global
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{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|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|BlackBerry.ActiveCfg = Release|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
@@ -128,6 +147,8 @@ Global
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|Win32.ActiveCfg = Release|Win32
 		{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|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
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
@@ -136,6 +157,8 @@ Global
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|Win32.Build.0 = Debug|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|Win32.Build.0 = Debug|Win32
+		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|x64.ActiveCfg = Debug|x64
+		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Debug|x64.Build.0 = Debug|x64
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
@@ -144,6 +167,8 @@ Global
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|Win32.Build.0 = DebugMem|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|x64.ActiveCfg = DebugMem|x64
+		{9A515C8B-3320-4C5C-9754-211E91206C9D}.DebugMem|x64.Build.0 = DebugMem|x64
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
@@ -152,6 +177,8 @@ Global
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|Win32.ActiveCfg = Release|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|Win32.ActiveCfg = Release|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|Win32.Build.0 = Release|Win32
 		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|Win32.Build.0 = Release|Win32
+		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|x64.ActiveCfg = Release|x64
+		{9A515C8B-3320-4C5C-9754-211E91206C9D}.Release|x64.Build.0 = Release|x64
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
@@ -160,6 +187,8 @@ Global
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|Win32.Build.0 = Debug|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|Win32.Build.0 = Debug|Win32
+		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|x64.ActiveCfg = Debug|x64
+		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|x64.Build.0 = Debug|x64
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
@@ -168,6 +197,8 @@ Global
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|Win32.Build.0 = DebugMem|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|x64.ActiveCfg = DebugMem|x64
+		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|x64.Build.0 = DebugMem|x64
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
@@ -176,6 +207,8 @@ Global
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|Win32.ActiveCfg = Release|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|Win32.ActiveCfg = Release|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|Win32.Build.0 = Release|Win32
 		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|Win32.Build.0 = Release|Win32
+		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|x64.ActiveCfg = Release|x64
+		{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Release|x64.Build.0 = Release|x64
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
@@ -184,6 +217,8 @@ Global
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|Win32.ActiveCfg = Debug|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|Win32.ActiveCfg = Debug|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|Win32.Build.0 = Debug|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|Win32.Build.0 = Debug|Win32
+		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|x64.ActiveCfg = Debug|x64
+		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Debug|x64.Build.0 = Debug|x64
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
@@ -192,6 +227,8 @@ Global
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|Win32.Build.0 = DebugMem|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|x64.ActiveCfg = DebugMem|x64
+		{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|x64.Build.0 = DebugMem|x64
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
@@ -200,6 +237,8 @@ Global
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|Win32.ActiveCfg = Release|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|Win32.ActiveCfg = Release|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|Win32.Build.0 = Release|Win32
 		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|Win32.Build.0 = Release|Win32
+		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|x64.ActiveCfg = Release|x64
+		{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|x64.Build.0 = Release|x64
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
@@ -208,6 +247,8 @@ Global
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|Win32.Build.0 = Debug|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|Win32.Build.0 = Debug|Win32
+		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|x64.ActiveCfg = Debug|x64
+		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|x64.Build.0 = Debug|x64
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
@@ -216,6 +257,8 @@ Global
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|Win32.Build.0 = DebugMem|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|x64.ActiveCfg = DebugMem|x64
+		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|x64.Build.0 = DebugMem|x64
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|BlackBerry.Build.0 = Release|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
@@ -224,54 +267,68 @@ Global
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|Win32.ActiveCfg = Release|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|Win32.ActiveCfg = Release|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|Win32.Build.0 = Release|Win32
 		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|Win32.Build.0 = Release|Win32
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Debug|BlackBerrySimulator.ActiveCfg = Debug|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Debug|BlackBerrySimulator.Build.0 = Debug|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Debug|Win32.Build.0 = Debug|Win32
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.DebugMem|BlackBerrySimulator.ActiveCfg = DebugMem|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.DebugMem|BlackBerrySimulator.Build.0 = DebugMem|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.DebugMem|Win32.Build.0 = DebugMem|Win32
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Release|BlackBerry.Build.0 = Release|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Release|BlackBerrySimulator.ActiveCfg = Release|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Release|BlackBerrySimulator.Build.0 = Release|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Release|Win32.ActiveCfg = Release|Win32
-		{C6121A62-AA46-BA6D-A1CE-8000544456AA}.Release|Win32.Build.0 = Release|Win32
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Debug|BlackBerrySimulator.ActiveCfg = Debug|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Debug|BlackBerrySimulator.Build.0 = Debug|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Debug|Win32.Build.0 = Debug|Win32
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.DebugMem|BlackBerrySimulator.ActiveCfg = DebugMem|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.DebugMem|BlackBerrySimulator.Build.0 = DebugMem|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.DebugMem|Win32.Build.0 = DebugMem|Win32
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Release|BlackBerry.Build.0 = Release|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Release|BlackBerrySimulator.ActiveCfg = Release|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Release|BlackBerrySimulator.Build.0 = Release|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Release|Win32.ActiveCfg = Release|Win32
-		{1808B3EA-1ED5-1219-6D3C-9F588D2D8385}.Release|Win32.Build.0 = Release|Win32
+		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|x64.ActiveCfg = Release|x64
+		{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|x64.Build.0 = Release|x64
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|BlackBerrySimulator.ActiveCfg = Debug|BlackBerrySimulator
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|BlackBerrySimulator.Build.0 = Debug|BlackBerrySimulator
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
+		{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
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|x64.Build.0 = Debug|x64
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|BlackBerrySimulator.ActiveCfg = DebugMem|BlackBerrySimulator
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|BlackBerrySimulator.Build.0 = DebugMem|BlackBerrySimulator
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|x64.ActiveCfg = DebugMem|x64
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|x64.Build.0 = DebugMem|x64
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|BlackBerry.Build.0 = Release|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|BlackBerrySimulator.ActiveCfg = Release|BlackBerrySimulator
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|BlackBerrySimulator.Build.0 = Release|BlackBerrySimulator
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|Win32.ActiveCfg = Release|Win32
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|Win32.Build.0 = Release|Win32
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|x64.ActiveCfg = Release|x64
+		{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|x64.Build.0 = Release|x64
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|BlackBerry.ActiveCfg = Debug|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|BlackBerry.Build.0 = Debug|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|BlackBerry.Deploy.0 = Debug|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|BlackBerrySimulator.ActiveCfg = Debug|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|BlackBerrySimulator.Build.0 = Debug|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|BlackBerrySimulator.Deploy.0 = Debug|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|Win32.Build.0 = Debug|Win32
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|x64.ActiveCfg = Debug|x64
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|x64.Build.0 = Debug|x64
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|BlackBerry.ActiveCfg = DebugMem|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|BlackBerry.Build.0 = DebugMem|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|BlackBerry.Deploy.0 = DebugMem|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|BlackBerrySimulator.ActiveCfg = DebugMem|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|BlackBerrySimulator.Build.0 = DebugMem|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|BlackBerrySimulator.Deploy.0 = DebugMem|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|Win32.ActiveCfg = DebugMem|Win32
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|Win32.Build.0 = DebugMem|Win32
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|x64.ActiveCfg = DebugMem|x64
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|x64.Build.0 = DebugMem|x64
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|BlackBerry.ActiveCfg = Release|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|BlackBerry.Build.0 = Release|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|BlackBerry.Deploy.0 = Release|BlackBerry
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|BlackBerrySimulator.ActiveCfg = Release|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|BlackBerrySimulator.Build.0 = Release|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|BlackBerrySimulator.Deploy.0 = Release|BlackBerrySimulator
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|Win32.ActiveCfg = Release|Win32
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|Win32.Build.0 = Release|Win32
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|x64.ActiveCfg = Release|x64
+		{82522888-E09A-ED48-AD7D-247237B37B3A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 		HideSolutionNode = FALSE

+ 126 - 6
gameplay/gameplay.vcxproj

@@ -13,6 +13,10 @@
       <Configuration>DebugMem</Configuration>
       <Configuration>DebugMem</Configuration>
       <Platform>Win32</Platform>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugMem|x64">
+      <Configuration>DebugMem</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|BlackBerry">
     <ProjectConfiguration Include="Debug|BlackBerry">
       <Configuration>Debug</Configuration>
       <Configuration>Debug</Configuration>
       <Platform>BlackBerry</Platform>
       <Platform>BlackBerry</Platform>
@@ -25,6 +29,10 @@
       <Configuration>Debug</Configuration>
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|BlackBerry">
     <ProjectConfiguration Include="Release|BlackBerry">
       <Configuration>Release</Configuration>
       <Configuration>Release</Configuration>
       <Platform>BlackBerry</Platform>
       <Platform>BlackBerry</Platform>
@@ -37,6 +45,10 @@
       <Configuration>Release</Configuration>
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AbsoluteLayout.cpp" />
     <ClCompile Include="src\AbsoluteLayout.cpp" />
@@ -635,6 +647,11 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'" Label="Configuration">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -650,6 +667,11 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'" Label="Configuration">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -666,6 +688,12 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'" Label="Configuration">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -684,6 +712,9 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'" Label="PropertySheets">
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
@@ -693,6 +724,9 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'" Label="PropertySheets">
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'" Label="PropertySheets">
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
@@ -702,6 +736,9 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'" Label="PropertySheets">
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   </ImportGroup>
@@ -710,7 +747,10 @@
   </ImportGroup>
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
+    <OutDir>windows\x86\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>windows\x64\$(Configuration)\</OutDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
     <OutDir>Device-$(Configuration)\</OutDir>
     <OutDir>Device-$(Configuration)\</OutDir>
@@ -719,7 +759,10 @@
     <OutDir>Simulator\</OutDir>
     <OutDir>Simulator\</OutDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
+    <OutDir>windows\x86\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
+    <OutDir>windows\x64\$(Configuration)\</OutDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'">
     <OutDir>Device-$(Configuration)\</OutDir>
     <OutDir>Device-$(Configuration)\</OutDir>
@@ -728,7 +771,10 @@
     <OutDir>Simulator\</OutDir>
     <OutDir>Simulator\</OutDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>windows\x86\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>windows\x64\$(Configuration)\</IntDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
     <IntDir>Device-$(Configuration)\</IntDir>
     <IntDir>Device-$(Configuration)\</IntDir>
@@ -739,7 +785,10 @@
     <TargetName>lib$(ProjectName)</TargetName>
     <TargetName>lib$(ProjectName)</TargetName>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|Win32'">
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>windows\x86\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
+    <IntDir>windows\x64\$(Configuration)\</IntDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'">
     <IntDir>Device-$(Configuration)\</IntDir>
     <IntDir>Device-$(Configuration)\</IntDir>
@@ -750,7 +799,10 @@
     <TargetName>lib$(ProjectName)</TargetName>
     <TargetName>lib$(ProjectName)</TargetName>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
+    <OutDir>windows\x86\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>windows\x64\$(Configuration)\</OutDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'">
     <OutDir>Device-$(Configuration)\</OutDir>
     <OutDir>Device-$(Configuration)\</OutDir>
@@ -759,7 +811,10 @@
     <OutDir>Simulator\</OutDir>
     <OutDir>Simulator\</OutDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>windows\x86\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>windows\x64\$(Configuration)\</IntDir>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|BlackBerry'">
     <IntDir>Device-$(Configuration)\</IntDir>
     <IntDir>Device-$(Configuration)\</IntDir>
@@ -785,6 +840,29 @@
       <SubSystem>Windows</SubSystem>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     </Link>
+    <Lib>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)src;..\external-deps\lua\include;..\external-deps\bullet\include;..\external-deps\openal\include\AL;..\external-deps\alut\include\AL;..\external-deps\oggvorbis\include;..\external-deps\glew\include;..\external-deps\libpng\include;..\external-deps\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeTypeInfo>
+      </RuntimeTypeInfo>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|BlackBerry'">
     <ClCompile>
     <ClCompile>
@@ -841,6 +919,26 @@
       </Verbose>
       </Verbose>
     </Lib>
     </Lib>
   </ItemDefinitionGroup>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_LIB;GAMEPLAY_MEM_LEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)src;..\external-deps\lua\include;..\external-deps\bullet\include;..\external-deps\openal\include\AL;..\external-deps\alut\include\AL;..\external-deps\oggvorbis\include;..\external-deps\glew\include;..\external-deps\libpng\include;..\external-deps\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <Verbose>
+      </Verbose>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'">
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|BlackBerry'">
     <ClCompile>
     <ClCompile>
       <PrecompiledHeader>
       <PrecompiledHeader>
@@ -892,6 +990,28 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir)src;..\external-deps\lua\include;..\external-deps\bullet\include;..\external-deps\openal\include\AL;..\external-deps\alut\include\AL;..\external-deps\oggvorbis\include;..\external-deps\glew\include;..\external-deps\libpng\include;..\external-deps\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ProjectDir)src;..\external-deps\lua\include;..\external-deps\bullet\include;..\external-deps\openal\include\AL;..\external-deps\alut\include\AL;..\external-deps\oggvorbis\include;..\external-deps\glew\include;..\external-deps\libpng\include;..\external-deps\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)src;..\external-deps\lua\include;..\external-deps\bullet\include;..\external-deps\openal\include\AL;..\external-deps\alut\include\AL;..\external-deps\oggvorbis\include;..\external-deps\glew\include;..\external-deps\libpng\include;..\external-deps\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
     </ClCompile>
     </ClCompile>
     <Link>
     <Link>
       <SubSystem>Windows</SubSystem>
       <SubSystem>Windows</SubSystem>

+ 1 - 2
gameplay/src/AbsoluteLayout.cpp

@@ -42,8 +42,7 @@ void AbsoluteLayout::update(const Container* container, const Vector2& offset)
 
 
     // An AbsoluteLayout does nothing to modify the layout of Controls.
     // An AbsoluteLayout does nothing to modify the layout of Controls.
     std::vector<Control*> controls = container->getControls();
     std::vector<Control*> controls = container->getControls();
-    unsigned int controlsCount = controls.size();
-    for (unsigned int i = 0; i < controlsCount; i++)
+    for (size_t i = 0, count = controls.size(); i < count; i++)
     {
     {
         Control* control = controls[i];
         Control* control = controls[i];
         GP_ASSERT(control);
         GP_ASSERT(control);

+ 1 - 1
gameplay/src/Animation.cpp

@@ -171,7 +171,7 @@ AnimationClip* Animation::getClip(unsigned int index) const
 
 
 unsigned int Animation::getClipCount() const
 unsigned int Animation::getClipCount() const
 {
 {
-    return _clips ? _clips->size() : 0;
+    return _clips ? (unsigned int)_clips->size() : 0;
 }
 }
 
 
 void Animation::play(const char* clipId)
 void Animation::play(const char* clipId)

+ 2 - 3
gameplay/src/AnimationClip.cpp

@@ -17,9 +17,8 @@ AnimationClip::AnimationClip(const char* id, Animation* animation, unsigned long
 {
 {
     GP_ASSERT(_animation);
     GP_ASSERT(_animation);
     GP_ASSERT(0 <= startTime && startTime <= _animation->_duration && 0 <= endTime && endTime <= _animation->_duration);
     GP_ASSERT(0 <= startTime && startTime <= _animation->_duration && 0 <= endTime && endTime <= _animation->_duration);
-    
-    unsigned int channelCount = _animation->_channels.size();
-    for (unsigned int i = 0; i < channelCount; i++)
+
+    for (size_t i = 0, count = _animation->_channels.size(); i < count; i++)
     {
     {
         GP_ASSERT(_animation->_channels[i]);
         GP_ASSERT(_animation->_channels[i]);
         GP_ASSERT(_animation->_channels[i]->getCurve());
         GP_ASSERT(_animation->_channels[i]->getCurve());

+ 8 - 9
gameplay/src/Bundle.cpp

@@ -160,7 +160,7 @@ Bundle* Bundle::create(const char* path)
     GP_ASSERT(path);
     GP_ASSERT(path);
 
 
     // Search the cache for this bundle.
     // Search the cache for this bundle.
-    for (unsigned int i = 0, count = __bundleCache.size(); i < count; ++i)
+    for (size_t i = 0, count = __bundleCache.size(); i < count; ++i)
     {
     {
         Bundle* p = __bundleCache[i];
         Bundle* p = __bundleCache[i];
         GP_ASSERT(p);
         GP_ASSERT(p);
@@ -272,7 +272,7 @@ Bundle::Reference* Bundle::find(const char* id) const
 
 
 void Bundle::clearLoadSession()
 void Bundle::clearLoadSession()
 {
 {
-    for (unsigned int i = 0, count = _meshSkins.size(); i < count; ++i)
+    for (size_t i = 0, count = _meshSkins.size(); i < count; ++i)
     {
     {
         SAFE_DELETE(_meshSkins[i]);
         SAFE_DELETE(_meshSkins[i]);
     }
     }
@@ -1074,16 +1074,15 @@ void Bundle::resolveJointReferences(Scene* sceneContext, Node* nodeContext)
 {
 {
     GP_ASSERT(_file);
     GP_ASSERT(_file);
 
 
-    const unsigned int skinCount = _meshSkins.size();
-    for (unsigned int i = 0; i < skinCount; ++i)
+    for (size_t i = 0, skinCount = _meshSkins.size(); i < skinCount; ++i)
     {
     {
         MeshSkinData* skinData = _meshSkins[i];
         MeshSkinData* skinData = _meshSkins[i];
         GP_ASSERT(skinData);
         GP_ASSERT(skinData);
         GP_ASSERT(skinData->skin);
         GP_ASSERT(skinData->skin);
 
 
         // Resolve all joints in skin joint list.
         // Resolve all joints in skin joint list.
-        const unsigned int jointCount = skinData->joints.size();
-        for (unsigned int j = 0; j < jointCount; ++j)
+        size_t jointCount = skinData->joints.size();
+        for (size_t j = 0; j < jointCount; ++j)
         {
         {
             // TODO: Handle full xrefs (not just local # xrefs).
             // TODO: Handle full xrefs (not just local # xrefs).
             std::string jointId = skinData->joints[j];
             std::string jointId = skinData->joints[j];
@@ -1096,7 +1095,7 @@ void Bundle::resolveJointReferences(Scene* sceneContext, Node* nodeContext)
                 {
                 {
                     Joint* joint = static_cast<Joint*>(n);
                     Joint* joint = static_cast<Joint*>(n);
                     joint->setInverseBindPose(skinData->inverseBindPoseMatrices[j]);
                     joint->setInverseBindPose(skinData->inverseBindPoseMatrices[j]);
-                    skinData->skin->setJoint(joint, j);
+                    skinData->skin->setJoint(joint, (unsigned int)j);
                     SAFE_RELEASE(joint);
                     SAFE_RELEASE(joint);
                 }
                 }
             }
             }
@@ -1556,7 +1555,7 @@ Bundle::MeshData* Bundle::readMeshData(const char* url)
 {
 {
     GP_ASSERT(url);
     GP_ASSERT(url);
 
 
-    unsigned int len = strlen(url);
+    size_t len = strlen(url);
     if (len == 0)
     if (len == 0)
     {
     {
         GP_ERROR("Mesh data URL must be non-empty.");
         GP_ERROR("Mesh data URL must be non-empty.");
@@ -1565,7 +1564,7 @@ Bundle::MeshData* Bundle::readMeshData(const char* url)
 
 
     // Parse URL (formatted as 'bundle#id').
     // Parse URL (formatted as 'bundle#id').
     std::string urlstring(url);
     std::string urlstring(url);
-    unsigned int pos = urlstring.find('#');
+    size_t pos = urlstring.find('#');
     if (pos == std::string::npos)
     if (pos == std::string::npos)
     {
     {
         GP_ERROR("Invalid mesh data URL '%s' (must be of the form 'bundle#id').", url);
         GP_ERROR("Invalid mesh data URL '%s' (must be of the form 'bundle#id').", url);

+ 3 - 4
gameplay/src/Container.cpp

@@ -218,7 +218,7 @@ unsigned int Container::addControl(Control* control)
         _controls.push_back(control);
         _controls.push_back(control);
         control->addRef();
         control->addRef();
         control->_parent = this;
         control->_parent = this;
-        return _controls.size() - 1;
+        return (unsigned int)(_controls.size() - 1);
     }
     }
     else
     else
     {
     {
@@ -230,7 +230,7 @@ unsigned int Container::addControl(Control* control)
             Control* c = _controls[i];
             Control* c = _controls[i];
             if (c == control)
             if (c == control)
             {
             {
-                return i;
+                return (unsigned int)i;
             }
             }
         }
         }
 
 
@@ -696,8 +696,7 @@ void Container::updateScroll()
 
 
     // Calculate total width and height.
     // Calculate total width and height.
     std::vector<Control*> controls = getControls();
     std::vector<Control*> controls = getControls();
-    unsigned int controlsCount = controls.size();
-    for (unsigned int i = 0; i < controlsCount; i++)
+    for (size_t i = 0, controlsCount = controls.size(); i < controlsCount; i++)
     {
     {
         Control* control = controls.at(i);
         Control* control = controls.at(i);
 
 

+ 1 - 1
gameplay/src/Effect.cpp

@@ -466,7 +466,7 @@ Uniform* Effect::getUniform(unsigned int index) const
 
 
 unsigned int Effect::getUniformCount() const
 unsigned int Effect::getUniformCount() const
 {
 {
-    return _uniforms.size();
+    return (unsigned int)_uniforms.size();
 }
 }
 
 
 void Effect::setValue(Uniform* uniform, float value)
 void Effect::setValue(Uniform* uniform, float value)

+ 1 - 2
gameplay/src/FlowLayout.cpp

@@ -52,8 +52,7 @@ void FlowLayout::update(const Container* container, const Vector2& offset)
     float tallestHeight = 0;
     float tallestHeight = 0;
 
 
     std::vector<Control*> controls = container->getControls();
     std::vector<Control*> controls = container->getControls();
-    unsigned int controlsCount = controls.size();
-    for (unsigned int i = 0; i < controlsCount; i++)
+    for (size_t i = 0, controlsCount = controls.size(); i < controlsCount; i++)
     {
     {
         Control* control = controls.at(i);
         Control* control = controls.at(i);
         GP_ASSERT(control);
         GP_ASSERT(control);

+ 21 - 21
gameplay/src/Font.cpp

@@ -64,7 +64,7 @@ Font* Font::create(const char* path, const char* id)
     GP_ASSERT(path);
     GP_ASSERT(path);
 
 
     // Search the font cache for a font with the given path and ID.
     // Search the font cache for a font with the given path and ID.
-    for (unsigned int i = 0, count = __fontCache.size(); i < count; ++i)
+    for (size_t i = 0, count = __fontCache.size(); i < count; ++i)
     {
     {
         Font* f = __fontCache[i];
         Font* f = __fontCache[i];
         GP_ASSERT(f);
         GP_ASSERT(f);
@@ -249,7 +249,7 @@ Font::Text* Font::createText(const char* text, const Rectangle& area, const Vect
         }
         }
         else
         else
         {
         {
-            tokenLength = strcspn(token, " \r\n\t");
+            tokenLength = (unsigned int)strcspn(token, " \r\n\t");
             tokenWidth = getTokenWidth(token, tokenLength, size, scale);
             tokenWidth = getTokenWidth(token, tokenLength, size, scale);
             iteration = 1;
             iteration = 1;
             startIndex = 0;
             startIndex = 0;
@@ -398,7 +398,7 @@ Font::Text* Font::createText(const char* text, const Rectangle& area, const Vect
             else
             else
             {
             {
                 // Skip the rest of this line.
                 // Skip the rest of this line.
-                unsigned int tokenLength = strcspn(token, "\n");
+                size_t tokenLength = strcspn(token, "\n");
 
 
                 if (tokenLength > 0)
                 if (tokenLength > 0)
                 {                
                 {                
@@ -439,8 +439,8 @@ void Font::drawText(const char* text, int x, int y, const Vector4& color, unsign
 
 
     while (!done)
     while (!done)
     {
     {
-        int length;
-        int startIndex;
+        size_t length;
+        size_t startIndex;
         int iteration;
         int iteration;
         if (rightToLeft)
         if (rightToLeft)
         {
         {
@@ -490,7 +490,7 @@ void Font::drawText(const char* text, int x, int y, const Vector4& color, unsign
 
 
         GP_ASSERT(_glyphs);
         GP_ASSERT(_glyphs);
         GP_ASSERT(_batch);
         GP_ASSERT(_batch);
-        for (int i = startIndex; i < length && i >= 0; i += iteration)
+        for (size_t i = startIndex; i < length && i >= 0; i += iteration)
         {
         {
             char c = 0;
             char c = 0;
             if (rightToLeft)
             if (rightToLeft)
@@ -606,7 +606,7 @@ void Font::drawText(const char* text, const Rectangle& area, const Vector4& colo
         }
         }
         else
         else
         {
         {
-            tokenLength = strcspn(token, " \r\n\t");
+            tokenLength = (unsigned int)strcspn(token, " \r\n\t");
             tokenWidth = getTokenWidth(token, tokenLength, size, scale);
             tokenWidth = getTokenWidth(token, tokenLength, size, scale);
             iteration = 1;
             iteration = 1;
             startIndex = 0;
             startIndex = 0;
@@ -728,7 +728,7 @@ void Font::drawText(const char* text, const Rectangle& area, const Vector4& colo
             else
             else
             {
             {
                 // Skip the rest of this line.
                 // Skip the rest of this line.
-                unsigned int tokenLength = strcspn(token, "\n");
+                size_t tokenLength = strcspn(token, "\n");
 
 
                 if (tokenLength > 0)
                 if (tokenLength > 0)
                 {                
                 {                
@@ -753,7 +753,7 @@ void Font::measureText(const char* text, unsigned int size, unsigned int* width,
     GP_ASSERT(width);
     GP_ASSERT(width);
     GP_ASSERT(height);
     GP_ASSERT(height);
 
 
-    const int length = strlen(text);
+    const size_t length = strlen(text);
     if (length == 0)
     if (length == 0)
     {
     {
         *width = 0;
         *width = 0;
@@ -776,7 +776,7 @@ void Font::measureText(const char* text, unsigned int size, unsigned int* width,
             ++token;
             ++token;
         }
         }
 
 
-        unsigned int tokenLength = strcspn(token, "\n");
+        unsigned int tokenLength = (unsigned int)strcspn(token, "\n");
         unsigned int tokenWidth = getTokenWidth(token, tokenLength, size, scale);
         unsigned int tokenWidth = getTokenWidth(token, tokenLength, size, scale);
         if (tokenWidth > *width)
         if (tokenWidth > *width)
         {
         {
@@ -895,7 +895,7 @@ void Font::measureText(const char* text, const Rectangle& clip, unsigned int siz
             }
             }
 
 
             // Measure the next token.
             // Measure the next token.
-            unsigned int tokenLength = strcspn(token, " \r\n\t");
+            unsigned int tokenLength = (unsigned int)strcspn(token, " \r\n\t");
             unsigned int tokenWidth = getTokenWidth(token, tokenLength, size, scale);
             unsigned int tokenWidth = getTokenWidth(token, tokenLength, size, scale);
 
 
             // Wrap if necessary.
             // Wrap if necessary.
@@ -961,7 +961,7 @@ void Font::measureText(const char* text, const Rectangle& clip, unsigned int siz
             }
             }
 
 
             // Measure the next line.
             // Measure the next line.
-            unsigned int tokenLength = strcspn(token, "\n");
+            unsigned int tokenLength = (unsigned int)strcspn(token, "\n");
             lineWidth = getTokenWidth(token, tokenLength, size, scale);
             lineWidth = getTokenWidth(token, tokenLength, size, scale);
             
             
             // Determine horizontal position and width.
             // Determine horizontal position and width.
@@ -1017,7 +1017,7 @@ void Font::measureText(const char* text, const Rectangle& clip, unsigned int siz
     {
     {
         y += vWhitespace;
         y += vWhitespace;
     }
     }
-
+    
     int clippedTop = 0;
     int clippedTop = 0;
     int clippedBottom = 0;
     int clippedBottom = 0;
     if (!ignoreClip)
     if (!ignoreClip)
@@ -1030,7 +1030,7 @@ void Font::measureText(const char* text, const Rectangle& clip, unsigned int siz
             if (clippedBottom > 0)
             if (clippedBottom > 0)
             {
             {
                 // Also need to crop empty lines above non-empty lines that have been clipped.
                 // Also need to crop empty lines above non-empty lines that have been clipped.
-                unsigned int emptyIndex = emptyLines.size() - clippedBottom;
+                size_t emptyIndex = emptyLines.size() - clippedBottom;
                 while (emptyIndex < emptyLines.size() && emptyLines[emptyIndex] == true)
                 while (emptyIndex < emptyLines.size() && emptyLines[emptyIndex] == true)
                 {
                 {
                     height -= size;
                     height -= size;
@@ -1054,7 +1054,7 @@ void Font::measureText(const char* text, const Rectangle& clip, unsigned int siz
             }
             }
 
 
             // Also need to crop empty lines below non-empty lines that have been clipped.
             // Also need to crop empty lines below non-empty lines that have been clipped.
-            unsigned int emptyIndex = clippedTop;
+            size_t emptyIndex = clippedTop;
             while (emptyIndex < emptyLines.size() && emptyLines[emptyIndex] == true)
             while (emptyIndex < emptyLines.size() && emptyLines[emptyIndex] == true)
             {
             {
                 y += size;
                 y += size;
@@ -1209,7 +1209,7 @@ void Font::getMeasurementInfo(const char* text, const Rectangle& area, unsigned
                     break;
                     break;
                 }
                 }
 
 
-                unsigned int tokenLength = strcspn(token, " \r\n\t");
+                unsigned int tokenLength = (unsigned int)strcspn(token, " \r\n\t");
                 tokenWidth += getTokenWidth(token, tokenLength, size, scale);
                 tokenWidth += getTokenWidth(token, tokenLength, size, scale);
 
 
                 // Wrap if necessary.
                 // Wrap if necessary.
@@ -1271,10 +1271,10 @@ void Font::getMeasurementInfo(const char* text, const Rectangle& area, unsigned
                     delimiter = token[0];
                     delimiter = token[0];
                 }
                 }
 
 
-                unsigned int tokenLength = strcspn(token, "\n");
+                unsigned int tokenLength = (unsigned int)strcspn(token, "\n");
                 if (tokenLength == 0)
                 if (tokenLength == 0)
                 {
                 {
-                    tokenLength = strlen(token);
+                    tokenLength = (unsigned int)strlen(token);
                 }
                 }
 
 
                 int lineWidth = getTokenWidth(token, tokenLength, size, scale);
                 int lineWidth = getTokenWidth(token, tokenLength, size, scale);
@@ -1403,7 +1403,7 @@ int Font::getIndexOrLocation(const char* text, const Rectangle& area, unsigned i
         }
         }
         else
         else
         {
         {
-            tokenLength = strcspn(token, " \r\n\t");
+            tokenLength = (unsigned int)strcspn(token, " \r\n\t");
             tokenWidth = getTokenWidth(token, tokenLength, size, scale);
             tokenWidth = getTokenWidth(token, tokenLength, size, scale);
             iteration = 1;
             iteration = 1;
             startIndex = 0;
             startIndex = 0;
@@ -1518,7 +1518,7 @@ int Font::getIndexOrLocation(const char* text, const Rectangle& area, unsigned i
             else
             else
             {
             {
                 // Skip the rest of this line.
                 // Skip the rest of this line.
-                unsigned int tokenLength = strcspn(token, "\n");
+                unsigned int tokenLength = (unsigned int)strcspn(token, "\n");
 
 
                 if (tokenLength > 0)
                 if (tokenLength > 0)
                 {                
                 {                
@@ -1788,7 +1788,7 @@ Font::Justify Font::getJustify(const char* justify)
 
 
 Font::Text::Text(const char* text) : _text(text ? text : ""), _vertexCount(0), _vertices(NULL), _indexCount(0), _indices(NULL)
 Font::Text::Text(const char* text) : _text(text ? text : ""), _vertexCount(0), _vertices(NULL), _indexCount(0), _indices(NULL)
 {
 {
-    const int length = strlen(text);
+    const size_t length = strlen(text);
     _vertices = new SpriteBatch::SpriteVertex[length * 4];
     _vertices = new SpriteBatch::SpriteVertex[length * 4];
     _indices = new unsigned short[((length - 1) * 6) + 4];
     _indices = new unsigned short[((length - 1) * 6) + 4];
 }
 }

+ 1 - 1
gameplay/src/Font.h

@@ -312,7 +312,7 @@ private:
     int getIndexOrLocation(const char* text, const Rectangle& clip, unsigned int size, const Vector2& inLocation, Vector2* outLocation,
     int getIndexOrLocation(const char* text, const Rectangle& clip, unsigned int size, const Vector2& inLocation, Vector2* outLocation,
                            const int destIndex = -1, Justify justify = ALIGN_TOP_LEFT, bool wrap = true, bool rightToLeft = false);
                            const int destIndex = -1, Justify justify = ALIGN_TOP_LEFT, bool wrap = true, bool rightToLeft = false);
 
 
-    unsigned int getTokenWidth(const char* token, unsigned int length, unsigned int size, float scale);
+    unsigned int getTokenWidth(const char* token, unsigned length, unsigned int size, float scale);
 
 
     unsigned int getReversedTokenLength(const char* token, const char* bufStart);
     unsigned int getReversedTokenLength(const char* token, const char* bufStart);
 
 

+ 1 - 1
gameplay/src/Game.cpp

@@ -601,7 +601,7 @@ unsigned int Game::createGamepad(const char* id, unsigned int handle, unsigned i
     Gamepad* gamepad = new Gamepad(id, handle, buttonCount, joystickCount, triggerCount);
     Gamepad* gamepad = new Gamepad(id, handle, buttonCount, joystickCount, triggerCount);
     GP_ASSERT(gamepad);
     GP_ASSERT(gamepad);
     _gamepads->push_back(gamepad);
     _gamepads->push_back(gamepad);
-    return _gamepads->size() - 1;
+    return (unsigned int)(_gamepads->size() - 1);
 }
 }
 
 
 void Game::triggerGamepadEvents()
 void Game::triggerGamepadEvents()

+ 1 - 1
gameplay/src/Game.inl

@@ -123,7 +123,7 @@ inline void Game::displayKeyboard(bool display)
 
 
 inline unsigned int Game::getGamepadCount() const
 inline unsigned int Game::getGamepadCount() const
 {
 {
-    return _gamepads->size();
+    return (unsigned int)_gamepads->size();
 }
 }
 
 
 inline unsigned int Game::getGamepadsConnected()
 inline unsigned int Game::getGamepadsConnected()

+ 1 - 1
gameplay/src/Image.cpp

@@ -100,7 +100,7 @@ Image* Image::create(const char* path)
         return NULL;
         return NULL;
     }
     }
 
 
-    unsigned int stride = png_get_rowbytes(png, info);
+    size_t stride = png_get_rowbytes(png, info);
 
 
     // Allocate image data.
     // Allocate image data.
     image->_data = new unsigned char[stride * image->_height];
     image->_data = new unsigned char[stride * image->_height];

+ 3 - 3
gameplay/src/Material.cpp

@@ -18,7 +18,7 @@ Material::Material() :
 Material::~Material()
 Material::~Material()
 {
 {
     // Destroy all the techniques.
     // Destroy all the techniques.
-    for (unsigned int i = 0, count = _techniques.size(); i < count; ++i)
+    for (size_t i = 0, count = _techniques.size(); i < count; ++i)
     {
     {
         Technique* technique = _techniques[i];
         Technique* technique = _techniques[i];
         SAFE_RELEASE(technique);
         SAFE_RELEASE(technique);
@@ -126,7 +126,7 @@ Material* Material::create(const char* vshPath, const char* fshPath, const char*
 
 
 unsigned int Material::getTechniqueCount() const
 unsigned int Material::getTechniqueCount() const
 {
 {
-    return _techniques.size();
+    return (unsigned int)_techniques.size();
 }
 }
 
 
 Technique* Material::getTechniqueByIndex(unsigned int index) const
 Technique* Material::getTechniqueByIndex(unsigned int index) const
@@ -138,7 +138,7 @@ Technique* Material::getTechniqueByIndex(unsigned int index) const
 Technique* Material::getTechnique(const char* id) const
 Technique* Material::getTechnique(const char* id) const
 {
 {
     GP_ASSERT(id);
     GP_ASSERT(id);
-    for (unsigned int i = 0, count = _techniques.size(); i < count; ++i)
+    for (size_t i = 0, count = _techniques.size(); i < count; ++i)
     {
     {
         Technique* t = _techniques[i];
         Technique* t = _techniques[i];
         GP_ASSERT(t);
         GP_ASSERT(t);

+ 6 - 7
gameplay/src/MeshSkin.cpp

@@ -32,7 +32,7 @@ void MeshSkin::setBindShape(const float* matrix)
 
 
 unsigned int MeshSkin::getJointCount() const
 unsigned int MeshSkin::getJointCount() const
 {
 {
-    return _joints.size();
+    return (unsigned int)_joints.size();
 }
 }
 
 
 Joint* MeshSkin::getJoint(unsigned int index) const
 Joint* MeshSkin::getJoint(unsigned int index) const
@@ -45,7 +45,7 @@ Joint* MeshSkin::getJoint(const char* id) const
 {
 {
     GP_ASSERT(id);
     GP_ASSERT(id);
 
 
-    for (unsigned int i = 0, count = _joints.size(); i < count; ++i)
+    for (size_t i = 0, count = _joints.size(); i < count; ++i)
     {
     {
         Joint* j = _joints[i];
         Joint* j = _joints[i];
         if (j && j->getId() != NULL && strcmp(j->getId(), id) == 0)
         if (j && j->getId() != NULL && strcmp(j->getId(), id) == 0)
@@ -158,8 +158,7 @@ Vector4* MeshSkin::getMatrixPalette() const
 {
 {
     GP_ASSERT(_matrixPalette);
     GP_ASSERT(_matrixPalette);
 
 
-    unsigned int count = _joints.size();
-    for (unsigned int i = 0; i < count; i++)
+    for (size_t i = 0, count = _joints.size(); i < count; i++)
     {
     {
         GP_ASSERT(_joints[i]);
         GP_ASSERT(_joints[i]);
         _joints[i]->updateJointMatrix(getBindShape(), &_matrixPalette[i * PALETTE_ROWS]);
         _joints[i]->updateJointMatrix(getBindShape(), &_matrixPalette[i * PALETTE_ROWS]);
@@ -169,7 +168,7 @@ Vector4* MeshSkin::getMatrixPalette() const
 
 
 unsigned int MeshSkin::getMatrixPaletteSize() const
 unsigned int MeshSkin::getMatrixPaletteSize() const
 {
 {
-    return _joints.size() * PALETTE_ROWS;
+    return (unsigned int)_joints.size() * PALETTE_ROWS;
 }
 }
 
 
 Model* MeshSkin::getModel() const
 Model* MeshSkin::getModel() const
@@ -237,7 +236,7 @@ void MeshSkin::transformChanged(Transform* transform, long cookie)
 
 
 int MeshSkin::getJointIndex(Joint* joint) const
 int MeshSkin::getJointIndex(Joint* joint) const
 {
 {
-    for (unsigned int i = 0, count = _joints.size(); i < count; ++i)
+    for (size_t i = 0, count = _joints.size(); i < count; ++i)
     {
     {
         if (_joints[i] == joint)
         if (_joints[i] == joint)
         {
         {
@@ -265,7 +264,7 @@ void MeshSkin::clearJoints()
 {
 {
     setRootJoint(NULL);
     setRootJoint(NULL);
 
 
-    for (unsigned int i = 0, count = _joints.size(); i < count; ++i)
+    for (size_t i = 0, count = _joints.size(); i < count; ++i)
     {
     {
         SAFE_RELEASE(_joints[i]);
         SAFE_RELEASE(_joints[i]);
     }
     }

+ 1 - 1
gameplay/src/Node.cpp

@@ -1139,7 +1139,7 @@ PhysicsCollisionObject* Node::setCollisionObject(Properties* properties)
 
 
 unsigned int Node::getNumAdvertisedDescendants() const
 unsigned int Node::getNumAdvertisedDescendants() const
 {
 {
-    return _advertisedDescendants.size();
+    return (unsigned int)_advertisedDescendants.size();
 }
 }
 
 
 Node* Node::getAdvertisedDescendant(unsigned int i) const
 Node* Node::getAdvertisedDescendant(unsigned int i) const

+ 5 - 5
gameplay/src/PhysicsController.cpp

@@ -567,14 +567,14 @@ void PhysicsController::update(float elapsedTime)
 
 
     // Update all the collision status cache entries.
     // Update all the collision status cache entries.
     iter = _collisionStatus.begin();
     iter = _collisionStatus.begin();
-    for (; iter != _collisionStatus.end(); iter++)
+    for ( ; iter != _collisionStatus.end(); iter++)
     {
     {
         if ((iter->second._status & DIRTY) != 0)
         if ((iter->second._status & DIRTY) != 0)
         {
         {
             if ((iter->second._status & COLLISION) != 0 && iter->first.objectB)
             if ((iter->second._status & COLLISION) != 0 && iter->first.objectB)
             {
             {
-                unsigned int size = iter->second._listeners.size();
-                for (unsigned int i = 0; i < size; i++)
+                size_t size = iter->second._listeners.size();
+                for (size_t i = 0; i < size; i++)
                 {
                 {
                     iter->second._listeners[i]->collisionEvent(PhysicsCollisionObject::CollisionListener::NOT_COLLIDING, iter->first);
                     iter->second._listeners[i]->collisionEvent(PhysicsCollisionObject::CollisionListener::NOT_COLLIDING, iter->first);
                 }
                 }
@@ -1193,13 +1193,13 @@ PhysicsCollisionShape* PhysicsController::createMesh(Mesh* mesh, const Vector3&
 
 
     btTriangleIndexVertexArray* meshInterface = bullet_new<btTriangleIndexVertexArray>();
     btTriangleIndexVertexArray* meshInterface = bullet_new<btTriangleIndexVertexArray>();
 
 
-    unsigned int partCount = data->parts.size();
+    size_t partCount = data->parts.size();
     if (partCount > 0)
     if (partCount > 0)
     {
     {
         PHY_ScalarType indexType = PHY_UCHAR;
         PHY_ScalarType indexType = PHY_UCHAR;
         int indexStride = 0;
         int indexStride = 0;
         Bundle::MeshPartData* meshPart = NULL;
         Bundle::MeshPartData* meshPart = NULL;
-        for (unsigned int i = 0; i < partCount; i++)
+        for (size_t i = 0; i < partCount; i++)
         {
         {
             meshPart = data->parts[i];
             meshPart = data->parts[i];
             GP_ASSERT(meshPart);
             GP_ASSERT(meshPart);

+ 2 - 2
gameplay/src/PhysicsVehicle.cpp

@@ -233,7 +233,7 @@ void PhysicsVehicle::setEnabled(bool enable)
 
 
 unsigned int PhysicsVehicle::getNumWheels() const
 unsigned int PhysicsVehicle::getNumWheels() const
 {
 {
-    return _wheels.size();
+    return (unsigned int)_wheels.size();
 }
 }
 
 
 PhysicsVehicleWheel* PhysicsVehicle::getWheel(unsigned int i)
 PhysicsVehicleWheel* PhysicsVehicle::getWheel(unsigned int i)
@@ -243,7 +243,7 @@ PhysicsVehicleWheel* PhysicsVehicle::getWheel(unsigned int i)
 
 
 void PhysicsVehicle::addWheel(PhysicsVehicleWheel* wheel)
 void PhysicsVehicle::addWheel(PhysicsVehicleWheel* wheel)
 {
 {
-    unsigned int i = _wheels.size();
+    unsigned i = (unsigned int)_wheels.size();
     _wheels.push_back(wheel);
     _wheels.push_back(wheel);
     wheel->setHost(this, i);
     wheel->setHost(this, i);
     wheel->addToVehicle(_vehicle);
     wheel->addToVehicle(_vehicle);

+ 1 - 1
gameplay/src/PlatformWindows.cpp

@@ -986,7 +986,7 @@ Platform* Platform::create(Game* game, void* attachToWindow)
         __hwnd = (HWND)__attachToWindow;
         __hwnd = (HWND)__attachToWindow;
         __hdc = GetDC(__hwnd);
         __hdc = GetDC(__hwnd);
 
 
-        SetWindowLongPtr(__hwnd, GWL_WNDPROC, (LONG)(WNDPROC)__WndProc);
+        SetWindowLongPtr(__hwnd, GWLP_WNDPROC, (LONG)(WNDPROC)__WndProc);
 
 
         if (!initializeGL(NULL))
         if (!initializeGL(NULL))
             goto error;
             goto error;

+ 5 - 8
gameplay/src/Properties.cpp

@@ -325,8 +325,7 @@ void Properties::readProperties(FILE* file)
 
 
 Properties::~Properties()
 Properties::~Properties()
 {
 {
-    unsigned int count = _namespaces.size();
-    for (unsigned int i = 0; i < count; ++i)
+    for (size_t i = 0, count = _namespaces.size(); i < count; ++i)
     {
     {
         SAFE_DELETE(_namespaces[i]);
         SAFE_DELETE(_namespaces[i]);
     }
     }
@@ -412,8 +411,7 @@ void Properties::resolveInheritance(const char* id)
                 Properties* overrides = new Properties(*derived);
                 Properties* overrides = new Properties(*derived);
 
 
                 // Delete the child's data.
                 // Delete the child's data.
-                unsigned int count = derived->_namespaces.size();
-                for (unsigned int i = 0; i < count; i++)
+                for (size_t i = 0, count = derived->_namespaces.size(); i < count; i++)
                 {
                 {
                     SAFE_DELETE(derived->_namespaces[i]);
                     SAFE_DELETE(derived->_namespaces[i]);
                 }
                 }
@@ -960,8 +958,7 @@ Properties* Properties::clone()
     p->_properties = _properties;
     p->_properties = _properties;
     p->_propertiesItr = p->_properties.end();
     p->_propertiesItr = p->_properties.end();
 
 
-    unsigned int count = _namespaces.size();
-    for (unsigned int i = 0; i < count; i++)
+    for (size_t i = 0, count = _namespaces.size(); i < count; i++)
     {
     {
         GP_ASSERT(_namespaces[i]);
         GP_ASSERT(_namespaces[i]);
         p->_namespaces.push_back(_namespaces[i]->clone());
         p->_namespaces.push_back(_namespaces[i]->clone());
@@ -999,10 +996,10 @@ Properties* getPropertiesFromNamespacePath(Properties* properties, const std::ve
     // return the specified namespace or notify the user if it cannot be found.
     // return the specified namespace or notify the user if it cannot be found.
     if (namespacePath.size() > 0)
     if (namespacePath.size() > 0)
     {
     {
-        unsigned int size = namespacePath.size();
+        size_t size = namespacePath.size();
         properties->rewind();
         properties->rewind();
         Properties* iter = properties->getNextNamespace();
         Properties* iter = properties->getNextNamespace();
-        for (unsigned int i = 0; i < size;)
+        for (size_t i = 0; i < size; )
         {
         {
             while (true)
             while (true)
             {
             {

+ 9 - 3
gameplay/src/RenderState.cpp

@@ -28,7 +28,7 @@ RenderState::~RenderState()
     SAFE_RELEASE(_state);
     SAFE_RELEASE(_state);
 
 
     // Destroy all the material parameters
     // Destroy all the material parameters
-    for (unsigned int i = 0, count = _parameters.size(); i < count; ++i)
+    for (size_t i = 0, count = _parameters.size(); i < count; ++i)
     {
     {
         SAFE_RELEASE(_parameters[i]);
         SAFE_RELEASE(_parameters[i]);
     }
     }
@@ -58,7 +58,7 @@ MaterialParameter* RenderState::getParameter(const char* name) const
 
 
     // Search for an existing parameter with this name.
     // Search for an existing parameter with this name.
     MaterialParameter* param;
     MaterialParameter* param;
-    for (unsigned int i = 0, count = _parameters.size(); i < count; ++i)
+    for (size_t i = 0, count = _parameters.size(); i < count; ++i)
     {
     {
         param = _parameters[i];
         param = _parameters[i];
         GP_ASSERT(param);
         GP_ASSERT(param);
@@ -75,6 +75,9 @@ MaterialParameter* RenderState::getParameter(const char* name) const
     return param;
     return param;
 }
 }
 
 
+/**
+ * @script{ignore}
+ */
 const char* autoBindingToString(RenderState::AutoBinding autoBinding)
 const char* autoBindingToString(RenderState::AutoBinding autoBinding)
 {
 {
     // NOTE: As new AutoBinding values are added, this switch statement must be updatd.
     // NOTE: As new AutoBinding values are added, this switch statement must be updatd.
@@ -112,6 +115,9 @@ const char* autoBindingToString(RenderState::AutoBinding autoBinding)
 
 
     case RenderState::MATRIX_PALETTE:
     case RenderState::MATRIX_PALETTE:
         return "MATRIX_PALETTE";
         return "MATRIX_PALETTE";
+
+    default:
+        return "";
     }
     }
 }
 }
 
 
@@ -285,7 +291,7 @@ void RenderState::bind(Pass* pass)
     Effect* effect = pass->getEffect();
     Effect* effect = pass->getEffect();
     while ((rs = getTopmost(rs)))
     while ((rs = getTopmost(rs)))
     {
     {
-        for (unsigned int i = 0, count = rs->_parameters.size(); i < count; ++i)
+        for (size_t i = 0, count = rs->_parameters.size(); i < count; ++i)
         {
         {
             GP_ASSERT(rs->_parameters[i]);
             GP_ASSERT(rs->_parameters[i]);
             rs->_parameters[i]->bind(effect);
             rs->_parameters[i]->bind(effect);

+ 1 - 1
gameplay/src/RenderState.h

@@ -103,7 +103,6 @@ public:
      *      handling the auto binding.
      *      handling the auto binding.
      *
      *
      * @see RenderState::registerAutoBindingResolver(const char*, RenderState::AutoBindingResolver)
      * @see RenderState::registerAutoBindingResolver(const char*, RenderState::AutoBindingResolver)
-     *
      * @script{ignore}
      * @script{ignore}
      */
      */
     typedef bool (*ResolveAutoBindingCallback) (const char* autoBinding, Node* node, MaterialParameter* parameter);
     typedef bool (*ResolveAutoBindingCallback) (const char* autoBinding, Node* node, MaterialParameter* parameter);
@@ -333,6 +332,7 @@ public:
      * auto bindings found in the RenderState::AutoBinding enumeration.
      * auto bindings found in the RenderState::AutoBinding enumeration.
      *
      *
      * @param callback Callback function for resolving parameter auto bindings.
      * @param callback Callback function for resolving parameter auto bindings.
+     * @script{ignore}
      */
      */
     static void registerAutoBindingResolver(ResolveAutoBindingCallback callback);
     static void registerAutoBindingResolver(ResolveAutoBindingCallback callback);
 
 

+ 1 - 0
gameplay/src/RenderTarget.h

@@ -39,6 +39,7 @@ public:
      * and restrictions on what texture formats are supported as render targets.
      * and restrictions on what texture formats are supported as render targets.
      *
      *
      * @param id The ID of the new RenderTarget.
      * @param id The ID of the new RenderTarget.
+     * @param texture The texture for the new RenderTarget.
      *
      *
      * @return A newly created RenderTarget.
      * @return A newly created RenderTarget.
      * @script{create}
      * @script{create}

+ 8 - 8
gameplay/src/SceneLoader.cpp

@@ -73,12 +73,12 @@ Scene* SceneLoader::loadInternal(const char* url)
     applyNodeProperties(scene, sceneProperties, SceneNodeProperty::COLLISION_OBJECT);
     applyNodeProperties(scene, sceneProperties, SceneNodeProperty::COLLISION_OBJECT);
 
 
     // Apply node tags
     // Apply node tags
-    for (unsigned int i = 0, sncount = _sceneNodes.size(); i < sncount; ++i)
+    for (size_t i = 0, sncount = _sceneNodes.size(); i < sncount; ++i)
     {
     {
         SceneNode& sceneNode = _sceneNodes[i];
         SceneNode& sceneNode = _sceneNodes[i];
         for (std::map<std::string, std::string>::const_iterator itr = sceneNode._tags.begin(); itr != sceneNode._tags.end(); ++itr)
         for (std::map<std::string, std::string>::const_iterator itr = sceneNode._tags.begin(); itr != sceneNode._tags.end(); ++itr)
         {
         {
-            for (unsigned int n = 0, ncount = sceneNode._nodes.size(); n < ncount; ++n)
+            for (size_t n = 0, ncount = sceneNode._nodes.size(); n < ncount; ++n)
                 sceneNode._nodes[n]->setTag(itr->first.c_str(), itr->second.c_str());
                 sceneNode._nodes[n]->setTag(itr->first.c_str(), itr->second.c_str());
         }
         }
     }
     }
@@ -156,16 +156,16 @@ void SceneLoader::addSceneNodeProperty(SceneNode& sceneNode, SceneNodeProperty::
 
 
 void SceneLoader::applyNodeProperties(const Scene* scene, const Properties* sceneProperties, unsigned int typeFlags)
 void SceneLoader::applyNodeProperties(const Scene* scene, const Properties* sceneProperties, unsigned int typeFlags)
 {
 {
-    for (unsigned int i = 0, sncount = _sceneNodes.size(); i < sncount; ++i)
+    for (size_t i = 0, sncount = _sceneNodes.size(); i < sncount; ++i)
     {
     {
         SceneNode& sceneNode = _sceneNodes[i];
         SceneNode& sceneNode = _sceneNodes[i];
 
 
-        for (unsigned int p = 0, pcount = sceneNode._properties.size(); p < pcount; ++p)
+        for (size_t p = 0, pcount = sceneNode._properties.size(); p < pcount; ++p)
         {
         {
             SceneNodeProperty& snp = sceneNode._properties[p];
             SceneNodeProperty& snp = sceneNode._properties[p];
             if (typeFlags & snp._type)
             if (typeFlags & snp._type)
             {
             {
-                for (unsigned int n = 0, ncount = sceneNode._nodes.size(); n < ncount; ++n)
+                for (size_t n = 0, ncount = sceneNode._nodes.size(); n < ncount; ++n)
                     applyNodeProperty(sceneNode, sceneNode._nodes[n], sceneProperties, snp, scene);
                     applyNodeProperty(sceneNode, sceneNode._nodes[n], sceneProperties, snp, scene);
             }
             }
         }
         }
@@ -327,14 +327,14 @@ void SceneLoader::applyNodeUrls(Scene* scene)
 
 
     // Apply all URL node properties so that when we go to apply
     // Apply all URL node properties so that when we go to apply
     // the other node properties, the node is in the scene.
     // the other node properties, the node is in the scene.
-    for (unsigned int i = 0, ncount = _sceneNodes.size(); i < ncount; ++i)
+    for (size_t i = 0, ncount = _sceneNodes.size(); i < ncount; ++i)
     {
     {
         SceneNode& sceneNode = _sceneNodes[i];
         SceneNode& sceneNode = _sceneNodes[i];
 
 
         // Iterate backwards over the properties list so we can remove properties as we go
         // Iterate backwards over the properties list so we can remove properties as we go
         // without danger of indexing out of bounds.
         // without danger of indexing out of bounds.
         bool hasURL = false;
         bool hasURL = false;
-        for (int j = sceneNode._properties.size() - 1; j >= 0; --j)
+        for (int j = (int)sceneNode._properties.size() - 1; j >= 0; --j)
         {
         {
             SceneNodeProperty& snp = sceneNode._properties[j];
             SceneNodeProperty& snp = sceneNode._properties[j];
             if (snp._type != SceneNodeProperty::URL)
             if (snp._type != SceneNodeProperty::URL)
@@ -647,7 +647,7 @@ void SceneLoader::buildReferenceTables(Properties* sceneProperties)
 void SceneLoader::createAnimations(const Scene* scene)
 void SceneLoader::createAnimations(const Scene* scene)
 {
 {
     // Create the scene animations.
     // Create the scene animations.
-    for (unsigned int i = 0, count = _animations.size(); i < count; i++)
+    for (size_t i = 0, count = _animations.size(); i < count; i++)
     {
     {
         // If the target node doesn't exist in the scene, then we
         // If the target node doesn't exist in the scene, then we
         // can't do anything so we skip to the next animation.
         // can't do anything so we skip to the next animation.

+ 4 - 4
gameplay/src/ScriptController.cpp

@@ -79,7 +79,7 @@ void ScriptUtil::registerConstantBool(const std::string& name, bool value, const
         lua_setfield(sc->_lua, -2, name.c_str());
         lua_setfield(sc->_lua, -2, name.c_str());
 
 
         // Pop all the parent tables off the stack.
         // Pop all the parent tables off the stack.
-        int size = scopePath.size();
+        int size = (int)scopePath.size();
         lua_pop(sc->_lua, size);
         lua_pop(sc->_lua, size);
     }
     }
     else
     else
@@ -112,7 +112,7 @@ void ScriptUtil::registerConstantNumber(const std::string& name, double value, c
         lua_setfield(sc->_lua, -2, name.c_str());
         lua_setfield(sc->_lua, -2, name.c_str());
 
 
         // Pop all the parent tables off the stack.
         // Pop all the parent tables off the stack.
-        int size = scopePath.size();
+        int size = (int)scopePath.size();
         lua_pop(sc->_lua, size);
         lua_pop(sc->_lua, size);
     }
     }
     else
     else
@@ -145,7 +145,7 @@ void ScriptUtil::registerConstantString(const std::string& name, const std::stri
         lua_setfield(sc->_lua, -2, name.c_str());
         lua_setfield(sc->_lua, -2, name.c_str());
 
 
         // Pop all the parent tables off the stack.
         // Pop all the parent tables off the stack.
-        int size = scopePath.size();
+        int size = (int)scopePath.size();
         lua_pop(sc->_lua, size);
         lua_pop(sc->_lua, size);
     }
     }
     else
     else
@@ -234,7 +234,7 @@ void ScriptUtil::registerClass(const char* name, const luaL_Reg* members, lua_CF
         lua_settable(sc->_lua, -3);
         lua_settable(sc->_lua, -3);
 
 
         // Pop all the parent tables off the stack.
         // Pop all the parent tables off the stack.
-        int size = scopePath.size();
+        int size = (int)scopePath.size();
         lua_pop(sc->_lua, size);
         lua_pop(sc->_lua, size);
     }
     }
     else
     else

+ 2 - 2
gameplay/src/ScriptController.inl

@@ -136,7 +136,7 @@ ScriptUtil::LuaArray<T> ScriptUtil::getObjectPointer(int index, const char* type
 
 
                     // Check if it matches any of the derived types' metatables.
                     // Check if it matches any of the derived types' metatables.
                     const std::vector<std::string>& types = sc->_hierarchy[type];
                     const std::vector<std::string>& types = sc->_hierarchy[type];
-                    for (unsigned int k = 0, count = types.size(); k < count; k++)
+                    for (size_t k = 0, count = types.size(); k < count; k++)
                     {
                     {
                         luaL_getmetatable(sc->_lua, types[k].c_str());
                         luaL_getmetatable(sc->_lua, types[k].c_str());
                         if (lua_rawequal(sc->_lua, -1, -2))
                         if (lua_rawequal(sc->_lua, -1, -2))
@@ -178,7 +178,7 @@ ScriptUtil::LuaArray<T> ScriptUtil::getObjectPointer(int index, const char* type
 
 
                 // Check if it matches any of the derived types' metatables.
                 // Check if it matches any of the derived types' metatables.
                 const std::vector<std::string>& types = sc->_hierarchy[type];
                 const std::vector<std::string>& types = sc->_hierarchy[type];
-                for (unsigned int i = 0, count = types.size(); i < count; i++)
+                for (size_t i = 0, count = types.size(); i < count; i++)
                 {
                 {
                     luaL_getmetatable(sc->_lua, types[i].c_str());
                     luaL_getmetatable(sc->_lua, types[i].c_str());
                     if (lua_rawequal(sc->_lua, -1, -2))
                     if (lua_rawequal(sc->_lua, -1, -2))

+ 3 - 3
gameplay/src/Technique.cpp

@@ -15,7 +15,7 @@ Technique::Technique(const char* id, Material* material)
 Technique::~Technique()
 Technique::~Technique()
 {
 {
     // Destroy all the passes.
     // Destroy all the passes.
-    for (unsigned int i = 0, count = _passes.size(); i < count; ++i)
+    for (size_t i = 0, count = _passes.size(); i < count; ++i)
     {
     {
         SAFE_RELEASE(_passes[i]);
         SAFE_RELEASE(_passes[i]);
     }
     }
@@ -28,7 +28,7 @@ const char* Technique::getId() const
 
 
 unsigned int Technique::getPassCount() const
 unsigned int Technique::getPassCount() const
 {
 {
-    return _passes.size();
+    return (unsigned int)_passes.size();
 }
 }
 
 
 Pass* Technique::getPassByIndex(unsigned int index) const
 Pass* Technique::getPassByIndex(unsigned int index) const
@@ -41,7 +41,7 @@ Pass* Technique::getPass(const char* id) const
 {
 {
     GP_ASSERT(id);
     GP_ASSERT(id);
 
 
-    for (unsigned int i = 0, count = _passes.size(); i < count; ++i)
+    for (size_t i = 0, count = _passes.size(); i < count; ++i)
     {
     {
         Pass* pass = _passes[i];
         Pass* pass = _passes[i];
         GP_ASSERT(pass);
         GP_ASSERT(pass);

+ 1 - 1
gameplay/src/TextBox.cpp

@@ -372,7 +372,7 @@ void TextBox::setCaretLocation(int x, int y)
         if (_caretLocation.x > textBounds.x + textBounds.width &&
         if (_caretLocation.x > textBounds.x + textBounds.width &&
             _caretLocation.y > textBounds.y + textBounds.height)
             _caretLocation.y > textBounds.y + textBounds.height)
         {
         {
-            font->getLocationAtIndex(_text.c_str(), _textBounds, fontSize, &_caretLocation, _text.length(),
+            font->getLocationAtIndex(_text.c_str(), _textBounds, fontSize, &_caretLocation, (unsigned int)_text.length(),
                 textAlignment, true, rightToLeft);
                 textAlignment, true, rightToLeft);
             return;
             return;
         }
         }

+ 4 - 4
gameplay/src/Texture.cpp

@@ -73,7 +73,7 @@ Texture* Texture::create(const char* path, bool generateMipmaps)
     GP_ASSERT(path);
     GP_ASSERT(path);
 
 
     // Search texture cache first.
     // Search texture cache first.
-    for (unsigned int i = 0, count = __textureCache.size(); i < count; ++i)
+    for (size_t i = 0, count = __textureCache.size(); i < count; ++i)
     {
     {
         Texture* t = __textureCache[i];
         Texture* t = __textureCache[i];
         GP_ASSERT(t);
         GP_ASSERT(t);
@@ -228,7 +228,7 @@ Texture* Texture::createCompressedPVRTC(const char* path)
     }
     }
 
 
     // Read first 4 bytes to determine PVRTC format.
     // Read first 4 bytes to determine PVRTC format.
-    unsigned int read;
+    size_t read;
     unsigned int version;
     unsigned int version;
     read = fread(&version, sizeof(unsigned int), 1, file);
     read = fread(&version, sizeof(unsigned int), 1, file);
     if (read != 1)
     if (read != 1)
@@ -347,7 +347,7 @@ GLubyte* Texture::readCompressedPVRTC(const char* path, FILE* file, GLsizei* wid
         unsigned int metaDataSize;
         unsigned int metaDataSize;
     };
     };
 
 
-    unsigned int read;
+    size_t read;
 
 
     // Read header data.
     // Read header data.
     pvrtc_file_header header;
     pvrtc_file_header header;
@@ -404,7 +404,7 @@ GLubyte* Texture::readCompressedPVRTC(const char* path, FILE* file, GLsizei* wid
     // Compute total size of data to be read.
     // Compute total size of data to be read.
     int w = *width;
     int w = *width;
     int h = *height;
     int h = *height;
-    unsigned int dataSize = 0;
+    size_t dataSize = 0;
     for (unsigned int level = 0; level < header.mipMapCount; ++level)
     for (unsigned int level = 0; level < header.mipMapCount; ++level)
     {
     {
         dataSize += computePVRTCDataSize(w, h, bpp);
         dataSize += computePVRTCDataSize(w, h, bpp);

+ 6 - 6
gameplay/src/Theme.cpp

@@ -14,25 +14,25 @@ Theme::Theme()
 Theme::~Theme()
 Theme::~Theme()
 {
 {
     // Destroy all the cursors, styles and , fonts.
     // Destroy all the cursors, styles and , fonts.
-    for (unsigned int i = 0, count = _styles.size(); i < count; ++i)
+    for (size_t i = 0, count = _styles.size(); i < count; ++i)
     {
     {
         Style* style = _styles[i];
         Style* style = _styles[i];
         SAFE_DELETE(style);
         SAFE_DELETE(style);
     }
     }
 
 
-    for (unsigned int i = 0, count = _images.size(); i < count; ++i)
+    for (size_t i = 0, count = _images.size(); i < count; ++i)
     {
     {
         ThemeImage* image = _images[i];
         ThemeImage* image = _images[i];
         SAFE_RELEASE(image);
         SAFE_RELEASE(image);
     }
     }
 
 
-    for (unsigned int i = 0, count = _imageLists.size(); i < count; ++i)
+    for (size_t i = 0, count = _imageLists.size(); i < count; ++i)
     {
     {
         ImageList* imageList = _imageLists[i];
         ImageList* imageList = _imageLists[i];
         SAFE_RELEASE(imageList);
         SAFE_RELEASE(imageList);
     }
     }
 
 
-    for (unsigned int i = 0, count = _skins.size(); i < count; ++i)
+    for (size_t i = 0, count = _skins.size(); i < count; ++i)
     {
     {
         Skin* skin = _skins[i];
         Skin* skin = _skins[i];
         SAFE_RELEASE(skin);
         SAFE_RELEASE(skin);
@@ -54,7 +54,7 @@ Theme* Theme::create(const char* url)
     GP_ASSERT(url);
     GP_ASSERT(url);
 
 
     // Search theme cache first.
     // Search theme cache first.
-    for (unsigned int i = 0, count = __themeCache.size(); i < count; ++i)
+    for (size_t i = 0, count = __themeCache.size(); i < count; ++i)
     {
     {
         Theme* t = __themeCache[i];
         Theme* t = __themeCache[i];
         if (t->_url == url)
         if (t->_url == url)
@@ -435,7 +435,7 @@ Theme::Style* Theme::getStyle(const char* name) const
 {
 {
     GP_ASSERT(name);
     GP_ASSERT(name);
 
 
-    for (unsigned int i = 0, count = _styles.size(); i < count; ++i)
+    for (size_t i = 0, count = _styles.size(); i < count; ++i)
     {
     {
         GP_ASSERT(_styles[i]);
         GP_ASSERT(_styles[i]);
         if (strcmp(name, _styles[i]->getId()) == 0)
         if (strcmp(name, _styles[i]->getId()) == 0)

+ 3 - 3
gameplay/src/Transform.cpp

@@ -59,8 +59,8 @@ void Transform::resumeTransformChanged()
     if (_suspendTransformChanged == 1)
     if (_suspendTransformChanged == 1)
     {
     {
         // Call transformChanged() on all transforms in the list
         // Call transformChanged() on all transforms in the list
-        unsigned int transformCount = _transformsChanged.size();
-        for (unsigned int i = 0; i < transformCount; i++)
+        size_t transformCount = _transformsChanged.size();
+        for (size_t i = 0; i < transformCount; i++)
         {
         {
             Transform* t = _transformsChanged.at(i);
             Transform* t = _transformsChanged.at(i);
             GP_ASSERT(t);
             GP_ASSERT(t);
@@ -70,7 +70,7 @@ void Transform::resumeTransformChanged()
         // Go through list and reset DIRTY_NOTIFY bit. The list could potentially be larger here if the 
         // Go through list and reset DIRTY_NOTIFY bit. The list could potentially be larger here if the 
         // transforms we were delaying calls to transformChanged() have any child nodes.
         // transforms we were delaying calls to transformChanged() have any child nodes.
         transformCount = _transformsChanged.size();
         transformCount = _transformsChanged.size();
-        for (unsigned int i = 0; i < transformCount; i++)
+        for (size_t i = 0; i < transformCount; i++)
         {
         {
             Transform* t = _transformsChanged.at(i);
             Transform* t = _transformsChanged.at(i);
             GP_ASSERT(t);
             GP_ASSERT(t);

+ 1 - 1
gameplay/src/VertexAttributeBinding.cpp

@@ -40,7 +40,7 @@ VertexAttributeBinding* VertexAttributeBinding::create(Mesh* mesh, Effect* effec
 
 
     // Search for an existing vertex attribute binding that can be used.
     // Search for an existing vertex attribute binding that can be used.
     VertexAttributeBinding* b;
     VertexAttributeBinding* b;
-    for (unsigned int i = 0, count = __vertexAttributeBindingCache.size(); i < count; ++i)
+    for (size_t i = 0, count = __vertexAttributeBindingCache.size(); i < count; ++i)
     {
     {
         b = __vertexAttributeBindingCache[i];
         b = __vertexAttributeBindingCache[i];
         GP_ASSERT(b);
         GP_ASSERT(b);

+ 2 - 2
gameplay/src/VertexFormat.cpp

@@ -33,7 +33,7 @@ const VertexFormat::Element& VertexFormat::getElement(unsigned int index) const
 
 
 unsigned int VertexFormat::getElementCount() const
 unsigned int VertexFormat::getElementCount() const
 {
 {
-    return _elements.size();
+    return (unsigned int)_elements.size();
 }
 }
 
 
 unsigned int VertexFormat::getVertexSize() const
 unsigned int VertexFormat::getVertexSize() const
@@ -46,7 +46,7 @@ bool VertexFormat::operator == (const VertexFormat& f) const
     if (_elements.size() != f._elements.size())
     if (_elements.size() != f._elements.size())
         return false;
         return false;
 
 
-    for (unsigned int i = 0, count = _elements.size(); i < count; ++i)
+    for (size_t i = 0, count = _elements.size(); i < count; ++i)
     {
     {
         if (_elements[i] != f._elements[i])
         if (_elements[i] != f._elements[i])
             return false;
             return false;

+ 3 - 3
gameplay/src/VerticalLayout.cpp

@@ -44,17 +44,17 @@ void VerticalLayout::update(const Container* container, const Vector2& offset)
 
 
     std::vector<Control*> controls = container->getControls();
     std::vector<Control*> controls = container->getControls();
 
 
-    unsigned int i, end, iter;
+    int i, end, iter;
     if (_bottomToTop)
     if (_bottomToTop)
     {
     {
-        i = controls.size() - 1;
+        i = (int)controls.size() - 1;
         end = -1;
         end = -1;
         iter = -1;
         iter = -1;
     }
     }
     else
     else
     {
     {
         i = 0;
         i = 0;
-        end = controls.size();
+        end = (int)controls.size();
         iter = 1;
         iter = 1;
     }
     }
 
 

+ 6 - 6
gameplay/src/lua/lua_AnimationTarget.cpp

@@ -13,7 +13,7 @@ namespace gameplay
 
 
 void luaRegister_AnimationTarget()
 void luaRegister_AnimationTarget()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"createAnimation", lua_AnimationTarget_createAnimation},
         {"createAnimation", lua_AnimationTarget_createAnimation},
         {"createAnimationFromBy", lua_AnimationTarget_createAnimationFromBy},
         {"createAnimationFromBy", lua_AnimationTarget_createAnimationFromBy},
@@ -385,7 +385,7 @@ int lua_AnimationTarget_destroyAnimation(lua_State* state)
             {
             {
                 AnimationTarget* instance = getInstance(state);
                 AnimationTarget* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -405,7 +405,7 @@ int lua_AnimationTarget_destroyAnimation(lua_State* state)
 
 
                 AnimationTarget* instance = getInstance(state);
                 AnimationTarget* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -566,7 +566,7 @@ int lua_AnimationTarget_getAnimationPropertyValue(lua_State* state)
 
 
                 AnimationTarget* instance = getInstance(state);
                 AnimationTarget* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -608,7 +608,7 @@ int lua_AnimationTarget_setAnimationPropertyValue(lua_State* state)
 
 
                 AnimationTarget* instance = getInstance(state);
                 AnimationTarget* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -636,7 +636,7 @@ int lua_AnimationTarget_setAnimationPropertyValue(lua_State* state)
 
 
                 AnimationTarget* instance = getInstance(state);
                 AnimationTarget* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 55 - 55
gameplay/src/lua/lua_Button.cpp

@@ -23,7 +23,7 @@ namespace gameplay
 
 
 void luaRegister_Button()
 void luaRegister_Button()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_Button_addListener},
         {"addListener", lua_Button_addListener},
         {"addRef", lua_Button_addRef},
         {"addRef", lua_Button_addRef},
@@ -108,7 +108,7 @@ void luaRegister_Button()
         {"setZIndex", lua_Button_setZIndex},
         {"setZIndex", lua_Button_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_Button_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_Button_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_Button_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_Button_static_ANIMATE_POSITION},
@@ -152,7 +152,7 @@ int lua_Button__gc(lua_State* state)
                     Button* instance = (Button*)object->instance;
                     Button* instance = (Button*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -194,7 +194,7 @@ int lua_Button_addListener(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -228,7 +228,7 @@ int lua_Button_addRef(lua_State* state)
             {
             {
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -270,7 +270,7 @@ int lua_Button_addScriptCallback(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -637,7 +637,7 @@ int lua_Button_destroyAnimation(lua_State* state)
             {
             {
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -657,7 +657,7 @@ int lua_Button_destroyAnimation(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -691,7 +691,7 @@ int lua_Button_disable(lua_State* state)
             {
             {
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -725,7 +725,7 @@ int lua_Button_enable(lua_State* state)
             {
             {
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -923,7 +923,7 @@ int lua_Button_getAnimationPropertyValue(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2730,7 +2730,7 @@ int lua_Button_release(lua_State* state)
             {
             {
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2772,7 +2772,7 @@ int lua_Button_removeScriptCallback(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2810,7 +2810,7 @@ int lua_Button_setAlignment(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2852,7 +2852,7 @@ int lua_Button_setAnimationPropertyValue(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2880,7 +2880,7 @@ int lua_Button_setAnimationPropertyValue(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2918,7 +2918,7 @@ int lua_Button_setAutoHeight(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2956,7 +2956,7 @@ int lua_Button_setAutoWidth(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3006,7 +3006,7 @@ int lua_Button_setBorder(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3042,7 +3042,7 @@ int lua_Button_setBorder(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3080,7 +3080,7 @@ int lua_Button_setBounds(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3118,7 +3118,7 @@ int lua_Button_setConsumeInputEvents(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3160,7 +3160,7 @@ int lua_Button_setCursorColor(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3202,7 +3202,7 @@ int lua_Button_setCursorRegion(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3240,7 +3240,7 @@ int lua_Button_setFocusIndex(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3278,7 +3278,7 @@ int lua_Button_setFont(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3302,7 +3302,7 @@ int lua_Button_setFont(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3340,7 +3340,7 @@ int lua_Button_setFontSize(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3364,7 +3364,7 @@ int lua_Button_setFontSize(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3402,7 +3402,7 @@ int lua_Button_setHeight(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3444,7 +3444,7 @@ int lua_Button_setImageColor(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3472,7 +3472,7 @@ int lua_Button_setImageColor(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3514,7 +3514,7 @@ int lua_Button_setImageRegion(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3542,7 +3542,7 @@ int lua_Button_setImageRegion(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3592,7 +3592,7 @@ int lua_Button_setMargin(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3630,7 +3630,7 @@ int lua_Button_setOpacity(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3654,7 +3654,7 @@ int lua_Button_setOpacity(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3704,7 +3704,7 @@ int lua_Button_setPadding(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3746,7 +3746,7 @@ int lua_Button_setPosition(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3788,7 +3788,7 @@ int lua_Button_setSize(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3826,7 +3826,7 @@ int lua_Button_setSkinColor(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3850,7 +3850,7 @@ int lua_Button_setSkinColor(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3888,7 +3888,7 @@ int lua_Button_setSkinRegion(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3912,7 +3912,7 @@ int lua_Button_setSkinRegion(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3950,7 +3950,7 @@ int lua_Button_setState(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3988,7 +3988,7 @@ int lua_Button_setStyle(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4026,7 +4026,7 @@ int lua_Button_setText(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setText(param1);
                 instance->setText(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4064,7 +4064,7 @@ int lua_Button_setTextAlignment(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4088,7 +4088,7 @@ int lua_Button_setTextAlignment(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4126,7 +4126,7 @@ int lua_Button_setTextColor(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4150,7 +4150,7 @@ int lua_Button_setTextColor(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4188,7 +4188,7 @@ int lua_Button_setTextRightToLeft(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4212,7 +4212,7 @@ int lua_Button_setTextRightToLeft(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4250,7 +4250,7 @@ int lua_Button_setWidth(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4288,7 +4288,7 @@ int lua_Button_setZIndex(lua_State* state)
 
 
                 Button* instance = getInstance(state);
                 Button* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 57 - 57
gameplay/src/lua/lua_CheckBox.cpp

@@ -24,7 +24,7 @@ namespace gameplay
 
 
 void luaRegister_CheckBox()
 void luaRegister_CheckBox()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_CheckBox_addListener},
         {"addListener", lua_CheckBox_addListener},
         {"addRef", lua_CheckBox_addRef},
         {"addRef", lua_CheckBox_addRef},
@@ -114,7 +114,7 @@ void luaRegister_CheckBox()
         {"setZIndex", lua_CheckBox_setZIndex},
         {"setZIndex", lua_CheckBox_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_CheckBox_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_CheckBox_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_CheckBox_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_CheckBox_static_ANIMATE_POSITION},
@@ -158,7 +158,7 @@ int lua_CheckBox__gc(lua_State* state)
                     CheckBox* instance = (CheckBox*)object->instance;
                     CheckBox* instance = (CheckBox*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -200,7 +200,7 @@ int lua_CheckBox_addListener(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -234,7 +234,7 @@ int lua_CheckBox_addRef(lua_State* state)
             {
             {
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -276,7 +276,7 @@ int lua_CheckBox_addScriptCallback(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -643,7 +643,7 @@ int lua_CheckBox_destroyAnimation(lua_State* state)
             {
             {
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -663,7 +663,7 @@ int lua_CheckBox_destroyAnimation(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -697,7 +697,7 @@ int lua_CheckBox_disable(lua_State* state)
             {
             {
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -731,7 +731,7 @@ int lua_CheckBox_enable(lua_State* state)
             {
             {
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -929,7 +929,7 @@ int lua_CheckBox_getAnimationPropertyValue(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2856,7 +2856,7 @@ int lua_CheckBox_release(lua_State* state)
             {
             {
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2898,7 +2898,7 @@ int lua_CheckBox_removeScriptCallback(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2936,7 +2936,7 @@ int lua_CheckBox_setAlignment(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2978,7 +2978,7 @@ int lua_CheckBox_setAnimationPropertyValue(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3006,7 +3006,7 @@ int lua_CheckBox_setAnimationPropertyValue(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3044,7 +3044,7 @@ int lua_CheckBox_setAutoHeight(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3082,7 +3082,7 @@ int lua_CheckBox_setAutoWidth(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3132,7 +3132,7 @@ int lua_CheckBox_setBorder(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3168,7 +3168,7 @@ int lua_CheckBox_setBorder(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3206,7 +3206,7 @@ int lua_CheckBox_setBounds(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3244,7 +3244,7 @@ int lua_CheckBox_setChecked(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setChecked(param1);
                 instance->setChecked(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3282,7 +3282,7 @@ int lua_CheckBox_setConsumeInputEvents(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3324,7 +3324,7 @@ int lua_CheckBox_setCursorColor(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3366,7 +3366,7 @@ int lua_CheckBox_setCursorRegion(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3404,7 +3404,7 @@ int lua_CheckBox_setFocusIndex(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3442,7 +3442,7 @@ int lua_CheckBox_setFont(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3466,7 +3466,7 @@ int lua_CheckBox_setFont(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3504,7 +3504,7 @@ int lua_CheckBox_setFontSize(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3528,7 +3528,7 @@ int lua_CheckBox_setFontSize(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3566,7 +3566,7 @@ int lua_CheckBox_setHeight(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3608,7 +3608,7 @@ int lua_CheckBox_setImageColor(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3636,7 +3636,7 @@ int lua_CheckBox_setImageColor(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3678,7 +3678,7 @@ int lua_CheckBox_setImageRegion(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3706,7 +3706,7 @@ int lua_CheckBox_setImageRegion(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3748,7 +3748,7 @@ int lua_CheckBox_setImageSize(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setImageSize(param1, param2);
                 instance->setImageSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3798,7 +3798,7 @@ int lua_CheckBox_setMargin(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3836,7 +3836,7 @@ int lua_CheckBox_setOpacity(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3860,7 +3860,7 @@ int lua_CheckBox_setOpacity(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3910,7 +3910,7 @@ int lua_CheckBox_setPadding(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3952,7 +3952,7 @@ int lua_CheckBox_setPosition(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3994,7 +3994,7 @@ int lua_CheckBox_setSize(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4032,7 +4032,7 @@ int lua_CheckBox_setSkinColor(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4056,7 +4056,7 @@ int lua_CheckBox_setSkinColor(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4094,7 +4094,7 @@ int lua_CheckBox_setSkinRegion(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4118,7 +4118,7 @@ int lua_CheckBox_setSkinRegion(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4156,7 +4156,7 @@ int lua_CheckBox_setState(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4194,7 +4194,7 @@ int lua_CheckBox_setStyle(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4232,7 +4232,7 @@ int lua_CheckBox_setText(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setText(param1);
                 instance->setText(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4270,7 +4270,7 @@ int lua_CheckBox_setTextAlignment(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4294,7 +4294,7 @@ int lua_CheckBox_setTextAlignment(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4332,7 +4332,7 @@ int lua_CheckBox_setTextColor(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4356,7 +4356,7 @@ int lua_CheckBox_setTextColor(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4394,7 +4394,7 @@ int lua_CheckBox_setTextRightToLeft(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4418,7 +4418,7 @@ int lua_CheckBox_setTextRightToLeft(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4456,7 +4456,7 @@ int lua_CheckBox_setWidth(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4494,7 +4494,7 @@ int lua_CheckBox_setZIndex(lua_State* state)
 
 
                 CheckBox* instance = getInstance(state);
                 CheckBox* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 60 - 60
gameplay/src/lua/lua_Container.cpp

@@ -35,7 +35,7 @@ namespace gameplay
 
 
 void luaRegister_Container()
 void luaRegister_Container()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addControl", lua_Container_addControl},
         {"addControl", lua_Container_addControl},
         {"addListener", lua_Container_addListener},
         {"addListener", lua_Container_addListener},
@@ -129,7 +129,7 @@ void luaRegister_Container()
         {"setZIndex", lua_Container_setZIndex},
         {"setZIndex", lua_Container_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_Container_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_Container_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_Container_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_Container_static_ANIMATE_POSITION},
@@ -174,7 +174,7 @@ int lua_Container__gc(lua_State* state)
                     Container* instance = (Container*)object->instance;
                     Container* instance = (Container*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -257,7 +257,7 @@ int lua_Container_addListener(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -291,7 +291,7 @@ int lua_Container_addRef(lua_State* state)
             {
             {
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -333,7 +333,7 @@ int lua_Container_addScriptCallback(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -700,7 +700,7 @@ int lua_Container_destroyAnimation(lua_State* state)
             {
             {
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -720,7 +720,7 @@ int lua_Container_destroyAnimation(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -754,7 +754,7 @@ int lua_Container_disable(lua_State* state)
             {
             {
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -788,7 +788,7 @@ int lua_Container_enable(lua_State* state)
             {
             {
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -986,7 +986,7 @@ int lua_Container_getAnimationPropertyValue(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2883,7 +2883,7 @@ int lua_Container_insertControl(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->insertControl(param1, param2);
                 instance->insertControl(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3065,7 +3065,7 @@ int lua_Container_release(lua_State* state)
             {
             {
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3103,7 +3103,7 @@ int lua_Container_removeControl(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->removeControl(param1);
                 instance->removeControl(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3114,7 +3114,7 @@ int lua_Container_removeControl(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->removeControl(param1);
                 instance->removeControl(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3125,7 +3125,7 @@ int lua_Container_removeControl(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->removeControl(param1);
                 instance->removeControl(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3167,7 +3167,7 @@ int lua_Container_removeScriptCallback(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3205,7 +3205,7 @@ int lua_Container_setAlignment(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3247,7 +3247,7 @@ int lua_Container_setAnimationPropertyValue(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3275,7 +3275,7 @@ int lua_Container_setAnimationPropertyValue(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3313,7 +3313,7 @@ int lua_Container_setAutoHeight(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3351,7 +3351,7 @@ int lua_Container_setAutoWidth(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3401,7 +3401,7 @@ int lua_Container_setBorder(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3437,7 +3437,7 @@ int lua_Container_setBorder(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3475,7 +3475,7 @@ int lua_Container_setBounds(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3513,7 +3513,7 @@ int lua_Container_setConsumeInputEvents(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3555,7 +3555,7 @@ int lua_Container_setCursorColor(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3597,7 +3597,7 @@ int lua_Container_setCursorRegion(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3635,7 +3635,7 @@ int lua_Container_setFocusIndex(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3673,7 +3673,7 @@ int lua_Container_setFont(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3697,7 +3697,7 @@ int lua_Container_setFont(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3735,7 +3735,7 @@ int lua_Container_setFontSize(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3759,7 +3759,7 @@ int lua_Container_setFontSize(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3797,7 +3797,7 @@ int lua_Container_setHeight(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3839,7 +3839,7 @@ int lua_Container_setImageColor(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3867,7 +3867,7 @@ int lua_Container_setImageColor(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3909,7 +3909,7 @@ int lua_Container_setImageRegion(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3937,7 +3937,7 @@ int lua_Container_setImageRegion(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3987,7 +3987,7 @@ int lua_Container_setMargin(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4025,7 +4025,7 @@ int lua_Container_setOpacity(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4049,7 +4049,7 @@ int lua_Container_setOpacity(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4099,7 +4099,7 @@ int lua_Container_setPadding(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4141,7 +4141,7 @@ int lua_Container_setPosition(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4179,7 +4179,7 @@ int lua_Container_setScroll(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setScroll(param1);
                 instance->setScroll(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4217,7 +4217,7 @@ int lua_Container_setScrollBarsAutoHide(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setScrollBarsAutoHide(param1);
                 instance->setScrollBarsAutoHide(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4259,7 +4259,7 @@ int lua_Container_setSize(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4297,7 +4297,7 @@ int lua_Container_setSkinColor(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4321,7 +4321,7 @@ int lua_Container_setSkinColor(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4359,7 +4359,7 @@ int lua_Container_setSkinRegion(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4383,7 +4383,7 @@ int lua_Container_setSkinRegion(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4421,7 +4421,7 @@ int lua_Container_setState(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4459,7 +4459,7 @@ int lua_Container_setStyle(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4497,7 +4497,7 @@ int lua_Container_setTextAlignment(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4521,7 +4521,7 @@ int lua_Container_setTextAlignment(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4559,7 +4559,7 @@ int lua_Container_setTextColor(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4583,7 +4583,7 @@ int lua_Container_setTextColor(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4621,7 +4621,7 @@ int lua_Container_setTextRightToLeft(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4645,7 +4645,7 @@ int lua_Container_setTextRightToLeft(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4683,7 +4683,7 @@ int lua_Container_setWidth(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4721,7 +4721,7 @@ int lua_Container_setZIndex(lua_State* state)
 
 
                 Container* instance = getInstance(state);
                 Container* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 54 - 54
gameplay/src/lua/lua_Control.cpp

@@ -21,7 +21,7 @@ namespace gameplay
 
 
 void luaRegister_Control()
 void luaRegister_Control()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_Control_addListener},
         {"addListener", lua_Control_addListener},
         {"addRef", lua_Control_addRef},
         {"addRef", lua_Control_addRef},
@@ -105,7 +105,7 @@ void luaRegister_Control()
         {"setZIndex", lua_Control_setZIndex},
         {"setZIndex", lua_Control_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_Control_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_Control_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_Control_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_Control_static_ANIMATE_POSITION},
@@ -148,7 +148,7 @@ int lua_Control__gc(lua_State* state)
                     Control* instance = (Control*)object->instance;
                     Control* instance = (Control*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -190,7 +190,7 @@ int lua_Control_addListener(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -224,7 +224,7 @@ int lua_Control_addRef(lua_State* state)
             {
             {
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -266,7 +266,7 @@ int lua_Control_addScriptCallback(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -633,7 +633,7 @@ int lua_Control_destroyAnimation(lua_State* state)
             {
             {
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -653,7 +653,7 @@ int lua_Control_destroyAnimation(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -687,7 +687,7 @@ int lua_Control_disable(lua_State* state)
             {
             {
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -721,7 +721,7 @@ int lua_Control_enable(lua_State* state)
             {
             {
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -919,7 +919,7 @@ int lua_Control_getAnimationPropertyValue(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2726,7 +2726,7 @@ int lua_Control_release(lua_State* state)
             {
             {
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2768,7 +2768,7 @@ int lua_Control_removeScriptCallback(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2806,7 +2806,7 @@ int lua_Control_setAlignment(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2848,7 +2848,7 @@ int lua_Control_setAnimationPropertyValue(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2876,7 +2876,7 @@ int lua_Control_setAnimationPropertyValue(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2914,7 +2914,7 @@ int lua_Control_setAutoHeight(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2952,7 +2952,7 @@ int lua_Control_setAutoWidth(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3002,7 +3002,7 @@ int lua_Control_setBorder(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3038,7 +3038,7 @@ int lua_Control_setBorder(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3076,7 +3076,7 @@ int lua_Control_setBounds(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3114,7 +3114,7 @@ int lua_Control_setConsumeInputEvents(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3156,7 +3156,7 @@ int lua_Control_setCursorColor(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3198,7 +3198,7 @@ int lua_Control_setCursorRegion(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3236,7 +3236,7 @@ int lua_Control_setFocusIndex(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3274,7 +3274,7 @@ int lua_Control_setFont(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3298,7 +3298,7 @@ int lua_Control_setFont(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3336,7 +3336,7 @@ int lua_Control_setFontSize(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3360,7 +3360,7 @@ int lua_Control_setFontSize(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3398,7 +3398,7 @@ int lua_Control_setHeight(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3440,7 +3440,7 @@ int lua_Control_setImageColor(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3468,7 +3468,7 @@ int lua_Control_setImageColor(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3510,7 +3510,7 @@ int lua_Control_setImageRegion(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3538,7 +3538,7 @@ int lua_Control_setImageRegion(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3588,7 +3588,7 @@ int lua_Control_setMargin(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3626,7 +3626,7 @@ int lua_Control_setOpacity(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3650,7 +3650,7 @@ int lua_Control_setOpacity(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3700,7 +3700,7 @@ int lua_Control_setPadding(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3742,7 +3742,7 @@ int lua_Control_setPosition(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3784,7 +3784,7 @@ int lua_Control_setSize(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3822,7 +3822,7 @@ int lua_Control_setSkinColor(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3846,7 +3846,7 @@ int lua_Control_setSkinColor(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3884,7 +3884,7 @@ int lua_Control_setSkinRegion(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3908,7 +3908,7 @@ int lua_Control_setSkinRegion(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3946,7 +3946,7 @@ int lua_Control_setState(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3984,7 +3984,7 @@ int lua_Control_setStyle(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4022,7 +4022,7 @@ int lua_Control_setTextAlignment(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4046,7 +4046,7 @@ int lua_Control_setTextAlignment(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4084,7 +4084,7 @@ int lua_Control_setTextColor(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4108,7 +4108,7 @@ int lua_Control_setTextColor(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4146,7 +4146,7 @@ int lua_Control_setTextRightToLeft(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4170,7 +4170,7 @@ int lua_Control_setTextRightToLeft(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4208,7 +4208,7 @@ int lua_Control_setWidth(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4246,7 +4246,7 @@ int lua_Control_setZIndex(lua_State* state)
 
 
                 Control* instance = getInstance(state);
                 Control* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 76 - 0
gameplay/src/lua/lua_DepthStencilTarget.cpp

@@ -16,8 +16,10 @@ void luaRegister_DepthStencilTarget()
     {
     {
         {"addRef", lua_DepthStencilTarget_addRef},
         {"addRef", lua_DepthStencilTarget_addRef},
         {"getFormat", lua_DepthStencilTarget_getFormat},
         {"getFormat", lua_DepthStencilTarget_getFormat},
+        {"getHeight", lua_DepthStencilTarget_getHeight},
         {"getId", lua_DepthStencilTarget_getId},
         {"getId", lua_DepthStencilTarget_getId},
         {"getRefCount", lua_DepthStencilTarget_getRefCount},
         {"getRefCount", lua_DepthStencilTarget_getRefCount},
+        {"getWidth", lua_DepthStencilTarget_getWidth},
         {"release", lua_DepthStencilTarget_release},
         {"release", lua_DepthStencilTarget_release},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
@@ -150,6 +152,43 @@ int lua_DepthStencilTarget_getFormat(lua_State* state)
     return 0;
     return 0;
 }
 }
 
 
+int lua_DepthStencilTarget_getHeight(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 1:
+        {
+            if ((lua_type(state, 1) == LUA_TUSERDATA))
+            {
+                DepthStencilTarget* instance = getInstance(state);
+                unsigned int result = instance->getHeight();
+
+                // Push the return value onto the stack.
+                lua_pushunsigned(state, result);
+
+                return 1;
+            }
+            else
+            {
+                lua_pushstring(state, "lua_DepthStencilTarget_getHeight - Failed to match the given parameters to a valid function signature.");
+                lua_error(state);
+            }
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 1).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_DepthStencilTarget_getId(lua_State* state)
 int lua_DepthStencilTarget_getId(lua_State* state)
 {
 {
     // Get the number of parameters.
     // Get the number of parameters.
@@ -224,6 +263,43 @@ int lua_DepthStencilTarget_getRefCount(lua_State* state)
     return 0;
     return 0;
 }
 }
 
 
+int lua_DepthStencilTarget_getWidth(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 1:
+        {
+            if ((lua_type(state, 1) == LUA_TUSERDATA))
+            {
+                DepthStencilTarget* instance = getInstance(state);
+                unsigned int result = instance->getWidth();
+
+                // Push the return value onto the stack.
+                lua_pushunsigned(state, result);
+
+                return 1;
+            }
+            else
+            {
+                lua_pushstring(state, "lua_DepthStencilTarget_getWidth - Failed to match the given parameters to a valid function signature.");
+                lua_error(state);
+            }
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 1).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_DepthStencilTarget_release(lua_State* state)
 int lua_DepthStencilTarget_release(lua_State* state)
 {
 {
     // Get the number of parameters.
     // Get the number of parameters.

+ 2 - 0
gameplay/src/lua/lua_DepthStencilTarget.h

@@ -8,8 +8,10 @@ namespace gameplay
 int lua_DepthStencilTarget__gc(lua_State* state);
 int lua_DepthStencilTarget__gc(lua_State* state);
 int lua_DepthStencilTarget_addRef(lua_State* state);
 int lua_DepthStencilTarget_addRef(lua_State* state);
 int lua_DepthStencilTarget_getFormat(lua_State* state);
 int lua_DepthStencilTarget_getFormat(lua_State* state);
+int lua_DepthStencilTarget_getHeight(lua_State* state);
 int lua_DepthStencilTarget_getId(lua_State* state);
 int lua_DepthStencilTarget_getId(lua_State* state);
 int lua_DepthStencilTarget_getRefCount(lua_State* state);
 int lua_DepthStencilTarget_getRefCount(lua_State* state);
+int lua_DepthStencilTarget_getWidth(lua_State* state);
 int lua_DepthStencilTarget_release(lua_State* state);
 int lua_DepthStencilTarget_release(lua_State* state);
 int lua_DepthStencilTarget_static_create(lua_State* state);
 int lua_DepthStencilTarget_static_create(lua_State* state);
 int lua_DepthStencilTarget_static_getDepthStencilTarget(lua_State* state);
 int lua_DepthStencilTarget_static_getDepthStencilTarget(lua_State* state);

+ 63 - 63
gameplay/src/lua/lua_Form.cpp

@@ -38,7 +38,7 @@ namespace gameplay
 
 
 void luaRegister_Form()
 void luaRegister_Form()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addControl", lua_Form_addControl},
         {"addControl", lua_Form_addControl},
         {"addListener", lua_Form_addListener},
         {"addListener", lua_Form_addListener},
@@ -136,7 +136,7 @@ void luaRegister_Form()
         {"update", lua_Form_update},
         {"update", lua_Form_update},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_Form_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_Form_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_Form_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_Form_static_ANIMATE_POSITION},
@@ -182,7 +182,7 @@ int lua_Form__gc(lua_State* state)
                     Form* instance = (Form*)object->instance;
                     Form* instance = (Form*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -265,7 +265,7 @@ int lua_Form_addListener(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -299,7 +299,7 @@ int lua_Form_addRef(lua_State* state)
             {
             {
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -341,7 +341,7 @@ int lua_Form_addScriptCallback(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -708,7 +708,7 @@ int lua_Form_destroyAnimation(lua_State* state)
             {
             {
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -728,7 +728,7 @@ int lua_Form_destroyAnimation(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -762,7 +762,7 @@ int lua_Form_disable(lua_State* state)
             {
             {
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -796,7 +796,7 @@ int lua_Form_draw(lua_State* state)
             {
             {
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->draw();
                 instance->draw();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -830,7 +830,7 @@ int lua_Form_enable(lua_State* state)
             {
             {
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1028,7 +1028,7 @@ int lua_Form_getAnimationPropertyValue(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2971,7 +2971,7 @@ int lua_Form_insertControl(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->insertControl(param1, param2);
                 instance->insertControl(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3153,7 +3153,7 @@ int lua_Form_release(lua_State* state)
             {
             {
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3191,7 +3191,7 @@ int lua_Form_removeControl(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->removeControl(param1);
                 instance->removeControl(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3202,7 +3202,7 @@ int lua_Form_removeControl(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->removeControl(param1);
                 instance->removeControl(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3213,7 +3213,7 @@ int lua_Form_removeControl(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->removeControl(param1);
                 instance->removeControl(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3255,7 +3255,7 @@ int lua_Form_removeScriptCallback(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3293,7 +3293,7 @@ int lua_Form_setAlignment(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3335,7 +3335,7 @@ int lua_Form_setAnimationPropertyValue(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3363,7 +3363,7 @@ int lua_Form_setAnimationPropertyValue(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3401,7 +3401,7 @@ int lua_Form_setAutoHeight(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3439,7 +3439,7 @@ int lua_Form_setAutoWidth(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3489,7 +3489,7 @@ int lua_Form_setBorder(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3525,7 +3525,7 @@ int lua_Form_setBorder(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3563,7 +3563,7 @@ int lua_Form_setBounds(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3601,7 +3601,7 @@ int lua_Form_setConsumeInputEvents(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3643,7 +3643,7 @@ int lua_Form_setCursorColor(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3685,7 +3685,7 @@ int lua_Form_setCursorRegion(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3723,7 +3723,7 @@ int lua_Form_setFocusIndex(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3761,7 +3761,7 @@ int lua_Form_setFont(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3785,7 +3785,7 @@ int lua_Form_setFont(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3823,7 +3823,7 @@ int lua_Form_setFontSize(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3847,7 +3847,7 @@ int lua_Form_setFontSize(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3885,7 +3885,7 @@ int lua_Form_setHeight(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3927,7 +3927,7 @@ int lua_Form_setImageColor(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3955,7 +3955,7 @@ int lua_Form_setImageColor(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3997,7 +3997,7 @@ int lua_Form_setImageRegion(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4025,7 +4025,7 @@ int lua_Form_setImageRegion(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4075,7 +4075,7 @@ int lua_Form_setMargin(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4113,7 +4113,7 @@ int lua_Form_setNode(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setNode(param1);
                 instance->setNode(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4151,7 +4151,7 @@ int lua_Form_setOpacity(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4175,7 +4175,7 @@ int lua_Form_setOpacity(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4225,7 +4225,7 @@ int lua_Form_setPadding(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4267,7 +4267,7 @@ int lua_Form_setPosition(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4305,7 +4305,7 @@ int lua_Form_setScroll(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setScroll(param1);
                 instance->setScroll(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4343,7 +4343,7 @@ int lua_Form_setScrollBarsAutoHide(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setScrollBarsAutoHide(param1);
                 instance->setScrollBarsAutoHide(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4385,7 +4385,7 @@ int lua_Form_setSize(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4423,7 +4423,7 @@ int lua_Form_setSkinColor(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4447,7 +4447,7 @@ int lua_Form_setSkinColor(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4485,7 +4485,7 @@ int lua_Form_setSkinRegion(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4509,7 +4509,7 @@ int lua_Form_setSkinRegion(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4547,7 +4547,7 @@ int lua_Form_setState(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4585,7 +4585,7 @@ int lua_Form_setStyle(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4623,7 +4623,7 @@ int lua_Form_setTextAlignment(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4647,7 +4647,7 @@ int lua_Form_setTextAlignment(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4685,7 +4685,7 @@ int lua_Form_setTextColor(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4709,7 +4709,7 @@ int lua_Form_setTextColor(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4747,7 +4747,7 @@ int lua_Form_setTextRightToLeft(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4771,7 +4771,7 @@ int lua_Form_setTextRightToLeft(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4809,7 +4809,7 @@ int lua_Form_setWidth(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4847,7 +4847,7 @@ int lua_Form_setZIndex(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5189,7 +5189,7 @@ int lua_Form_update(lua_State* state)
 
 
                 Form* instance = getInstance(state);
                 Form* instance = getInstance(state);
                 instance->update(param1);
                 instance->update(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 31 - 1
gameplay/src/lua/lua_FrameBuffer.cpp

@@ -593,6 +593,36 @@ int lua_FrameBuffer_static_create(lua_State* state)
     // Attempt to match the parameters to a valid binding.
     // Attempt to match the parameters to a valid binding.
     switch (paramCount)
     switch (paramCount)
     {
     {
+        case 1:
+        {
+            if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL))
+            {
+                // Get parameter 1 off the stack.
+                ScriptUtil::LuaArray<const char> param1 = ScriptUtil::getString(1, false);
+
+                void* returnPtr = (void*)FrameBuffer::create(param1);
+                if (returnPtr)
+                {
+                    ScriptUtil::LuaObject* object = (ScriptUtil::LuaObject*)lua_newuserdata(state, sizeof(ScriptUtil::LuaObject));
+                    object->instance = returnPtr;
+                    object->owns = true;
+                    luaL_getmetatable(state, "FrameBuffer");
+                    lua_setmetatable(state, -2);
+                }
+                else
+                {
+                    lua_pushnil(state);
+                }
+
+                return 1;
+            }
+            else
+            {
+                lua_pushstring(state, "lua_FrameBuffer_static_create - Failed to match the given parameters to a valid function signature.");
+                lua_error(state);
+            }
+            break;
+        }
         case 3:
         case 3:
         {
         {
             if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL) &&
             if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL) &&
@@ -633,7 +663,7 @@ int lua_FrameBuffer_static_create(lua_State* state)
         }
         }
         default:
         default:
         {
         {
-            lua_pushstring(state, "Invalid number of parameters (expected 3).");
+            lua_pushstring(state, "Invalid number of parameters (expected 1 or 3).");
             lua_error(state);
             lua_error(state);
             break;
             break;
         }
         }

+ 38 - 0
gameplay/src/lua/lua_Game.cpp

@@ -23,6 +23,7 @@ void luaRegister_Game()
 {
 {
     const luaL_Reg lua_members[] = 
     const luaL_Reg lua_members[] = 
     {
     {
+        {"canExit", lua_Game_canExit},
         {"clear", lua_Game_clear},
         {"clear", lua_Game_clear},
         {"displayKeyboard", lua_Game_displayKeyboard},
         {"displayKeyboard", lua_Game_displayKeyboard},
         {"exit", lua_Game_exit},
         {"exit", lua_Game_exit},
@@ -132,6 +133,43 @@ int lua_Game__gc(lua_State* state)
     return 0;
     return 0;
 }
 }
 
 
+int lua_Game_canExit(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 1:
+        {
+            if ((lua_type(state, 1) == LUA_TUSERDATA))
+            {
+                Game* instance = getInstance(state);
+                bool result = instance->canExit();
+
+                // Push the return value onto the stack.
+                lua_pushboolean(state, result);
+
+                return 1;
+            }
+            else
+            {
+                lua_pushstring(state, "lua_Game_canExit - Failed to match the given parameters to a valid function signature.");
+                lua_error(state);
+            }
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 1).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_Game_clear(lua_State* state)
 int lua_Game_clear(lua_State* state)
 {
 {
     // Get the number of parameters.
     // Get the number of parameters.

+ 1 - 0
gameplay/src/lua/lua_Game.h

@@ -6,6 +6,7 @@ namespace gameplay
 
 
 // Lua bindings for Game.
 // Lua bindings for Game.
 int lua_Game__gc(lua_State* state);
 int lua_Game__gc(lua_State* state);
+int lua_Game_canExit(lua_State* state);
 int lua_Game_clear(lua_State* state);
 int lua_Game_clear(lua_State* state);
 int lua_Game_displayKeyboard(lua_State* state);
 int lua_Game_displayKeyboard(lua_State* state);
 int lua_Game_exit(lua_State* state);
 int lua_Game_exit(lua_State* state);

+ 1 - 0
gameplay/src/lua/lua_Global.cpp

@@ -741,6 +741,7 @@ void luaRegister_lua_Global()
     {
     {
         std::vector<std::string> scopePath;
         std::vector<std::string> scopePath;
         scopePath.push_back("Texture");
         scopePath.push_back("Texture");
+        ScriptUtil::registerConstantString("UNKNOWN", "UNKNOWN", scopePath);
         ScriptUtil::registerConstantString("RGB", "RGB", scopePath);
         ScriptUtil::registerConstantString("RGB", "RGB", scopePath);
         ScriptUtil::registerConstantString("RGBA", "RGBA", scopePath);
         ScriptUtil::registerConstantString("RGBA", "RGBA", scopePath);
         ScriptUtil::registerConstantString("ALPHA", "ALPHA", scopePath);
         ScriptUtil::registerConstantString("ALPHA", "ALPHA", scopePath);

+ 88 - 88
gameplay/src/lua/lua_Joint.cpp

@@ -28,7 +28,7 @@ namespace gameplay
 
 
 void luaRegister_Joint()
 void luaRegister_Joint()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addAdvertisedDescendant", lua_Joint_addAdvertisedDescendant},
         {"addAdvertisedDescendant", lua_Joint_addAdvertisedDescendant},
         {"addChild", lua_Joint_addChild},
         {"addChild", lua_Joint_addChild},
@@ -149,7 +149,7 @@ void luaRegister_Joint()
         {"translateZ", lua_Joint_translateZ},
         {"translateZ", lua_Joint_translateZ},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_ROTATE", lua_Joint_static_ANIMATE_ROTATE},
         {"ANIMATE_ROTATE", lua_Joint_static_ANIMATE_ROTATE},
         {"ANIMATE_ROTATE_TRANSLATE", lua_Joint_static_ANIMATE_ROTATE_TRANSLATE},
         {"ANIMATE_ROTATE_TRANSLATE", lua_Joint_static_ANIMATE_ROTATE_TRANSLATE},
@@ -202,7 +202,7 @@ int lua_Joint__gc(lua_State* state)
                     Joint* instance = (Joint*)object->instance;
                     Joint* instance = (Joint*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -240,7 +240,7 @@ int lua_Joint_addAdvertisedDescendant(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->addAdvertisedDescendant(param1);
                 instance->addAdvertisedDescendant(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -278,7 +278,7 @@ int lua_Joint_addChild(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->addChild(param1);
                 instance->addChild(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -316,7 +316,7 @@ int lua_Joint_addListener(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->addListener(param1);
                 instance->addListener(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -340,7 +340,7 @@ int lua_Joint_addListener(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -374,7 +374,7 @@ int lua_Joint_addRef(lua_State* state)
             {
             {
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -416,7 +416,7 @@ int lua_Joint_addScriptCallback(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -829,7 +829,7 @@ int lua_Joint_destroyAnimation(lua_State* state)
             {
             {
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -849,7 +849,7 @@ int lua_Joint_destroyAnimation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1324,7 +1324,7 @@ int lua_Joint_getAnimationPropertyValue(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1436,7 +1436,7 @@ int lua_Joint_getBackVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getBackVector(param1);
                 instance->getBackVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1677,7 +1677,7 @@ int lua_Joint_getDownVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getDownVector(param1);
                 instance->getDownVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1835,7 +1835,7 @@ int lua_Joint_getForwardVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getForwardVector(param1);
                 instance->getForwardVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2260,7 +2260,7 @@ int lua_Joint_getLeftVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getLeftVector(param1);
                 instance->getLeftVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2768,7 +2768,7 @@ int lua_Joint_getRightVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getRightVector(param1);
                 instance->getRightVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2926,7 +2926,7 @@ int lua_Joint_getRotation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getRotation(param1);
                 instance->getRotation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2937,7 +2937,7 @@ int lua_Joint_getRotation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getRotation(param1);
                 instance->getRotation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3017,7 +3017,7 @@ int lua_Joint_getScale(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getScale(param1);
                 instance->getScale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3281,7 +3281,7 @@ int lua_Joint_getTranslation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getTranslation(param1);
                 instance->getTranslation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3587,7 +3587,7 @@ int lua_Joint_getUpVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->getUpVector(param1);
                 instance->getUpVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3938,7 +3938,7 @@ int lua_Joint_release(lua_State* state)
             {
             {
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3972,7 +3972,7 @@ int lua_Joint_removeAllChildren(lua_State* state)
             {
             {
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->removeAllChildren();
                 instance->removeAllChildren();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4010,7 +4010,7 @@ int lua_Joint_removeChild(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->removeChild(param1);
                 instance->removeChild(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4048,7 +4048,7 @@ int lua_Joint_removeListener(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->removeListener(param1);
                 instance->removeListener(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4090,7 +4090,7 @@ int lua_Joint_removeScriptCallback(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4128,7 +4128,7 @@ int lua_Joint_rotate(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->rotate(*param1);
                 instance->rotate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4139,7 +4139,7 @@ int lua_Joint_rotate(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->rotate(*param1);
                 instance->rotate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4163,7 +4163,7 @@ int lua_Joint_rotate(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->rotate(*param1, param2);
                 instance->rotate(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4195,7 +4195,7 @@ int lua_Joint_rotate(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->rotate(param1, param2, param3, param4);
                 instance->rotate(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4233,7 +4233,7 @@ int lua_Joint_rotateX(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->rotateX(param1);
                 instance->rotateX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4271,7 +4271,7 @@ int lua_Joint_rotateY(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->rotateY(param1);
                 instance->rotateY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4309,7 +4309,7 @@ int lua_Joint_rotateZ(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->rotateZ(param1);
                 instance->rotateZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4347,7 +4347,7 @@ int lua_Joint_scale(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->scale(param1);
                 instance->scale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4358,7 +4358,7 @@ int lua_Joint_scale(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->scale(*param1);
                 instance->scale(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4386,7 +4386,7 @@ int lua_Joint_scale(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->scale(param1, param2, param3);
                 instance->scale(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4424,7 +4424,7 @@ int lua_Joint_scaleX(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->scaleX(param1);
                 instance->scaleX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4462,7 +4462,7 @@ int lua_Joint_scaleY(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->scaleY(param1);
                 instance->scaleY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4500,7 +4500,7 @@ int lua_Joint_scaleZ(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->scaleZ(param1);
                 instance->scaleZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4538,7 +4538,7 @@ int lua_Joint_set(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->set(*param1);
                 instance->set(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4566,7 +4566,7 @@ int lua_Joint_set(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->set(*param1, *param2, *param3);
                 instance->set(*param1, *param2, *param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4585,7 +4585,7 @@ int lua_Joint_set(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->set(*param1, *param2, *param3);
                 instance->set(*param1, *param2, *param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4617,7 +4617,7 @@ int lua_Joint_set(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->set(*param1, *param2, param3, *param4);
                 instance->set(*param1, *param2, param3, *param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4655,7 +4655,7 @@ int lua_Joint_setAgent(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setAgent(param1);
                 instance->setAgent(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4697,7 +4697,7 @@ int lua_Joint_setAnimationPropertyValue(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4725,7 +4725,7 @@ int lua_Joint_setAnimationPropertyValue(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4763,7 +4763,7 @@ int lua_Joint_setAudioSource(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setAudioSource(param1);
                 instance->setAudioSource(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4801,7 +4801,7 @@ int lua_Joint_setCamera(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setCamera(param1);
                 instance->setCamera(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5011,7 +5011,7 @@ int lua_Joint_setForm(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setForm(param1);
                 instance->setForm(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5049,7 +5049,7 @@ int lua_Joint_setId(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setId(param1);
                 instance->setId(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5083,7 +5083,7 @@ int lua_Joint_setIdentity(lua_State* state)
             {
             {
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setIdentity();
                 instance->setIdentity();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5121,7 +5121,7 @@ int lua_Joint_setLight(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setLight(param1);
                 instance->setLight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5159,7 +5159,7 @@ int lua_Joint_setModel(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setModel(param1);
                 instance->setModel(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5197,7 +5197,7 @@ int lua_Joint_setParticleEmitter(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setParticleEmitter(param1);
                 instance->setParticleEmitter(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5235,7 +5235,7 @@ int lua_Joint_setRotation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setRotation(*param1);
                 instance->setRotation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -5246,7 +5246,7 @@ int lua_Joint_setRotation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setRotation(*param1);
                 instance->setRotation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5270,7 +5270,7 @@ int lua_Joint_setRotation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setRotation(*param1, param2);
                 instance->setRotation(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5302,7 +5302,7 @@ int lua_Joint_setRotation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setRotation(param1, param2, param3, param4);
                 instance->setRotation(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5340,7 +5340,7 @@ int lua_Joint_setScale(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setScale(param1);
                 instance->setScale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -5351,7 +5351,7 @@ int lua_Joint_setScale(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setScale(*param1);
                 instance->setScale(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5379,7 +5379,7 @@ int lua_Joint_setScale(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setScale(param1, param2, param3);
                 instance->setScale(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5417,7 +5417,7 @@ int lua_Joint_setScaleX(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setScaleX(param1);
                 instance->setScaleX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5455,7 +5455,7 @@ int lua_Joint_setScaleY(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setScaleY(param1);
                 instance->setScaleY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5493,7 +5493,7 @@ int lua_Joint_setScaleZ(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setScaleZ(param1);
                 instance->setScaleZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5531,7 +5531,7 @@ int lua_Joint_setTag(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setTag(param1);
                 instance->setTag(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5555,7 +5555,7 @@ int lua_Joint_setTag(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setTag(param1, param2);
                 instance->setTag(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5593,7 +5593,7 @@ int lua_Joint_setTranslation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setTranslation(*param1);
                 instance->setTranslation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5621,7 +5621,7 @@ int lua_Joint_setTranslation(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setTranslation(param1, param2, param3);
                 instance->setTranslation(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5659,7 +5659,7 @@ int lua_Joint_setTranslationX(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setTranslationX(param1);
                 instance->setTranslationX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5697,7 +5697,7 @@ int lua_Joint_setTranslationY(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setTranslationY(param1);
                 instance->setTranslationY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5735,7 +5735,7 @@ int lua_Joint_setTranslationZ(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->setTranslationZ(param1);
                 instance->setTranslationZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6032,7 +6032,7 @@ int lua_Joint_static_resumeTransformChanged(lua_State* state)
         case 0:
         case 0:
         {
         {
             Joint::resumeTransformChanged();
             Joint::resumeTransformChanged();
-
+            
             return 0;
             return 0;
             break;
             break;
         }
         }
@@ -6057,7 +6057,7 @@ int lua_Joint_static_suspendTransformChanged(lua_State* state)
         case 0:
         case 0:
         {
         {
             Joint::suspendTransformChanged();
             Joint::suspendTransformChanged();
-
+            
             return 0;
             return 0;
             break;
             break;
         }
         }
@@ -6089,7 +6089,7 @@ int lua_Joint_transformPoint(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->transformPoint(param1);
                 instance->transformPoint(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6113,7 +6113,7 @@ int lua_Joint_transformPoint(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->transformPoint(*param1, param2);
                 instance->transformPoint(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6151,7 +6151,7 @@ int lua_Joint_transformVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->transformVector(param1);
                 instance->transformVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6175,7 +6175,7 @@ int lua_Joint_transformVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->transformVector(*param1, param2);
                 instance->transformVector(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6211,7 +6211,7 @@ int lua_Joint_transformVector(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->transformVector(param1, param2, param3, param4, param5);
                 instance->transformVector(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6249,7 +6249,7 @@ int lua_Joint_translate(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translate(*param1);
                 instance->translate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6277,7 +6277,7 @@ int lua_Joint_translate(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translate(param1, param2, param3);
                 instance->translate(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6315,7 +6315,7 @@ int lua_Joint_translateForward(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translateForward(param1);
                 instance->translateForward(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6353,7 +6353,7 @@ int lua_Joint_translateLeft(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translateLeft(param1);
                 instance->translateLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6399,7 +6399,7 @@ int lua_Joint_translateSmooth(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translateSmooth(*param1, param2, param3);
                 instance->translateSmooth(*param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6437,7 +6437,7 @@ int lua_Joint_translateUp(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translateUp(param1);
                 instance->translateUp(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6475,7 +6475,7 @@ int lua_Joint_translateX(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translateX(param1);
                 instance->translateX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6513,7 +6513,7 @@ int lua_Joint_translateY(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translateY(param1);
                 instance->translateY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6551,7 +6551,7 @@ int lua_Joint_translateZ(lua_State* state)
 
 
                 Joint* instance = getInstance(state);
                 Joint* instance = getInstance(state);
                 instance->translateZ(param1);
                 instance->translateZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 57 - 57
gameplay/src/lua/lua_Joystick.cpp

@@ -22,7 +22,7 @@ namespace gameplay
 
 
 void luaRegister_Joystick()
 void luaRegister_Joystick()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_Joystick_addListener},
         {"addListener", lua_Joystick_addListener},
         {"addRef", lua_Joystick_addRef},
         {"addRef", lua_Joystick_addRef},
@@ -113,7 +113,7 @@ void luaRegister_Joystick()
         {"setZIndex", lua_Joystick_setZIndex},
         {"setZIndex", lua_Joystick_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_Joystick_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_Joystick_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_Joystick_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_Joystick_static_ANIMATE_POSITION},
@@ -157,7 +157,7 @@ int lua_Joystick__gc(lua_State* state)
                     Joystick* instance = (Joystick*)object->instance;
                     Joystick* instance = (Joystick*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -199,7 +199,7 @@ int lua_Joystick_addListener(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -233,7 +233,7 @@ int lua_Joystick_addRef(lua_State* state)
             {
             {
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -275,7 +275,7 @@ int lua_Joystick_addScriptCallback(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -642,7 +642,7 @@ int lua_Joystick_destroyAnimation(lua_State* state)
             {
             {
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -662,7 +662,7 @@ int lua_Joystick_destroyAnimation(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -696,7 +696,7 @@ int lua_Joystick_disable(lua_State* state)
             {
             {
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -730,7 +730,7 @@ int lua_Joystick_enable(lua_State* state)
             {
             {
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -928,7 +928,7 @@ int lua_Joystick_getAnimationPropertyValue(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2910,7 +2910,7 @@ int lua_Joystick_release(lua_State* state)
             {
             {
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2952,7 +2952,7 @@ int lua_Joystick_removeScriptCallback(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2990,7 +2990,7 @@ int lua_Joystick_setAlignment(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3032,7 +3032,7 @@ int lua_Joystick_setAnimationPropertyValue(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3060,7 +3060,7 @@ int lua_Joystick_setAnimationPropertyValue(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3098,7 +3098,7 @@ int lua_Joystick_setAutoHeight(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3136,7 +3136,7 @@ int lua_Joystick_setAutoWidth(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3186,7 +3186,7 @@ int lua_Joystick_setBorder(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3222,7 +3222,7 @@ int lua_Joystick_setBorder(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3260,7 +3260,7 @@ int lua_Joystick_setBounds(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3298,7 +3298,7 @@ int lua_Joystick_setConsumeInputEvents(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3340,7 +3340,7 @@ int lua_Joystick_setCursorColor(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3382,7 +3382,7 @@ int lua_Joystick_setCursorRegion(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3420,7 +3420,7 @@ int lua_Joystick_setFocusIndex(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3458,7 +3458,7 @@ int lua_Joystick_setFont(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3482,7 +3482,7 @@ int lua_Joystick_setFont(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3520,7 +3520,7 @@ int lua_Joystick_setFontSize(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3544,7 +3544,7 @@ int lua_Joystick_setFontSize(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3582,7 +3582,7 @@ int lua_Joystick_setHeight(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3624,7 +3624,7 @@ int lua_Joystick_setImageColor(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3652,7 +3652,7 @@ int lua_Joystick_setImageColor(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3694,7 +3694,7 @@ int lua_Joystick_setImageRegion(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3722,7 +3722,7 @@ int lua_Joystick_setImageRegion(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3760,7 +3760,7 @@ int lua_Joystick_setInnerRegionSize(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setInnerRegionSize(*param1);
                 instance->setInnerRegionSize(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3810,7 +3810,7 @@ int lua_Joystick_setMargin(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3848,7 +3848,7 @@ int lua_Joystick_setOpacity(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3872,7 +3872,7 @@ int lua_Joystick_setOpacity(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3910,7 +3910,7 @@ int lua_Joystick_setOuterRegionSize(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setOuterRegionSize(*param1);
                 instance->setOuterRegionSize(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3960,7 +3960,7 @@ int lua_Joystick_setPadding(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4002,7 +4002,7 @@ int lua_Joystick_setPosition(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4040,7 +4040,7 @@ int lua_Joystick_setRelative(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setRelative(param1);
                 instance->setRelative(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4082,7 +4082,7 @@ int lua_Joystick_setSize(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4120,7 +4120,7 @@ int lua_Joystick_setSkinColor(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4144,7 +4144,7 @@ int lua_Joystick_setSkinColor(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4182,7 +4182,7 @@ int lua_Joystick_setSkinRegion(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4206,7 +4206,7 @@ int lua_Joystick_setSkinRegion(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4244,7 +4244,7 @@ int lua_Joystick_setState(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4282,7 +4282,7 @@ int lua_Joystick_setStyle(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4320,7 +4320,7 @@ int lua_Joystick_setTextAlignment(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4344,7 +4344,7 @@ int lua_Joystick_setTextAlignment(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4382,7 +4382,7 @@ int lua_Joystick_setTextColor(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4406,7 +4406,7 @@ int lua_Joystick_setTextColor(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4444,7 +4444,7 @@ int lua_Joystick_setTextRightToLeft(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4468,7 +4468,7 @@ int lua_Joystick_setTextRightToLeft(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4506,7 +4506,7 @@ int lua_Joystick_setWidth(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4544,7 +4544,7 @@ int lua_Joystick_setZIndex(lua_State* state)
 
 
                 Joystick* instance = getInstance(state);
                 Joystick* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 55 - 55
gameplay/src/lua/lua_Label.cpp

@@ -22,7 +22,7 @@ namespace gameplay
 
 
 void luaRegister_Label()
 void luaRegister_Label()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_Label_addListener},
         {"addListener", lua_Label_addListener},
         {"addRef", lua_Label_addRef},
         {"addRef", lua_Label_addRef},
@@ -108,7 +108,7 @@ void luaRegister_Label()
         {"setZIndex", lua_Label_setZIndex},
         {"setZIndex", lua_Label_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_Label_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_Label_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_Label_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_Label_static_ANIMATE_POSITION},
@@ -152,7 +152,7 @@ int lua_Label__gc(lua_State* state)
                     Label* instance = (Label*)object->instance;
                     Label* instance = (Label*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -194,7 +194,7 @@ int lua_Label_addListener(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -228,7 +228,7 @@ int lua_Label_addRef(lua_State* state)
             {
             {
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -270,7 +270,7 @@ int lua_Label_addScriptCallback(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -637,7 +637,7 @@ int lua_Label_destroyAnimation(lua_State* state)
             {
             {
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -657,7 +657,7 @@ int lua_Label_destroyAnimation(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -691,7 +691,7 @@ int lua_Label_disable(lua_State* state)
             {
             {
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -725,7 +725,7 @@ int lua_Label_enable(lua_State* state)
             {
             {
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -923,7 +923,7 @@ int lua_Label_getAnimationPropertyValue(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2767,7 +2767,7 @@ int lua_Label_release(lua_State* state)
             {
             {
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2809,7 +2809,7 @@ int lua_Label_removeScriptCallback(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2847,7 +2847,7 @@ int lua_Label_setAlignment(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2889,7 +2889,7 @@ int lua_Label_setAnimationPropertyValue(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2917,7 +2917,7 @@ int lua_Label_setAnimationPropertyValue(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2955,7 +2955,7 @@ int lua_Label_setAutoHeight(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2993,7 +2993,7 @@ int lua_Label_setAutoWidth(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3043,7 +3043,7 @@ int lua_Label_setBorder(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3079,7 +3079,7 @@ int lua_Label_setBorder(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3117,7 +3117,7 @@ int lua_Label_setBounds(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3155,7 +3155,7 @@ int lua_Label_setConsumeInputEvents(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3197,7 +3197,7 @@ int lua_Label_setCursorColor(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3239,7 +3239,7 @@ int lua_Label_setCursorRegion(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3277,7 +3277,7 @@ int lua_Label_setFocusIndex(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3315,7 +3315,7 @@ int lua_Label_setFont(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3339,7 +3339,7 @@ int lua_Label_setFont(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3377,7 +3377,7 @@ int lua_Label_setFontSize(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3401,7 +3401,7 @@ int lua_Label_setFontSize(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3439,7 +3439,7 @@ int lua_Label_setHeight(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3481,7 +3481,7 @@ int lua_Label_setImageColor(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3509,7 +3509,7 @@ int lua_Label_setImageColor(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3551,7 +3551,7 @@ int lua_Label_setImageRegion(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3579,7 +3579,7 @@ int lua_Label_setImageRegion(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3629,7 +3629,7 @@ int lua_Label_setMargin(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3667,7 +3667,7 @@ int lua_Label_setOpacity(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3691,7 +3691,7 @@ int lua_Label_setOpacity(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3741,7 +3741,7 @@ int lua_Label_setPadding(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3783,7 +3783,7 @@ int lua_Label_setPosition(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3825,7 +3825,7 @@ int lua_Label_setSize(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3863,7 +3863,7 @@ int lua_Label_setSkinColor(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3887,7 +3887,7 @@ int lua_Label_setSkinColor(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3925,7 +3925,7 @@ int lua_Label_setSkinRegion(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3949,7 +3949,7 @@ int lua_Label_setSkinRegion(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3987,7 +3987,7 @@ int lua_Label_setState(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4025,7 +4025,7 @@ int lua_Label_setStyle(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4063,7 +4063,7 @@ int lua_Label_setText(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setText(param1);
                 instance->setText(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4101,7 +4101,7 @@ int lua_Label_setTextAlignment(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4125,7 +4125,7 @@ int lua_Label_setTextAlignment(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4163,7 +4163,7 @@ int lua_Label_setTextColor(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4187,7 +4187,7 @@ int lua_Label_setTextColor(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4225,7 +4225,7 @@ int lua_Label_setTextRightToLeft(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4249,7 +4249,7 @@ int lua_Label_setTextRightToLeft(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4287,7 +4287,7 @@ int lua_Label_setWidth(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4325,7 +4325,7 @@ int lua_Label_setZIndex(lua_State* state)
 
 
                 Label* instance = getInstance(state);
                 Label* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 30 - 30
gameplay/src/lua/lua_MaterialParameter.cpp

@@ -15,7 +15,7 @@ namespace gameplay
 
 
 void luaRegister_MaterialParameter()
 void luaRegister_MaterialParameter()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addRef", lua_MaterialParameter_addRef},
         {"addRef", lua_MaterialParameter_addRef},
         {"bindValue", lua_MaterialParameter_bindValue},
         {"bindValue", lua_MaterialParameter_bindValue},
@@ -34,7 +34,7 @@ void luaRegister_MaterialParameter()
         {"setValue", lua_MaterialParameter_setValue},
         {"setValue", lua_MaterialParameter_setValue},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_UNIFORM", lua_MaterialParameter_static_ANIMATE_UNIFORM},
         {"ANIMATE_UNIFORM", lua_MaterialParameter_static_ANIMATE_UNIFORM},
         {NULL, NULL}
         {NULL, NULL}
@@ -71,7 +71,7 @@ int lua_MaterialParameter__gc(lua_State* state)
                     MaterialParameter* instance = (MaterialParameter*)object->instance;
                     MaterialParameter* instance = (MaterialParameter*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -105,7 +105,7 @@ int lua_MaterialParameter_addRef(lua_State* state)
             {
             {
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -147,7 +147,7 @@ int lua_MaterialParameter_bindValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->bindValue(param1, param2);
                 instance->bindValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -514,7 +514,7 @@ int lua_MaterialParameter_destroyAnimation(lua_State* state)
             {
             {
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -534,7 +534,7 @@ int lua_MaterialParameter_destroyAnimation(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -695,7 +695,7 @@ int lua_MaterialParameter_getAnimationPropertyValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -849,7 +849,7 @@ int lua_MaterialParameter_release(lua_State* state)
             {
             {
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -891,7 +891,7 @@ int lua_MaterialParameter_setAnimationPropertyValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -919,7 +919,7 @@ int lua_MaterialParameter_setAnimationPropertyValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -957,7 +957,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -968,7 +968,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -979,7 +979,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -990,7 +990,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1001,7 +1001,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(*param1);
                 instance->setValue(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1012,7 +1012,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1023,7 +1023,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(*param1);
                 instance->setValue(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1034,7 +1034,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1045,7 +1045,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(*param1);
                 instance->setValue(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1056,7 +1056,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1067,7 +1067,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(*param1);
                 instance->setValue(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1078,7 +1078,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1089,7 +1089,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1113,7 +1113,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1, param2);
                 instance->setValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1128,7 +1128,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1, param2);
                 instance->setValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1143,7 +1143,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1, param2);
                 instance->setValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1158,7 +1158,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1, param2);
                 instance->setValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1173,7 +1173,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1, param2);
                 instance->setValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1188,7 +1188,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
 
 
                 MaterialParameter* instance = getInstance(state);
                 MaterialParameter* instance = getInstance(state);
                 instance->setValue(param1, param2);
                 instance->setValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&

+ 88 - 88
gameplay/src/lua/lua_Node.cpp

@@ -27,7 +27,7 @@ namespace gameplay
 
 
 void luaRegister_Node()
 void luaRegister_Node()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addAdvertisedDescendant", lua_Node_addAdvertisedDescendant},
         {"addAdvertisedDescendant", lua_Node_addAdvertisedDescendant},
         {"addChild", lua_Node_addChild},
         {"addChild", lua_Node_addChild},
@@ -147,7 +147,7 @@ void luaRegister_Node()
         {"translateZ", lua_Node_translateZ},
         {"translateZ", lua_Node_translateZ},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_ROTATE", lua_Node_static_ANIMATE_ROTATE},
         {"ANIMATE_ROTATE", lua_Node_static_ANIMATE_ROTATE},
         {"ANIMATE_ROTATE_TRANSLATE", lua_Node_static_ANIMATE_ROTATE_TRANSLATE},
         {"ANIMATE_ROTATE_TRANSLATE", lua_Node_static_ANIMATE_ROTATE_TRANSLATE},
@@ -201,7 +201,7 @@ int lua_Node__gc(lua_State* state)
                     Node* instance = (Node*)object->instance;
                     Node* instance = (Node*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -239,7 +239,7 @@ int lua_Node_addAdvertisedDescendant(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->addAdvertisedDescendant(param1);
                 instance->addAdvertisedDescendant(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -277,7 +277,7 @@ int lua_Node_addChild(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->addChild(param1);
                 instance->addChild(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -315,7 +315,7 @@ int lua_Node_addListener(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->addListener(param1);
                 instance->addListener(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -339,7 +339,7 @@ int lua_Node_addListener(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -373,7 +373,7 @@ int lua_Node_addRef(lua_State* state)
             {
             {
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -415,7 +415,7 @@ int lua_Node_addScriptCallback(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -828,7 +828,7 @@ int lua_Node_destroyAnimation(lua_State* state)
             {
             {
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -848,7 +848,7 @@ int lua_Node_destroyAnimation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1323,7 +1323,7 @@ int lua_Node_getAnimationPropertyValue(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1435,7 +1435,7 @@ int lua_Node_getBackVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getBackVector(param1);
                 instance->getBackVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1676,7 +1676,7 @@ int lua_Node_getDownVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getDownVector(param1);
                 instance->getDownVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1834,7 +1834,7 @@ int lua_Node_getForwardVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getForwardVector(param1);
                 instance->getForwardVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2213,7 +2213,7 @@ int lua_Node_getLeftVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getLeftVector(param1);
                 instance->getLeftVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2721,7 +2721,7 @@ int lua_Node_getRightVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getRightVector(param1);
                 instance->getRightVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2879,7 +2879,7 @@ int lua_Node_getRotation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getRotation(param1);
                 instance->getRotation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2890,7 +2890,7 @@ int lua_Node_getRotation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getRotation(param1);
                 instance->getRotation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2970,7 +2970,7 @@ int lua_Node_getScale(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getScale(param1);
                 instance->getScale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3234,7 +3234,7 @@ int lua_Node_getTranslation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getTranslation(param1);
                 instance->getTranslation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3540,7 +3540,7 @@ int lua_Node_getUpVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->getUpVector(param1);
                 instance->getUpVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3891,7 +3891,7 @@ int lua_Node_release(lua_State* state)
             {
             {
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3925,7 +3925,7 @@ int lua_Node_removeAllChildren(lua_State* state)
             {
             {
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->removeAllChildren();
                 instance->removeAllChildren();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3963,7 +3963,7 @@ int lua_Node_removeChild(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->removeChild(param1);
                 instance->removeChild(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4001,7 +4001,7 @@ int lua_Node_removeListener(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->removeListener(param1);
                 instance->removeListener(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4043,7 +4043,7 @@ int lua_Node_removeScriptCallback(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4081,7 +4081,7 @@ int lua_Node_rotate(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->rotate(*param1);
                 instance->rotate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4092,7 +4092,7 @@ int lua_Node_rotate(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->rotate(*param1);
                 instance->rotate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4116,7 +4116,7 @@ int lua_Node_rotate(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->rotate(*param1, param2);
                 instance->rotate(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4148,7 +4148,7 @@ int lua_Node_rotate(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->rotate(param1, param2, param3, param4);
                 instance->rotate(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4186,7 +4186,7 @@ int lua_Node_rotateX(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->rotateX(param1);
                 instance->rotateX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4224,7 +4224,7 @@ int lua_Node_rotateY(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->rotateY(param1);
                 instance->rotateY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4262,7 +4262,7 @@ int lua_Node_rotateZ(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->rotateZ(param1);
                 instance->rotateZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4300,7 +4300,7 @@ int lua_Node_scale(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->scale(param1);
                 instance->scale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4311,7 +4311,7 @@ int lua_Node_scale(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->scale(*param1);
                 instance->scale(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4339,7 +4339,7 @@ int lua_Node_scale(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->scale(param1, param2, param3);
                 instance->scale(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4377,7 +4377,7 @@ int lua_Node_scaleX(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->scaleX(param1);
                 instance->scaleX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4415,7 +4415,7 @@ int lua_Node_scaleY(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->scaleY(param1);
                 instance->scaleY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4453,7 +4453,7 @@ int lua_Node_scaleZ(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->scaleZ(param1);
                 instance->scaleZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4491,7 +4491,7 @@ int lua_Node_set(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->set(*param1);
                 instance->set(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4519,7 +4519,7 @@ int lua_Node_set(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->set(*param1, *param2, *param3);
                 instance->set(*param1, *param2, *param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4538,7 +4538,7 @@ int lua_Node_set(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->set(*param1, *param2, *param3);
                 instance->set(*param1, *param2, *param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4570,7 +4570,7 @@ int lua_Node_set(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->set(*param1, *param2, param3, *param4);
                 instance->set(*param1, *param2, param3, *param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4608,7 +4608,7 @@ int lua_Node_setAgent(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setAgent(param1);
                 instance->setAgent(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4650,7 +4650,7 @@ int lua_Node_setAnimationPropertyValue(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4678,7 +4678,7 @@ int lua_Node_setAnimationPropertyValue(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4716,7 +4716,7 @@ int lua_Node_setAudioSource(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setAudioSource(param1);
                 instance->setAudioSource(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4754,7 +4754,7 @@ int lua_Node_setCamera(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setCamera(param1);
                 instance->setCamera(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4964,7 +4964,7 @@ int lua_Node_setForm(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setForm(param1);
                 instance->setForm(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5002,7 +5002,7 @@ int lua_Node_setId(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setId(param1);
                 instance->setId(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5036,7 +5036,7 @@ int lua_Node_setIdentity(lua_State* state)
             {
             {
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setIdentity();
                 instance->setIdentity();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5074,7 +5074,7 @@ int lua_Node_setLight(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setLight(param1);
                 instance->setLight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5112,7 +5112,7 @@ int lua_Node_setModel(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setModel(param1);
                 instance->setModel(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5150,7 +5150,7 @@ int lua_Node_setParticleEmitter(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setParticleEmitter(param1);
                 instance->setParticleEmitter(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5188,7 +5188,7 @@ int lua_Node_setRotation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setRotation(*param1);
                 instance->setRotation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -5199,7 +5199,7 @@ int lua_Node_setRotation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setRotation(*param1);
                 instance->setRotation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5223,7 +5223,7 @@ int lua_Node_setRotation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setRotation(*param1, param2);
                 instance->setRotation(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5255,7 +5255,7 @@ int lua_Node_setRotation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setRotation(param1, param2, param3, param4);
                 instance->setRotation(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5293,7 +5293,7 @@ int lua_Node_setScale(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setScale(param1);
                 instance->setScale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -5304,7 +5304,7 @@ int lua_Node_setScale(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setScale(*param1);
                 instance->setScale(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5332,7 +5332,7 @@ int lua_Node_setScale(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setScale(param1, param2, param3);
                 instance->setScale(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5370,7 +5370,7 @@ int lua_Node_setScaleX(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setScaleX(param1);
                 instance->setScaleX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5408,7 +5408,7 @@ int lua_Node_setScaleY(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setScaleY(param1);
                 instance->setScaleY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5446,7 +5446,7 @@ int lua_Node_setScaleZ(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setScaleZ(param1);
                 instance->setScaleZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5484,7 +5484,7 @@ int lua_Node_setTag(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setTag(param1);
                 instance->setTag(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5508,7 +5508,7 @@ int lua_Node_setTag(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setTag(param1, param2);
                 instance->setTag(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5546,7 +5546,7 @@ int lua_Node_setTranslation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setTranslation(*param1);
                 instance->setTranslation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5574,7 +5574,7 @@ int lua_Node_setTranslation(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setTranslation(param1, param2, param3);
                 instance->setTranslation(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5612,7 +5612,7 @@ int lua_Node_setTranslationX(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setTranslationX(param1);
                 instance->setTranslationX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5650,7 +5650,7 @@ int lua_Node_setTranslationY(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setTranslationY(param1);
                 instance->setTranslationY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -5688,7 +5688,7 @@ int lua_Node_setTranslationZ(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->setTranslationZ(param1);
                 instance->setTranslationZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6052,7 +6052,7 @@ int lua_Node_static_resumeTransformChanged(lua_State* state)
         case 0:
         case 0:
         {
         {
             Node::resumeTransformChanged();
             Node::resumeTransformChanged();
-
+            
             return 0;
             return 0;
             break;
             break;
         }
         }
@@ -6077,7 +6077,7 @@ int lua_Node_static_suspendTransformChanged(lua_State* state)
         case 0:
         case 0:
         {
         {
             Node::suspendTransformChanged();
             Node::suspendTransformChanged();
-
+            
             return 0;
             return 0;
             break;
             break;
         }
         }
@@ -6109,7 +6109,7 @@ int lua_Node_transformPoint(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->transformPoint(param1);
                 instance->transformPoint(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6133,7 +6133,7 @@ int lua_Node_transformPoint(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->transformPoint(*param1, param2);
                 instance->transformPoint(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6171,7 +6171,7 @@ int lua_Node_transformVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->transformVector(param1);
                 instance->transformVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6195,7 +6195,7 @@ int lua_Node_transformVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->transformVector(*param1, param2);
                 instance->transformVector(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6231,7 +6231,7 @@ int lua_Node_transformVector(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->transformVector(param1, param2, param3, param4, param5);
                 instance->transformVector(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6269,7 +6269,7 @@ int lua_Node_translate(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translate(*param1);
                 instance->translate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6297,7 +6297,7 @@ int lua_Node_translate(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translate(param1, param2, param3);
                 instance->translate(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6335,7 +6335,7 @@ int lua_Node_translateForward(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translateForward(param1);
                 instance->translateForward(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6373,7 +6373,7 @@ int lua_Node_translateLeft(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translateLeft(param1);
                 instance->translateLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6419,7 +6419,7 @@ int lua_Node_translateSmooth(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translateSmooth(*param1, param2, param3);
                 instance->translateSmooth(*param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6457,7 +6457,7 @@ int lua_Node_translateUp(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translateUp(param1);
                 instance->translateUp(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6495,7 +6495,7 @@ int lua_Node_translateX(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translateX(param1);
                 instance->translateX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6533,7 +6533,7 @@ int lua_Node_translateY(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translateY(param1);
                 instance->translateY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -6571,7 +6571,7 @@ int lua_Node_translateZ(lua_State* state)
 
 
                 Node* instance = getInstance(state);
                 Node* instance = getInstance(state);
                 instance->translateZ(param1);
                 instance->translateZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 29 - 0
gameplay/src/lua/lua_Platform.cpp

@@ -19,6 +19,7 @@ void luaRegister_Platform()
     };
     };
     const luaL_Reg lua_statics[] = 
     const luaL_Reg lua_statics[] = 
     {
     {
+        {"canExit", lua_Platform_static_canExit},
         {"displayKeyboard", lua_Platform_static_displayKeyboard},
         {"displayKeyboard", lua_Platform_static_displayKeyboard},
         {"getAbsoluteTime", lua_Platform_static_getAbsoluteTime},
         {"getAbsoluteTime", lua_Platform_static_getAbsoluteTime},
         {"getAccelerometerValues", lua_Platform_static_getAccelerometerValues},
         {"getAccelerometerValues", lua_Platform_static_getAccelerometerValues},
@@ -147,6 +148,34 @@ int lua_Platform_enterMessagePump(lua_State* state)
     return 0;
     return 0;
 }
 }
 
 
+int lua_Platform_static_canExit(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 0:
+        {
+            bool result = Platform::canExit();
+
+            // Push the return value onto the stack.
+            lua_pushboolean(state, result);
+
+            return 1;
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 0).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_Platform_static_displayKeyboard(lua_State* state)
 int lua_Platform_static_displayKeyboard(lua_State* state)
 {
 {
     // Get the number of parameters.
     // Get the number of parameters.

+ 1 - 0
gameplay/src/lua/lua_Platform.h

@@ -7,6 +7,7 @@ namespace gameplay
 // Lua bindings for Platform.
 // Lua bindings for Platform.
 int lua_Platform__gc(lua_State* state);
 int lua_Platform__gc(lua_State* state);
 int lua_Platform_enterMessagePump(lua_State* state);
 int lua_Platform_enterMessagePump(lua_State* state);
+int lua_Platform_static_canExit(lua_State* state);
 int lua_Platform_static_displayKeyboard(lua_State* state);
 int lua_Platform_static_displayKeyboard(lua_State* state);
 int lua_Platform_static_getAbsoluteTime(lua_State* state);
 int lua_Platform_static_getAbsoluteTime(lua_State* state);
 int lua_Platform_static_getAccelerometerValues(lua_State* state);
 int lua_Platform_static_getAccelerometerValues(lua_State* state);

+ 58 - 58
gameplay/src/lua/lua_RadioButton.cpp

@@ -24,7 +24,7 @@ namespace gameplay
 
 
 void luaRegister_RadioButton()
 void luaRegister_RadioButton()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_RadioButton_addListener},
         {"addListener", lua_RadioButton_addListener},
         {"addRef", lua_RadioButton_addRef},
         {"addRef", lua_RadioButton_addRef},
@@ -116,7 +116,7 @@ void luaRegister_RadioButton()
         {"setZIndex", lua_RadioButton_setZIndex},
         {"setZIndex", lua_RadioButton_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_RadioButton_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_RadioButton_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_RadioButton_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_RadioButton_static_ANIMATE_POSITION},
@@ -160,7 +160,7 @@ int lua_RadioButton__gc(lua_State* state)
                     RadioButton* instance = (RadioButton*)object->instance;
                     RadioButton* instance = (RadioButton*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -202,7 +202,7 @@ int lua_RadioButton_addListener(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -236,7 +236,7 @@ int lua_RadioButton_addRef(lua_State* state)
             {
             {
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -278,7 +278,7 @@ int lua_RadioButton_addScriptCallback(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -645,7 +645,7 @@ int lua_RadioButton_destroyAnimation(lua_State* state)
             {
             {
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -665,7 +665,7 @@ int lua_RadioButton_destroyAnimation(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -699,7 +699,7 @@ int lua_RadioButton_disable(lua_State* state)
             {
             {
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -733,7 +733,7 @@ int lua_RadioButton_enable(lua_State* state)
             {
             {
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -931,7 +931,7 @@ int lua_RadioButton_getAnimationPropertyValue(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2895,7 +2895,7 @@ int lua_RadioButton_release(lua_State* state)
             {
             {
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2937,7 +2937,7 @@ int lua_RadioButton_removeScriptCallback(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2975,7 +2975,7 @@ int lua_RadioButton_setAlignment(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3017,7 +3017,7 @@ int lua_RadioButton_setAnimationPropertyValue(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3045,7 +3045,7 @@ int lua_RadioButton_setAnimationPropertyValue(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3083,7 +3083,7 @@ int lua_RadioButton_setAutoHeight(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3121,7 +3121,7 @@ int lua_RadioButton_setAutoWidth(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3171,7 +3171,7 @@ int lua_RadioButton_setBorder(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3207,7 +3207,7 @@ int lua_RadioButton_setBorder(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3245,7 +3245,7 @@ int lua_RadioButton_setBounds(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3283,7 +3283,7 @@ int lua_RadioButton_setConsumeInputEvents(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3325,7 +3325,7 @@ int lua_RadioButton_setCursorColor(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3367,7 +3367,7 @@ int lua_RadioButton_setCursorRegion(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3405,7 +3405,7 @@ int lua_RadioButton_setFocusIndex(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3443,7 +3443,7 @@ int lua_RadioButton_setFont(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3467,7 +3467,7 @@ int lua_RadioButton_setFont(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3505,7 +3505,7 @@ int lua_RadioButton_setFontSize(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3529,7 +3529,7 @@ int lua_RadioButton_setFontSize(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3567,7 +3567,7 @@ int lua_RadioButton_setGroupId(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setGroupId(param1);
                 instance->setGroupId(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3605,7 +3605,7 @@ int lua_RadioButton_setHeight(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3647,7 +3647,7 @@ int lua_RadioButton_setImageColor(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3675,7 +3675,7 @@ int lua_RadioButton_setImageColor(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3717,7 +3717,7 @@ int lua_RadioButton_setImageRegion(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3745,7 +3745,7 @@ int lua_RadioButton_setImageRegion(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3787,7 +3787,7 @@ int lua_RadioButton_setImageSize(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setImageSize(param1, param2);
                 instance->setImageSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3837,7 +3837,7 @@ int lua_RadioButton_setMargin(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3875,7 +3875,7 @@ int lua_RadioButton_setOpacity(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3899,7 +3899,7 @@ int lua_RadioButton_setOpacity(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3949,7 +3949,7 @@ int lua_RadioButton_setPadding(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3991,7 +3991,7 @@ int lua_RadioButton_setPosition(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4029,7 +4029,7 @@ int lua_RadioButton_setSelected(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setSelected(param1);
                 instance->setSelected(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4071,7 +4071,7 @@ int lua_RadioButton_setSize(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4109,7 +4109,7 @@ int lua_RadioButton_setSkinColor(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4133,7 +4133,7 @@ int lua_RadioButton_setSkinColor(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4171,7 +4171,7 @@ int lua_RadioButton_setSkinRegion(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4195,7 +4195,7 @@ int lua_RadioButton_setSkinRegion(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4233,7 +4233,7 @@ int lua_RadioButton_setState(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4271,7 +4271,7 @@ int lua_RadioButton_setStyle(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4309,7 +4309,7 @@ int lua_RadioButton_setText(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setText(param1);
                 instance->setText(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4347,7 +4347,7 @@ int lua_RadioButton_setTextAlignment(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4371,7 +4371,7 @@ int lua_RadioButton_setTextAlignment(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4409,7 +4409,7 @@ int lua_RadioButton_setTextColor(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4433,7 +4433,7 @@ int lua_RadioButton_setTextColor(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4471,7 +4471,7 @@ int lua_RadioButton_setTextRightToLeft(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4495,7 +4495,7 @@ int lua_RadioButton_setTextRightToLeft(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4533,7 +4533,7 @@ int lua_RadioButton_setWidth(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4571,7 +4571,7 @@ int lua_RadioButton_setZIndex(lua_State* state)
 
 
                 RadioButton* instance = getInstance(state);
                 RadioButton* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 111 - 1
gameplay/src/lua/lua_RenderTarget.cpp

@@ -14,9 +14,11 @@ void luaRegister_RenderTarget()
     const luaL_Reg lua_members[] = 
     const luaL_Reg lua_members[] = 
     {
     {
         {"addRef", lua_RenderTarget_addRef},
         {"addRef", lua_RenderTarget_addRef},
+        {"getHeight", lua_RenderTarget_getHeight},
         {"getId", lua_RenderTarget_getId},
         {"getId", lua_RenderTarget_getId},
         {"getRefCount", lua_RenderTarget_getRefCount},
         {"getRefCount", lua_RenderTarget_getRefCount},
         {"getTexture", lua_RenderTarget_getTexture},
         {"getTexture", lua_RenderTarget_getTexture},
+        {"getWidth", lua_RenderTarget_getWidth},
         {"release", lua_RenderTarget_release},
         {"release", lua_RenderTarget_release},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
@@ -112,6 +114,43 @@ int lua_RenderTarget_addRef(lua_State* state)
     return 0;
     return 0;
 }
 }
 
 
+int lua_RenderTarget_getHeight(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 1:
+        {
+            if ((lua_type(state, 1) == LUA_TUSERDATA))
+            {
+                RenderTarget* instance = getInstance(state);
+                unsigned int result = instance->getHeight();
+
+                // Push the return value onto the stack.
+                lua_pushunsigned(state, result);
+
+                return 1;
+            }
+            else
+            {
+                lua_pushstring(state, "lua_RenderTarget_getHeight - Failed to match the given parameters to a valid function signature.");
+                lua_error(state);
+            }
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 1).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_RenderTarget_getId(lua_State* state)
 int lua_RenderTarget_getId(lua_State* state)
 {
 {
     // Get the number of parameters.
     // Get the number of parameters.
@@ -232,6 +271,43 @@ int lua_RenderTarget_getTexture(lua_State* state)
     return 0;
     return 0;
 }
 }
 
 
+int lua_RenderTarget_getWidth(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 1:
+        {
+            if ((lua_type(state, 1) == LUA_TUSERDATA))
+            {
+                RenderTarget* instance = getInstance(state);
+                unsigned int result = instance->getWidth();
+
+                // Push the return value onto the stack.
+                lua_pushunsigned(state, result);
+
+                return 1;
+            }
+            else
+            {
+                lua_pushstring(state, "lua_RenderTarget_getWidth - Failed to match the given parameters to a valid function signature.");
+                lua_error(state);
+            }
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 1).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_RenderTarget_release(lua_State* state)
 int lua_RenderTarget_release(lua_State* state)
 {
 {
     // Get the number of parameters.
     // Get the number of parameters.
@@ -274,6 +350,40 @@ int lua_RenderTarget_static_create(lua_State* state)
     // Attempt to match the parameters to a valid binding.
     // Attempt to match the parameters to a valid binding.
     switch (paramCount)
     switch (paramCount)
     {
     {
+        case 2:
+        {
+            if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL) &&
+                (lua_type(state, 2) == LUA_TUSERDATA || lua_type(state, 2) == LUA_TTABLE || lua_type(state, 2) == LUA_TNIL))
+            {
+                // Get parameter 1 off the stack.
+                ScriptUtil::LuaArray<const char> param1 = ScriptUtil::getString(1, false);
+
+                // Get parameter 2 off the stack.
+                ScriptUtil::LuaArray<Texture> param2 = ScriptUtil::getObjectPointer<Texture>(2, "Texture", false);
+
+                void* returnPtr = (void*)RenderTarget::create(param1, param2);
+                if (returnPtr)
+                {
+                    ScriptUtil::LuaObject* object = (ScriptUtil::LuaObject*)lua_newuserdata(state, sizeof(ScriptUtil::LuaObject));
+                    object->instance = returnPtr;
+                    object->owns = true;
+                    luaL_getmetatable(state, "RenderTarget");
+                    lua_setmetatable(state, -2);
+                }
+                else
+                {
+                    lua_pushnil(state);
+                }
+
+                return 1;
+            }
+            else
+            {
+                lua_pushstring(state, "lua_RenderTarget_static_create - Failed to match the given parameters to a valid function signature.");
+                lua_error(state);
+            }
+            break;
+        }
         case 3:
         case 3:
         {
         {
             if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL) &&
             if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL) &&
@@ -314,7 +424,7 @@ int lua_RenderTarget_static_create(lua_State* state)
         }
         }
         default:
         default:
         {
         {
-            lua_pushstring(state, "Invalid number of parameters (expected 3).");
+            lua_pushstring(state, "Invalid number of parameters (expected 2 or 3).");
             lua_error(state);
             lua_error(state);
             break;
             break;
         }
         }

+ 2 - 0
gameplay/src/lua/lua_RenderTarget.h

@@ -7,9 +7,11 @@ namespace gameplay
 // Lua bindings for RenderTarget.
 // Lua bindings for RenderTarget.
 int lua_RenderTarget__gc(lua_State* state);
 int lua_RenderTarget__gc(lua_State* state);
 int lua_RenderTarget_addRef(lua_State* state);
 int lua_RenderTarget_addRef(lua_State* state);
+int lua_RenderTarget_getHeight(lua_State* state);
 int lua_RenderTarget_getId(lua_State* state);
 int lua_RenderTarget_getId(lua_State* state);
 int lua_RenderTarget_getRefCount(lua_State* state);
 int lua_RenderTarget_getRefCount(lua_State* state);
 int lua_RenderTarget_getTexture(lua_State* state);
 int lua_RenderTarget_getTexture(lua_State* state);
+int lua_RenderTarget_getWidth(lua_State* state);
 int lua_RenderTarget_release(lua_State* state);
 int lua_RenderTarget_release(lua_State* state);
 int lua_RenderTarget_static_create(lua_State* state);
 int lua_RenderTarget_static_create(lua_State* state);
 int lua_RenderTarget_static_getRenderTarget(lua_State* state);
 int lua_RenderTarget_static_getRenderTarget(lua_State* state);

+ 59 - 59
gameplay/src/lua/lua_Slider.cpp

@@ -23,7 +23,7 @@ namespace gameplay
 
 
 void luaRegister_Slider()
 void luaRegister_Slider()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_Slider_addListener},
         {"addListener", lua_Slider_addListener},
         {"addRef", lua_Slider_addRef},
         {"addRef", lua_Slider_addRef},
@@ -117,7 +117,7 @@ void luaRegister_Slider()
         {"setZIndex", lua_Slider_setZIndex},
         {"setZIndex", lua_Slider_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_Slider_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_Slider_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_Slider_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_Slider_static_ANIMATE_POSITION},
@@ -161,7 +161,7 @@ int lua_Slider__gc(lua_State* state)
                     Slider* instance = (Slider*)object->instance;
                     Slider* instance = (Slider*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -203,7 +203,7 @@ int lua_Slider_addListener(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -237,7 +237,7 @@ int lua_Slider_addRef(lua_State* state)
             {
             {
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -279,7 +279,7 @@ int lua_Slider_addScriptCallback(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -646,7 +646,7 @@ int lua_Slider_destroyAnimation(lua_State* state)
             {
             {
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -666,7 +666,7 @@ int lua_Slider_destroyAnimation(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -700,7 +700,7 @@ int lua_Slider_disable(lua_State* state)
             {
             {
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -734,7 +734,7 @@ int lua_Slider_enable(lua_State* state)
             {
             {
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -932,7 +932,7 @@ int lua_Slider_getAnimationPropertyValue(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2924,7 +2924,7 @@ int lua_Slider_release(lua_State* state)
             {
             {
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2966,7 +2966,7 @@ int lua_Slider_removeScriptCallback(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3004,7 +3004,7 @@ int lua_Slider_setAlignment(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3046,7 +3046,7 @@ int lua_Slider_setAnimationPropertyValue(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3074,7 +3074,7 @@ int lua_Slider_setAnimationPropertyValue(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3112,7 +3112,7 @@ int lua_Slider_setAutoHeight(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3150,7 +3150,7 @@ int lua_Slider_setAutoWidth(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3200,7 +3200,7 @@ int lua_Slider_setBorder(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3236,7 +3236,7 @@ int lua_Slider_setBorder(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3274,7 +3274,7 @@ int lua_Slider_setBounds(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3312,7 +3312,7 @@ int lua_Slider_setConsumeInputEvents(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3354,7 +3354,7 @@ int lua_Slider_setCursorColor(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3396,7 +3396,7 @@ int lua_Slider_setCursorRegion(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3434,7 +3434,7 @@ int lua_Slider_setFocusIndex(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3472,7 +3472,7 @@ int lua_Slider_setFont(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3496,7 +3496,7 @@ int lua_Slider_setFont(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3534,7 +3534,7 @@ int lua_Slider_setFontSize(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3558,7 +3558,7 @@ int lua_Slider_setFontSize(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3596,7 +3596,7 @@ int lua_Slider_setHeight(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3638,7 +3638,7 @@ int lua_Slider_setImageColor(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3666,7 +3666,7 @@ int lua_Slider_setImageColor(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3708,7 +3708,7 @@ int lua_Slider_setImageRegion(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3736,7 +3736,7 @@ int lua_Slider_setImageRegion(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3786,7 +3786,7 @@ int lua_Slider_setMargin(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3824,7 +3824,7 @@ int lua_Slider_setMax(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setMax(param1);
                 instance->setMax(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3862,7 +3862,7 @@ int lua_Slider_setMin(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setMin(param1);
                 instance->setMin(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3900,7 +3900,7 @@ int lua_Slider_setOpacity(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3924,7 +3924,7 @@ int lua_Slider_setOpacity(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3974,7 +3974,7 @@ int lua_Slider_setPadding(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4016,7 +4016,7 @@ int lua_Slider_setPosition(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4058,7 +4058,7 @@ int lua_Slider_setSize(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4096,7 +4096,7 @@ int lua_Slider_setSkinColor(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4120,7 +4120,7 @@ int lua_Slider_setSkinColor(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4158,7 +4158,7 @@ int lua_Slider_setSkinRegion(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4182,7 +4182,7 @@ int lua_Slider_setSkinRegion(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4220,7 +4220,7 @@ int lua_Slider_setState(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4258,7 +4258,7 @@ int lua_Slider_setStep(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setStep(param1);
                 instance->setStep(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4296,7 +4296,7 @@ int lua_Slider_setStyle(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4334,7 +4334,7 @@ int lua_Slider_setText(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setText(param1);
                 instance->setText(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4372,7 +4372,7 @@ int lua_Slider_setTextAlignment(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4396,7 +4396,7 @@ int lua_Slider_setTextAlignment(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4434,7 +4434,7 @@ int lua_Slider_setTextColor(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4458,7 +4458,7 @@ int lua_Slider_setTextColor(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4496,7 +4496,7 @@ int lua_Slider_setTextRightToLeft(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4520,7 +4520,7 @@ int lua_Slider_setTextRightToLeft(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4558,7 +4558,7 @@ int lua_Slider_setValue(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setValue(param1);
                 instance->setValue(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4596,7 +4596,7 @@ int lua_Slider_setWidth(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4634,7 +4634,7 @@ int lua_Slider_setZIndex(lua_State* state)
 
 
                 Slider* instance = getInstance(state);
                 Slider* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 55 - 55
gameplay/src/lua/lua_TextBox.cpp

@@ -23,7 +23,7 @@ namespace gameplay
 
 
 void luaRegister_TextBox()
 void luaRegister_TextBox()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_TextBox_addListener},
         {"addListener", lua_TextBox_addListener},
         {"addRef", lua_TextBox_addRef},
         {"addRef", lua_TextBox_addRef},
@@ -110,7 +110,7 @@ void luaRegister_TextBox()
         {"setZIndex", lua_TextBox_setZIndex},
         {"setZIndex", lua_TextBox_setZIndex},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_OPACITY", lua_TextBox_static_ANIMATE_OPACITY},
         {"ANIMATE_OPACITY", lua_TextBox_static_ANIMATE_OPACITY},
         {"ANIMATE_POSITION", lua_TextBox_static_ANIMATE_POSITION},
         {"ANIMATE_POSITION", lua_TextBox_static_ANIMATE_POSITION},
@@ -154,7 +154,7 @@ int lua_TextBox__gc(lua_State* state)
                     TextBox* instance = (TextBox*)object->instance;
                     TextBox* instance = (TextBox*)object->instance;
                     SAFE_RELEASE(instance);
                     SAFE_RELEASE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -196,7 +196,7 @@ int lua_TextBox_addListener(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -230,7 +230,7 @@ int lua_TextBox_addRef(lua_State* state)
             {
             {
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->addRef();
                 instance->addRef();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -272,7 +272,7 @@ int lua_TextBox_addScriptCallback(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -639,7 +639,7 @@ int lua_TextBox_destroyAnimation(lua_State* state)
             {
             {
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -659,7 +659,7 @@ int lua_TextBox_destroyAnimation(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -693,7 +693,7 @@ int lua_TextBox_disable(lua_State* state)
             {
             {
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->disable();
                 instance->disable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -727,7 +727,7 @@ int lua_TextBox_enable(lua_State* state)
             {
             {
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->enable();
                 instance->enable();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -925,7 +925,7 @@ int lua_TextBox_getAnimationPropertyValue(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2806,7 +2806,7 @@ int lua_TextBox_release(lua_State* state)
             {
             {
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->release();
                 instance->release();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2848,7 +2848,7 @@ int lua_TextBox_removeScriptCallback(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2886,7 +2886,7 @@ int lua_TextBox_setAlignment(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setAlignment(param1);
                 instance->setAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2928,7 +2928,7 @@ int lua_TextBox_setAnimationPropertyValue(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2956,7 +2956,7 @@ int lua_TextBox_setAnimationPropertyValue(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2994,7 +2994,7 @@ int lua_TextBox_setAutoHeight(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setAutoHeight(param1);
                 instance->setAutoHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3032,7 +3032,7 @@ int lua_TextBox_setAutoWidth(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setAutoWidth(param1);
                 instance->setAutoWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3082,7 +3082,7 @@ int lua_TextBox_setBorder(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4);
                 instance->setBorder(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3118,7 +3118,7 @@ int lua_TextBox_setBorder(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setBorder(param1, param2, param3, param4, param5);
                 instance->setBorder(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3156,7 +3156,7 @@ int lua_TextBox_setBounds(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setBounds(*param1);
                 instance->setBounds(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3194,7 +3194,7 @@ int lua_TextBox_setConsumeInputEvents(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setConsumeInputEvents(param1);
                 instance->setConsumeInputEvents(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3236,7 +3236,7 @@ int lua_TextBox_setCursorColor(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setCursorColor(*param1, param2);
                 instance->setCursorColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3278,7 +3278,7 @@ int lua_TextBox_setCursorRegion(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setCursorRegion(*param1, param2);
                 instance->setCursorRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3316,7 +3316,7 @@ int lua_TextBox_setFocusIndex(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setFocusIndex(param1);
                 instance->setFocusIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3354,7 +3354,7 @@ int lua_TextBox_setFont(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setFont(param1);
                 instance->setFont(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3378,7 +3378,7 @@ int lua_TextBox_setFont(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setFont(param1, param2);
                 instance->setFont(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3416,7 +3416,7 @@ int lua_TextBox_setFontSize(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setFontSize(param1);
                 instance->setFontSize(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3440,7 +3440,7 @@ int lua_TextBox_setFontSize(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setFontSize(param1, param2);
                 instance->setFontSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3478,7 +3478,7 @@ int lua_TextBox_setHeight(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setHeight(param1);
                 instance->setHeight(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3520,7 +3520,7 @@ int lua_TextBox_setImageColor(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setImageColor(param1, *param2);
                 instance->setImageColor(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3548,7 +3548,7 @@ int lua_TextBox_setImageColor(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setImageColor(param1, *param2, param3);
                 instance->setImageColor(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3590,7 +3590,7 @@ int lua_TextBox_setImageRegion(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2);
                 instance->setImageRegion(param1, *param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3618,7 +3618,7 @@ int lua_TextBox_setImageRegion(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setImageRegion(param1, *param2, param3);
                 instance->setImageRegion(param1, *param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3668,7 +3668,7 @@ int lua_TextBox_setMargin(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setMargin(param1, param2, param3, param4);
                 instance->setMargin(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3706,7 +3706,7 @@ int lua_TextBox_setOpacity(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setOpacity(param1);
                 instance->setOpacity(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3730,7 +3730,7 @@ int lua_TextBox_setOpacity(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setOpacity(param1, param2);
                 instance->setOpacity(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3780,7 +3780,7 @@ int lua_TextBox_setPadding(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setPadding(param1, param2, param3, param4);
                 instance->setPadding(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3822,7 +3822,7 @@ int lua_TextBox_setPosition(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setPosition(param1, param2);
                 instance->setPosition(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3864,7 +3864,7 @@ int lua_TextBox_setSize(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setSize(param1, param2);
                 instance->setSize(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3902,7 +3902,7 @@ int lua_TextBox_setSkinColor(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setSkinColor(*param1);
                 instance->setSkinColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3926,7 +3926,7 @@ int lua_TextBox_setSkinColor(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setSkinColor(*param1, param2);
                 instance->setSkinColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3964,7 +3964,7 @@ int lua_TextBox_setSkinRegion(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setSkinRegion(*param1);
                 instance->setSkinRegion(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3988,7 +3988,7 @@ int lua_TextBox_setSkinRegion(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setSkinRegion(*param1, param2);
                 instance->setSkinRegion(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4026,7 +4026,7 @@ int lua_TextBox_setState(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setState(param1);
                 instance->setState(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4064,7 +4064,7 @@ int lua_TextBox_setStyle(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setStyle(param1);
                 instance->setStyle(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4102,7 +4102,7 @@ int lua_TextBox_setText(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setText(param1);
                 instance->setText(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4140,7 +4140,7 @@ int lua_TextBox_setTextAlignment(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setTextAlignment(param1);
                 instance->setTextAlignment(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4164,7 +4164,7 @@ int lua_TextBox_setTextAlignment(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setTextAlignment(param1, param2);
                 instance->setTextAlignment(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4202,7 +4202,7 @@ int lua_TextBox_setTextColor(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setTextColor(*param1);
                 instance->setTextColor(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4226,7 +4226,7 @@ int lua_TextBox_setTextColor(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setTextColor(*param1, param2);
                 instance->setTextColor(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4264,7 +4264,7 @@ int lua_TextBox_setTextRightToLeft(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setTextRightToLeft(param1);
                 instance->setTextRightToLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4288,7 +4288,7 @@ int lua_TextBox_setTextRightToLeft(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setTextRightToLeft(param1, param2);
                 instance->setTextRightToLeft(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4326,7 +4326,7 @@ int lua_TextBox_setWidth(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setWidth(param1);
                 instance->setWidth(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -4364,7 +4364,7 @@ int lua_TextBox_setZIndex(lua_State* state)
 
 
                 TextBox* instance = getInstance(state);
                 TextBox* instance = getInstance(state);
                 instance->setZIndex(param1);
                 instance->setZIndex(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else

+ 72 - 1
gameplay/src/lua/lua_Texture.cpp

@@ -661,6 +661,44 @@ int lua_Texture_static_create(lua_State* state)
             }
             }
             break;
             break;
         }
         }
+        case 3:
+        {
+            if ((lua_type(state, 1) == LUA_TUSERDATA || lua_type(state, 1) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
+                lua_type(state, 3) == LUA_TNUMBER)
+            {
+                // Get parameter 1 off the stack.
+                ScriptUtil::LuaArray<GLuint> param1 = ScriptUtil::getObjectPointer<GLuint>(1, "GLuint", true);
+
+                // Get parameter 2 off the stack.
+                int param2 = (int)luaL_checkint(state, 2);
+
+                // Get parameter 3 off the stack.
+                int param3 = (int)luaL_checkint(state, 3);
+
+                void* returnPtr = (void*)Texture::create(*param1, param2, param3);
+                if (returnPtr)
+                {
+                    ScriptUtil::LuaObject* object = (ScriptUtil::LuaObject*)lua_newuserdata(state, sizeof(ScriptUtil::LuaObject));
+                    object->instance = returnPtr;
+                    object->owns = true;
+                    luaL_getmetatable(state, "Texture");
+                    lua_setmetatable(state, -2);
+                }
+                else
+                {
+                    lua_pushnil(state);
+                }
+
+                return 1;
+            }
+            else
+            {
+                lua_pushstring(state, "lua_Texture_static_create - Failed to match the given parameters to a valid function signature.");
+                lua_error(state);
+            }
+            break;
+        }
         case 4:
         case 4:
         {
         {
             if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL) &&
             if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL) &&
@@ -696,6 +734,39 @@ int lua_Texture_static_create(lua_State* state)
 
 
                 return 1;
                 return 1;
             }
             }
+            else if ((lua_type(state, 1) == LUA_TUSERDATA || lua_type(state, 1) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
+                lua_type(state, 3) == LUA_TNUMBER &&
+                (lua_type(state, 4) == LUA_TSTRING || lua_type(state, 4) == LUA_TNIL))
+            {
+                // Get parameter 1 off the stack.
+                ScriptUtil::LuaArray<GLuint> param1 = ScriptUtil::getObjectPointer<GLuint>(1, "GLuint", true);
+
+                // Get parameter 2 off the stack.
+                int param2 = (int)luaL_checkint(state, 2);
+
+                // Get parameter 3 off the stack.
+                int param3 = (int)luaL_checkint(state, 3);
+
+                // Get parameter 4 off the stack.
+                Texture::Format param4 = (Texture::Format)lua_enumFromString_TextureFormat(luaL_checkstring(state, 4));
+
+                void* returnPtr = (void*)Texture::create(*param1, param2, param3, param4);
+                if (returnPtr)
+                {
+                    ScriptUtil::LuaObject* object = (ScriptUtil::LuaObject*)lua_newuserdata(state, sizeof(ScriptUtil::LuaObject));
+                    object->instance = returnPtr;
+                    object->owns = true;
+                    luaL_getmetatable(state, "Texture");
+                    lua_setmetatable(state, -2);
+                }
+                else
+                {
+                    lua_pushnil(state);
+                }
+
+                return 1;
+            }
             else
             else
             {
             {
                 lua_pushstring(state, "lua_Texture_static_create - Failed to match the given parameters to a valid function signature.");
                 lua_pushstring(state, "lua_Texture_static_create - Failed to match the given parameters to a valid function signature.");
@@ -751,7 +822,7 @@ int lua_Texture_static_create(lua_State* state)
         }
         }
         default:
         default:
         {
         {
-            lua_pushstring(state, "Invalid number of parameters (expected 1, 2, 4 or 5).");
+            lua_pushstring(state, "Invalid number of parameters (expected 1, 2, 3, 4 or 5).");
             lua_error(state);
             lua_error(state);
             break;
             break;
         }
         }

+ 6 - 1
gameplay/src/lua/lua_TextureFormat.cpp

@@ -6,12 +6,15 @@ namespace gameplay
 
 
 static const char* enumStringEmpty = "";
 static const char* enumStringEmpty = "";
 
 
+static const char* luaEnumString_TextureFormat_UNKNOWN = "UNKNOWN";
 static const char* luaEnumString_TextureFormat_RGB = "RGB";
 static const char* luaEnumString_TextureFormat_RGB = "RGB";
 static const char* luaEnumString_TextureFormat_RGBA = "RGBA";
 static const char* luaEnumString_TextureFormat_RGBA = "RGBA";
 static const char* luaEnumString_TextureFormat_ALPHA = "ALPHA";
 static const char* luaEnumString_TextureFormat_ALPHA = "ALPHA";
 
 
 Texture::Format lua_enumFromString_TextureFormat(const char* s)
 Texture::Format lua_enumFromString_TextureFormat(const char* s)
 {
 {
+    if (strcmp(s, luaEnumString_TextureFormat_UNKNOWN) == 0)
+        return Texture::UNKNOWN;
     if (strcmp(s, luaEnumString_TextureFormat_RGB) == 0)
     if (strcmp(s, luaEnumString_TextureFormat_RGB) == 0)
         return Texture::RGB;
         return Texture::RGB;
     if (strcmp(s, luaEnumString_TextureFormat_RGBA) == 0)
     if (strcmp(s, luaEnumString_TextureFormat_RGBA) == 0)
@@ -19,11 +22,13 @@ Texture::Format lua_enumFromString_TextureFormat(const char* s)
     if (strcmp(s, luaEnumString_TextureFormat_ALPHA) == 0)
     if (strcmp(s, luaEnumString_TextureFormat_ALPHA) == 0)
         return Texture::ALPHA;
         return Texture::ALPHA;
     GP_ERROR("Invalid enumeration value '%s' for enumeration Texture::Format.", s);
     GP_ERROR("Invalid enumeration value '%s' for enumeration Texture::Format.", s);
-    return Texture::RGB;
+    return Texture::UNKNOWN;
 }
 }
 
 
 const char* lua_stringFromEnum_TextureFormat(Texture::Format e)
 const char* lua_stringFromEnum_TextureFormat(Texture::Format e)
 {
 {
+    if (e == Texture::UNKNOWN)
+        return luaEnumString_TextureFormat_UNKNOWN;
     if (e == Texture::RGB)
     if (e == Texture::RGB)
         return luaEnumString_TextureFormat_RGB;
         return luaEnumString_TextureFormat_RGB;
     if (e == Texture::RGBA)
     if (e == Texture::RGBA)

+ 72 - 72
gameplay/src/lua/lua_Transform.cpp

@@ -16,7 +16,7 @@ namespace gameplay
 
 
 void luaRegister_Transform()
 void luaRegister_Transform()
 {
 {
-    const luaL_Reg lua_members[] =
+    const luaL_Reg lua_members[] = 
     {
     {
         {"addListener", lua_Transform_addListener},
         {"addListener", lua_Transform_addListener},
         {"addScriptCallback", lua_Transform_addScriptCallback},
         {"addScriptCallback", lua_Transform_addScriptCallback},
@@ -77,7 +77,7 @@ void luaRegister_Transform()
         {"translateZ", lua_Transform_translateZ},
         {"translateZ", lua_Transform_translateZ},
         {NULL, NULL}
         {NULL, NULL}
     };
     };
-    const luaL_Reg lua_statics[] =
+    const luaL_Reg lua_statics[] = 
     {
     {
         {"ANIMATE_ROTATE", lua_Transform_static_ANIMATE_ROTATE},
         {"ANIMATE_ROTATE", lua_Transform_static_ANIMATE_ROTATE},
         {"ANIMATE_ROTATE_TRANSLATE", lua_Transform_static_ANIMATE_ROTATE_TRANSLATE},
         {"ANIMATE_ROTATE_TRANSLATE", lua_Transform_static_ANIMATE_ROTATE_TRANSLATE},
@@ -130,7 +130,7 @@ int lua_Transform__gc(lua_State* state)
                     Transform* instance = (Transform*)object->instance;
                     Transform* instance = (Transform*)object->instance;
                     SAFE_DELETE(instance);
                     SAFE_DELETE(instance);
                 }
                 }
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -302,7 +302,7 @@ int lua_Transform_addListener(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->addListener(param1);
                 instance->addListener(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -326,7 +326,7 @@ int lua_Transform_addListener(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->addListener(param1, param2);
                 instance->addListener(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -368,7 +368,7 @@ int lua_Transform_addScriptCallback(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->addScriptCallback(param1, param2);
                 instance->addScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -735,7 +735,7 @@ int lua_Transform_destroyAnimation(lua_State* state)
             {
             {
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->destroyAnimation();
                 instance->destroyAnimation();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -755,7 +755,7 @@ int lua_Transform_destroyAnimation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->destroyAnimation(param1);
                 instance->destroyAnimation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -916,7 +916,7 @@ int lua_Transform_getAnimationPropertyValue(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getAnimationPropertyValue(param1, param2);
                 instance->getAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -982,7 +982,7 @@ int lua_Transform_getBackVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getBackVector(param1);
                 instance->getBackVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1048,7 +1048,7 @@ int lua_Transform_getDownVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getDownVector(param1);
                 instance->getDownVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1114,7 +1114,7 @@ int lua_Transform_getForwardVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getForwardVector(param1);
                 instance->getForwardVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1180,7 +1180,7 @@ int lua_Transform_getLeftVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getLeftVector(param1);
                 instance->getLeftVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1292,7 +1292,7 @@ int lua_Transform_getRightVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getRightVector(param1);
                 instance->getRightVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1358,7 +1358,7 @@ int lua_Transform_getRotation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getRotation(param1);
                 instance->getRotation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1369,7 +1369,7 @@ int lua_Transform_getRotation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getRotation(param1);
                 instance->getRotation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1449,7 +1449,7 @@ int lua_Transform_getScale(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getScale(param1);
                 instance->getScale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1626,7 +1626,7 @@ int lua_Transform_getTranslation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getTranslation(param1);
                 instance->getTranslation(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1803,7 +1803,7 @@ int lua_Transform_getUpVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->getUpVector(param1);
                 instance->getUpVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1841,7 +1841,7 @@ int lua_Transform_removeListener(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->removeListener(param1);
                 instance->removeListener(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1883,7 +1883,7 @@ int lua_Transform_removeScriptCallback(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->removeScriptCallback(param1, param2);
                 instance->removeScriptCallback(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1921,7 +1921,7 @@ int lua_Transform_rotate(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->rotate(*param1);
                 instance->rotate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1932,7 +1932,7 @@ int lua_Transform_rotate(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->rotate(*param1);
                 instance->rotate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1956,7 +1956,7 @@ int lua_Transform_rotate(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->rotate(*param1, param2);
                 instance->rotate(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -1988,7 +1988,7 @@ int lua_Transform_rotate(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->rotate(param1, param2, param3, param4);
                 instance->rotate(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2026,7 +2026,7 @@ int lua_Transform_rotateX(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->rotateX(param1);
                 instance->rotateX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2064,7 +2064,7 @@ int lua_Transform_rotateY(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->rotateY(param1);
                 instance->rotateY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2102,7 +2102,7 @@ int lua_Transform_rotateZ(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->rotateZ(param1);
                 instance->rotateZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2140,7 +2140,7 @@ int lua_Transform_scale(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->scale(param1);
                 instance->scale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2151,7 +2151,7 @@ int lua_Transform_scale(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->scale(*param1);
                 instance->scale(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2179,7 +2179,7 @@ int lua_Transform_scale(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->scale(param1, param2, param3);
                 instance->scale(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2217,7 +2217,7 @@ int lua_Transform_scaleX(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->scaleX(param1);
                 instance->scaleX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2255,7 +2255,7 @@ int lua_Transform_scaleY(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->scaleY(param1);
                 instance->scaleY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2293,7 +2293,7 @@ int lua_Transform_scaleZ(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->scaleZ(param1);
                 instance->scaleZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2331,7 +2331,7 @@ int lua_Transform_set(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->set(*param1);
                 instance->set(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2359,7 +2359,7 @@ int lua_Transform_set(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->set(*param1, *param2, *param3);
                 instance->set(*param1, *param2, *param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2378,7 +2378,7 @@ int lua_Transform_set(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->set(*param1, *param2, *param3);
                 instance->set(*param1, *param2, *param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2410,7 +2410,7 @@ int lua_Transform_set(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->set(*param1, *param2, param3, *param4);
                 instance->set(*param1, *param2, param3, *param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2452,7 +2452,7 @@ int lua_Transform_setAnimationPropertyValue(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2);
                 instance->setAnimationPropertyValue(param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2480,7 +2480,7 @@ int lua_Transform_setAnimationPropertyValue(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setAnimationPropertyValue(param1, param2, param3);
                 instance->setAnimationPropertyValue(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2514,7 +2514,7 @@ int lua_Transform_setIdentity(lua_State* state)
             {
             {
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setIdentity();
                 instance->setIdentity();
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2552,7 +2552,7 @@ int lua_Transform_setRotation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setRotation(*param1);
                 instance->setRotation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2563,7 +2563,7 @@ int lua_Transform_setRotation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setRotation(*param1);
                 instance->setRotation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2587,7 +2587,7 @@ int lua_Transform_setRotation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setRotation(*param1, param2);
                 instance->setRotation(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2619,7 +2619,7 @@ int lua_Transform_setRotation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setRotation(param1, param2, param3, param4);
                 instance->setRotation(param1, param2, param3, param4);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2657,7 +2657,7 @@ int lua_Transform_setScale(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setScale(param1);
                 instance->setScale(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
             else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2668,7 +2668,7 @@ int lua_Transform_setScale(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setScale(*param1);
                 instance->setScale(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2696,7 +2696,7 @@ int lua_Transform_setScale(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setScale(param1, param2, param3);
                 instance->setScale(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2734,7 +2734,7 @@ int lua_Transform_setScaleX(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setScaleX(param1);
                 instance->setScaleX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2772,7 +2772,7 @@ int lua_Transform_setScaleY(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setScaleY(param1);
                 instance->setScaleY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2810,7 +2810,7 @@ int lua_Transform_setScaleZ(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setScaleZ(param1);
                 instance->setScaleZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2848,7 +2848,7 @@ int lua_Transform_setTranslation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setTranslation(*param1);
                 instance->setTranslation(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2876,7 +2876,7 @@ int lua_Transform_setTranslation(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setTranslation(param1, param2, param3);
                 instance->setTranslation(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2914,7 +2914,7 @@ int lua_Transform_setTranslationX(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setTranslationX(param1);
                 instance->setTranslationX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2952,7 +2952,7 @@ int lua_Transform_setTranslationY(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setTranslationY(param1);
                 instance->setTranslationY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -2990,7 +2990,7 @@ int lua_Transform_setTranslationZ(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->setTranslationZ(param1);
                 instance->setTranslationZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3287,7 +3287,7 @@ int lua_Transform_static_resumeTransformChanged(lua_State* state)
         case 0:
         case 0:
         {
         {
             Transform::resumeTransformChanged();
             Transform::resumeTransformChanged();
-
+            
             return 0;
             return 0;
             break;
             break;
         }
         }
@@ -3312,7 +3312,7 @@ int lua_Transform_static_suspendTransformChanged(lua_State* state)
         case 0:
         case 0:
         {
         {
             Transform::suspendTransformChanged();
             Transform::suspendTransformChanged();
-
+            
             return 0;
             return 0;
             break;
             break;
         }
         }
@@ -3344,7 +3344,7 @@ int lua_Transform_transformPoint(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->transformPoint(param1);
                 instance->transformPoint(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3368,7 +3368,7 @@ int lua_Transform_transformPoint(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->transformPoint(*param1, param2);
                 instance->transformPoint(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3406,7 +3406,7 @@ int lua_Transform_transformVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->transformVector(param1);
                 instance->transformVector(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3430,7 +3430,7 @@ int lua_Transform_transformVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->transformVector(*param1, param2);
                 instance->transformVector(*param1, param2);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3466,7 +3466,7 @@ int lua_Transform_transformVector(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->transformVector(param1, param2, param3, param4, param5);
                 instance->transformVector(param1, param2, param3, param4, param5);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3504,7 +3504,7 @@ int lua_Transform_translate(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translate(*param1);
                 instance->translate(*param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3532,7 +3532,7 @@ int lua_Transform_translate(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translate(param1, param2, param3);
                 instance->translate(param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3570,7 +3570,7 @@ int lua_Transform_translateForward(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translateForward(param1);
                 instance->translateForward(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3608,7 +3608,7 @@ int lua_Transform_translateLeft(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translateLeft(param1);
                 instance->translateLeft(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3654,7 +3654,7 @@ int lua_Transform_translateSmooth(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translateSmooth(*param1, param2, param3);
                 instance->translateSmooth(*param1, param2, param3);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3692,7 +3692,7 @@ int lua_Transform_translateUp(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translateUp(param1);
                 instance->translateUp(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3730,7 +3730,7 @@ int lua_Transform_translateX(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translateX(param1);
                 instance->translateX(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3768,7 +3768,7 @@ int lua_Transform_translateY(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translateY(param1);
                 instance->translateY(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else
@@ -3806,7 +3806,7 @@ int lua_Transform_translateZ(lua_State* state)
 
 
                 Transform* instance = getInstance(state);
                 Transform* instance = getInstance(state);
                 instance->translateZ(param1);
                 instance->translateZ(param1);
-
+                
                 return 0;
                 return 0;
             }
             }
             else
             else