Changed Lua enum bindings to use integers instead of strings. This not only increased performance for enums, but it fixed some scripting bugs anf removed a large number of generated script binding source files.

Continued work for supporting sandboxed Lua scripts.

gameplay/gameplay.vcxproj

@@ -67,7 +67,6 @@
     <ClCompile Include="src\lua\lua_AIAgentListener.cpp" />
     <ClCompile Include="src\lua\lua_AIController.cpp" />
     <ClCompile Include="src\lua\lua_AIMessage.cpp" />
-    <ClCompile Include="src\lua\lua_AIMessageParameterType.cpp" />
     <ClCompile Include="src\lua\lua_AIState.cpp" />
     <ClCompile Include="src\lua\lua_AIStateListener.cpp" />
     <ClCompile Include="src\lua\lua_AIStateMachine.cpp" />
@@ -75,7 +74,6 @@
     <ClCompile Include="src\lua\lua_Animation.cpp" />
     <ClCompile Include="src\lua\lua_AnimationClip.cpp" />
     <ClCompile Include="src\lua\lua_AnimationClipListener.cpp" />
-    <ClCompile Include="src\lua\lua_AnimationClipListenerEventType.cpp" />
     <ClCompile Include="src\lua\lua_AnimationController.cpp" />
     <ClCompile Include="src\lua\lua_AnimationTarget.cpp" />
     <ClCompile Include="src\lua\lua_AnimationValue.cpp" />
@@ -83,98 +81,65 @@
     <ClCompile Include="src\lua\lua_AudioController.cpp" />
     <ClCompile Include="src\lua\lua_AudioListener.cpp" />
     <ClCompile Include="src\lua\lua_AudioSource.cpp" />
-    <ClCompile Include="src\lua\lua_AudioSourceState.cpp" />
     <ClCompile Include="src\lua\lua_BoundingBox.cpp" />
     <ClCompile Include="src\lua\lua_BoundingSphere.cpp" />
     <ClCompile Include="src\lua\lua_Bundle.cpp" />
     <ClCompile Include="src\lua\lua_Button.cpp" />
     <ClCompile Include="src\lua\lua_Camera.cpp" />
     <ClCompile Include="src\lua\lua_CameraListener.cpp" />
-    <ClCompile Include="src\lua\lua_CameraType.cpp" />
     <ClCompile Include="src\lua\lua_CheckBox.cpp" />
     <ClCompile Include="src\lua\lua_Container.cpp" />
-    <ClCompile Include="src\lua\lua_ContainerDirection.cpp" />
-    <ClCompile Include="src\lua\lua_ContainerScroll.cpp" />
     <ClCompile Include="src\lua\lua_Control.cpp" />
-    <ClCompile Include="src\lua\lua_ControlAlignment.cpp" />
-    <ClCompile Include="src\lua\lua_ControlAutoSize.cpp" />
     <ClCompile Include="src\lua\lua_ControlListener.cpp" />
-    <ClCompile Include="src\lua\lua_ControlListenerEventType.cpp" />
-    <ClCompile Include="src\lua\lua_ControlState.cpp" />
     <ClCompile Include="src\lua\lua_Curve.cpp" />
-    <ClCompile Include="src\lua\lua_CurveInterpolationType.cpp" />
     <ClCompile Include="src\lua\lua_DepthStencilTarget.cpp" />
-    <ClCompile Include="src\lua\lua_DepthStencilTargetFormat.cpp" />
     <ClCompile Include="src\lua\lua_Effect.cpp" />
     <ClCompile Include="src\lua\lua_FileSystem.cpp" />
     <ClCompile Include="src\lua\lua_FlowLayout.cpp" />
     <ClCompile Include="src\lua\lua_Font.cpp" />
-    <ClCompile Include="src\lua\lua_FontFormat.cpp" />
-    <ClCompile Include="src\lua\lua_FontJustify.cpp" />
-    <ClCompile Include="src\lua\lua_FontStyle.cpp" />
     <ClCompile Include="src\lua\lua_FontText.cpp" />
     <ClCompile Include="src\lua\lua_Form.cpp" />
     <ClCompile Include="src\lua\lua_FrameBuffer.cpp" />
     <ClCompile Include="src\lua\lua_Frustum.cpp" />
     <ClCompile Include="src\lua\lua_Game.cpp" />
-    <ClCompile Include="src\lua\lua_GameClearFlags.cpp" />
     <ClCompile Include="src\lua\lua_Gamepad.cpp" />
-    <ClCompile Include="src\lua\lua_GamepadButtonMapping.cpp" />
-    <ClCompile Include="src\lua\lua_GamepadGamepadEvent.cpp" />
-    <ClCompile Include="src\lua\lua_GameState.cpp" />
     <ClCompile Include="src\lua\lua_Gesture.cpp" />
-    <ClCompile Include="src\lua\lua_GestureGestureEvent.cpp" />
     <ClCompile Include="src\lua\lua_Global.cpp" />
     <ClCompile Include="src\lua\lua_HeightField.cpp" />
     <ClCompile Include="src\lua\lua_Image.cpp" />
     <ClCompile Include="src\lua\lua_ImageControl.cpp" />
-    <ClCompile Include="src\lua\lua_ImageFormat.cpp" />
     <ClCompile Include="src\lua\lua_Joint.cpp" />
     <ClCompile Include="src\lua\lua_JoystickControl.cpp" />
     <ClCompile Include="src\lua\lua_Keyboard.cpp" />
-    <ClCompile Include="src\lua\lua_KeyboardKey.cpp" />
-    <ClCompile Include="src\lua\lua_KeyboardKeyEvent.cpp" />
     <ClCompile Include="src\lua\lua_Label.cpp" />
     <ClCompile Include="src\lua\lua_Layout.cpp" />
-    <ClCompile Include="src\lua\lua_LayoutType.cpp" />
     <ClCompile Include="src\lua\lua_Light.cpp" />
-    <ClCompile Include="src\lua\lua_LightType.cpp" />
     <ClCompile Include="src\lua\lua_Logger.cpp" />
-    <ClCompile Include="src\lua\lua_LoggerLevel.cpp" />
     <ClCompile Include="src\lua\lua_Material.cpp" />
     <ClCompile Include="src\lua\lua_MaterialParameter.cpp" />
     <ClCompile Include="src\lua\lua_MathUtil.cpp" />
     <ClCompile Include="src\lua\lua_Matrix.cpp" />
     <ClCompile Include="src\lua\lua_Mesh.cpp" />
     <ClCompile Include="src\lua\lua_MeshBatch.cpp" />
-    <ClCompile Include="src\lua\lua_MeshIndexFormat.cpp" />
     <ClCompile Include="src\lua\lua_MeshPart.cpp" />
-    <ClCompile Include="src\lua\lua_MeshPrimitiveType.cpp" />
     <ClCompile Include="src\lua\lua_MeshSkin.cpp" />
     <ClCompile Include="src\lua\lua_Model.cpp" />
     <ClCompile Include="src\lua\lua_Mouse.cpp" />
-    <ClCompile Include="src\lua\lua_MouseMouseEvent.cpp" />
     <ClCompile Include="src\lua\lua_Node.cpp" />
     <ClCompile Include="src\lua\lua_NodeCloneContext.cpp" />
-    <ClCompile Include="src\lua\lua_NodeType.cpp" />
     <ClCompile Include="src\lua\lua_ParticleEmitter.cpp" />
-    <ClCompile Include="src\lua\lua_ParticleEmitterTextureBlending.cpp" />
     <ClCompile Include="src\lua\lua_Pass.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsCharacter.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsCollisionObject.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsCollisionObjectCollisionListener.cpp" />
-    <ClCompile Include="src\lua\lua_PhysicsCollisionObjectCollisionListenerEventType.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsCollisionObjectCollisionPair.cpp" />
-    <ClCompile Include="src\lua\lua_PhysicsCollisionObjectType.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsCollisionShape.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsCollisionShapeDefinition.cpp" />
-    <ClCompile Include="src\lua\lua_PhysicsCollisionShapeType.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsConstraint.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsController.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsControllerHitFilter.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsControllerHitResult.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsControllerListener.cpp" />
-    <ClCompile Include="src\lua\lua_PhysicsControllerListenerEventType.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsFixedConstraint.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsGenericConstraint.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsGhostObject.cpp" />
@@ -188,21 +153,13 @@
     <ClCompile Include="src\lua\lua_Plane.cpp" />
     <ClCompile Include="src\lua\lua_Platform.cpp" />
     <ClCompile Include="src\lua\lua_Properties.cpp" />
-    <ClCompile Include="src\lua\lua_PropertiesType.cpp" />
     <ClCompile Include="src\lua\lua_Quaternion.cpp" />
     <ClCompile Include="src\lua\lua_RadioButton.cpp" />
     <ClCompile Include="src\lua\lua_Ray.cpp" />
     <ClCompile Include="src\lua\lua_Rectangle.cpp" />
     <ClCompile Include="src\lua\lua_Ref.cpp" />
     <ClCompile Include="src\lua\lua_RenderState.cpp" />
-    <ClCompile Include="src\lua\lua_RenderStateAutoBinding.cpp" />
-    <ClCompile Include="src\lua\lua_RenderStateBlend.cpp" />
-    <ClCompile Include="src\lua\lua_RenderStateCullFaceSide.cpp" />
-    <ClCompile Include="src\lua\lua_RenderStateDepthFunction.cpp" />
-    <ClCompile Include="src\lua\lua_RenderStateFrontFace.cpp" />
     <ClCompile Include="src\lua\lua_RenderStateStateBlock.cpp" />
-    <ClCompile Include="src\lua\lua_RenderStateStencilFunction.cpp" />
-    <ClCompile Include="src\lua\lua_RenderStateStencilOperation.cpp" />
     <ClCompile Include="src\lua\lua_RenderTarget.cpp" />
     <ClCompile Include="src\lua\lua_Scene.cpp" />
     <ClCompile Include="src\lua\lua_ScreenDisplayer.cpp" />
@@ -212,22 +169,16 @@
     <ClCompile Include="src\lua\lua_SpriteBatch.cpp" />
     <ClCompile Include="src\lua\lua_Technique.cpp" />
     <ClCompile Include="src\lua\lua_Terrain.cpp" />
-    <ClCompile Include="src\lua\lua_TerrainFlags.cpp" />
     <ClCompile Include="src\lua\lua_TerrainPatch.cpp" />
     <ClCompile Include="src\lua\lua_TextBox.cpp" />
-    <ClCompile Include="src\lua\lua_TextBoxInputMode.cpp" />
     <ClCompile Include="src\lua\lua_Texture.cpp" />
-    <ClCompile Include="src\lua\lua_TextureFilter.cpp" />
-    <ClCompile Include="src\lua\lua_TextureFormat.cpp" />
     <ClCompile Include="src\lua\lua_TextureSampler.cpp" />
-    <ClCompile Include="src\lua\lua_TextureWrap.cpp" />
     <ClCompile Include="src\lua\lua_Theme.cpp" />
     <ClCompile Include="src\lua\lua_ThemeSideRegions.cpp" />
     <ClCompile Include="src\lua\lua_ThemeStyle.cpp" />
     <ClCompile Include="src\lua\lua_ThemeThemeImage.cpp" />
     <ClCompile Include="src\lua\lua_ThemeUVs.cpp" />
     <ClCompile Include="src\lua\lua_Touch.cpp" />
-    <ClCompile Include="src\lua\lua_TouchTouchEvent.cpp" />
     <ClCompile Include="src\lua\lua_Transform.cpp" />
     <ClCompile Include="src\lua\lua_TransformListener.cpp" />
     <ClCompile Include="src\lua\lua_Uniform.cpp" />
@@ -237,7 +188,6 @@
     <ClCompile Include="src\lua\lua_VertexAttributeBinding.cpp" />
     <ClCompile Include="src\lua\lua_VertexFormat.cpp" />
     <ClCompile Include="src\lua\lua_VertexFormatElement.cpp" />
-    <ClCompile Include="src\lua\lua_VertexFormatUsage.cpp" />
     <ClCompile Include="src\lua\lua_VerticalLayout.cpp" />
     <ClCompile Include="src\Material.cpp" />
     <ClCompile Include="src\MathUtil.cpp" />
@@ -355,7 +305,6 @@
     <ClInclude Include="src\lua\lua_AIAgentListener.h" />
     <ClInclude Include="src\lua\lua_AIController.h" />
     <ClInclude Include="src\lua\lua_AIMessage.h" />
-    <ClInclude Include="src\lua\lua_AIMessageParameterType.h" />
     <ClInclude Include="src\lua\lua_AIState.h" />
     <ClInclude Include="src\lua\lua_AIStateListener.h" />
     <ClInclude Include="src\lua\lua_AIStateMachine.h" />
@@ -363,7 +312,6 @@
     <ClInclude Include="src\lua\lua_Animation.h" />
     <ClInclude Include="src\lua\lua_AnimationClip.h" />
     <ClInclude Include="src\lua\lua_AnimationClipListener.h" />
-    <ClInclude Include="src\lua\lua_AnimationClipListenerEventType.h" />
     <ClInclude Include="src\lua\lua_AnimationController.h" />
     <ClInclude Include="src\lua\lua_AnimationTarget.h" />
     <ClInclude Include="src\lua\lua_AnimationValue.h" />
@@ -371,98 +319,65 @@
     <ClInclude Include="src\lua\lua_AudioController.h" />
     <ClInclude Include="src\lua\lua_AudioListener.h" />
     <ClInclude Include="src\lua\lua_AudioSource.h" />
-    <ClInclude Include="src\lua\lua_AudioSourceState.h" />
     <ClInclude Include="src\lua\lua_BoundingBox.h" />
     <ClInclude Include="src\lua\lua_BoundingSphere.h" />
     <ClInclude Include="src\lua\lua_Bundle.h" />
     <ClInclude Include="src\lua\lua_Button.h" />
     <ClInclude Include="src\lua\lua_Camera.h" />
     <ClInclude Include="src\lua\lua_CameraListener.h" />
-    <ClInclude Include="src\lua\lua_CameraType.h" />
     <ClInclude Include="src\lua\lua_CheckBox.h" />
     <ClInclude Include="src\lua\lua_Container.h" />
-    <ClInclude Include="src\lua\lua_ContainerDirection.h" />
-    <ClInclude Include="src\lua\lua_ContainerScroll.h" />
     <ClInclude Include="src\lua\lua_Control.h" />
-    <ClInclude Include="src\lua\lua_ControlAlignment.h" />
-    <ClInclude Include="src\lua\lua_ControlAutoSize.h" />
     <ClInclude Include="src\lua\lua_ControlListener.h" />
-    <ClInclude Include="src\lua\lua_ControlListenerEventType.h" />
-    <ClInclude Include="src\lua\lua_ControlState.h" />
     <ClInclude Include="src\lua\lua_Curve.h" />
-    <ClInclude Include="src\lua\lua_CurveInterpolationType.h" />
     <ClInclude Include="src\lua\lua_DepthStencilTarget.h" />
-    <ClInclude Include="src\lua\lua_DepthStencilTargetFormat.h" />
     <ClInclude Include="src\lua\lua_Effect.h" />
     <ClInclude Include="src\lua\lua_FileSystem.h" />
     <ClInclude Include="src\lua\lua_FlowLayout.h" />
     <ClInclude Include="src\lua\lua_Font.h" />
-    <ClInclude Include="src\lua\lua_FontFormat.h" />
-    <ClInclude Include="src\lua\lua_FontJustify.h" />
-    <ClInclude Include="src\lua\lua_FontStyle.h" />
     <ClInclude Include="src\lua\lua_FontText.h" />
     <ClInclude Include="src\lua\lua_Form.h" />
     <ClInclude Include="src\lua\lua_FrameBuffer.h" />
     <ClInclude Include="src\lua\lua_Frustum.h" />
     <ClInclude Include="src\lua\lua_Game.h" />
-    <ClInclude Include="src\lua\lua_GameClearFlags.h" />
     <ClInclude Include="src\lua\lua_Gamepad.h" />
-    <ClInclude Include="src\lua\lua_GamepadButtonMapping.h" />
-    <ClInclude Include="src\lua\lua_GamepadGamepadEvent.h" />
-    <ClInclude Include="src\lua\lua_GameState.h" />
     <ClInclude Include="src\lua\lua_Gesture.h" />
-    <ClInclude Include="src\lua\lua_GestureGestureEvent.h" />
     <ClInclude Include="src\lua\lua_Global.h" />
     <ClInclude Include="src\lua\lua_HeightField.h" />
     <ClInclude Include="src\lua\lua_Image.h" />
     <ClInclude Include="src\lua\lua_ImageControl.h" />
-    <ClInclude Include="src\lua\lua_ImageFormat.h" />
     <ClInclude Include="src\lua\lua_Joint.h" />
     <ClInclude Include="src\lua\lua_JoystickControl.h" />
     <ClInclude Include="src\lua\lua_Keyboard.h" />
-    <ClInclude Include="src\lua\lua_KeyboardKey.h" />
-    <ClInclude Include="src\lua\lua_KeyboardKeyEvent.h" />
     <ClInclude Include="src\lua\lua_Label.h" />
     <ClInclude Include="src\lua\lua_Layout.h" />
-    <ClInclude Include="src\lua\lua_LayoutType.h" />
     <ClInclude Include="src\lua\lua_Light.h" />
-    <ClInclude Include="src\lua\lua_LightType.h" />
     <ClInclude Include="src\lua\lua_Logger.h" />
-    <ClInclude Include="src\lua\lua_LoggerLevel.h" />
     <ClInclude Include="src\lua\lua_Material.h" />
     <ClInclude Include="src\lua\lua_MaterialParameter.h" />
     <ClInclude Include="src\lua\lua_MathUtil.h" />
     <ClInclude Include="src\lua\lua_Matrix.h" />
     <ClInclude Include="src\lua\lua_Mesh.h" />
     <ClInclude Include="src\lua\lua_MeshBatch.h" />
-    <ClInclude Include="src\lua\lua_MeshIndexFormat.h" />
     <ClInclude Include="src\lua\lua_MeshPart.h" />
-    <ClInclude Include="src\lua\lua_MeshPrimitiveType.h" />
     <ClInclude Include="src\lua\lua_MeshSkin.h" />
     <ClInclude Include="src\lua\lua_Model.h" />
     <ClInclude Include="src\lua\lua_Mouse.h" />
-    <ClInclude Include="src\lua\lua_MouseMouseEvent.h" />
     <ClInclude Include="src\lua\lua_Node.h" />
     <ClInclude Include="src\lua\lua_NodeCloneContext.h" />
-    <ClInclude Include="src\lua\lua_NodeType.h" />
     <ClInclude Include="src\lua\lua_ParticleEmitter.h" />
-    <ClInclude Include="src\lua\lua_ParticleEmitterTextureBlending.h" />
     <ClInclude Include="src\lua\lua_Pass.h" />
     <ClInclude Include="src\lua\lua_PhysicsCharacter.h" />
     <ClInclude Include="src\lua\lua_PhysicsCollisionObject.h" />
     <ClInclude Include="src\lua\lua_PhysicsCollisionObjectCollisionListener.h" />
-    <ClInclude Include="src\lua\lua_PhysicsCollisionObjectCollisionListenerEventType.h" />
     <ClInclude Include="src\lua\lua_PhysicsCollisionObjectCollisionPair.h" />
-    <ClInclude Include="src\lua\lua_PhysicsCollisionObjectType.h" />
     <ClInclude Include="src\lua\lua_PhysicsCollisionShape.h" />
     <ClInclude Include="src\lua\lua_PhysicsCollisionShapeDefinition.h" />
-    <ClInclude Include="src\lua\lua_PhysicsCollisionShapeType.h" />
     <ClInclude Include="src\lua\lua_PhysicsConstraint.h" />
     <ClInclude Include="src\lua\lua_PhysicsController.h" />
     <ClInclude Include="src\lua\lua_PhysicsControllerHitFilter.h" />
     <ClInclude Include="src\lua\lua_PhysicsControllerHitResult.h" />
     <ClInclude Include="src\lua\lua_PhysicsControllerListener.h" />
-    <ClInclude Include="src\lua\lua_PhysicsControllerListenerEventType.h" />
     <ClInclude Include="src\lua\lua_PhysicsFixedConstraint.h" />
     <ClInclude Include="src\lua\lua_PhysicsGenericConstraint.h" />
     <ClInclude Include="src\lua\lua_PhysicsGhostObject.h" />
@@ -476,21 +391,13 @@
     <ClInclude Include="src\lua\lua_Plane.h" />
     <ClInclude Include="src\lua\lua_Platform.h" />
     <ClInclude Include="src\lua\lua_Properties.h" />
-    <ClInclude Include="src\lua\lua_PropertiesType.h" />
     <ClInclude Include="src\lua\lua_Quaternion.h" />
     <ClInclude Include="src\lua\lua_RadioButton.h" />
     <ClInclude Include="src\lua\lua_Ray.h" />
     <ClInclude Include="src\lua\lua_Rectangle.h" />
     <ClInclude Include="src\lua\lua_Ref.h" />
     <ClInclude Include="src\lua\lua_RenderState.h" />
-    <ClInclude Include="src\lua\lua_RenderStateAutoBinding.h" />
-    <ClInclude Include="src\lua\lua_RenderStateBlend.h" />
-    <ClInclude Include="src\lua\lua_RenderStateCullFaceSide.h" />
-    <ClInclude Include="src\lua\lua_RenderStateDepthFunction.h" />
-    <ClInclude Include="src\lua\lua_RenderStateFrontFace.h" />
     <ClInclude Include="src\lua\lua_RenderStateStateBlock.h" />
-    <ClInclude Include="src\lua\lua_RenderStateStencilFunction.h" />
-    <ClInclude Include="src\lua\lua_RenderStateStencilOperation.h" />
     <ClInclude Include="src\lua\lua_RenderTarget.h" />
     <ClInclude Include="src\lua\lua_Scene.h" />
     <ClInclude Include="src\lua\lua_ScreenDisplayer.h" />
@@ -500,22 +407,16 @@
     <ClInclude Include="src\lua\lua_SpriteBatch.h" />
     <ClInclude Include="src\lua\lua_Technique.h" />
     <ClInclude Include="src\lua\lua_Terrain.h" />
-    <ClInclude Include="src\lua\lua_TerrainFlags.h" />
     <ClInclude Include="src\lua\lua_TerrainPatch.h" />
     <ClInclude Include="src\lua\lua_TextBox.h" />
-    <ClInclude Include="src\lua\lua_TextBoxInputMode.h" />
     <ClInclude Include="src\lua\lua_Texture.h" />
-    <ClInclude Include="src\lua\lua_TextureFilter.h" />
-    <ClInclude Include="src\lua\lua_TextureFormat.h" />
     <ClInclude Include="src\lua\lua_TextureSampler.h" />
-    <ClInclude Include="src\lua\lua_TextureWrap.h" />
     <ClInclude Include="src\lua\lua_Theme.h" />
     <ClInclude Include="src\lua\lua_ThemeSideRegions.h" />
     <ClInclude Include="src\lua\lua_ThemeStyle.h" />
     <ClInclude Include="src\lua\lua_ThemeThemeImage.h" />
     <ClInclude Include="src\lua\lua_ThemeUVs.h" />
     <ClInclude Include="src\lua\lua_Touch.h" />
-    <ClInclude Include="src\lua\lua_TouchTouchEvent.h" />
     <ClInclude Include="src\lua\lua_Transform.h" />
     <ClInclude Include="src\lua\lua_TransformListener.h" />
     <ClInclude Include="src\lua\lua_Uniform.h" />
@@ -525,7 +426,6 @@
     <ClInclude Include="src\lua\lua_VertexAttributeBinding.h" />
     <ClInclude Include="src\lua\lua_VertexFormat.h" />
     <ClInclude Include="src\lua\lua_VertexFormatElement.h" />
-    <ClInclude Include="src\lua\lua_VertexFormatUsage.h" />
     <ClInclude Include="src\lua\lua_VerticalLayout.h" />
     <ClInclude Include="src\Material.h" />
     <ClInclude Include="src\MathUtil.h" />

gameplay/gameplay.vcxproj.filters

@@ -357,9 +357,6 @@
     <ClCompile Include="src\lua\lua_AIMessage.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_AIMessageParameterType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_AIState.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -381,9 +378,6 @@
     <ClCompile Include="src\lua\lua_AnimationClipListener.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_AnimationClipListenerEventType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_AnimationController.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -405,9 +399,6 @@
     <ClCompile Include="src\lua\lua_AudioSource.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_AudioSourceState.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_BoundingBox.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -423,48 +414,24 @@
     <ClCompile Include="src\lua\lua_Camera.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_CameraType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_CheckBox.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
     <ClCompile Include="src\lua\lua_Container.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_ContainerScroll.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Control.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_ControlAlignment.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_ControlAutoSize.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_ControlListener.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_ControlListenerEventType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_ControlState.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Curve.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_CurveInterpolationType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_DepthStencilTarget.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_DepthStencilTargetFormat.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Effect.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -477,15 +444,6 @@
     <ClCompile Include="src\lua\lua_Font.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_FontFormat.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_FontJustify.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_FontStyle.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_FontText.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -501,27 +459,12 @@
     <ClCompile Include="src\lua\lua_Game.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_GameClearFlags.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Gamepad.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_GamepadButtonMapping.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_GamepadGamepadEvent.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_GameState.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Gesture.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_GestureGestureEvent.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Global.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -534,42 +477,24 @@
     <ClCompile Include="src\lua\lua_ImageControl.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_ImageFormat.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Joint.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
     <ClCompile Include="src\lua\lua_Keyboard.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_KeyboardKey.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_KeyboardKeyEvent.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Label.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
     <ClCompile Include="src\lua\lua_Layout.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_LayoutType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Light.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_LightType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Logger.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_LoggerLevel.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Material.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -588,15 +513,9 @@
     <ClCompile Include="src\lua\lua_MeshBatch.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_MeshIndexFormat.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_MeshPart.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_MeshPrimitiveType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_MeshSkin.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -606,24 +525,15 @@
     <ClCompile Include="src\lua\lua_Mouse.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_MouseMouseEvent.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Node.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
     <ClCompile Include="src\lua\lua_NodeCloneContext.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_NodeType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_ParticleEmitter.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_ParticleEmitterTextureBlending.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Pass.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -636,24 +546,15 @@
     <ClCompile Include="src\lua\lua_PhysicsCollisionObjectCollisionListener.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_PhysicsCollisionObjectCollisionListenerEventType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_PhysicsCollisionObjectCollisionPair.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_PhysicsCollisionObjectType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_PhysicsCollisionShape.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
     <ClCompile Include="src\lua\lua_PhysicsCollisionShapeDefinition.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_PhysicsCollisionShapeType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_PhysicsConstraint.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -669,9 +570,6 @@
     <ClCompile Include="src\lua\lua_PhysicsControllerListener.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_PhysicsControllerListenerEventType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_PhysicsFixedConstraint.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -711,9 +609,6 @@
     <ClCompile Include="src\lua\lua_Properties.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_PropertiesType.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Quaternion.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -732,30 +627,9 @@
     <ClCompile Include="src\lua\lua_RenderState.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_RenderStateAutoBinding.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_RenderStateBlend.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_RenderStateCullFaceSide.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_RenderStateDepthFunction.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_RenderStateFrontFace.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_RenderStateStateBlock.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_RenderStateStencilFunction.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_RenderStateStencilOperation.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_RenderTarget.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -783,30 +657,15 @@
     <ClCompile Include="src\lua\lua_Terrain.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_TerrainFlags.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_TextBox.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_TextBoxInputMode.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Texture.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_TextureFilter.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lua\lua_TextureFormat.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_TextureSampler.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_TextureWrap.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Theme.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -825,9 +684,6 @@
     <ClCompile Include="src\lua\lua_Touch.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_TouchTouchEvent.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_Transform.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -855,9 +711,6 @@
     <ClCompile Include="src\lua\lua_VertexFormatElement.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_VertexFormatUsage.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
     <ClCompile Include="src\lua\lua_VerticalLayout.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
@@ -873,9 +726,6 @@
     <ClCompile Include="src\lua\lua_JoystickControl.cpp">
       <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\lua\lua_ContainerDirection.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Plane.h">
@@ -1220,9 +1070,6 @@
     <ClInclude Include="src\lua\lua_AIMessage.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_AIMessageParameterType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_AIState.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1244,9 +1091,6 @@
     <ClInclude Include="src\lua\lua_AnimationClipListener.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_AnimationClipListenerEventType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_AnimationController.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1268,9 +1112,6 @@
     <ClInclude Include="src\lua\lua_AudioSource.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_AudioSourceState.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_BoundingBox.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1286,48 +1127,24 @@
     <ClInclude Include="src\lua\lua_Camera.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_CameraType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_CheckBox.h">
       <Filter>src\lua</Filter>
     </ClInclude>
     <ClInclude Include="src\lua\lua_Container.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_ContainerScroll.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Control.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_ControlAlignment.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_ControlAutoSize.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_ControlListener.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_ControlListenerEventType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_ControlState.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Curve.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_CurveInterpolationType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_DepthStencilTarget.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_DepthStencilTargetFormat.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Effect.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1340,15 +1157,6 @@
     <ClInclude Include="src\lua\lua_Font.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_FontFormat.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_FontJustify.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_FontStyle.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_FontText.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1364,27 +1172,12 @@
     <ClInclude Include="src\lua\lua_Game.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_GameClearFlags.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Gamepad.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_GamepadButtonMapping.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_GamepadGamepadEvent.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_GameState.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Gesture.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_GestureGestureEvent.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Global.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1397,42 +1190,24 @@
     <ClInclude Include="src\lua\lua_ImageControl.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_ImageFormat.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Joint.h">
       <Filter>src\lua</Filter>
     </ClInclude>
     <ClInclude Include="src\lua\lua_Keyboard.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_KeyboardKey.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_KeyboardKeyEvent.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Label.h">
       <Filter>src\lua</Filter>
     </ClInclude>
     <ClInclude Include="src\lua\lua_Layout.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_LayoutType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Light.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_LightType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Logger.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_LoggerLevel.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Material.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1451,15 +1226,9 @@
     <ClInclude Include="src\lua\lua_MeshBatch.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_MeshIndexFormat.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_MeshPart.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_MeshPrimitiveType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_MeshSkin.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1469,24 +1238,15 @@
     <ClInclude Include="src\lua\lua_Mouse.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_MouseMouseEvent.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Node.h">
       <Filter>src\lua</Filter>
     </ClInclude>
     <ClInclude Include="src\lua\lua_NodeCloneContext.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_NodeType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_ParticleEmitter.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_ParticleEmitterTextureBlending.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Pass.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1499,24 +1259,15 @@
     <ClInclude Include="src\lua\lua_PhysicsCollisionObjectCollisionListener.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_PhysicsCollisionObjectCollisionListenerEventType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_PhysicsCollisionObjectCollisionPair.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_PhysicsCollisionObjectType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_PhysicsCollisionShape.h">
       <Filter>src\lua</Filter>
     </ClInclude>
     <ClInclude Include="src\lua\lua_PhysicsCollisionShapeDefinition.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_PhysicsCollisionShapeType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_PhysicsConstraint.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1532,9 +1283,6 @@
     <ClInclude Include="src\lua\lua_PhysicsControllerListener.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_PhysicsControllerListenerEventType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_PhysicsFixedConstraint.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1574,9 +1322,6 @@
     <ClInclude Include="src\lua\lua_Properties.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_PropertiesType.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Quaternion.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1595,30 +1340,9 @@
     <ClInclude Include="src\lua\lua_RenderState.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_RenderStateAutoBinding.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_RenderStateBlend.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_RenderStateCullFaceSide.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_RenderStateDepthFunction.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_RenderStateFrontFace.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_RenderStateStateBlock.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_RenderStateStencilFunction.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_RenderStateStencilOperation.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_RenderTarget.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1646,30 +1370,15 @@
     <ClInclude Include="src\lua\lua_Terrain.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_TerrainFlags.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_TextBox.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_TextBoxInputMode.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Texture.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_TextureFilter.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
-    <ClInclude Include="src\lua\lua_TextureFormat.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_TextureSampler.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_TextureWrap.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Theme.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1688,9 +1397,6 @@
     <ClInclude Include="src\lua\lua_Touch.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_TouchTouchEvent.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_Transform.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1718,9 +1424,6 @@
     <ClInclude Include="src\lua\lua_VertexFormatElement.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_VertexFormatUsage.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="src\lua\lua_VerticalLayout.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -1736,9 +1439,6 @@
     <ClInclude Include="src\lua\lua_JoystickControl.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="src\lua\lua_ContainerDirection.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\ScriptController.inl">

gameplay/src/Game.cpp

@@ -13,6 +13,39 @@ GLenum __gl_error_code = GL_NO_ERROR;
 /** @script{ignore} */
 ALenum __al_error_code = AL_NO_ERROR;
 
+/** @script{ignore} */
+GP_SCRIPT_EVENTS();
+/** @script{ignore} */
+GP_SCRIPT_EVENT(initialize, "");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(finalize, "");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(update, "f");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(render, "f");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(resizeEvent, "ii");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(keyEvent, "[Keyboard::KeyEvent]i");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(touchEvent, "[Touch::TouchEvent]iiui");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(mouseEvent, "[Mouse::MouseEvent]iii");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(gestureSwipeEvent, "iii");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(gesturePinchEvent, "iif");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(gestureTapEvent, "ii");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(gestureLongTapevent, "iif");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(gestureDragEvent, "ii");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(gestureDropEvent, "ii");
+/** @script{ignore} */
+GP_SCRIPT_EVENT(gamepadEvent, "[Gamepad::GamepadEvent]<Gamepad>");
+
 namespace gameplay
 {
 
@@ -20,21 +53,36 @@ static Game* __gameInstance = NULL;
 double Game::_pausedTimeLast = 0.0;
 double Game::_pausedTimeTotal = 0.0;
 
+/**
+* @script{ignore}
+*/
+class GameScriptTarget : public ScriptTarget
+{
+    friend class Game;
+public:
+    GameScriptTarget()
+    {
+        GP_REGISTER_SCRIPT_EVENTS();
+    }
+};
+
 Game::Game()
     : _initialized(false), _state(UNINITIALIZED), _pausedCount(0),
       _frameLastFPS(0), _frameCount(0), _frameRate(0), _width(0), _height(0),
       _clearDepth(1.0f), _clearStencil(0), _properties(NULL),
       _animationController(NULL), _audioController(NULL),
       _physicsController(NULL), _aiController(NULL), _audioListener(NULL),
-      _timeEvents(NULL), _scriptController(NULL), _scriptListeners(NULL)
+      _timeEvents(NULL), _scriptController(NULL), _scriptListeners(NULL), _scriptTarget(NULL)
 {
     GP_ASSERT(__gameInstance == NULL);
+
     __gameInstance = this;
     _timeEvents = new std::priority_queue<TimeEvent, std::vector<TimeEvent>, std::less<TimeEvent> >();
 }
 
 Game::~Game()
 {
+    SAFE_DELETE(_scriptTarget);
 	SAFE_DELETE(_scriptController);
 
     // Do not call any virtual functions from the destructor.
@@ -44,14 +92,35 @@ Game::~Game()
     Ref::printLeaks();
     printMemoryLeaks();
 #endif
+
+    __gameInstance = NULL;
 }
 
 Game* Game::getInstance()
 {
-    GP_ASSERT(__gameInstance);
     return __gameInstance;
 }
 
+void Game::initialize()
+{
+    // stub
+}
+
+void Game::finalize()
+{
+    // stub
+}
+
+void Game::update(float elapsedTime)
+{
+    // stub
+}
+
+void Game::render(float elapsedTime)
+{
+    // stub
+}
+
 double Game::getAbsoluteTime()
 {
     return Platform::getAbsoluteTime();
@@ -119,30 +188,14 @@ bool Game::startup()
     // Load any gamepads, ui or physical.
     loadGamepads();
 
-    // Set the script callback functions.
+    // Set script handler
     if (_properties)
     {
-        Properties* scripts = _properties->getNamespace("scripts", true);
-        if (scripts)
+        const char* script = _properties->getString("script");
+        if (script)
         {
-            const char* callback;
-            while ((callback = scripts->getNextProperty()) != NULL)
-            {
-                std::string url = scripts->getString();
-                std::string file;
-                std::string id;
-                splitURL(url, &file, &id);
-
-                if (file.size() <= 0 || id.size() <= 0)
-                {
-                    GP_ERROR("Invalid %s script callback function '%s'.", callback, url.c_str());
-                }
-                else
-                {
-                    _scriptController->loadScript(file.c_str());
-                    _scriptController->registerCallback(callback, id.c_str());
-                }
-            }
+            _scriptTarget = new GameScriptTarget();
+            _scriptTarget->addScript(script);
         }
     }
 
@@ -166,8 +219,14 @@ void Game::shutdown()
 		// Call user finalize
         finalize();
 
+        // Call script finalize
+        if (_scriptTarget)
+            _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_finalize);
+
+        // Destroy script target so no more script events are fired
+        SAFE_DELETE(_scriptTarget);
+
 		// Shutdown scripting system first so that any objects allocated in script are released before our subsystems are released
-		_scriptController->finalizeGame();
 		if (_scriptListeners)
 		{
 			for (size_t i = 0; i < _scriptListeners->size(); i++)
@@ -286,7 +345,8 @@ void Game::frame()
     {
         // Perform lazy first time initialization
         initialize();
-        _scriptController->initializeGame();
+        if (_scriptTarget)
+            _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_initialize);
         _initialized = true;
 
         // Fire first game resize event
@@ -329,7 +389,8 @@ void Game::frame()
         Form::updateInternal(elapsedTime);
 
         // Run script update.
-        _scriptController->update(elapsedTime);
+        if (_scriptTarget)
+            _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_update, elapsedTime);
 
         // Audio Rendering.
         _audioController->update(elapsedTime);
@@ -338,7 +399,8 @@ void Game::frame()
         render(elapsedTime);
 
         // Run script render.
-        _scriptController->render(elapsedTime);
+        if (_scriptTarget)
+            _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_render, elapsedTime);
 
         // Update FPS.
         ++_frameCount;
@@ -361,13 +423,15 @@ void Game::frame()
         Form::updateInternal(0);
 
         // Script update.
-        _scriptController->update(0);
+        if (_scriptTarget)
+            _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_update, 0);
 
         // Graphics Rendering.
         render(0);
 
         // Script render.
-        _scriptController->render(0);
+        if (_scriptTarget)
+            _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_render, 0);
     }
 }
 
@@ -395,7 +459,8 @@ void Game::updateOnce()
     _physicsController->update(elapsedTime);
     _aiController->update(elapsedTime);
     _audioController->update(elapsedTime);
-    _scriptController->update(elapsedTime);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_update, elapsedTime);
 }
 
 void Game::setViewport(const Rectangle& viewport)
@@ -463,19 +528,23 @@ AudioListener* Game::getAudioListener()
 
 void Game::keyEvent(Keyboard::KeyEvent evt, int key)
 {
+    // stub
 }
 
 void Game::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex)
 {
+    // stub
 }
 
 bool Game::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelDelta)
 {
+    // stub
     return false;
 }
 
 void Game::resizeEvent(unsigned int width, unsigned int height)
 {
+    // stub
 }
 
 bool Game::isGestureSupported(Gesture::GestureEvent evt)
@@ -500,30 +569,124 @@ bool Game::isGestureRegistered(Gesture::GestureEvent evt)
 
 void Game::gestureSwipeEvent(int x, int y, int direction)
 {
+    // stub
 }
 
 void Game::gesturePinchEvent(int x, int y, float scale)
 {
+    // stub
 }
 
 void Game::gestureTapEvent(int x, int y)
 {
+    // stub
 }
 
 void Game::gestureLongTapEvent(int x, int y, float duration)
 {
+    // stub
 }
 
 void Game::gestureDragEvent(int x, int y)
 {
+    // stub
 }
 
 void Game::gestureDropEvent(int x, int y)
 {
+    // stub
 }
 
 void Game::gamepadEvent(Gamepad::GamepadEvent evt, Gamepad* gamepad)
 {
+    // stub
+}
+
+void Game::keyEventInternal(Keyboard::KeyEvent evt, int key)
+{
+    keyEvent(evt, key);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_keyEvent, evt, key);
+}
+
+void Game::touchEventInternal(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex)
+{
+    touchEvent(evt, x, y, contactIndex);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_touchEvent, evt, x, y, contactIndex);
+}
+
+bool Game::mouseEventInternal(Mouse::MouseEvent evt, int x, int y, int wheelDelta)
+{
+    if (mouseEvent(evt, x, y, wheelDelta))
+        return true;
+
+    if (_scriptTarget)
+        return _scriptTarget->fireScriptEvent<bool>(SCRIPT_EVENT_mouseEvent, evt, x, y, wheelDelta);
+
+    return false;
+}
+
+void Game::resizeEventInternal(unsigned int width, unsigned int height)
+{
+    // Update the width and height of the game
+    if (_width != width || _height != height)
+    {
+        _width = width;
+        _height = height;
+        resizeEvent(width, height);
+        if (_scriptTarget)
+            _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_resizeEvent, width, height);
+    }
+}
+
+void Game::gestureSwipeEventInternal(int x, int y, int direction)
+{
+    gestureSwipeEvent(x, y, direction);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_gestureSwipeEvent, x, y, direction);
+}
+
+void Game::gesturePinchEventInternal(int x, int y, float scale)
+{
+    gesturePinchEvent(x, y, scale);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_gesturePinchEvent, x, y, scale);
+}
+
+void Game::gestureTapEventInternal(int x, int y)
+{
+    gestureTapEvent(x, y);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_gestureTapEvent, x, y);
+}
+
+void Game::gestureLongTapEventInternal(int x, int y, float duration)
+{
+    gestureLongTapEvent(x, y, duration);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_gestureLongTapevent, x, y, duration);
+}
+
+void Game::gestureDragEventInternal(int x, int y)
+{
+    gestureDragEvent(x, y);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_gestureDragEvent, x, y);
+}
+
+void Game::gestureDropEventInternal(int x, int y)
+{
+    gestureDropEvent(x, y);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_gestureDropEvent, x, y);
+}
+
+void Game::gamepadEventInternal(Gamepad::GamepadEvent evt, Gamepad* gamepad, unsigned int analogIndex)
+{
+    gamepadEvent(evt, gamepad);
+    if (_scriptTarget)
+        _scriptTarget->fireScriptEvent<void>(SCRIPT_EVENT_gamepadEvent, evt, gamepad);
 }
 
 void Game::getArguments(int* argc, char*** argv) const

gameplay/src/Game.h

@@ -59,6 +59,11 @@ public:
         CLEAR_COLOR_DEPTH_STENCIL = CLEAR_COLOR | CLEAR_DEPTH | CLEAR_STENCIL
     };
 
+    /**
+     * Constructor.
+     */
+    Game();
+
     /**
      * Destructor.
      */
@@ -614,20 +619,15 @@ public:
 
 protected:
 
-    /**
-     * Constructor.
-     */
-    Game();
-
     /**
      * Initialize callback that is called just before the first frame when the game starts.
      */
-    virtual void initialize() = 0;
+    virtual void initialize();
 
     /**
      * Finalize callback that is called when the game on exits.
      */
-    virtual void finalize() = 0;
+    virtual void finalize();
 
     /**
      * Update callback for handling update routines.
@@ -637,7 +637,7 @@ protected:
      *
      * @param elapsedTime The elapsed game time.
      */
-    virtual void update(float elapsedTime) = 0;
+    virtual void update(float elapsedTime);
 
     /**
      * Render callback for handling rendering routines.
@@ -647,7 +647,7 @@ protected:
      *
      * @param elapsedTime The elapsed game time.
      */
-    virtual void render(float elapsedTime) = 0;
+    virtual void render(float elapsedTime);
 
     /**
      * Renders a single frame once and then swaps it to the display.
@@ -748,6 +748,18 @@ private:
      */
     void loadGamepads();
 
+    void keyEventInternal(Keyboard::KeyEvent evt, int key);
+    void touchEventInternal(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex);
+    bool mouseEventInternal(Mouse::MouseEvent evt, int x, int y, int wheelDelta);
+    void resizeEventInternal(unsigned int width, unsigned int height);
+    void gestureSwipeEventInternal(int x, int y, int direction);
+    void gesturePinchEventInternal(int x, int y, float scale);
+    void gestureTapEventInternal(int x, int y);
+    void gestureLongTapEventInternal(int x, int y, float duration);
+    void gestureDragEventInternal(int x, int y);
+    void gestureDropEventInternal(int x, int y);
+    void gamepadEventInternal(Gamepad::GamepadEvent evt, Gamepad* gamepad, unsigned int analogIndex);
+
     bool _initialized;                          // If game has initialized yet.
     State _state;                               // The game state.
     unsigned int _pausedCount;                  // Number of times pause() has been called.
@@ -771,6 +783,7 @@ private:
     std::priority_queue<TimeEvent, std::vector<TimeEvent>, std::less<TimeEvent> >* _timeEvents;     // Contains the scheduled time events.
     ScriptController* _scriptController;            // Controls the scripting engine.
     std::vector<ScriptListener*>* _scriptListeners; // Lua script listeners.
+    ScriptTarget* _scriptTarget;                // Script target for the game
 
     // Note: Do not add STL object member variables on the stack; this will cause false memory leaks to be reported.
 

gameplay/src/Platform.cpp

@@ -12,8 +12,7 @@ void Platform::touchEventInternal(Touch::TouchEvent evt, int x, int y, unsigned
 {
     if (actuallyMouse || !Form::touchEventInternal(evt, x, y, contactIndex))
     {
-        Game::getInstance()->touchEvent(evt, x, y, contactIndex);
-        Game::getInstance()->getScriptController()->touchEvent(evt, x, y, contactIndex);
+        Game::getInstance()->touchEventInternal(evt, x, y, contactIndex);
     }
 }
 
@@ -21,80 +20,57 @@ void Platform::keyEventInternal(Keyboard::KeyEvent evt, int key)
 {
     if (!Form::keyEventInternal(evt, key))
     {
-        Game::getInstance()->keyEvent(evt, key);
-        Game::getInstance()->getScriptController()->keyEvent(evt, key);
+        Game::getInstance()->keyEventInternal(evt, key);
     }
 }
 
 bool Platform::mouseEventInternal(Mouse::MouseEvent evt, int x, int y, int wheelDelta)
 {
     if (Form::mouseEventInternal(evt, x, y, wheelDelta))
-    {
         return true;
-    }
-    else if (Game::getInstance()->mouseEvent(evt, x, y, wheelDelta))
-    {
-        return true;
-    }
-    else
-    {
-        return Game::getInstance()->getScriptController()->mouseEvent(evt, x, y, wheelDelta);
-    }
+
+    return Game::getInstance()->mouseEventInternal(evt, x, y, wheelDelta);
 }
 
 void Platform::gestureSwipeEventInternal(int x, int y, int direction)
 {
     // TODO: Add support to Form for gestures
-    Game::getInstance()->gestureSwipeEvent(x, y, direction);
-    Game::getInstance()->getScriptController()->gestureSwipeEvent(x, y, direction);
+    Game::getInstance()->gestureSwipeEventInternal(x, y, direction);
 }
 
 void Platform::gesturePinchEventInternal(int x, int y, float scale)
 {
     // TODO: Add support to Form for gestures
-    Game::getInstance()->gesturePinchEvent(x, y, scale);
-    Game::getInstance()->getScriptController()->gesturePinchEvent(x, y, scale);
+    Game::getInstance()->gesturePinchEventInternal(x, y, scale);
 }
 
 void Platform::gestureTapEventInternal(int x, int y)
 {
     // TODO: Add support to Form for gestures
-    Game::getInstance()->gestureTapEvent(x, y);
-    Game::getInstance()->getScriptController()->gestureTapEvent(x, y);
+    Game::getInstance()->gestureTapEventInternal(x, y);
 }
 
 void Platform::gestureLongTapEventInternal(int x, int y, float duration)
 {
     // TODO: Add support to Form for gestures
-	Game::getInstance()->gestureLongTapEvent(x, y, duration);
-	Game::getInstance()->getScriptController()->gestureLongTapEvent(x, y, duration);
+    Game::getInstance()->gestureLongTapEventInternal(x, y, duration);
 }
 
 void Platform::gestureDragEventInternal(int x, int y)
 {
     // TODO: Add support to Form for gestures
-	Game::getInstance()->gestureDragEvent(x, y);
-	Game::getInstance()->getScriptController()->gestureDragEvent(x, y);
+    Game::getInstance()->gestureDragEventInternal(x, y);
 }
 
 void Platform::gestureDropEventInternal(int x, int y)
 {
     // TODO: Add support to Form for gestures
-	Game::getInstance()->gestureDropEvent(x, y);
-	Game::getInstance()->getScriptController()->gestureDropEvent(x, y);
+    Game::getInstance()->gestureDropEventInternal(x, y);
 }
 
 void Platform::resizeEventInternal(unsigned int width, unsigned int height)
 {
-    // Update the width and height of the game
-    Game* game = Game::getInstance();
-    if (game->_width != width || game->_height != height)
-    {
-        game->_width = width;
-        game->_height = height;
-        game->resizeEvent(width, height);
-        game->getScriptController()->resizeEvent(width, height);
-    }
+    Game::getInstance()->resizeEventInternal(width, height);
 
     Form::resizeEventInternal(width, height);
 }
@@ -103,8 +79,7 @@ void Platform::gamepadEventInternal(Gamepad::GamepadEvent evt, Gamepad* gamepad,
 {
     if (!Form::gamepadEventInternal(evt, gamepad, analogIndex))
     {
-        Game::getInstance()->gamepadEvent(evt, gamepad);
-        Game::getInstance()->getScriptController()->gamepadEvent(evt, gamepad);
+        Game::getInstance()->gamepadEventInternal(evt, gamepad, analogIndex);
     }
 }
 

gameplay/src/ScriptController.cpp

@@ -268,6 +268,39 @@ void ScriptUtil::registerConstantString(const std::string& name, const std::stri
     }
 }
 
+void ScriptUtil::registerEnumValue(int enumValue, const std::string& enumValueString, const std::vector<std::string>& scopePath)
+{
+    ScriptController* sc = Game::getInstance()->getScriptController();
+
+    // If the constant is within a scope, get the correct parent 
+    // table on the stack before setting its value.
+    if (!scopePath.empty())
+    {
+        lua_getglobal(sc->_lua, scopePath[0].c_str());
+        for (unsigned int i = 1; i < scopePath.size(); i++)
+        {
+            lua_pushstring(sc->_lua, scopePath[i].c_str());
+            lua_gettable(sc->_lua, -2);
+        }
+
+        // Add the enum value to the parent table.
+        lua_pushnumber(sc->_lua, enumValue);
+        lua_setfield(sc->_lua, -2, enumValueString.c_str());
+
+        // Pop all the parent tables off the stack.
+        int size = (int)scopePath.size();
+        lua_pop(sc->_lua, size);
+    }
+    else
+    {
+        // TODO: Currently unsupported (we don't parse for this yet).
+        // If the constant is global, add it to the global table.
+        lua_pushnumber(sc->_lua, enumValue);
+        lua_pushvalue(sc->_lua, -1);
+        lua_setglobal(sc->_lua, enumValueString.c_str());
+    }
+}
+
 void ScriptUtil::registerClass(const char* name, const luaL_Reg* members, lua_CFunction newFunction, 
     lua_CFunction deleteFunction, const luaL_Reg* statics,  const std::vector<std::string>& scopePath)
 {
@@ -365,11 +398,6 @@ void ScriptUtil::setGlobalHierarchyPair(const std::string& base, const std::stri
     Game::getInstance()->getScriptController()->_hierarchy[base].push_back(derived);
 }
 
-void ScriptUtil::addStringFromEnumConversionFunction(luaStringEnumConversionFunction stringFromEnum)
-{
-    Game::getInstance()->getScriptController()->_stringFromEnum.push_back(stringFromEnum);
-}
-
 ScriptUtil::LuaArray<bool> ScriptUtil::getBoolPointer(int index)
 {
     GENERATE_LUA_GET_POINTER(bool, luaCheckBool);
@@ -873,6 +901,17 @@ void ScriptController::setString(const char* name, const char* v, int script)
     }
 }
 
+bool ScriptController::functionExists(const char* name, int script) const
+{
+    PUSH_NESTED_VARIABLE(name, false, script);
+
+    bool result = lua_isfunction(_lua, -1) ? true : false;
+
+    POP_NESTED_VARIABLE();
+
+    return result;
+}
+
 void ScriptController::print(const char* str)
 {
     gameplay::print("%s", str);
@@ -986,127 +1025,21 @@ void ScriptController::initialize()
     }
 }
 
-void ScriptController::initializeGame()
-{
-    std::vector<std::string>& list = _callbacks[INITIALIZE];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str());
-}
-
 void ScriptController::finalize()
 {
     if (_lua)
 	{
+        // Perform a full garbage collection cycle.
+        // Note that this does NOT free any global variables declared in scripts, since 
+        // they are stored in the global state and are still referenced. Only after 
+        // closing the state (lua_close) will those variables be released.
+        lua_gc(_lua, LUA_GCCOLLECT, 0);
+
         lua_close(_lua);
 		_lua = NULL;
 	}
 }
 
-void ScriptController::finalizeGame()
-{
-    std::vector<std::string> finalizeCallbacks = _callbacks[FINALIZE]; // no & : makes a copy of the vector
-
-	// Remove any registered callbacks so they don't get called after shutdown
-	for (unsigned int i = 0; i < CALLBACK_COUNT; i++)
-        _callbacks[i].clear();
-
-	// Fire script finalize callbacks
-    for (size_t i = 0; i < finalizeCallbacks.size(); ++i)
-        executeFunction<void>(finalizeCallbacks[i].c_str());
-
-    // Perform a full garbage collection cycle.
-	// Note that this does NOT free any global variables declared in scripts, since 
-	// they are stored in the global state and are still referenced. Only after 
-	// closing the state (lua_close) will those variables be released.
-    lua_gc(_lua, LUA_GCCOLLECT, 0);
-}
-
-void ScriptController::update(float elapsedTime)
-{
-    std::vector<std::string>& list = _callbacks[UPDATE];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "f", elapsedTime);
-}
-
-void ScriptController::render(float elapsedTime)
-{
-    std::vector<std::string>& list = _callbacks[RENDER];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "f", elapsedTime);
-}
-
-void ScriptController::resizeEvent(unsigned int width, unsigned int height)
-{
-    std::vector<std::string>& list = _callbacks[RESIZE_EVENT];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "uiui", width, height);
-}
-
-void ScriptController::keyEvent(Keyboard::KeyEvent evt, int key)
-{
-    std::vector<std::string>& list = _callbacks[KEY_EVENT];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "[Keyboard::KeyEvent][Keyboard::Key]", evt, key);
-}
-
-void ScriptController::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex)
-{
-    std::vector<std::string>& list = _callbacks[TOUCH_EVENT];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "[Touch::TouchEvent]iiui", evt, x, y, contactIndex);
-}
-
-bool ScriptController::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelDelta)
-{
-    std::vector<std::string>& list = _callbacks[MOUSE_EVENT];
-    for (size_t i = 0; i < list.size(); ++i)
-    {
-        if (executeFunction<bool>(list[i].c_str(), "[Mouse::MouseEvent]iii", evt, x, y, wheelDelta))
-            return true;
-    }
-    return false;
-}
-
-void ScriptController::gestureSwipeEvent(int x, int y, int direction)
-{
-    std::vector<std::string>& list = _callbacks[GESTURE_SWIPE_EVENT];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "iii", x, y, direction);
-}
-
-void ScriptController::gesturePinchEvent(int x, int y, float scale)
-{
-    std::vector<std::string>& list = _callbacks[GESTURE_PINCH_EVENT];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "iif", x, y, scale);
-}
-
-void ScriptController::gestureTapEvent(int x, int y)
-{
-    std::vector<std::string>& list = _callbacks[GESTURE_TAP_EVENT];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "ii", x, y);
-}
-
-void ScriptController::gestureLongTapEvent(int x, int y, float duration)
-{
-}
-
-void ScriptController::gestureDragEvent(int x, int y)
-{
-}
-
-void ScriptController::gestureDropEvent(int x, int y)
-{
-}
-
-void ScriptController::gamepadEvent(Gamepad::GamepadEvent evt, Gamepad* gamepad, unsigned int analogIndex)
-{
-    std::vector<std::string>& list = _callbacks[GAMEPAD_EVENT];
-    for (size_t i = 0; i < list.size(); ++i)
-        executeFunction<void>(list[i].c_str(), "[Gamepad::GamepadEvent]<Gamepad>", evt, gamepad);
-}
-
 void ScriptController::executeFunctionHelper(int resultCount, const char* func, const char* args, va_list* list, int script)
 {
 	if (!_lua)
@@ -1118,6 +1051,13 @@ void ScriptController::executeFunctionHelper(int resultCount, const char* func,
         return;
     }
 
+    // If script was not specified (or is 0/global) and we are currently executing another function,
+    // call this function in the previous call's environment (stored in _envStack).
+    // This allows gameplay script callbacks (such as Scene.visit) to work locally when called
+    // from an sandboxed script.
+    if (script == 0 && !_envStack.empty())
+        script = _envStack.back();
+
     if (!getNestedVariable(_lua, func, script))
     {
         GP_WARN("Failed to call function '%s'", func);
@@ -1176,14 +1116,8 @@ void ScriptController::executeFunctionHelper(int resultCount, const char* func,
                 // Skip past the closing ']' (the semi-colon here is intentional-do not remove).
                 while (*sig++ != ']');
 
-                unsigned int value = va_arg(*list, int);
-                std::string enumStr = "";
-                for (unsigned int i = 0; enumStr.size() == 0 && i < _stringFromEnum.size(); i++)
-                {
-                    enumStr = (*_stringFromEnum[i])(type, value);
-                }
-
-                lua_pushstring(_lua, enumStr.c_str());
+                // We simply push enums as the integer values they represent
+                lua_pushnumber(_lua, va_arg(*list, int));
                 break;
             }
             // Object references/pointers (Lua userdata).
@@ -1230,68 +1164,13 @@ void ScriptController::executeFunctionHelper(int resultCount, const char* func,
         }
     }
 
+    _envStack.push_back(script);
+
     // Perform the function call.
     if (lua_pcall(_lua, argumentCount, resultCount, 0) != 0)
         GP_WARN("Failed to call function '%s' with error '%s'.", func, lua_tostring(_lua, -1));
-}
-
-void ScriptController::registerCallback(const char* callback, const char* function)
-{
-    ScriptCallback scb = toCallback(callback);
-    if (scb < INVALID_CALLBACK)
-    {
-        _callbacks[scb].push_back(function);
-    }
-    else
-    {
-        GP_WARN("Invalid script callback function specified: %s", callback);
-    }
-}
-
-void ScriptController::unregisterCallback(const char* callback, const char* function)
-{
-    ScriptCallback scb = toCallback(callback);
-    if (scb < INVALID_CALLBACK)
-    {
-        std::vector<std::string>& list = _callbacks[scb];
-        std::vector<std::string>::iterator itr = std::find(list.begin(), list.end(), std::string(function));
-        if (itr != list.end())
-            list.erase(itr);
-    }
-    else
-    {
-        GP_WARN("Invalid script callback function specified: %s", callback);
-    }
-}
 
-ScriptController::ScriptCallback ScriptController::toCallback(const char* name)
-{
-    if (strcmp(name, "initialize") == 0)
-        return ScriptController::INITIALIZE;
-    else if (strcmp(name, "update") == 0)
-        return ScriptController::UPDATE;
-    else if (strcmp(name, "render") == 0)
-        return ScriptController::RENDER;
-    else if (strcmp(name, "finalize") == 0)
-        return ScriptController::FINALIZE;
-    else if (strcmp(name, "resizeEvent") == 0)
-        return ScriptController::RESIZE_EVENT;
-    else if (strcmp(name, "keyEvent") == 0)
-        return ScriptController::KEY_EVENT;
-    else if (strcmp(name, "touchEvent") == 0)
-        return ScriptController::TOUCH_EVENT;
-    else if (strcmp(name, "mouseEvent") == 0)
-        return ScriptController::MOUSE_EVENT;
-    else if (strcmp(name, "gestureSwipeEvent") == 0)
-        return ScriptController::GESTURE_SWIPE_EVENT;
-    else if (strcmp(name, "gesturePinchEvent") == 0)
-        return ScriptController::GESTURE_PINCH_EVENT;
-    else if (strcmp(name, "gestureTapEvent") == 0)
-        return ScriptController::GESTURE_TAP_EVENT;
-    else if (strcmp(name, "gamepadEvent") == 0)
-        return ScriptController::GAMEPAD_EVENT;
-    else
-        return ScriptController::INVALID_CALLBACK;
+    _envStack.pop_back();
 }
 
 int ScriptController::convert(lua_State* state)

gameplay/src/ScriptController.h

@@ -8,9 +8,6 @@
 namespace gameplay
 {
 
-/** Function pointer typedef for string-from-enum conversion functions. */
-typedef const char* (*luaStringEnumConversionFunction)(std::string&, unsigned int);
-
 /**
  * Functions and structures used by the generated Lua script bindings.
  */
@@ -142,6 +139,17 @@ void registerConstantNumber(const std::string& name, double value, const std::ve
  */
 void registerConstantString(const std::string& name, const std::string& value, const std::vector<std::string>& scopePath);
 
+/**
+ * Registers the given enum value as valid for the given scope path.
+ *
+ * @param enumValue The enumeration value, expressed as an integer.
+ * @param enumValueString The string representation of the enum value (what the user would use from Lua).
+ * @param scopePath The list of containing classes, going inward from the most outer class.
+ *
+ * @script{ignore}
+ */
+void registerEnumValue(int enumValue, const std::string& enumValueString, const std::vector<std::string>& scopePath);
+
 /**
  * Registers the given class type with Lua.
  * 
@@ -177,15 +185,6 @@ void registerFunction(const char* luaFunction, lua_CFunction cppFunction);
  */
 void setGlobalHierarchyPair(const std::string& base, const std::string& derived);
 
-/**
- * Adds the given function as a string-from-enumerated value conversion function.
- * 
- * @param stringFromEnum The pointer to the string-from-enum conversion function.
- * 
- * @script{ignore}
- */
-void addStringFromEnumConversionFunction(luaStringEnumConversionFunction stringFromEnum);
-
 /**
  * Gets a pointer to a bool (as an array-use SAFE_DELETE_ARRAY to clean up) for the given stack index.
  * 
@@ -419,30 +418,6 @@ public:
      */
     void parseUrl(const char* url, std::string* script, std::string* function);
 
-    /**
-     * Registers the given script callback.
-     *
-     * The 'callback' parameter must be one of the supported global callback
-     * event functions. The following strings are accepted: initialize, finalize,
-     * update, render, resizeEvent, keyEvent, touchEvent, mouseEvent, gamepadEvent.
-     * Signatures for the registered script function must match that of the
-     * corresponding signatures of these events on the Game class.
-     *
-     * @param callback The script callback to register for.
-     * @param function The name of the script function to register.
-     */
-    void registerCallback(const char* callback, const char* function);
-
-    /**
-     * Unregisters the given script callback.
-     *
-     * @param callback The script callback to unregister for.
-     * @param function The name of the script function to unregister.
-     *
-     * @see registerCallback(const char*, const char*)
-     */
-    void unregisterCallback(const char* callback, const char* function);
-
     /**
      * Calls the specified no-parameter global Lua function.
      * 
@@ -824,6 +799,16 @@ public:
      */
     template<typename T>void setObjectPointer(const char* type, const char* name, T* v);
 
+    /**
+     * Determines if there exists a function with the specified name in the given script environment.
+     *
+     * @param name The name of the function to check.
+     * @param script Optional ID of the script environment to inspect, or zero to inspect the global environment.
+     *
+     * @return True if the specified function exists, false otherwise.
+     */
+    bool functionExists(const char* name, int script = 0) const;
+
     /**
      * Prints the string to the platform's output stream or log file.
      * Used for overriding Lua's print function.
@@ -843,27 +828,6 @@ public:
 
 private:
 
-    /**
-     * Represents a callback function that can be registered for.
-     */
-    enum ScriptCallback
-    {
-        INITIALIZE = 0,
-        UPDATE,
-        RENDER,
-        FINALIZE,
-        RESIZE_EVENT,
-        KEY_EVENT,
-        MOUSE_EVENT,
-        TOUCH_EVENT,
-        GESTURE_SWIPE_EVENT,
-        GESTURE_PINCH_EVENT,
-        GESTURE_TAP_EVENT,
-        GAMEPAD_EVENT,
-        CALLBACK_COUNT,
-        INVALID_CALLBACK = CALLBACK_COUNT
-    };
-
     /**
      * Constructor.
      */
@@ -880,146 +844,15 @@ private:
     ~ScriptController();
 
     /**
-     * Callback for when the controller is initialized.
+     * Called to initialize the script controller.
      */
     void initialize();
 
-    /**
-     * Initializes the game using the appropriate callback script (if it was specified).
-     */
-    void initializeGame();
-
     /*
-     * Callback for when the controller is finalized.
+     * Called to finalize the script controller.
      */
     void finalize();
 
-    /**
-     * Finalizes the game using the appropriate callback script (if it was specified).
-     */
-    void finalizeGame();
-    
-    /**
-     * Callback for when the controller receives a frame update event.
-     */
-    void update(float elapsedTime);
-
-    /**
-     * Renders the game using the appropriate callback script (if it was specified).
-     */
-    void render(float elapsedTime);
-
-    /**
-     * Script callback for game resize events.
-     *
-     * @param width The new width of the game window content area.
-     * @param height The new height of the game window content area.
-     */
-    void resizeEvent(unsigned int width, unsigned int height);
-
-    /**
-     * Script keyboard callback on key events.
-     *
-     * @param evt The key event that occurred.
-     * @param key If evt is KEY_PRESS or KEY_RELEASE then key is the key code from Keyboard::Key.
-     *            If evt is KEY_CHAR then key is the unicode value of the character.
-     * 
-     * @see Keyboard::KeyEvent
-     * @see Keyboard::Key
-     */
-    void keyEvent(Keyboard::KeyEvent evt, int key);
-
-    /**
-     * Script touch callback on touch events.
-     *
-     * @param evt The touch event that occurred.
-     * @param x The x position of the touch in pixels. Left edge is zero.
-     * @param y The y position of the touch in pixels. Top edge is zero.
-     * @param contactIndex The order of occurrence for multiple touch contacts starting at zero.
-     *
-     * @see Touch::TouchEvent
-     */
-    void touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex);
-
-    /**
-     * Script mouse callback on mouse events. If the game does not consume the mouse move event or left mouse click event
-     * then it is interpreted as a touch event instead.
-     *
-     * @param evt The mouse event that occurred.
-     * @param x The x position of the mouse in pixels. Left edge is zero.
-     * @param y The y position of the mouse in pixels. Top edge is zero.
-     * @param wheelDelta The number of mouse wheel ticks. Positive is up (forward), negative is down (backward).
-     *
-     * @return True if the mouse event is consumed or false if it is not consumed.
-     *
-     * @see Mouse::MouseEvent
-     */
-    bool mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelDelta);
-
-    /**
-     * Script callback for Gesture::SWIPE events.
-     *
-     * @param x The x-coordinate of the start of the swipe.
-     * @param y The y-coordinate of the start of the swipe.
-     * @param direction The direction of the swipe
-     *
-     * @see Gesture::SWIPE_DIRECTION_UP
-     * @see Gesture::SWIPE_DIRECTION_DOWN
-     * @see Gesture::SWIPE_DIRECTION_LEFT
-     * @see Gesture::SWIPE_DIRECTION_RIGHT
-     */
-    void gestureSwipeEvent(int x, int y, int direction);
-
-    /**
-     * Script callback for Gesture::PINCH events.
-     *
-     * @param x The centroid x-coordinate of the pinch.
-     * @param y The centroid y-coordinate of the pinch.
-     * @param scale The scale of the pinch.
-     */
-    void gesturePinchEvent(int x, int y, float scale);
-
-    /**
-     * Script callback for Gesture::TAP events.
-     *
-     * @param x The x-coordinate of the tap.
-     * @param y The y-coordinate of the tap.
-     */
-    void gestureTapEvent(int x, int y);
-
-	/**
-	 * Gesture callback on Gesture::LONG_TAP events.
-	 *
-	 * @param x The x-coordinate of the long tap.
-	 * @param y The y-coordinate of the long tap.
-	 * @param duration The duration of the long tap in ms.
-	 */
-	void gestureLongTapEvent(int x, int y, float duration);
-
-	/**
-	 * Gesture callback on Gesture::DRAG events.
-	 *
-	 * @param x The x-coordinate of the start of the drag event.
-	 * @param y The y-coordinate of the start of the drag event.
-	 */
-	void gestureDragEvent(int x, int y);
-
-	/**
-	 * Gesture callback on Gesture::DROP events.
-	 *
-	 * @param x The x-coordinate of the drop event.
-	 * @param y The y-coordinate of the drop event.
-	 */
-	void gestureDropEvent(int x, int y);
-
-    /**
-     * Script gamepad callback on gamepad events.
-     *
-     * @param evt The gamepad event that occurred.
-     * @param gamepad the gamepad the event occurred on
-     */
-    void gamepadEvent(Gamepad::GamepadEvent evt, Gamepad* gamepad, unsigned int analogIndex = 0);
-
     /**
      * Calls the specified Lua function using the given parameters.
      * 
@@ -1047,16 +880,6 @@ private:
      */
     void executeFunctionHelper(int resultCount, const char* func, const char* args, va_list* list, int script = 0);
 
-    /**
-     * Converts the given string to a valid script callback enumeration value
-     * or to ScriptController::INVALID_CALLBACK if there is no valid conversion.
-     * 
-     * @param name The name of the callback.
-     * 
-     * @return The corresponding callback enumeration value.
-     */
-    static ScriptController::ScriptCallback toCallback(const char* name);
-
     /**
      * Converts a Gameplay userdata value to the type with the given class name.
      * This function will change the metatable of the userdata value to the metatable that matches the given string.
@@ -1088,11 +911,11 @@ private:
     friend void ScriptUtil::registerConstantBool(const std::string& name, bool value, const std::vector<std::string>& scopePath);
     friend void ScriptUtil::registerConstantNumber(const std::string& name, double value, const std::vector<std::string>& scopePath);
     friend void ScriptUtil::registerConstantString(const std::string& name, const std::string& value, const std::vector<std::string>& scopePath);
+    friend void ScriptUtil::registerEnumValue(int enumValue, const std::string& enumValueString, const std::vector<std::string>& scopePath);
     friend void ScriptUtil::registerClass(const char* name, const luaL_Reg* members, lua_CFunction newFunction,
         lua_CFunction deleteFunction, const luaL_Reg* statics, const std::vector<std::string>& scopePath);
     friend void ScriptUtil::registerFunction(const char* luaFunction, lua_CFunction cppFunction);
     friend void ScriptUtil::setGlobalHierarchyPair(const std::string& base, const std::string& derived);
-    friend void ScriptUtil::addStringFromEnumConversionFunction(luaStringEnumConversionFunction stringFromEnum);
     friend ScriptUtil::LuaArray<bool> ScriptUtil::getBoolPointer(int index);
     friend ScriptUtil::LuaArray<short> ScriptUtil::getShortPointer(int index);
     friend ScriptUtil::LuaArray<int> ScriptUtil::getIntPointer(int index);
@@ -1109,10 +932,9 @@ private:
     lua_State* _lua;
     unsigned int _returnCount;
     std::map<std::string, std::vector<std::string> > _hierarchy;
-    std::vector<std::string> _callbacks[CALLBACK_COUNT];
     std::set<std::string> _loadedScripts;
     std::map<int, std::string> _environments;
-    std::vector<luaStringEnumConversionFunction> _stringFromEnum;
+    std::vector<int> _envStack;
 };
 
 /** Template specialization. */

gameplay/src/ScriptTarget.cpp

@@ -5,22 +5,34 @@
 namespace gameplay
 {
 
+// TODO: Handle reloading scripts and then case where EventRegistries have events added AFTER a script has been loaded (i.e. need to reload callbacks for the script).
+// TODO: Should eventCallbacks store a vector of Event pointers instead of std::string (so we only have to do pointer comparisons instead of string comparisons)? What if Events are destroyed?
+// TODO: Should isolated scripts be cached (not currently), or a new script loaded for every ScriptTarget instance?
+
 ScriptTarget::EventRegistry::EventRegistry()
 {
 }
 
+ScriptTarget::EventRegistry::~EventRegistry()
+{
+    for (size_t i = 0, count = _events.size(); i < count; ++i)
+    {
+        SAFE_DELETE(_events[i]);
+    }
+}
+
 const ScriptTarget::EventRegistry::Event* ScriptTarget::EventRegistry::addEvent(const char* name, const char* args)
 {
     GP_ASSERT(name);
 
-    Event evt;
-    evt.name = name;
-    evt.args = args ? args : "";
-    evt.registry = this;
+    Event* evt = new Event;
+    evt->name = name;
+    evt->args = args ? args : "";
+    evt->registry = this;
 
     _events.push_back(evt);
 
-    return &_events.back();
+    return evt;
 }
 
 unsigned int ScriptTarget::EventRegistry::getEventCount() const
@@ -32,7 +44,7 @@ const ScriptTarget::EventRegistry::Event* ScriptTarget::EventRegistry::getEvent(
 {
     GP_ASSERT(index < _events.size());
 
-    return &_events[index];
+    return _events[index];
 }
 
 ScriptTarget::ScriptTarget() : _scripts(NULL), _events(NULL)
@@ -45,7 +57,15 @@ ScriptTarget::~ScriptTarget()
     Script* script = _scripts;
     while (script)
     {
-        Game::getInstance()->getScriptController()->unloadScript(script->id);
+        // The Game class is itself a ScriptTarget, so we need to protect against
+        // this destructor being called after the Game's destructor, when the
+        // ScriptController has already been destroyed.
+        Game* game = Game::getInstance();
+        if (game)
+        {
+            ScriptController* sc = game->getScriptController();
+            sc->unloadScript(script->id);
+        }
         script->id = 0;
         Script* tmp = script;
         script = script->next;
@@ -91,7 +111,23 @@ int ScriptTarget::addScript(const char* path)
         _scripts = script;
     }
 
-    // TODO: Inspect the loaded script for supported event functions
+    // Inspect the loaded script for supported event functions.
+    // TODO: We'll need to re-load eventCallbacks when EventRegistries change for this ScriptObject.
+    if (_events)
+    {
+        for (size_t i = 0, registryCount = _events->size(); i < registryCount; ++i)
+        {
+            std::vector<EventRegistry::Event*>& events = (*_events)[i]->_events;
+            for (size_t j = 0, eventCount = events.size(); j < eventCount; ++j)
+            {
+                EventRegistry::Event* event = events[j];
+                if (sc->functionExists(event->name.c_str(), id))
+                {
+                    script->eventCallbacks.push_back(event);
+                }
+            }
+        }
+    }
 
     return script->id;
 }
@@ -103,18 +139,7 @@ bool ScriptTarget::removeScript(const char* path)
     {
         if (script->path == path)
         {
-            // Link out this script
-            Script* next = script->next;
-            if (script->prev)
-                script->prev->next = script->next;
-            if (script->next)
-                script->next->prev = script->prev;
-            
-            // Unload the script
-            Game::getInstance()->getScriptController()->unloadScript(script->id);
-
-            // Free the script object
-            SAFE_DELETE(script);
+            removeScript(script);
 
             return true;
         }
@@ -124,16 +149,47 @@ bool ScriptTarget::removeScript(const char* path)
     return false;
 }
 
+void ScriptTarget::removeScript(Script* script)
+{
+    GP_ASSERT(script);
+
+    // Link out this script
+    Script* next = script->next;
+    if (script->prev)
+        script->prev->next = script->next;
+    if (script->next)
+        script->next->prev = script->prev;
+
+    // Unload the script
+    Game::getInstance()->getScriptController()->unloadScript(script->id);
+
+    // Free the script object
+    SAFE_DELETE(script);
+}
+
+void ScriptTarget::clearScripts()
+{
+    while (_scripts)
+    {
+        removeScript(_scripts);
+    }
+}
+
 bool ScriptTarget::hasScriptListener(const EventRegistry::Event* evt) const
 {
     Script* script = _scripts;
     while (script)
     {
         // Does this script have a callback implemented for the given event?
-        std::vector<std::string>& callbacks = script->eventCallbacks;
-        std::vector<std::string>::iterator itr = std::find(callbacks.begin(), callbacks.end(), evt->name);
-        if (itr != callbacks.end())
-            return true;
+        std::vector<const EventRegistry::Event*>& callbacks = script->eventCallbacks;
+        for (size_t i = 0, count = callbacks.size(); i < count; ++i)
+        {
+            if (callbacks[i] == evt)
+                return true;
+        }
+        //std::vector<std::string>::iterator itr = std::find(callbacks.begin(), callbacks.end(), evt->name);
+        //if (itr != callbacks.end())
+            //return true;
         script = script->next;
     }
 
@@ -152,12 +208,22 @@ template<> void ScriptTarget::fireScriptEvent<void>(const EventRegistry::Event*
     while (script)
     {
         // Is there a callback in this script for this event?
+        std::vector<const EventRegistry::Event*>& callbacks = script->eventCallbacks;
+        for (size_t i = 0, count = callbacks.size(); i < count; ++i)
+        {
+            if (callbacks[i] == evt)
+            {
+                Game::getInstance()->getScriptController()->executeFunction<void>(evt->name.c_str(), evt->args.c_str(), &list, script->id);
+            }
+        }
+        /*
         std::vector<std::string>& callbacks = script->eventCallbacks;
         std::vector<std::string>::iterator itr = std::find(callbacks.begin(), callbacks.end(), evt->name);
         if (itr != callbacks.end())
         {
             Game::getInstance()->getScriptController()->executeFunction<void>(itr->c_str(), evt->args.c_str(), &list, script->id);
         }
+        */
 
         script = script->next;
     }
@@ -175,6 +241,20 @@ template<> bool ScriptTarget::fireScriptEvent<bool>(const EventRegistry::Event*
     while (script)
     {
         // Is there a callback in this script for this event?
+        std::vector<const EventRegistry::Event*>& callbacks = script->eventCallbacks;
+        for (size_t i = 0, count = callbacks.size(); i < count; ++i)
+        {
+            if (callbacks[i] == evt)
+            {
+                // Call the script function
+                if (Game::getInstance()->getScriptController()->executeFunction<bool>(evt->name.c_str(), evt->args.c_str(), &list, script->id))
+                {
+                    va_end(list);
+                    return true;
+                }
+            }
+        }
+        /*
         std::vector<std::string>& callbacks = script->eventCallbacks;
         std::vector<std::string>::iterator itr = std::find(callbacks.begin(), callbacks.end(), evt->name);
         if (itr != callbacks.end())
@@ -186,6 +266,7 @@ template<> bool ScriptTarget::fireScriptEvent<bool>(const EventRegistry::Event*
                 return true;
             }
         }
+        */
 
         script = script->next;
     }

gameplay/src/ScriptTarget.h

@@ -57,6 +57,8 @@ namespace gameplay
  */
 class ScriptTarget
 {
+    friend class Game;
+
 public:
 
     /**
@@ -69,6 +71,7 @@ public:
      */
     class EventRegistry
     {
+        friend class ScriptTarget;
     public:
 
         /**
@@ -101,6 +104,11 @@ public:
          */
         EventRegistry();
 
+        /**
+         * Destructor.
+         */
+        ~EventRegistry();
+
         /**
          * Adds a registered event to the registry.
          *
@@ -131,7 +139,7 @@ public:
 
     private:
 
-        std::vector<Event> _events;
+        std::vector<Event*> _events;
     };
 
     /**
@@ -150,6 +158,11 @@ public:
      */
     bool removeScript(const char* path);
 
+    /**
+     *  Removes all scripts from this object.
+     */
+    void clearScripts();
+
     /**
      * Determines if there is a script installed that is listening for the given script
      * event (i.e. has a function callback defined for the given event).
@@ -157,11 +170,34 @@ public:
      * @param evt The script event to check.
      *
      * @return True if there is a listener for the specified event, false otherwise.
+     *
+     * @script{ignore}
      */
     bool hasScriptListener(const EventRegistry::Event* evt) const;
 
 protected:
 
+    /**
+     * Stores an attached script.
+     */
+    struct Script
+    {
+        // The ID of the script
+        int id;
+
+        // The path the script was loaded from
+        std::string path;
+
+        // Event callback functions available to be called for this script
+        std::vector<const EventRegistry::Event*> eventCallbacks;
+
+        // Linked list info
+        Script* next;
+        Script* prev;
+
+        Script() : id(0), next(NULL), prev(NULL) { }
+    };
+
     /**
      * Constructor.
      */
@@ -172,6 +208,11 @@ protected:
      */
     virtual ~ScriptTarget();
 
+    /**
+     * Removes the specified script.
+     */
+    void removeScript(Script* script);
+
     /**
      * Registers a set of supported script events and event arguments for this ScriptTarget. 
      *
@@ -201,25 +242,6 @@ protected:
      */
     template<typename T> T fireScriptEvent(const EventRegistry::Event* evt, ...);
 
-    /** Stores an attached script. */
-    struct Script
-    {
-        // The ID of the script
-        int id;
-
-        // The path the script was loaded from
-        std::string path;
-
-        // Event callback functions available to be called for this script
-        std::vector<std::string> eventCallbacks;
-
-        // Linked list info
-        Script* next;
-        Script* prev;
-
-        Script() : id(0), next(NULL), prev(NULL) { }
-    };
-
     /** Holds the registered events for this script target. */
     std::vector<EventRegistry*>* _events;
     /** Holds the list of scripts referenced by this ScriptTarget. */

gameplay/src/lua/lua_AIAgent.cpp

@@ -18,6 +18,7 @@ void luaRegister_AIAgent()
     {
         {"addRef", lua_AIAgent_addRef},
         {"addScript", lua_AIAgent_addScript},
+        {"clearScripts", lua_AIAgent_clearScripts},
         {"getId", lua_AIAgent_getId},
         {"getNode", lua_AIAgent_getNode},
         {"getRefCount", lua_AIAgent_getRefCount},
@@ -155,6 +156,38 @@ int lua_AIAgent_addScript(lua_State* state)
     return 0;
 }
 
+int lua_AIAgent_clearScripts(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))
+            {
+                AIAgent* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_AIAgent_clearScripts - 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_AIAgent_getId(lua_State* state)
 {
     // Get the number of parameters.

gameplay/src/lua/lua_AIAgent.h

@@ -8,6 +8,7 @@ namespace gameplay
 int lua_AIAgent__gc(lua_State* state);
 int lua_AIAgent_addRef(lua_State* state);
 int lua_AIAgent_addScript(lua_State* state);
+int lua_AIAgent_clearScripts(lua_State* state);
 int lua_AIAgent_getId(lua_State* state);
 int lua_AIAgent_getNode(lua_State* state);
 int lua_AIAgent_getRefCount(lua_State* state);

gameplay/src/lua/lua_AIMessage.cpp

@@ -3,7 +3,6 @@
 #include "lua_AIMessage.h"
 #include "AIMessage.h"
 #include "Base.h"
-#include "lua_AIMessageParameterType.h"
 
 namespace gameplay
 {
@@ -334,7 +333,7 @@ int lua_AIMessage_getParameterType(lua_State* state)
                 AIMessage::ParameterType result = instance->getParameterType(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_AIMessageParameterType(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }

gameplay/src/lua/lua_AIMessageParameterType.cpp

@@ -1,56 +0,0 @@
-#include "Base.h"
-#include "lua_AIMessageParameterType.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_AIMessageParameterType_UNDEFINED = "UNDEFINED";
-static const char* luaEnumString_AIMessageParameterType_INTEGER = "INTEGER";
-static const char* luaEnumString_AIMessageParameterType_LONG = "LONG";
-static const char* luaEnumString_AIMessageParameterType_FLOAT = "FLOAT";
-static const char* luaEnumString_AIMessageParameterType_DOUBLE = "DOUBLE";
-static const char* luaEnumString_AIMessageParameterType_BOOLEAN = "BOOLEAN";
-static const char* luaEnumString_AIMessageParameterType_STRING = "STRING";
-
-AIMessage::ParameterType lua_enumFromString_AIMessageParameterType(const char* s)
-{
-    if (strcmp(s, luaEnumString_AIMessageParameterType_UNDEFINED) == 0)
-        return AIMessage::UNDEFINED;
-    if (strcmp(s, luaEnumString_AIMessageParameterType_INTEGER) == 0)
-        return AIMessage::INTEGER;
-    if (strcmp(s, luaEnumString_AIMessageParameterType_LONG) == 0)
-        return AIMessage::LONG;
-    if (strcmp(s, luaEnumString_AIMessageParameterType_FLOAT) == 0)
-        return AIMessage::FLOAT;
-    if (strcmp(s, luaEnumString_AIMessageParameterType_DOUBLE) == 0)
-        return AIMessage::DOUBLE;
-    if (strcmp(s, luaEnumString_AIMessageParameterType_BOOLEAN) == 0)
-        return AIMessage::BOOLEAN;
-    if (strcmp(s, luaEnumString_AIMessageParameterType_STRING) == 0)
-        return AIMessage::STRING;
-    return AIMessage::UNDEFINED;
-}
-
-const char* lua_stringFromEnum_AIMessageParameterType(AIMessage::ParameterType e)
-{
-    if (e == AIMessage::UNDEFINED)
-        return luaEnumString_AIMessageParameterType_UNDEFINED;
-    if (e == AIMessage::INTEGER)
-        return luaEnumString_AIMessageParameterType_INTEGER;
-    if (e == AIMessage::LONG)
-        return luaEnumString_AIMessageParameterType_LONG;
-    if (e == AIMessage::FLOAT)
-        return luaEnumString_AIMessageParameterType_FLOAT;
-    if (e == AIMessage::DOUBLE)
-        return luaEnumString_AIMessageParameterType_DOUBLE;
-    if (e == AIMessage::BOOLEAN)
-        return luaEnumString_AIMessageParameterType_BOOLEAN;
-    if (e == AIMessage::STRING)
-        return luaEnumString_AIMessageParameterType_STRING;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_AIMessageParameterType.h

@@ -1,15 +0,0 @@
-#ifndef LUA_AIMESSAGEPARAMETERTYPE_H_
-#define LUA_AIMESSAGEPARAMETERTYPE_H_
-
-#include "AIMessage.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for AIMessage::ParameterType.
-AIMessage::ParameterType lua_enumFromString_AIMessageParameterType(const char* s);
-const char* lua_stringFromEnum_AIMessageParameterType(AIMessage::ParameterType e);
-
-}
-
-#endif

gameplay/src/lua/lua_AIState.cpp

@@ -18,6 +18,7 @@ void luaRegister_AIState()
     {
         {"addRef", lua_AIState_addRef},
         {"addScript", lua_AIState_addScript},
+        {"clearScripts", lua_AIState_clearScripts},
         {"getId", lua_AIState_getId},
         {"getRefCount", lua_AIState_getRefCount},
         {"release", lua_AIState_release},
@@ -151,6 +152,38 @@ int lua_AIState_addScript(lua_State* state)
     return 0;
 }
 
+int lua_AIState_clearScripts(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))
+            {
+                AIState* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_AIState_clearScripts - 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_AIState_getId(lua_State* state)
 {
     // Get the number of parameters.

gameplay/src/lua/lua_AIState.h

@@ -8,6 +8,7 @@ namespace gameplay
 int lua_AIState__gc(lua_State* state);
 int lua_AIState_addRef(lua_State* state);
 int lua_AIState_addScript(lua_State* state);
+int lua_AIState_clearScripts(lua_State* state);
 int lua_AIState_getId(lua_State* state);
 int lua_AIState_getRefCount(lua_State* state);
 int lua_AIState_release(lua_State* state);

gameplay/src/lua/lua_AbsoluteLayout.cpp

@@ -8,7 +8,6 @@
 #include "Game.h"
 #include "Layout.h"
 #include "Ref.h"
-#include "lua_LayoutType.h"
 
 namespace gameplay
 {
@@ -157,7 +156,7 @@ int lua_AbsoluteLayout_getType(lua_State* state)
                 Layout::Type result = instance->getType();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_LayoutType(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }

gameplay/src/lua/lua_AnimationClip.cpp

@@ -9,7 +9,6 @@
 #include "Quaternion.h"
 #include "Ref.h"
 #include "ScriptController.h"
-#include "lua_AnimationClipListenerEventType.h"
 
 namespace gameplay
 {

gameplay/src/lua/lua_AnimationClipListener.cpp

@@ -9,7 +9,6 @@
 #include "Quaternion.h"
 #include "Ref.h"
 #include "ScriptController.h"
-#include "lua_AnimationClipListenerEventType.h"
 
 namespace gameplay
 {
@@ -85,7 +84,7 @@ int lua_AnimationClipListener_animationEvent(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TUSERDATA || lua_type(state, 2) == LUA_TTABLE || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 bool param1Valid;
@@ -97,7 +96,7 @@ int lua_AnimationClipListener_animationEvent(lua_State* state)
                 }
 
                 // Get parameter 2 off the stack.
-                AnimationClip::Listener::EventType param2 = (AnimationClip::Listener::EventType)lua_enumFromString_AnimationClipListenerEventType(luaL_checkstring(state, 3));
+                AnimationClip::Listener::EventType param2 = (AnimationClip::Listener::EventType)luaL_checkint(state, 3);
 
                 AnimationClip::Listener* instance = getInstance(state);
                 instance->animationEvent(param1, param2);

gameplay/src/lua/lua_AnimationClipListenerEventType.cpp

@@ -1,36 +0,0 @@
-#include "Base.h"
-#include "lua_AnimationClipListenerEventType.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_AnimationClipListenerEventType_BEGIN = "BEGIN";
-static const char* luaEnumString_AnimationClipListenerEventType_END = "END";
-static const char* luaEnumString_AnimationClipListenerEventType_TIME = "TIME";
-
-AnimationClip::Listener::EventType lua_enumFromString_AnimationClipListenerEventType(const char* s)
-{
-    if (strcmp(s, luaEnumString_AnimationClipListenerEventType_BEGIN) == 0)
-        return AnimationClip::Listener::BEGIN;
-    if (strcmp(s, luaEnumString_AnimationClipListenerEventType_END) == 0)
-        return AnimationClip::Listener::END;
-    if (strcmp(s, luaEnumString_AnimationClipListenerEventType_TIME) == 0)
-        return AnimationClip::Listener::TIME;
-    return AnimationClip::Listener::BEGIN;
-}
-
-const char* lua_stringFromEnum_AnimationClipListenerEventType(AnimationClip::Listener::EventType e)
-{
-    if (e == AnimationClip::Listener::BEGIN)
-        return luaEnumString_AnimationClipListenerEventType_BEGIN;
-    if (e == AnimationClip::Listener::END)
-        return luaEnumString_AnimationClipListenerEventType_END;
-    if (e == AnimationClip::Listener::TIME)
-        return luaEnumString_AnimationClipListenerEventType_TIME;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_AnimationClipListenerEventType.h

@@ -1,15 +0,0 @@
-#ifndef LUA_ANIMATIONCLIPLISTENEREVENTTYPE_H_
-#define LUA_ANIMATIONCLIPLISTENEREVENTTYPE_H_
-
-#include "AnimationClip.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for AnimationClip::Listener::EventType.
-AnimationClip::Listener::EventType lua_enumFromString_AnimationClipListenerEventType(const char* s);
-const char* lua_stringFromEnum_AnimationClipListenerEventType(AnimationClip::Listener::EventType e);
-
-}
-
-#endif

gameplay/src/lua/lua_AnimationTarget.cpp

@@ -6,7 +6,6 @@
 #include "Base.h"
 #include "Game.h"
 #include "Node.h"
-#include "lua_CurveInterpolationType.h"
 
 namespace gameplay
 {
@@ -127,7 +126,7 @@ int lua_AnimationTarget_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -145,7 +144,7 @@ int lua_AnimationTarget_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     AnimationTarget* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -182,7 +181,7 @@ int lua_AnimationTarget_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -206,7 +205,7 @@ int lua_AnimationTarget_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     AnimationTarget* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -256,7 +255,7 @@ int lua_AnimationTarget_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -272,7 +271,7 @@ int lua_AnimationTarget_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -324,7 +323,7 @@ int lua_AnimationTarget_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -340,7 +339,7 @@ int lua_AnimationTarget_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);

gameplay/src/lua/lua_AudioListener.cpp

@@ -7,7 +7,6 @@
 #include "Game.h"
 #include "Node.h"
 #include "PhysicsController.h"
-#include "lua_CameraType.h"
 
 namespace gameplay
 {

gameplay/src/lua/lua_AudioSource.cpp

@@ -13,8 +13,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Transform.h"
-#include "lua_AudioSourceState.h"
-#include "lua_CurveInterpolationType.h"
 
 namespace gameplay
 {
@@ -296,7 +294,7 @@ int lua_AudioSource_getState(lua_State* state)
                 AudioSource::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_AudioSourceState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }

gameplay/src/lua/lua_AudioSourceState.cpp

@@ -1,41 +0,0 @@
-#include "Base.h"
-#include "lua_AudioSourceState.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_AudioSourceState_INITIAL = "INITIAL";
-static const char* luaEnumString_AudioSourceState_PLAYING = "PLAYING";
-static const char* luaEnumString_AudioSourceState_PAUSED = "PAUSED";
-static const char* luaEnumString_AudioSourceState_STOPPED = "STOPPED";
-
-AudioSource::State lua_enumFromString_AudioSourceState(const char* s)
-{
-    if (strcmp(s, luaEnumString_AudioSourceState_INITIAL) == 0)
-        return AudioSource::INITIAL;
-    if (strcmp(s, luaEnumString_AudioSourceState_PLAYING) == 0)
-        return AudioSource::PLAYING;
-    if (strcmp(s, luaEnumString_AudioSourceState_PAUSED) == 0)
-        return AudioSource::PAUSED;
-    if (strcmp(s, luaEnumString_AudioSourceState_STOPPED) == 0)
-        return AudioSource::STOPPED;
-    return AudioSource::INITIAL;
-}
-
-const char* lua_stringFromEnum_AudioSourceState(AudioSource::State e)
-{
-    if (e == AudioSource::INITIAL)
-        return luaEnumString_AudioSourceState_INITIAL;
-    if (e == AudioSource::PLAYING)
-        return luaEnumString_AudioSourceState_PLAYING;
-    if (e == AudioSource::PAUSED)
-        return luaEnumString_AudioSourceState_PAUSED;
-    if (e == AudioSource::STOPPED)
-        return luaEnumString_AudioSourceState_STOPPED;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_AudioSourceState.h

@@ -1,15 +0,0 @@
-#ifndef LUA_AUDIOSOURCESTATE_H_
-#define LUA_AUDIOSOURCESTATE_H_
-
-#include "AudioSource.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for AudioSource::State.
-AudioSource::State lua_enumFromString_AudioSourceState(const char* s);
-const char* lua_stringFromEnum_AudioSourceState(AudioSource::State e);
-
-}
-
-#endif

gameplay/src/lua/lua_Button.cpp

@@ -15,12 +15,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Theme.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {
@@ -33,6 +27,7 @@ void luaRegister_Button()
         {"addRef", lua_Button_addRef},
         {"addScript", lua_Button_addScript},
         {"canFocus", lua_Button_canFocus},
+        {"clearScripts", lua_Button_clearScripts},
         {"createAnimation", lua_Button_createAnimation},
         {"createAnimationFromBy", lua_Button_createAnimationFromBy},
         {"createAnimationFromTo", lua_Button_createAnimationFromTo},
@@ -343,6 +338,38 @@ int lua_Button_canFocus(lua_State* state)
     return 0;
 }
 
+int lua_Button_clearScripts(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))
+            {
+                Button* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_Button_clearScripts - 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_Button_createAnimation(lua_State* state)
 {
     // Get the number of parameters.
@@ -432,7 +459,7 @@ int lua_Button_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -450,7 +477,7 @@ int lua_Button_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     Button* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -487,7 +514,7 @@ int lua_Button_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -511,7 +538,7 @@ int lua_Button_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     Button* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -561,7 +588,7 @@ int lua_Button_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -577,7 +604,7 @@ int lua_Button_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -629,7 +656,7 @@ int lua_Button_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -645,7 +672,7 @@ int lua_Button_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -792,7 +819,7 @@ int lua_Button_getAlignment(lua_State* state)
                 Control::Alignment result = instance->getAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAlignment(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -986,7 +1013,7 @@ int lua_Button_getAutoSize(lua_State* state)
                 Control::AutoSize result = instance->getAutoSize();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAutoSize(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1042,10 +1069,10 @@ int lua_Button_getBorder(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getBorder(param1));
@@ -1257,10 +1284,10 @@ int lua_Button_getCursorColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorColor(param1));
@@ -1305,10 +1332,10 @@ int lua_Button_getCursorRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorRegion(param1));
@@ -1353,10 +1380,10 @@ int lua_Button_getCursorUVs(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorUVs(param1));
@@ -1462,10 +1489,10 @@ int lua_Button_getFont(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)instance->getFont(param1);
@@ -1527,10 +1554,10 @@ int lua_Button_getFontSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 unsigned int result = instance->getFontSize(param1);
@@ -1637,13 +1664,13 @@ int lua_Button_getImageColor(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageColor(param1, param2));
@@ -1689,13 +1716,13 @@ int lua_Button_getImageRegion(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageRegion(param1, param2));
@@ -1741,13 +1768,13 @@ int lua_Button_getImageUVs(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageUVs(param1, param2));
@@ -1853,10 +1880,10 @@ int lua_Button_getOpacity(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 float result = instance->getOpacity(param1);
@@ -2041,10 +2068,10 @@ int lua_Button_getSkinColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinColor(param1));
@@ -2115,10 +2142,10 @@ int lua_Button_getSkinRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinRegion(param1));
@@ -2168,7 +2195,7 @@ int lua_Button_getState(lua_State* state)
                 Control::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2282,7 +2309,7 @@ int lua_Button_getTextAlignment(lua_State* state)
                 Font::Justify result = instance->getTextAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2294,16 +2321,16 @@ int lua_Button_getTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 Font::Justify result = instance->getTextAlignment(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2359,10 +2386,10 @@ int lua_Button_getTextColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getTextColor(param1));
@@ -2424,10 +2451,10 @@ int lua_Button_getTextRightToLeft(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 bool result = instance->getTextRightToLeft(param1);
@@ -3199,10 +3226,10 @@ int lua_Button_setAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::Alignment param1 = (Control::Alignment)lua_enumFromString_ControlAlignment(luaL_checkstring(state, 2));
+                Control::Alignment param1 = (Control::Alignment)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 instance->setAlignment(param1);
@@ -3313,10 +3340,10 @@ int lua_Button_setAutoSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::AutoSize param1 = (Control::AutoSize)lua_enumFromString_ControlAutoSize(luaL_checkstring(state, 2));
+                Control::AutoSize param1 = (Control::AutoSize)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 instance->setAutoSize(param1);
@@ -4574,10 +4601,10 @@ int lua_Button_setTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 Button* instance = getInstance(state);
                 instance->setTextAlignment(param1);
@@ -4592,11 +4619,11 @@ int lua_Button_setTextAlignment(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 unsigned char param2 = (unsigned char)luaL_checkunsigned(state, 3);

gameplay/src/lua/lua_Button.h

@@ -10,6 +10,7 @@ int lua_Button_addListener(lua_State* state);
 int lua_Button_addRef(lua_State* state);
 int lua_Button_addScript(lua_State* state);
 int lua_Button_canFocus(lua_State* state);
+int lua_Button_clearScripts(lua_State* state);
 int lua_Button_createAnimation(lua_State* state);
 int lua_Button_createAnimationFromBy(lua_State* state);
 int lua_Button_createAnimationFromTo(lua_State* state);

gameplay/src/lua/lua_Camera.cpp

@@ -12,8 +12,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Transform.h"
-#include "lua_CameraType.h"
-#include "lua_CurveInterpolationType.h"
 
 namespace gameplay
 {
@@ -236,7 +234,7 @@ int lua_Camera_getCameraType(lua_State* state)
                 Camera::Type result = instance->getCameraType();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_CameraType(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }

gameplay/src/lua/lua_CameraListener.cpp

@@ -12,8 +12,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Transform.h"
-#include "lua_CameraType.h"
-#include "lua_CurveInterpolationType.h"
 
 namespace gameplay
 {

gameplay/src/lua/lua_CameraType.cpp

@@ -1,31 +0,0 @@
-#include "Base.h"
-#include "lua_CameraType.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_CameraType_PERSPECTIVE = "PERSPECTIVE";
-static const char* luaEnumString_CameraType_ORTHOGRAPHIC = "ORTHOGRAPHIC";
-
-Camera::Type lua_enumFromString_CameraType(const char* s)
-{
-    if (strcmp(s, luaEnumString_CameraType_PERSPECTIVE) == 0)
-        return Camera::PERSPECTIVE;
-    if (strcmp(s, luaEnumString_CameraType_ORTHOGRAPHIC) == 0)
-        return Camera::ORTHOGRAPHIC;
-    return Camera::PERSPECTIVE;
-}
-
-const char* lua_stringFromEnum_CameraType(Camera::Type e)
-{
-    if (e == Camera::PERSPECTIVE)
-        return luaEnumString_CameraType_PERSPECTIVE;
-    if (e == Camera::ORTHOGRAPHIC)
-        return luaEnumString_CameraType_ORTHOGRAPHIC;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_CameraType.h

@@ -1,15 +0,0 @@
-#ifndef LUA_CAMERATYPE_H_
-#define LUA_CAMERATYPE_H_
-
-#include "Camera.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Camera::Type.
-Camera::Type lua_enumFromString_CameraType(const char* s);
-const char* lua_stringFromEnum_CameraType(Camera::Type e);
-
-}
-
-#endif

gameplay/src/lua/lua_CheckBox.cpp

@@ -16,12 +16,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Theme.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {
@@ -34,6 +28,7 @@ void luaRegister_CheckBox()
         {"addRef", lua_CheckBox_addRef},
         {"addScript", lua_CheckBox_addScript},
         {"canFocus", lua_CheckBox_canFocus},
+        {"clearScripts", lua_CheckBox_clearScripts},
         {"createAnimation", lua_CheckBox_createAnimation},
         {"createAnimationFromBy", lua_CheckBox_createAnimationFromBy},
         {"createAnimationFromTo", lua_CheckBox_createAnimationFromTo},
@@ -347,6 +342,38 @@ int lua_CheckBox_canFocus(lua_State* state)
     return 0;
 }
 
+int lua_CheckBox_clearScripts(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))
+            {
+                CheckBox* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_CheckBox_clearScripts - 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_CheckBox_createAnimation(lua_State* state)
 {
     // Get the number of parameters.
@@ -436,7 +463,7 @@ int lua_CheckBox_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -454,7 +481,7 @@ int lua_CheckBox_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     CheckBox* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -491,7 +518,7 @@ int lua_CheckBox_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -515,7 +542,7 @@ int lua_CheckBox_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     CheckBox* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -565,7 +592,7 @@ int lua_CheckBox_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -581,7 +608,7 @@ int lua_CheckBox_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -633,7 +660,7 @@ int lua_CheckBox_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -649,7 +676,7 @@ int lua_CheckBox_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -796,7 +823,7 @@ int lua_CheckBox_getAlignment(lua_State* state)
                 Control::Alignment result = instance->getAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAlignment(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -990,7 +1017,7 @@ int lua_CheckBox_getAutoSize(lua_State* state)
                 Control::AutoSize result = instance->getAutoSize();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAutoSize(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1046,10 +1073,10 @@ int lua_CheckBox_getBorder(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getBorder(param1));
@@ -1261,10 +1288,10 @@ int lua_CheckBox_getCursorColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorColor(param1));
@@ -1309,10 +1336,10 @@ int lua_CheckBox_getCursorRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorRegion(param1));
@@ -1357,10 +1384,10 @@ int lua_CheckBox_getCursorUVs(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorUVs(param1));
@@ -1466,10 +1493,10 @@ int lua_CheckBox_getFont(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)instance->getFont(param1);
@@ -1531,10 +1558,10 @@ int lua_CheckBox_getFontSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 unsigned int result = instance->getFontSize(param1);
@@ -1641,13 +1668,13 @@ int lua_CheckBox_getImageColor(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageColor(param1, param2));
@@ -1693,13 +1720,13 @@ int lua_CheckBox_getImageRegion(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageRegion(param1, param2));
@@ -1745,13 +1772,13 @@ int lua_CheckBox_getImageUVs(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageUVs(param1, param2));
@@ -1857,10 +1884,10 @@ int lua_CheckBox_getOpacity(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 float result = instance->getOpacity(param1);
@@ -2045,10 +2072,10 @@ int lua_CheckBox_getSkinColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinColor(param1));
@@ -2119,10 +2146,10 @@ int lua_CheckBox_getSkinRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinRegion(param1));
@@ -2172,7 +2199,7 @@ int lua_CheckBox_getState(lua_State* state)
                 Control::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2286,7 +2313,7 @@ int lua_CheckBox_getTextAlignment(lua_State* state)
                 Font::Justify result = instance->getTextAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2298,16 +2325,16 @@ int lua_CheckBox_getTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 Font::Justify result = instance->getTextAlignment(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2363,10 +2390,10 @@ int lua_CheckBox_getTextColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getTextColor(param1));
@@ -2428,10 +2455,10 @@ int lua_CheckBox_getTextRightToLeft(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 bool result = instance->getTextRightToLeft(param1);
@@ -3273,10 +3300,10 @@ int lua_CheckBox_setAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::Alignment param1 = (Control::Alignment)lua_enumFromString_ControlAlignment(luaL_checkstring(state, 2));
+                Control::Alignment param1 = (Control::Alignment)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 instance->setAlignment(param1);
@@ -3387,10 +3414,10 @@ int lua_CheckBox_setAutoSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::AutoSize param1 = (Control::AutoSize)lua_enumFromString_ControlAutoSize(luaL_checkstring(state, 2));
+                Control::AutoSize param1 = (Control::AutoSize)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 instance->setAutoSize(param1);
@@ -4684,10 +4711,10 @@ int lua_CheckBox_setTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 CheckBox* instance = getInstance(state);
                 instance->setTextAlignment(param1);
@@ -4702,11 +4729,11 @@ int lua_CheckBox_setTextAlignment(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 unsigned char param2 = (unsigned char)luaL_checkunsigned(state, 3);

gameplay/src/lua/lua_CheckBox.h

@@ -10,6 +10,7 @@ int lua_CheckBox_addListener(lua_State* state);
 int lua_CheckBox_addRef(lua_State* state);
 int lua_CheckBox_addScript(lua_State* state);
 int lua_CheckBox_canFocus(lua_State* state);
+int lua_CheckBox_clearScripts(lua_State* state);
 int lua_CheckBox_createAnimation(lua_State* state);
 int lua_CheckBox_createAnimationFromBy(lua_State* state);
 int lua_CheckBox_createAnimationFromTo(lua_State* state);

gameplay/src/lua/lua_Container.cpp

@@ -26,15 +26,6 @@
 #include "TextBox.h"
 #include "Theme.h"
 #include "VerticalLayout.h"
-#include "lua_ContainerDirection.h"
-#include "lua_ContainerScroll.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
-#include "lua_LayoutType.h"
 
 namespace gameplay
 {
@@ -48,6 +39,7 @@ void luaRegister_Container()
         {"addRef", lua_Container_addRef},
         {"addScript", lua_Container_addScript},
         {"canFocus", lua_Container_canFocus},
+        {"clearScripts", lua_Container_clearScripts},
         {"createAnimation", lua_Container_createAnimation},
         {"createAnimationFromBy", lua_Container_createAnimationFromBy},
         {"createAnimationFromTo", lua_Container_createAnimationFromTo},
@@ -427,6 +419,38 @@ int lua_Container_canFocus(lua_State* state)
     return 0;
 }
 
+int lua_Container_clearScripts(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))
+            {
+                Container* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_Container_clearScripts - 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_Container_createAnimation(lua_State* state)
 {
     // Get the number of parameters.
@@ -516,7 +540,7 @@ int lua_Container_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -534,7 +558,7 @@ int lua_Container_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     Container* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -571,7 +595,7 @@ int lua_Container_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -595,7 +619,7 @@ int lua_Container_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     Container* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -645,7 +669,7 @@ int lua_Container_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -661,7 +685,7 @@ int lua_Container_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -713,7 +737,7 @@ int lua_Container_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -729,7 +753,7 @@ int lua_Container_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -920,7 +944,7 @@ int lua_Container_getAlignment(lua_State* state)
                 Control::Alignment result = instance->getAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAlignment(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1114,7 +1138,7 @@ int lua_Container_getAutoSize(lua_State* state)
                 Control::AutoSize result = instance->getAutoSize();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAutoSize(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1170,10 +1194,10 @@ int lua_Container_getBorder(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getBorder(param1));
@@ -1498,10 +1522,10 @@ int lua_Container_getCursorColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorColor(param1));
@@ -1546,10 +1570,10 @@ int lua_Container_getCursorRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorRegion(param1));
@@ -1594,10 +1618,10 @@ int lua_Container_getCursorUVs(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorUVs(param1));
@@ -1703,10 +1727,10 @@ int lua_Container_getFont(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)instance->getFont(param1);
@@ -1768,10 +1792,10 @@ int lua_Container_getFontSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 unsigned int result = instance->getFontSize(param1);
@@ -1878,13 +1902,13 @@ int lua_Container_getImageColor(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageColor(param1, param2));
@@ -1930,13 +1954,13 @@ int lua_Container_getImageRegion(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageRegion(param1, param2));
@@ -1982,13 +2006,13 @@ int lua_Container_getImageUVs(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageUVs(param1, param2));
@@ -2138,10 +2162,10 @@ int lua_Container_getOpacity(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 float result = instance->getOpacity(param1);
@@ -2305,7 +2329,7 @@ int lua_Container_getScroll(lua_State* state)
                 Container::Scroll result = instance->getScroll();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ContainerScroll(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2510,10 +2534,10 @@ int lua_Container_getSkinColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinColor(param1));
@@ -2584,10 +2608,10 @@ int lua_Container_getSkinRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinRegion(param1));
@@ -2637,7 +2661,7 @@ int lua_Container_getState(lua_State* state)
                 Control::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2716,7 +2740,7 @@ int lua_Container_getTextAlignment(lua_State* state)
                 Font::Justify result = instance->getTextAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2728,16 +2752,16 @@ int lua_Container_getTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 Font::Justify result = instance->getTextAlignment(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2793,10 +2817,10 @@ int lua_Container_getTextColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getTextColor(param1));
@@ -2858,10 +2882,10 @@ int lua_Container_getTextRightToLeft(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 bool result = instance->getTextRightToLeft(param1);
@@ -3706,10 +3730,10 @@ int lua_Container_moveFocus(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Container::Direction param1 = (Container::Direction)lua_enumFromString_ContainerDirection(luaL_checkstring(state, 2));
+                Container::Direction param1 = (Container::Direction)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 bool result = instance->moveFocus(param1);
@@ -3972,10 +3996,10 @@ int lua_Container_setAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::Alignment param1 = (Control::Alignment)lua_enumFromString_ControlAlignment(luaL_checkstring(state, 2));
+                Control::Alignment param1 = (Control::Alignment)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 instance->setAlignment(param1);
@@ -4086,10 +4110,10 @@ int lua_Container_setAutoSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::AutoSize param1 = (Control::AutoSize)lua_enumFromString_ControlAutoSize(luaL_checkstring(state, 2));
+                Control::AutoSize param1 = (Control::AutoSize)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 instance->setAutoSize(param1);
@@ -4895,10 +4919,10 @@ int lua_Container_setLayout(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Layout::Type param1 = (Layout::Type)lua_enumFromString_LayoutType(luaL_checkstring(state, 2));
+                Layout::Type param1 = (Layout::Type)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 instance->setLayout(param1);
@@ -5125,10 +5149,10 @@ int lua_Container_setScroll(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Container::Scroll param1 = (Container::Scroll)lua_enumFromString_ContainerScroll(luaL_checkstring(state, 2));
+                Container::Scroll param1 = (Container::Scroll)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 instance->setScroll(param1);
@@ -5569,10 +5593,10 @@ int lua_Container_setTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 Container* instance = getInstance(state);
                 instance->setTextAlignment(param1);
@@ -5587,11 +5611,11 @@ int lua_Container_setTextAlignment(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 unsigned char param2 = (unsigned char)luaL_checkunsigned(state, 3);
@@ -6204,7 +6228,7 @@ int lua_Container_static_create(lua_State* state)
         {
             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) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(1, false);
@@ -6219,7 +6243,7 @@ int lua_Container_static_create(lua_State* state)
                 }
 
                 // Get parameter 3 off the stack.
-                Layout::Type param3 = (Layout::Type)lua_enumFromString_LayoutType(luaL_checkstring(state, 3));
+                Layout::Type param3 = (Layout::Type)luaL_checkint(state, 3);
 
                 void* returnPtr = (void*)Container::create(param1, param2, param3);
                 if (returnPtr)

gameplay/src/lua/lua_Container.h

@@ -11,6 +11,7 @@ int lua_Container_addListener(lua_State* state);
 int lua_Container_addRef(lua_State* state);
 int lua_Container_addScript(lua_State* state);
 int lua_Container_canFocus(lua_State* state);
+int lua_Container_clearScripts(lua_State* state);
 int lua_Container_createAnimation(lua_State* state);
 int lua_Container_createAnimationFromBy(lua_State* state);
 int lua_Container_createAnimationFromTo(lua_State* state);

gameplay/src/lua/lua_ContainerDirection.cpp

@@ -1,51 +0,0 @@
-#include "Base.h"
-#include "lua_ContainerDirection.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ContainerDirection_UP = "UP";
-static const char* luaEnumString_ContainerDirection_DOWN = "DOWN";
-static const char* luaEnumString_ContainerDirection_LEFT = "LEFT";
-static const char* luaEnumString_ContainerDirection_RIGHT = "RIGHT";
-static const char* luaEnumString_ContainerDirection_NEXT = "NEXT";
-static const char* luaEnumString_ContainerDirection_PREVIOUS = "PREVIOUS";
-
-Container::Direction lua_enumFromString_ContainerDirection(const char* s)
-{
-    if (strcmp(s, luaEnumString_ContainerDirection_UP) == 0)
-        return Container::UP;
-    if (strcmp(s, luaEnumString_ContainerDirection_DOWN) == 0)
-        return Container::DOWN;
-    if (strcmp(s, luaEnumString_ContainerDirection_LEFT) == 0)
-        return Container::LEFT;
-    if (strcmp(s, luaEnumString_ContainerDirection_RIGHT) == 0)
-        return Container::RIGHT;
-    if (strcmp(s, luaEnumString_ContainerDirection_NEXT) == 0)
-        return Container::NEXT;
-    if (strcmp(s, luaEnumString_ContainerDirection_PREVIOUS) == 0)
-        return Container::PREVIOUS;
-    return Container::UP;
-}
-
-const char* lua_stringFromEnum_ContainerDirection(Container::Direction e)
-{
-    if (e == Container::UP)
-        return luaEnumString_ContainerDirection_UP;
-    if (e == Container::DOWN)
-        return luaEnumString_ContainerDirection_DOWN;
-    if (e == Container::LEFT)
-        return luaEnumString_ContainerDirection_LEFT;
-    if (e == Container::RIGHT)
-        return luaEnumString_ContainerDirection_RIGHT;
-    if (e == Container::NEXT)
-        return luaEnumString_ContainerDirection_NEXT;
-    if (e == Container::PREVIOUS)
-        return luaEnumString_ContainerDirection_PREVIOUS;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_ContainerDirection.h

@@ -1,15 +0,0 @@
-#ifndef LUA_CONTAINERDIRECTION_H_
-#define LUA_CONTAINERDIRECTION_H_
-
-#include "Container.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Container::Direction.
-Container::Direction lua_enumFromString_ContainerDirection(const char* s);
-const char* lua_stringFromEnum_ContainerDirection(Container::Direction e);
-
-}
-
-#endif

gameplay/src/lua/lua_ContainerScroll.cpp

@@ -1,41 +0,0 @@
-#include "Base.h"
-#include "lua_ContainerScroll.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ContainerScroll_SCROLL_NONE = "SCROLL_NONE";
-static const char* luaEnumString_ContainerScroll_SCROLL_HORIZONTAL = "SCROLL_HORIZONTAL";
-static const char* luaEnumString_ContainerScroll_SCROLL_VERTICAL = "SCROLL_VERTICAL";
-static const char* luaEnumString_ContainerScroll_SCROLL_BOTH = "SCROLL_BOTH";
-
-Container::Scroll lua_enumFromString_ContainerScroll(const char* s)
-{
-    if (strcmp(s, luaEnumString_ContainerScroll_SCROLL_NONE) == 0)
-        return Container::SCROLL_NONE;
-    if (strcmp(s, luaEnumString_ContainerScroll_SCROLL_HORIZONTAL) == 0)
-        return Container::SCROLL_HORIZONTAL;
-    if (strcmp(s, luaEnumString_ContainerScroll_SCROLL_VERTICAL) == 0)
-        return Container::SCROLL_VERTICAL;
-    if (strcmp(s, luaEnumString_ContainerScroll_SCROLL_BOTH) == 0)
-        return Container::SCROLL_BOTH;
-    return Container::SCROLL_NONE;
-}
-
-const char* lua_stringFromEnum_ContainerScroll(Container::Scroll e)
-{
-    if (e == Container::SCROLL_NONE)
-        return luaEnumString_ContainerScroll_SCROLL_NONE;
-    if (e == Container::SCROLL_HORIZONTAL)
-        return luaEnumString_ContainerScroll_SCROLL_HORIZONTAL;
-    if (e == Container::SCROLL_VERTICAL)
-        return luaEnumString_ContainerScroll_SCROLL_VERTICAL;
-    if (e == Container::SCROLL_BOTH)
-        return luaEnumString_ContainerScroll_SCROLL_BOTH;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_ContainerScroll.h

@@ -1,15 +0,0 @@
-#ifndef LUA_CONTAINERSCROLL_H_
-#define LUA_CONTAINERSCROLL_H_
-
-#include "Container.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Container::Scroll.
-Container::Scroll lua_enumFromString_ContainerScroll(const char* s);
-const char* lua_stringFromEnum_ContainerScroll(Container::Scroll e);
-
-}
-
-#endif

gameplay/src/lua/lua_Control.cpp

@@ -12,12 +12,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Theme.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {
@@ -30,6 +24,7 @@ void luaRegister_Control()
         {"addRef", lua_Control_addRef},
         {"addScript", lua_Control_addScript},
         {"canFocus", lua_Control_canFocus},
+        {"clearScripts", lua_Control_clearScripts},
         {"createAnimation", lua_Control_createAnimation},
         {"createAnimationFromBy", lua_Control_createAnimationFromBy},
         {"createAnimationFromTo", lua_Control_createAnimationFromTo},
@@ -338,6 +333,38 @@ int lua_Control_canFocus(lua_State* state)
     return 0;
 }
 
+int lua_Control_clearScripts(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))
+            {
+                Control* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_Control_clearScripts - 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_Control_createAnimation(lua_State* state)
 {
     // Get the number of parameters.
@@ -427,7 +454,7 @@ int lua_Control_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -445,7 +472,7 @@ int lua_Control_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     Control* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -482,7 +509,7 @@ int lua_Control_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -506,7 +533,7 @@ int lua_Control_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     Control* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -556,7 +583,7 @@ int lua_Control_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -572,7 +599,7 @@ int lua_Control_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -624,7 +651,7 @@ int lua_Control_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -640,7 +667,7 @@ int lua_Control_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -787,7 +814,7 @@ int lua_Control_getAlignment(lua_State* state)
                 Control::Alignment result = instance->getAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAlignment(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -981,7 +1008,7 @@ int lua_Control_getAutoSize(lua_State* state)
                 Control::AutoSize result = instance->getAutoSize();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAutoSize(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1037,10 +1064,10 @@ int lua_Control_getBorder(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getBorder(param1));
@@ -1252,10 +1279,10 @@ int lua_Control_getCursorColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorColor(param1));
@@ -1300,10 +1327,10 @@ int lua_Control_getCursorRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorRegion(param1));
@@ -1348,10 +1375,10 @@ int lua_Control_getCursorUVs(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorUVs(param1));
@@ -1457,10 +1484,10 @@ int lua_Control_getFont(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)instance->getFont(param1);
@@ -1522,10 +1549,10 @@ int lua_Control_getFontSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 unsigned int result = instance->getFontSize(param1);
@@ -1632,13 +1659,13 @@ int lua_Control_getImageColor(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageColor(param1, param2));
@@ -1684,13 +1711,13 @@ int lua_Control_getImageRegion(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageRegion(param1, param2));
@@ -1736,13 +1763,13 @@ int lua_Control_getImageUVs(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageUVs(param1, param2));
@@ -1848,10 +1875,10 @@ int lua_Control_getOpacity(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 float result = instance->getOpacity(param1);
@@ -2036,10 +2063,10 @@ int lua_Control_getSkinColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinColor(param1));
@@ -2110,10 +2137,10 @@ int lua_Control_getSkinRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinRegion(param1));
@@ -2163,7 +2190,7 @@ int lua_Control_getState(lua_State* state)
                 Control::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2242,7 +2269,7 @@ int lua_Control_getTextAlignment(lua_State* state)
                 Font::Justify result = instance->getTextAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2254,16 +2281,16 @@ int lua_Control_getTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 Font::Justify result = instance->getTextAlignment(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2319,10 +2346,10 @@ int lua_Control_getTextColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getTextColor(param1));
@@ -2384,10 +2411,10 @@ int lua_Control_getTextRightToLeft(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 bool result = instance->getTextRightToLeft(param1);
@@ -3194,10 +3221,10 @@ int lua_Control_setAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::Alignment param1 = (Control::Alignment)lua_enumFromString_ControlAlignment(luaL_checkstring(state, 2));
+                Control::Alignment param1 = (Control::Alignment)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 instance->setAlignment(param1);
@@ -3308,10 +3335,10 @@ int lua_Control_setAutoSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::AutoSize param1 = (Control::AutoSize)lua_enumFromString_ControlAutoSize(luaL_checkstring(state, 2));
+                Control::AutoSize param1 = (Control::AutoSize)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 instance->setAutoSize(param1);
@@ -4533,10 +4560,10 @@ int lua_Control_setTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 Control* instance = getInstance(state);
                 instance->setTextAlignment(param1);
@@ -4551,11 +4578,11 @@ int lua_Control_setTextAlignment(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 unsigned char param2 = (unsigned char)luaL_checkunsigned(state, 3);

gameplay/src/lua/lua_Control.h

@@ -10,6 +10,7 @@ int lua_Control_addListener(lua_State* state);
 int lua_Control_addRef(lua_State* state);
 int lua_Control_addScript(lua_State* state);
 int lua_Control_canFocus(lua_State* state);
+int lua_Control_clearScripts(lua_State* state);
 int lua_Control_createAnimation(lua_State* state);
 int lua_Control_createAnimationFromBy(lua_State* state);
 int lua_Control_createAnimationFromTo(lua_State* state);

gameplay/src/lua/lua_ControlAlignment.cpp

@@ -1,96 +0,0 @@
-#include "Base.h"
-#include "lua_ControlAlignment.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ControlAlignment_ALIGN_LEFT = "ALIGN_LEFT";
-static const char* luaEnumString_ControlAlignment_ALIGN_HCENTER = "ALIGN_HCENTER";
-static const char* luaEnumString_ControlAlignment_ALIGN_RIGHT = "ALIGN_RIGHT";
-static const char* luaEnumString_ControlAlignment_ALIGN_TOP = "ALIGN_TOP";
-static const char* luaEnumString_ControlAlignment_ALIGN_VCENTER = "ALIGN_VCENTER";
-static const char* luaEnumString_ControlAlignment_ALIGN_BOTTOM = "ALIGN_BOTTOM";
-static const char* luaEnumString_ControlAlignment_ALIGN_TOP_LEFT = "ALIGN_TOP_LEFT";
-static const char* luaEnumString_ControlAlignment_ALIGN_VCENTER_LEFT = "ALIGN_VCENTER_LEFT";
-static const char* luaEnumString_ControlAlignment_ALIGN_BOTTOM_LEFT = "ALIGN_BOTTOM_LEFT";
-static const char* luaEnumString_ControlAlignment_ALIGN_TOP_HCENTER = "ALIGN_TOP_HCENTER";
-static const char* luaEnumString_ControlAlignment_ALIGN_VCENTER_HCENTER = "ALIGN_VCENTER_HCENTER";
-static const char* luaEnumString_ControlAlignment_ALIGN_BOTTOM_HCENTER = "ALIGN_BOTTOM_HCENTER";
-static const char* luaEnumString_ControlAlignment_ALIGN_TOP_RIGHT = "ALIGN_TOP_RIGHT";
-static const char* luaEnumString_ControlAlignment_ALIGN_VCENTER_RIGHT = "ALIGN_VCENTER_RIGHT";
-static const char* luaEnumString_ControlAlignment_ALIGN_BOTTOM_RIGHT = "ALIGN_BOTTOM_RIGHT";
-
-Control::Alignment lua_enumFromString_ControlAlignment(const char* s)
-{
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_LEFT) == 0)
-        return Control::ALIGN_LEFT;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_HCENTER) == 0)
-        return Control::ALIGN_HCENTER;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_RIGHT) == 0)
-        return Control::ALIGN_RIGHT;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_TOP) == 0)
-        return Control::ALIGN_TOP;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_VCENTER) == 0)
-        return Control::ALIGN_VCENTER;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_BOTTOM) == 0)
-        return Control::ALIGN_BOTTOM;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_TOP_LEFT) == 0)
-        return Control::ALIGN_TOP_LEFT;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_VCENTER_LEFT) == 0)
-        return Control::ALIGN_VCENTER_LEFT;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_BOTTOM_LEFT) == 0)
-        return Control::ALIGN_BOTTOM_LEFT;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_TOP_HCENTER) == 0)
-        return Control::ALIGN_TOP_HCENTER;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_VCENTER_HCENTER) == 0)
-        return Control::ALIGN_VCENTER_HCENTER;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_BOTTOM_HCENTER) == 0)
-        return Control::ALIGN_BOTTOM_HCENTER;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_TOP_RIGHT) == 0)
-        return Control::ALIGN_TOP_RIGHT;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_VCENTER_RIGHT) == 0)
-        return Control::ALIGN_VCENTER_RIGHT;
-    if (strcmp(s, luaEnumString_ControlAlignment_ALIGN_BOTTOM_RIGHT) == 0)
-        return Control::ALIGN_BOTTOM_RIGHT;
-    return Control::ALIGN_LEFT;
-}
-
-const char* lua_stringFromEnum_ControlAlignment(Control::Alignment e)
-{
-    if (e == Control::ALIGN_LEFT)
-        return luaEnumString_ControlAlignment_ALIGN_LEFT;
-    if (e == Control::ALIGN_HCENTER)
-        return luaEnumString_ControlAlignment_ALIGN_HCENTER;
-    if (e == Control::ALIGN_RIGHT)
-        return luaEnumString_ControlAlignment_ALIGN_RIGHT;
-    if (e == Control::ALIGN_TOP)
-        return luaEnumString_ControlAlignment_ALIGN_TOP;
-    if (e == Control::ALIGN_VCENTER)
-        return luaEnumString_ControlAlignment_ALIGN_VCENTER;
-    if (e == Control::ALIGN_BOTTOM)
-        return luaEnumString_ControlAlignment_ALIGN_BOTTOM;
-    if (e == Control::ALIGN_TOP_LEFT)
-        return luaEnumString_ControlAlignment_ALIGN_TOP_LEFT;
-    if (e == Control::ALIGN_VCENTER_LEFT)
-        return luaEnumString_ControlAlignment_ALIGN_VCENTER_LEFT;
-    if (e == Control::ALIGN_BOTTOM_LEFT)
-        return luaEnumString_ControlAlignment_ALIGN_BOTTOM_LEFT;
-    if (e == Control::ALIGN_TOP_HCENTER)
-        return luaEnumString_ControlAlignment_ALIGN_TOP_HCENTER;
-    if (e == Control::ALIGN_VCENTER_HCENTER)
-        return luaEnumString_ControlAlignment_ALIGN_VCENTER_HCENTER;
-    if (e == Control::ALIGN_BOTTOM_HCENTER)
-        return luaEnumString_ControlAlignment_ALIGN_BOTTOM_HCENTER;
-    if (e == Control::ALIGN_TOP_RIGHT)
-        return luaEnumString_ControlAlignment_ALIGN_TOP_RIGHT;
-    if (e == Control::ALIGN_VCENTER_RIGHT)
-        return luaEnumString_ControlAlignment_ALIGN_VCENTER_RIGHT;
-    if (e == Control::ALIGN_BOTTOM_RIGHT)
-        return luaEnumString_ControlAlignment_ALIGN_BOTTOM_RIGHT;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_ControlAlignment.h

@@ -1,15 +0,0 @@
-#ifndef LUA_CONTROLALIGNMENT_H_
-#define LUA_CONTROLALIGNMENT_H_
-
-#include "Control.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Control::Alignment.
-Control::Alignment lua_enumFromString_ControlAlignment(const char* s);
-const char* lua_stringFromEnum_ControlAlignment(Control::Alignment e);
-
-}
-
-#endif

gameplay/src/lua/lua_ControlAutoSize.cpp

@@ -1,41 +0,0 @@
-#include "Base.h"
-#include "lua_ControlAutoSize.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ControlAutoSize_AUTO_SIZE_NONE = "AUTO_SIZE_NONE";
-static const char* luaEnumString_ControlAutoSize_AUTO_SIZE_WIDTH = "AUTO_SIZE_WIDTH";
-static const char* luaEnumString_ControlAutoSize_AUTO_SIZE_HEIGHT = "AUTO_SIZE_HEIGHT";
-static const char* luaEnumString_ControlAutoSize_AUTO_SIZE_BOTH = "AUTO_SIZE_BOTH";
-
-Control::AutoSize lua_enumFromString_ControlAutoSize(const char* s)
-{
-    if (strcmp(s, luaEnumString_ControlAutoSize_AUTO_SIZE_NONE) == 0)
-        return Control::AUTO_SIZE_NONE;
-    if (strcmp(s, luaEnumString_ControlAutoSize_AUTO_SIZE_WIDTH) == 0)
-        return Control::AUTO_SIZE_WIDTH;
-    if (strcmp(s, luaEnumString_ControlAutoSize_AUTO_SIZE_HEIGHT) == 0)
-        return Control::AUTO_SIZE_HEIGHT;
-    if (strcmp(s, luaEnumString_ControlAutoSize_AUTO_SIZE_BOTH) == 0)
-        return Control::AUTO_SIZE_BOTH;
-    return Control::AUTO_SIZE_NONE;
-}
-
-const char* lua_stringFromEnum_ControlAutoSize(Control::AutoSize e)
-{
-    if (e == Control::AUTO_SIZE_NONE)
-        return luaEnumString_ControlAutoSize_AUTO_SIZE_NONE;
-    if (e == Control::AUTO_SIZE_WIDTH)
-        return luaEnumString_ControlAutoSize_AUTO_SIZE_WIDTH;
-    if (e == Control::AUTO_SIZE_HEIGHT)
-        return luaEnumString_ControlAutoSize_AUTO_SIZE_HEIGHT;
-    if (e == Control::AUTO_SIZE_BOTH)
-        return luaEnumString_ControlAutoSize_AUTO_SIZE_BOTH;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_ControlAutoSize.h

@@ -1,15 +0,0 @@
-#ifndef LUA_CONTROLAUTOSIZE_H_
-#define LUA_CONTROLAUTOSIZE_H_
-
-#include "Control.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Control::AutoSize.
-Control::AutoSize lua_enumFromString_ControlAutoSize(const char* s);
-const char* lua_stringFromEnum_ControlAutoSize(Control::AutoSize e);
-
-}
-
-#endif

gameplay/src/lua/lua_ControlListener.cpp

@@ -12,12 +12,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Theme.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {
@@ -93,7 +87,7 @@ int lua_ControlListener_controlEvent(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TUSERDATA || lua_type(state, 2) == LUA_TTABLE || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 bool param1Valid;
@@ -105,7 +99,7 @@ int lua_ControlListener_controlEvent(lua_State* state)
                 }
 
                 // Get parameter 2 off the stack.
-                Control::Listener::EventType param2 = (Control::Listener::EventType)lua_enumFromString_ControlListenerEventType(luaL_checkstring(state, 3));
+                Control::Listener::EventType param2 = (Control::Listener::EventType)luaL_checkint(state, 3);
 
                 Control::Listener* instance = getInstance(state);
                 instance->controlEvent(param1, param2);

gameplay/src/lua/lua_ControlListenerEventType.cpp

@@ -1,66 +0,0 @@
-#include "Base.h"
-#include "lua_ControlListenerEventType.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ControlListenerEventType_PRESS = "PRESS";
-static const char* luaEnumString_ControlListenerEventType_RELEASE = "RELEASE";
-static const char* luaEnumString_ControlListenerEventType_CLICK = "CLICK";
-static const char* luaEnumString_ControlListenerEventType_VALUE_CHANGED = "VALUE_CHANGED";
-static const char* luaEnumString_ControlListenerEventType_TEXT_CHANGED = "TEXT_CHANGED";
-static const char* luaEnumString_ControlListenerEventType_MIDDLE_CLICK = "MIDDLE_CLICK";
-static const char* luaEnumString_ControlListenerEventType_RIGHT_CLICK = "RIGHT_CLICK";
-static const char* luaEnumString_ControlListenerEventType_FOCUS_GAINED = "FOCUS_GAINED";
-static const char* luaEnumString_ControlListenerEventType_FOCUS_LOST = "FOCUS_LOST";
-
-Control::Listener::EventType lua_enumFromString_ControlListenerEventType(const char* s)
-{
-    if (strcmp(s, luaEnumString_ControlListenerEventType_PRESS) == 0)
-        return Control::Listener::PRESS;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_RELEASE) == 0)
-        return Control::Listener::RELEASE;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_CLICK) == 0)
-        return Control::Listener::CLICK;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_VALUE_CHANGED) == 0)
-        return Control::Listener::VALUE_CHANGED;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_TEXT_CHANGED) == 0)
-        return Control::Listener::TEXT_CHANGED;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_MIDDLE_CLICK) == 0)
-        return Control::Listener::MIDDLE_CLICK;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_RIGHT_CLICK) == 0)
-        return Control::Listener::RIGHT_CLICK;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_FOCUS_GAINED) == 0)
-        return Control::Listener::FOCUS_GAINED;
-    if (strcmp(s, luaEnumString_ControlListenerEventType_FOCUS_LOST) == 0)
-        return Control::Listener::FOCUS_LOST;
-    return Control::Listener::PRESS;
-}
-
-const char* lua_stringFromEnum_ControlListenerEventType(Control::Listener::EventType e)
-{
-    if (e == Control::Listener::PRESS)
-        return luaEnumString_ControlListenerEventType_PRESS;
-    if (e == Control::Listener::RELEASE)
-        return luaEnumString_ControlListenerEventType_RELEASE;
-    if (e == Control::Listener::CLICK)
-        return luaEnumString_ControlListenerEventType_CLICK;
-    if (e == Control::Listener::VALUE_CHANGED)
-        return luaEnumString_ControlListenerEventType_VALUE_CHANGED;
-    if (e == Control::Listener::TEXT_CHANGED)
-        return luaEnumString_ControlListenerEventType_TEXT_CHANGED;
-    if (e == Control::Listener::MIDDLE_CLICK)
-        return luaEnumString_ControlListenerEventType_MIDDLE_CLICK;
-    if (e == Control::Listener::RIGHT_CLICK)
-        return luaEnumString_ControlListenerEventType_RIGHT_CLICK;
-    if (e == Control::Listener::FOCUS_GAINED)
-        return luaEnumString_ControlListenerEventType_FOCUS_GAINED;
-    if (e == Control::Listener::FOCUS_LOST)
-        return luaEnumString_ControlListenerEventType_FOCUS_LOST;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_ControlListenerEventType.h

@@ -1,15 +0,0 @@
-#ifndef LUA_CONTROLLISTENEREVENTTYPE_H_
-#define LUA_CONTROLLISTENEREVENTTYPE_H_
-
-#include "Control.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Control::Listener::EventType.
-Control::Listener::EventType lua_enumFromString_ControlListenerEventType(const char* s);
-const char* lua_stringFromEnum_ControlListenerEventType(Control::Listener::EventType e);
-
-}
-
-#endif

gameplay/src/lua/lua_ControlState.cpp

@@ -1,46 +0,0 @@
-#include "Base.h"
-#include "lua_ControlState.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ControlState_NORMAL = "NORMAL";
-static const char* luaEnumString_ControlState_FOCUS = "FOCUS";
-static const char* luaEnumString_ControlState_ACTIVE = "ACTIVE";
-static const char* luaEnumString_ControlState_DISABLED = "DISABLED";
-static const char* luaEnumString_ControlState_HOVER = "HOVER";
-
-Control::State lua_enumFromString_ControlState(const char* s)
-{
-    if (strcmp(s, luaEnumString_ControlState_NORMAL) == 0)
-        return Control::NORMAL;
-    if (strcmp(s, luaEnumString_ControlState_FOCUS) == 0)
-        return Control::FOCUS;
-    if (strcmp(s, luaEnumString_ControlState_ACTIVE) == 0)
-        return Control::ACTIVE;
-    if (strcmp(s, luaEnumString_ControlState_DISABLED) == 0)
-        return Control::DISABLED;
-    if (strcmp(s, luaEnumString_ControlState_HOVER) == 0)
-        return Control::HOVER;
-    return Control::NORMAL;
-}
-
-const char* lua_stringFromEnum_ControlState(Control::State e)
-{
-    if (e == Control::NORMAL)
-        return luaEnumString_ControlState_NORMAL;
-    if (e == Control::FOCUS)
-        return luaEnumString_ControlState_FOCUS;
-    if (e == Control::ACTIVE)
-        return luaEnumString_ControlState_ACTIVE;
-    if (e == Control::DISABLED)
-        return luaEnumString_ControlState_DISABLED;
-    if (e == Control::HOVER)
-        return luaEnumString_ControlState_HOVER;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_ControlState.h

@@ -1,15 +0,0 @@
-#ifndef LUA_CONTROLSTATE_H_
-#define LUA_CONTROLSTATE_H_
-
-#include "Control.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Control::State.
-Control::State lua_enumFromString_ControlState(const char* s);
-const char* lua_stringFromEnum_ControlState(Control::State e);
-
-}
-
-#endif

gameplay/src/lua/lua_Curve.cpp

@@ -6,7 +6,6 @@
 #include "Game.h"
 #include "Quaternion.h"
 #include "Ref.h"
-#include "lua_CurveInterpolationType.h"
 
 namespace gameplay
 {
@@ -418,7 +417,7 @@ int lua_Curve_setPoint(lua_State* state)
                     lua_type(state, 2) == LUA_TNUMBER &&
                     lua_type(state, 3) == LUA_TNUMBER &&
                     (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 5) == LUA_TSTRING || lua_type(state, 5) == LUA_TNIL))
+                    lua_type(state, 5) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     unsigned int param1 = (unsigned int)luaL_checkunsigned(state, 2);
@@ -430,7 +429,7 @@ int lua_Curve_setPoint(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param3 = gameplay::ScriptUtil::getFloatPointer(4);
 
                     // Get parameter 4 off the stack.
-                    Curve::InterpolationType param4 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 5));
+                    Curve::InterpolationType param4 = (Curve::InterpolationType)luaL_checkint(state, 5);
 
                     Curve* instance = getInstance(state);
                     instance->setPoint(param1, param2, param3, param4);
@@ -451,7 +450,7 @@ int lua_Curve_setPoint(lua_State* state)
                     lua_type(state, 2) == LUA_TNUMBER &&
                     lua_type(state, 3) == LUA_TNUMBER &&
                     (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 5) == LUA_TSTRING || lua_type(state, 5) == LUA_TNIL) &&
+                    lua_type(state, 5) == LUA_TNUMBER &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA))
                 {
@@ -465,7 +464,7 @@ int lua_Curve_setPoint(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param3 = gameplay::ScriptUtil::getFloatPointer(4);
 
                     // Get parameter 4 off the stack.
-                    Curve::InterpolationType param4 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 5));
+                    Curve::InterpolationType param4 = (Curve::InterpolationType)luaL_checkint(state, 5);
 
                     // Get parameter 5 off the stack.
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
@@ -506,7 +505,7 @@ int lua_Curve_setTangent(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 lua_type(state, 2) == LUA_TNUMBER &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL) &&
+                lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA))
             {
@@ -514,7 +513,7 @@ int lua_Curve_setTangent(lua_State* state)
                 unsigned int param1 = (unsigned int)luaL_checkunsigned(state, 2);
 
                 // Get parameter 2 off the stack.
-                Curve::InterpolationType param2 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 3));
+                Curve::InterpolationType param2 = (Curve::InterpolationType)luaL_checkint(state, 3);
 
                 // Get parameter 3 off the stack.
                 gameplay::ScriptUtil::LuaArray<float> param3 = gameplay::ScriptUtil::getFloatPointer(4);

gameplay/src/lua/lua_CurveInterpolationType.cpp

@@ -1,256 +0,0 @@
-#include "Base.h"
-#include "lua_CurveInterpolationType.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_CurveInterpolationType_BEZIER = "BEZIER";
-static const char* luaEnumString_CurveInterpolationType_BSPLINE = "BSPLINE";
-static const char* luaEnumString_CurveInterpolationType_FLAT = "FLAT";
-static const char* luaEnumString_CurveInterpolationType_HERMITE = "HERMITE";
-static const char* luaEnumString_CurveInterpolationType_LINEAR = "LINEAR";
-static const char* luaEnumString_CurveInterpolationType_SMOOTH = "SMOOTH";
-static const char* luaEnumString_CurveInterpolationType_STEP = "STEP";
-static const char* luaEnumString_CurveInterpolationType_QUADRATIC_IN = "QUADRATIC_IN";
-static const char* luaEnumString_CurveInterpolationType_QUADRATIC_OUT = "QUADRATIC_OUT";
-static const char* luaEnumString_CurveInterpolationType_QUADRATIC_IN_OUT = "QUADRATIC_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_QUADRATIC_OUT_IN = "QUADRATIC_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_CUBIC_IN = "CUBIC_IN";
-static const char* luaEnumString_CurveInterpolationType_CUBIC_OUT = "CUBIC_OUT";
-static const char* luaEnumString_CurveInterpolationType_CUBIC_IN_OUT = "CUBIC_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_CUBIC_OUT_IN = "CUBIC_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_QUARTIC_IN = "QUARTIC_IN";
-static const char* luaEnumString_CurveInterpolationType_QUARTIC_OUT = "QUARTIC_OUT";
-static const char* luaEnumString_CurveInterpolationType_QUARTIC_IN_OUT = "QUARTIC_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_QUARTIC_OUT_IN = "QUARTIC_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_QUINTIC_IN = "QUINTIC_IN";
-static const char* luaEnumString_CurveInterpolationType_QUINTIC_OUT = "QUINTIC_OUT";
-static const char* luaEnumString_CurveInterpolationType_QUINTIC_IN_OUT = "QUINTIC_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_QUINTIC_OUT_IN = "QUINTIC_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_SINE_IN = "SINE_IN";
-static const char* luaEnumString_CurveInterpolationType_SINE_OUT = "SINE_OUT";
-static const char* luaEnumString_CurveInterpolationType_SINE_IN_OUT = "SINE_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_SINE_OUT_IN = "SINE_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_EXPONENTIAL_IN = "EXPONENTIAL_IN";
-static const char* luaEnumString_CurveInterpolationType_EXPONENTIAL_OUT = "EXPONENTIAL_OUT";
-static const char* luaEnumString_CurveInterpolationType_EXPONENTIAL_IN_OUT = "EXPONENTIAL_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_EXPONENTIAL_OUT_IN = "EXPONENTIAL_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_CIRCULAR_IN = "CIRCULAR_IN";
-static const char* luaEnumString_CurveInterpolationType_CIRCULAR_OUT = "CIRCULAR_OUT";
-static const char* luaEnumString_CurveInterpolationType_CIRCULAR_IN_OUT = "CIRCULAR_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_CIRCULAR_OUT_IN = "CIRCULAR_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_ELASTIC_IN = "ELASTIC_IN";
-static const char* luaEnumString_CurveInterpolationType_ELASTIC_OUT = "ELASTIC_OUT";
-static const char* luaEnumString_CurveInterpolationType_ELASTIC_IN_OUT = "ELASTIC_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_ELASTIC_OUT_IN = "ELASTIC_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_OVERSHOOT_IN = "OVERSHOOT_IN";
-static const char* luaEnumString_CurveInterpolationType_OVERSHOOT_OUT = "OVERSHOOT_OUT";
-static const char* luaEnumString_CurveInterpolationType_OVERSHOOT_IN_OUT = "OVERSHOOT_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_OVERSHOOT_OUT_IN = "OVERSHOOT_OUT_IN";
-static const char* luaEnumString_CurveInterpolationType_BOUNCE_IN = "BOUNCE_IN";
-static const char* luaEnumString_CurveInterpolationType_BOUNCE_OUT = "BOUNCE_OUT";
-static const char* luaEnumString_CurveInterpolationType_BOUNCE_IN_OUT = "BOUNCE_IN_OUT";
-static const char* luaEnumString_CurveInterpolationType_BOUNCE_OUT_IN = "BOUNCE_OUT_IN";
-
-Curve::InterpolationType lua_enumFromString_CurveInterpolationType(const char* s)
-{
-    if (strcmp(s, luaEnumString_CurveInterpolationType_BEZIER) == 0)
-        return Curve::BEZIER;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_BSPLINE) == 0)
-        return Curve::BSPLINE;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_FLAT) == 0)
-        return Curve::FLAT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_HERMITE) == 0)
-        return Curve::HERMITE;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_LINEAR) == 0)
-        return Curve::LINEAR;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_SMOOTH) == 0)
-        return Curve::SMOOTH;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_STEP) == 0)
-        return Curve::STEP;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUADRATIC_IN) == 0)
-        return Curve::QUADRATIC_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUADRATIC_OUT) == 0)
-        return Curve::QUADRATIC_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUADRATIC_IN_OUT) == 0)
-        return Curve::QUADRATIC_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUADRATIC_OUT_IN) == 0)
-        return Curve::QUADRATIC_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_CUBIC_IN) == 0)
-        return Curve::CUBIC_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_CUBIC_OUT) == 0)
-        return Curve::CUBIC_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_CUBIC_IN_OUT) == 0)
-        return Curve::CUBIC_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_CUBIC_OUT_IN) == 0)
-        return Curve::CUBIC_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUARTIC_IN) == 0)
-        return Curve::QUARTIC_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUARTIC_OUT) == 0)
-        return Curve::QUARTIC_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUARTIC_IN_OUT) == 0)
-        return Curve::QUARTIC_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUARTIC_OUT_IN) == 0)
-        return Curve::QUARTIC_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUINTIC_IN) == 0)
-        return Curve::QUINTIC_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUINTIC_OUT) == 0)
-        return Curve::QUINTIC_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUINTIC_IN_OUT) == 0)
-        return Curve::QUINTIC_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_QUINTIC_OUT_IN) == 0)
-        return Curve::QUINTIC_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_SINE_IN) == 0)
-        return Curve::SINE_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_SINE_OUT) == 0)
-        return Curve::SINE_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_SINE_IN_OUT) == 0)
-        return Curve::SINE_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_SINE_OUT_IN) == 0)
-        return Curve::SINE_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_EXPONENTIAL_IN) == 0)
-        return Curve::EXPONENTIAL_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_EXPONENTIAL_OUT) == 0)
-        return Curve::EXPONENTIAL_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_EXPONENTIAL_IN_OUT) == 0)
-        return Curve::EXPONENTIAL_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_EXPONENTIAL_OUT_IN) == 0)
-        return Curve::EXPONENTIAL_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_CIRCULAR_IN) == 0)
-        return Curve::CIRCULAR_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_CIRCULAR_OUT) == 0)
-        return Curve::CIRCULAR_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_CIRCULAR_IN_OUT) == 0)
-        return Curve::CIRCULAR_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_CIRCULAR_OUT_IN) == 0)
-        return Curve::CIRCULAR_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_ELASTIC_IN) == 0)
-        return Curve::ELASTIC_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_ELASTIC_OUT) == 0)
-        return Curve::ELASTIC_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_ELASTIC_IN_OUT) == 0)
-        return Curve::ELASTIC_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_ELASTIC_OUT_IN) == 0)
-        return Curve::ELASTIC_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_OVERSHOOT_IN) == 0)
-        return Curve::OVERSHOOT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_OVERSHOOT_OUT) == 0)
-        return Curve::OVERSHOOT_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_OVERSHOOT_IN_OUT) == 0)
-        return Curve::OVERSHOOT_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_OVERSHOOT_OUT_IN) == 0)
-        return Curve::OVERSHOOT_OUT_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_BOUNCE_IN) == 0)
-        return Curve::BOUNCE_IN;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_BOUNCE_OUT) == 0)
-        return Curve::BOUNCE_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_BOUNCE_IN_OUT) == 0)
-        return Curve::BOUNCE_IN_OUT;
-    if (strcmp(s, luaEnumString_CurveInterpolationType_BOUNCE_OUT_IN) == 0)
-        return Curve::BOUNCE_OUT_IN;
-    return Curve::BEZIER;
-}
-
-const char* lua_stringFromEnum_CurveInterpolationType(Curve::InterpolationType e)
-{
-    if (e == Curve::BEZIER)
-        return luaEnumString_CurveInterpolationType_BEZIER;
-    if (e == Curve::BSPLINE)
-        return luaEnumString_CurveInterpolationType_BSPLINE;
-    if (e == Curve::FLAT)
-        return luaEnumString_CurveInterpolationType_FLAT;
-    if (e == Curve::HERMITE)
-        return luaEnumString_CurveInterpolationType_HERMITE;
-    if (e == Curve::LINEAR)
-        return luaEnumString_CurveInterpolationType_LINEAR;
-    if (e == Curve::SMOOTH)
-        return luaEnumString_CurveInterpolationType_SMOOTH;
-    if (e == Curve::STEP)
-        return luaEnumString_CurveInterpolationType_STEP;
-    if (e == Curve::QUADRATIC_IN)
-        return luaEnumString_CurveInterpolationType_QUADRATIC_IN;
-    if (e == Curve::QUADRATIC_OUT)
-        return luaEnumString_CurveInterpolationType_QUADRATIC_OUT;
-    if (e == Curve::QUADRATIC_IN_OUT)
-        return luaEnumString_CurveInterpolationType_QUADRATIC_IN_OUT;
-    if (e == Curve::QUADRATIC_OUT_IN)
-        return luaEnumString_CurveInterpolationType_QUADRATIC_OUT_IN;
-    if (e == Curve::CUBIC_IN)
-        return luaEnumString_CurveInterpolationType_CUBIC_IN;
-    if (e == Curve::CUBIC_OUT)
-        return luaEnumString_CurveInterpolationType_CUBIC_OUT;
-    if (e == Curve::CUBIC_IN_OUT)
-        return luaEnumString_CurveInterpolationType_CUBIC_IN_OUT;
-    if (e == Curve::CUBIC_OUT_IN)
-        return luaEnumString_CurveInterpolationType_CUBIC_OUT_IN;
-    if (e == Curve::QUARTIC_IN)
-        return luaEnumString_CurveInterpolationType_QUARTIC_IN;
-    if (e == Curve::QUARTIC_OUT)
-        return luaEnumString_CurveInterpolationType_QUARTIC_OUT;
-    if (e == Curve::QUARTIC_IN_OUT)
-        return luaEnumString_CurveInterpolationType_QUARTIC_IN_OUT;
-    if (e == Curve::QUARTIC_OUT_IN)
-        return luaEnumString_CurveInterpolationType_QUARTIC_OUT_IN;
-    if (e == Curve::QUINTIC_IN)
-        return luaEnumString_CurveInterpolationType_QUINTIC_IN;
-    if (e == Curve::QUINTIC_OUT)
-        return luaEnumString_CurveInterpolationType_QUINTIC_OUT;
-    if (e == Curve::QUINTIC_IN_OUT)
-        return luaEnumString_CurveInterpolationType_QUINTIC_IN_OUT;
-    if (e == Curve::QUINTIC_OUT_IN)
-        return luaEnumString_CurveInterpolationType_QUINTIC_OUT_IN;
-    if (e == Curve::SINE_IN)
-        return luaEnumString_CurveInterpolationType_SINE_IN;
-    if (e == Curve::SINE_OUT)
-        return luaEnumString_CurveInterpolationType_SINE_OUT;
-    if (e == Curve::SINE_IN_OUT)
-        return luaEnumString_CurveInterpolationType_SINE_IN_OUT;
-    if (e == Curve::SINE_OUT_IN)
-        return luaEnumString_CurveInterpolationType_SINE_OUT_IN;
-    if (e == Curve::EXPONENTIAL_IN)
-        return luaEnumString_CurveInterpolationType_EXPONENTIAL_IN;
-    if (e == Curve::EXPONENTIAL_OUT)
-        return luaEnumString_CurveInterpolationType_EXPONENTIAL_OUT;
-    if (e == Curve::EXPONENTIAL_IN_OUT)
-        return luaEnumString_CurveInterpolationType_EXPONENTIAL_IN_OUT;
-    if (e == Curve::EXPONENTIAL_OUT_IN)
-        return luaEnumString_CurveInterpolationType_EXPONENTIAL_OUT_IN;
-    if (e == Curve::CIRCULAR_IN)
-        return luaEnumString_CurveInterpolationType_CIRCULAR_IN;
-    if (e == Curve::CIRCULAR_OUT)
-        return luaEnumString_CurveInterpolationType_CIRCULAR_OUT;
-    if (e == Curve::CIRCULAR_IN_OUT)
-        return luaEnumString_CurveInterpolationType_CIRCULAR_IN_OUT;
-    if (e == Curve::CIRCULAR_OUT_IN)
-        return luaEnumString_CurveInterpolationType_CIRCULAR_OUT_IN;
-    if (e == Curve::ELASTIC_IN)
-        return luaEnumString_CurveInterpolationType_ELASTIC_IN;
-    if (e == Curve::ELASTIC_OUT)
-        return luaEnumString_CurveInterpolationType_ELASTIC_OUT;
-    if (e == Curve::ELASTIC_IN_OUT)
-        return luaEnumString_CurveInterpolationType_ELASTIC_IN_OUT;
-    if (e == Curve::ELASTIC_OUT_IN)
-        return luaEnumString_CurveInterpolationType_ELASTIC_OUT_IN;
-    if (e == Curve::OVERSHOOT_IN)
-        return luaEnumString_CurveInterpolationType_OVERSHOOT_IN;
-    if (e == Curve::OVERSHOOT_OUT)
-        return luaEnumString_CurveInterpolationType_OVERSHOOT_OUT;
-    if (e == Curve::OVERSHOOT_IN_OUT)
-        return luaEnumString_CurveInterpolationType_OVERSHOOT_IN_OUT;
-    if (e == Curve::OVERSHOOT_OUT_IN)
-        return luaEnumString_CurveInterpolationType_OVERSHOOT_OUT_IN;
-    if (e == Curve::BOUNCE_IN)
-        return luaEnumString_CurveInterpolationType_BOUNCE_IN;
-    if (e == Curve::BOUNCE_OUT)
-        return luaEnumString_CurveInterpolationType_BOUNCE_OUT;
-    if (e == Curve::BOUNCE_IN_OUT)
-        return luaEnumString_CurveInterpolationType_BOUNCE_IN_OUT;
-    if (e == Curve::BOUNCE_OUT_IN)
-        return luaEnumString_CurveInterpolationType_BOUNCE_OUT_IN;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_CurveInterpolationType.h

@@ -1,15 +0,0 @@
-#ifndef LUA_CURVEINTERPOLATIONTYPE_H_
-#define LUA_CURVEINTERPOLATIONTYPE_H_
-
-#include "Curve.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Curve::InterpolationType.
-Curve::InterpolationType lua_enumFromString_CurveInterpolationType(const char* s);
-const char* lua_stringFromEnum_CurveInterpolationType(Curve::InterpolationType e);
-
-}
-
-#endif

gameplay/src/lua/lua_DepthStencilTarget.cpp

@@ -5,7 +5,6 @@
 #include "DepthStencilTarget.h"
 #include "Game.h"
 #include "Ref.h"
-#include "lua_DepthStencilTargetFormat.h"
 
 namespace gameplay
 {
@@ -128,7 +127,7 @@ int lua_DepthStencilTarget_getFormat(lua_State* state)
                 DepthStencilTarget::Format result = instance->getFormat();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_DepthStencilTargetFormat(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -365,7 +364,7 @@ int lua_DepthStencilTarget_static_create(lua_State* state)
         case 4:
         {
             if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER &&
                 lua_type(state, 4) == LUA_TNUMBER)
             {
@@ -373,7 +372,7 @@ int lua_DepthStencilTarget_static_create(lua_State* state)
                 const char* param1 = gameplay::ScriptUtil::getString(1, false);
 
                 // Get parameter 2 off the stack.
-                DepthStencilTarget::Format param2 = (DepthStencilTarget::Format)lua_enumFromString_DepthStencilTargetFormat(luaL_checkstring(state, 2));
+                DepthStencilTarget::Format param2 = (DepthStencilTarget::Format)luaL_checkint(state, 2);
 
                 // Get parameter 3 off the stack.
                 unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 3);

gameplay/src/lua/lua_DepthStencilTargetFormat.cpp

@@ -1,31 +0,0 @@
-#include "Base.h"
-#include "lua_DepthStencilTargetFormat.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_DepthStencilTargetFormat_DEPTH = "DEPTH";
-static const char* luaEnumString_DepthStencilTargetFormat_DEPTH_STENCIL = "DEPTH_STENCIL";
-
-DepthStencilTarget::Format lua_enumFromString_DepthStencilTargetFormat(const char* s)
-{
-    if (strcmp(s, luaEnumString_DepthStencilTargetFormat_DEPTH) == 0)
-        return DepthStencilTarget::DEPTH;
-    if (strcmp(s, luaEnumString_DepthStencilTargetFormat_DEPTH_STENCIL) == 0)
-        return DepthStencilTarget::DEPTH_STENCIL;
-    return DepthStencilTarget::DEPTH;
-}
-
-const char* lua_stringFromEnum_DepthStencilTargetFormat(DepthStencilTarget::Format e)
-{
-    if (e == DepthStencilTarget::DEPTH)
-        return luaEnumString_DepthStencilTargetFormat_DEPTH;
-    if (e == DepthStencilTarget::DEPTH_STENCIL)
-        return luaEnumString_DepthStencilTargetFormat_DEPTH_STENCIL;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_DepthStencilTargetFormat.h

@@ -1,15 +0,0 @@
-#ifndef LUA_DEPTHSTENCILTARGETFORMAT_H_
-#define LUA_DEPTHSTENCILTARGETFORMAT_H_
-
-#include "DepthStencilTarget.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for DepthStencilTarget::Format.
-DepthStencilTarget::Format lua_enumFromString_DepthStencilTargetFormat(const char* s);
-const char* lua_stringFromEnum_DepthStencilTargetFormat(DepthStencilTarget::Format e);
-
-}
-
-#endif

gameplay/src/lua/lua_FlowLayout.cpp

@@ -8,7 +8,6 @@
 #include "Game.h"
 #include "Layout.h"
 #include "Ref.h"
-#include "lua_LayoutType.h"
 
 namespace gameplay
 {
@@ -195,7 +194,7 @@ int lua_FlowLayout_getType(lua_State* state)
                 Layout::Type result = instance->getType();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_LayoutType(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }

gameplay/src/lua/lua_Font.cpp

@@ -7,8 +7,6 @@
 #include "Font.h"
 #include "Game.h"
 #include "Ref.h"
-#include "lua_FontFormat.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {
@@ -243,7 +241,7 @@ int lua_Font_createText(lua_State* state)
                 (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                 (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TNIL) &&
                 lua_type(state, 5) == LUA_TNUMBER &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL))
+                lua_type(state, 6) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -270,7 +268,7 @@ int lua_Font_createText(lua_State* state)
                 unsigned int param4 = (unsigned int)luaL_checkunsigned(state, 5);
 
                 // Get parameter 5 off the stack.
-                Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                 Font* instance = getInstance(state);
                 void* returnPtr = (void*)instance->createText(param1, *param2, *param3, param4, param5);
@@ -301,7 +299,7 @@ int lua_Font_createText(lua_State* state)
                 (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                 (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TNIL) &&
                 lua_type(state, 5) == LUA_TNUMBER &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TBOOLEAN)
             {
                 // Get parameter 1 off the stack.
@@ -329,7 +327,7 @@ int lua_Font_createText(lua_State* state)
                 unsigned int param4 = (unsigned int)luaL_checkunsigned(state, 5);
 
                 // Get parameter 5 off the stack.
-                Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 bool param6 = gameplay::ScriptUtil::luaCheckBool(state, 7);
@@ -363,7 +361,7 @@ int lua_Font_createText(lua_State* state)
                 (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                 (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TNIL) &&
                 lua_type(state, 5) == LUA_TNUMBER &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TBOOLEAN &&
                 lua_type(state, 8) == LUA_TBOOLEAN)
             {
@@ -392,7 +390,7 @@ int lua_Font_createText(lua_State* state)
                 unsigned int param4 = (unsigned int)luaL_checkunsigned(state, 5);
 
                 // Get parameter 5 off the stack.
-                Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 bool param6 = gameplay::ScriptUtil::luaCheckBool(state, 7);
@@ -429,7 +427,7 @@ int lua_Font_createText(lua_State* state)
                 (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                 (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TNIL) &&
                 lua_type(state, 5) == LUA_TNUMBER &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TBOOLEAN &&
                 lua_type(state, 8) == LUA_TBOOLEAN &&
                 (lua_type(state, 9) == LUA_TUSERDATA || lua_type(state, 9) == LUA_TTABLE || lua_type(state, 9) == LUA_TNIL))
@@ -459,7 +457,7 @@ int lua_Font_createText(lua_State* state)
                 unsigned int param4 = (unsigned int)luaL_checkunsigned(state, 5);
 
                 // Get parameter 5 off the stack.
-                Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 bool param6 = gameplay::ScriptUtil::luaCheckBool(state, 7);
@@ -687,7 +685,7 @@ int lua_Font_drawText(lua_State* state)
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TNIL) &&
                     lua_type(state, 5) == LUA_TNUMBER &&
-                    (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL))
+                    lua_type(state, 6) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -708,7 +706,7 @@ int lua_Font_drawText(lua_State* state)
                     unsigned int param4 = (unsigned int)luaL_checkunsigned(state, 5);
 
                     // Get parameter 5 off the stack.
-                    Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                    Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                     Font* instance = getInstance(state);
                     instance->drawText(param1, *param2, *param3, param4, param5);
@@ -768,7 +766,7 @@ int lua_Font_drawText(lua_State* state)
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TNIL) &&
                     lua_type(state, 5) == LUA_TNUMBER &&
-                    (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                    lua_type(state, 6) == LUA_TNUMBER &&
                     lua_type(state, 7) == LUA_TBOOLEAN)
                 {
                     // Get parameter 1 off the stack.
@@ -790,7 +788,7 @@ int lua_Font_drawText(lua_State* state)
                     unsigned int param4 = (unsigned int)luaL_checkunsigned(state, 5);
 
                     // Get parameter 5 off the stack.
-                    Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                    Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                     // Get parameter 6 off the stack.
                     bool param6 = gameplay::ScriptUtil::luaCheckBool(state, 7);
@@ -854,7 +852,7 @@ int lua_Font_drawText(lua_State* state)
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TNIL) &&
                     lua_type(state, 5) == LUA_TNUMBER &&
-                    (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                    lua_type(state, 6) == LUA_TNUMBER &&
                     lua_type(state, 7) == LUA_TBOOLEAN &&
                     lua_type(state, 8) == LUA_TBOOLEAN)
                 {
@@ -877,7 +875,7 @@ int lua_Font_drawText(lua_State* state)
                     unsigned int param4 = (unsigned int)luaL_checkunsigned(state, 5);
 
                     // Get parameter 5 off the stack.
-                    Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                    Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                     // Get parameter 6 off the stack.
                     bool param6 = gameplay::ScriptUtil::luaCheckBool(state, 7);
@@ -948,7 +946,7 @@ int lua_Font_drawText(lua_State* state)
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TNIL) &&
                     lua_type(state, 5) == LUA_TNUMBER &&
-                    (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                    lua_type(state, 6) == LUA_TNUMBER &&
                     lua_type(state, 7) == LUA_TBOOLEAN &&
                     lua_type(state, 8) == LUA_TBOOLEAN &&
                     (lua_type(state, 9) == LUA_TUSERDATA || lua_type(state, 9) == LUA_TTABLE || lua_type(state, 9) == LUA_TNIL))
@@ -972,7 +970,7 @@ int lua_Font_drawText(lua_State* state)
                     unsigned int param4 = (unsigned int)luaL_checkunsigned(state, 5);
 
                     // Get parameter 5 off the stack.
-                    Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                    Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                     // Get parameter 6 off the stack.
                     bool param6 = gameplay::ScriptUtil::luaCheckBool(state, 7);
@@ -1143,7 +1141,7 @@ int lua_Font_getFormat(lua_State* state)
                 Font::Format result = instance->getFormat();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontFormat(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1233,7 +1231,7 @@ int lua_Font_getIndexAtLocation(lua_State* state)
                 lua_type(state, 4) == LUA_TNUMBER &&
                 (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TNIL) &&
                 (lua_type(state, 6) == LUA_TUSERDATA || lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TNIL) &&
-                (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -1269,7 +1267,7 @@ int lua_Font_getIndexAtLocation(lua_State* state)
                 }
 
                 // Get parameter 6 off the stack.
-                Font::Justify param6 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 7));
+                Font::Justify param6 = (Font::Justify)luaL_checkint(state, 7);
 
                 Font* instance = getInstance(state);
                 int result = instance->getIndexAtLocation(param1, *param2, param3, *param4, param5, param6);
@@ -1292,7 +1290,7 @@ int lua_Font_getIndexAtLocation(lua_State* state)
                 lua_type(state, 4) == LUA_TNUMBER &&
                 (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TNIL) &&
                 (lua_type(state, 6) == LUA_TUSERDATA || lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TNIL) &&
-                (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL) &&
+                lua_type(state, 7) == LUA_TNUMBER &&
                 lua_type(state, 8) == LUA_TBOOLEAN)
             {
                 // Get parameter 1 off the stack.
@@ -1329,7 +1327,7 @@ int lua_Font_getIndexAtLocation(lua_State* state)
                 }
 
                 // Get parameter 6 off the stack.
-                Font::Justify param6 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 7));
+                Font::Justify param6 = (Font::Justify)luaL_checkint(state, 7);
 
                 // Get parameter 7 off the stack.
                 bool param7 = gameplay::ScriptUtil::luaCheckBool(state, 8);
@@ -1355,7 +1353,7 @@ int lua_Font_getIndexAtLocation(lua_State* state)
                 lua_type(state, 4) == LUA_TNUMBER &&
                 (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TNIL) &&
                 (lua_type(state, 6) == LUA_TUSERDATA || lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TNIL) &&
-                (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL) &&
+                lua_type(state, 7) == LUA_TNUMBER &&
                 lua_type(state, 8) == LUA_TBOOLEAN &&
                 lua_type(state, 9) == LUA_TBOOLEAN)
             {
@@ -1393,7 +1391,7 @@ int lua_Font_getIndexAtLocation(lua_State* state)
                 }
 
                 // Get parameter 6 off the stack.
-                Font::Justify param6 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 7));
+                Font::Justify param6 = (Font::Justify)luaL_checkint(state, 7);
 
                 // Get parameter 7 off the stack.
                 bool param7 = gameplay::ScriptUtil::luaCheckBool(state, 8);
@@ -1486,7 +1484,7 @@ int lua_Font_getLocationAtIndex(lua_State* state)
                 lua_type(state, 4) == LUA_TNUMBER &&
                 (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TNIL) &&
                 lua_type(state, 6) == LUA_TNUMBER &&
-                (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -1516,7 +1514,7 @@ int lua_Font_getLocationAtIndex(lua_State* state)
                 unsigned int param5 = (unsigned int)luaL_checkunsigned(state, 6);
 
                 // Get parameter 6 off the stack.
-                Font::Justify param6 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 7));
+                Font::Justify param6 = (Font::Justify)luaL_checkint(state, 7);
 
                 Font* instance = getInstance(state);
                 instance->getLocationAtIndex(param1, *param2, param3, param4, param5, param6);
@@ -1536,7 +1534,7 @@ int lua_Font_getLocationAtIndex(lua_State* state)
                 lua_type(state, 4) == LUA_TNUMBER &&
                 (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TNIL) &&
                 lua_type(state, 6) == LUA_TNUMBER &&
-                (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL) &&
+                lua_type(state, 7) == LUA_TNUMBER &&
                 lua_type(state, 8) == LUA_TBOOLEAN)
             {
                 // Get parameter 1 off the stack.
@@ -1567,7 +1565,7 @@ int lua_Font_getLocationAtIndex(lua_State* state)
                 unsigned int param5 = (unsigned int)luaL_checkunsigned(state, 6);
 
                 // Get parameter 6 off the stack.
-                Font::Justify param6 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 7));
+                Font::Justify param6 = (Font::Justify)luaL_checkint(state, 7);
 
                 // Get parameter 7 off the stack.
                 bool param7 = gameplay::ScriptUtil::luaCheckBool(state, 8);
@@ -1590,7 +1588,7 @@ int lua_Font_getLocationAtIndex(lua_State* state)
                 lua_type(state, 4) == LUA_TNUMBER &&
                 (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TNIL) &&
                 lua_type(state, 6) == LUA_TNUMBER &&
-                (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL) &&
+                lua_type(state, 7) == LUA_TNUMBER &&
                 lua_type(state, 8) == LUA_TBOOLEAN &&
                 lua_type(state, 9) == LUA_TBOOLEAN)
             {
@@ -1622,7 +1620,7 @@ int lua_Font_getLocationAtIndex(lua_State* state)
                 unsigned int param5 = (unsigned int)luaL_checkunsigned(state, 6);
 
                 // Get parameter 6 off the stack.
-                Font::Justify param6 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 7));
+                Font::Justify param6 = (Font::Justify)luaL_checkint(state, 7);
 
                 // Get parameter 7 off the stack.
                 bool param7 = gameplay::ScriptUtil::luaCheckBool(state, 8);
@@ -1946,7 +1944,7 @@ int lua_Font_measureText(lua_State* state)
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TNIL) &&
-                    (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL))
+                    lua_type(state, 6) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -1967,7 +1965,7 @@ int lua_Font_measureText(lua_State* state)
                         break;
 
                     // Get parameter 5 off the stack.
-                    Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                    Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                     Font* instance = getInstance(state);
                     instance->measureText(param1, *param2, param3, param4, param5);
@@ -1989,7 +1987,7 @@ int lua_Font_measureText(lua_State* state)
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TNIL) &&
-                    (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                    lua_type(state, 6) == LUA_TNUMBER &&
                     lua_type(state, 7) == LUA_TBOOLEAN)
                 {
                     // Get parameter 1 off the stack.
@@ -2011,7 +2009,7 @@ int lua_Font_measureText(lua_State* state)
                         break;
 
                     // Get parameter 5 off the stack.
-                    Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                    Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                     // Get parameter 6 off the stack.
                     bool param6 = gameplay::ScriptUtil::luaCheckBool(state, 7);
@@ -2036,7 +2034,7 @@ int lua_Font_measureText(lua_State* state)
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TUSERDATA || lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TNIL) &&
-                    (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                    lua_type(state, 6) == LUA_TNUMBER &&
                     lua_type(state, 7) == LUA_TBOOLEAN &&
                     lua_type(state, 8) == LUA_TBOOLEAN)
                 {
@@ -2059,7 +2057,7 @@ int lua_Font_measureText(lua_State* state)
                         break;
 
                     // Get parameter 5 off the stack.
-                    Font::Justify param5 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 6));
+                    Font::Justify param5 = (Font::Justify)luaL_checkint(state, 6);
 
                     // Get parameter 6 off the stack.
                     bool param6 = gameplay::ScriptUtil::luaCheckBool(state, 7);
@@ -2284,7 +2282,7 @@ int lua_Font_static_getJustify(lua_State* state)
                 Font::Justify result = Font::getJustify(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }

gameplay/src/lua/lua_FontFormat.cpp

@@ -1,31 +0,0 @@
-#include "Base.h"
-#include "lua_FontFormat.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_FontFormat_BITMAP = "BITMAP";
-static const char* luaEnumString_FontFormat_DISTANCE_FIELD = "DISTANCE_FIELD";
-
-Font::Format lua_enumFromString_FontFormat(const char* s)
-{
-    if (strcmp(s, luaEnumString_FontFormat_BITMAP) == 0)
-        return Font::BITMAP;
-    if (strcmp(s, luaEnumString_FontFormat_DISTANCE_FIELD) == 0)
-        return Font::DISTANCE_FIELD;
-    return Font::BITMAP;
-}
-
-const char* lua_stringFromEnum_FontFormat(Font::Format e)
-{
-    if (e == Font::BITMAP)
-        return luaEnumString_FontFormat_BITMAP;
-    if (e == Font::DISTANCE_FIELD)
-        return luaEnumString_FontFormat_DISTANCE_FIELD;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_FontFormat.h

@@ -1,15 +0,0 @@
-#ifndef LUA_FONTFORMAT_H_
-#define LUA_FONTFORMAT_H_
-
-#include "Font.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Font::Format.
-Font::Format lua_enumFromString_FontFormat(const char* s);
-const char* lua_stringFromEnum_FontFormat(Font::Format e);
-
-}
-
-#endif

gameplay/src/lua/lua_FontJustify.cpp

@@ -1,96 +0,0 @@
-#include "Base.h"
-#include "lua_FontJustify.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_FontJustify_ALIGN_LEFT = "ALIGN_LEFT";
-static const char* luaEnumString_FontJustify_ALIGN_HCENTER = "ALIGN_HCENTER";
-static const char* luaEnumString_FontJustify_ALIGN_RIGHT = "ALIGN_RIGHT";
-static const char* luaEnumString_FontJustify_ALIGN_TOP = "ALIGN_TOP";
-static const char* luaEnumString_FontJustify_ALIGN_VCENTER = "ALIGN_VCENTER";
-static const char* luaEnumString_FontJustify_ALIGN_BOTTOM = "ALIGN_BOTTOM";
-static const char* luaEnumString_FontJustify_ALIGN_TOP_LEFT = "ALIGN_TOP_LEFT";
-static const char* luaEnumString_FontJustify_ALIGN_VCENTER_LEFT = "ALIGN_VCENTER_LEFT";
-static const char* luaEnumString_FontJustify_ALIGN_BOTTOM_LEFT = "ALIGN_BOTTOM_LEFT";
-static const char* luaEnumString_FontJustify_ALIGN_TOP_HCENTER = "ALIGN_TOP_HCENTER";
-static const char* luaEnumString_FontJustify_ALIGN_VCENTER_HCENTER = "ALIGN_VCENTER_HCENTER";
-static const char* luaEnumString_FontJustify_ALIGN_BOTTOM_HCENTER = "ALIGN_BOTTOM_HCENTER";
-static const char* luaEnumString_FontJustify_ALIGN_TOP_RIGHT = "ALIGN_TOP_RIGHT";
-static const char* luaEnumString_FontJustify_ALIGN_VCENTER_RIGHT = "ALIGN_VCENTER_RIGHT";
-static const char* luaEnumString_FontJustify_ALIGN_BOTTOM_RIGHT = "ALIGN_BOTTOM_RIGHT";
-
-Font::Justify lua_enumFromString_FontJustify(const char* s)
-{
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_LEFT) == 0)
-        return Font::ALIGN_LEFT;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_HCENTER) == 0)
-        return Font::ALIGN_HCENTER;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_RIGHT) == 0)
-        return Font::ALIGN_RIGHT;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_TOP) == 0)
-        return Font::ALIGN_TOP;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_VCENTER) == 0)
-        return Font::ALIGN_VCENTER;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_BOTTOM) == 0)
-        return Font::ALIGN_BOTTOM;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_TOP_LEFT) == 0)
-        return Font::ALIGN_TOP_LEFT;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_VCENTER_LEFT) == 0)
-        return Font::ALIGN_VCENTER_LEFT;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_BOTTOM_LEFT) == 0)
-        return Font::ALIGN_BOTTOM_LEFT;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_TOP_HCENTER) == 0)
-        return Font::ALIGN_TOP_HCENTER;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_VCENTER_HCENTER) == 0)
-        return Font::ALIGN_VCENTER_HCENTER;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_BOTTOM_HCENTER) == 0)
-        return Font::ALIGN_BOTTOM_HCENTER;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_TOP_RIGHT) == 0)
-        return Font::ALIGN_TOP_RIGHT;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_VCENTER_RIGHT) == 0)
-        return Font::ALIGN_VCENTER_RIGHT;
-    if (strcmp(s, luaEnumString_FontJustify_ALIGN_BOTTOM_RIGHT) == 0)
-        return Font::ALIGN_BOTTOM_RIGHT;
-    return Font::ALIGN_LEFT;
-}
-
-const char* lua_stringFromEnum_FontJustify(Font::Justify e)
-{
-    if (e == Font::ALIGN_LEFT)
-        return luaEnumString_FontJustify_ALIGN_LEFT;
-    if (e == Font::ALIGN_HCENTER)
-        return luaEnumString_FontJustify_ALIGN_HCENTER;
-    if (e == Font::ALIGN_RIGHT)
-        return luaEnumString_FontJustify_ALIGN_RIGHT;
-    if (e == Font::ALIGN_TOP)
-        return luaEnumString_FontJustify_ALIGN_TOP;
-    if (e == Font::ALIGN_VCENTER)
-        return luaEnumString_FontJustify_ALIGN_VCENTER;
-    if (e == Font::ALIGN_BOTTOM)
-        return luaEnumString_FontJustify_ALIGN_BOTTOM;
-    if (e == Font::ALIGN_TOP_LEFT)
-        return luaEnumString_FontJustify_ALIGN_TOP_LEFT;
-    if (e == Font::ALIGN_VCENTER_LEFT)
-        return luaEnumString_FontJustify_ALIGN_VCENTER_LEFT;
-    if (e == Font::ALIGN_BOTTOM_LEFT)
-        return luaEnumString_FontJustify_ALIGN_BOTTOM_LEFT;
-    if (e == Font::ALIGN_TOP_HCENTER)
-        return luaEnumString_FontJustify_ALIGN_TOP_HCENTER;
-    if (e == Font::ALIGN_VCENTER_HCENTER)
-        return luaEnumString_FontJustify_ALIGN_VCENTER_HCENTER;
-    if (e == Font::ALIGN_BOTTOM_HCENTER)
-        return luaEnumString_FontJustify_ALIGN_BOTTOM_HCENTER;
-    if (e == Font::ALIGN_TOP_RIGHT)
-        return luaEnumString_FontJustify_ALIGN_TOP_RIGHT;
-    if (e == Font::ALIGN_VCENTER_RIGHT)
-        return luaEnumString_FontJustify_ALIGN_VCENTER_RIGHT;
-    if (e == Font::ALIGN_BOTTOM_RIGHT)
-        return luaEnumString_FontJustify_ALIGN_BOTTOM_RIGHT;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_FontJustify.h

@@ -1,15 +0,0 @@
-#ifndef LUA_FONTJUSTIFY_H_
-#define LUA_FONTJUSTIFY_H_
-
-#include "Font.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Font::Justify.
-Font::Justify lua_enumFromString_FontJustify(const char* s);
-const char* lua_stringFromEnum_FontJustify(Font::Justify e);
-
-}
-
-#endif

gameplay/src/lua/lua_FontStyle.cpp

@@ -1,41 +0,0 @@
-#include "Base.h"
-#include "lua_FontStyle.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_FontStyle_PLAIN = "PLAIN";
-static const char* luaEnumString_FontStyle_BOLD = "BOLD";
-static const char* luaEnumString_FontStyle_ITALIC = "ITALIC";
-static const char* luaEnumString_FontStyle_BOLD_ITALIC = "BOLD_ITALIC";
-
-Font::Style lua_enumFromString_FontStyle(const char* s)
-{
-    if (strcmp(s, luaEnumString_FontStyle_PLAIN) == 0)
-        return Font::PLAIN;
-    if (strcmp(s, luaEnumString_FontStyle_BOLD) == 0)
-        return Font::BOLD;
-    if (strcmp(s, luaEnumString_FontStyle_ITALIC) == 0)
-        return Font::ITALIC;
-    if (strcmp(s, luaEnumString_FontStyle_BOLD_ITALIC) == 0)
-        return Font::BOLD_ITALIC;
-    return Font::PLAIN;
-}
-
-const char* lua_stringFromEnum_FontStyle(Font::Style e)
-{
-    if (e == Font::PLAIN)
-        return luaEnumString_FontStyle_PLAIN;
-    if (e == Font::BOLD)
-        return luaEnumString_FontStyle_BOLD;
-    if (e == Font::ITALIC)
-        return luaEnumString_FontStyle_ITALIC;
-    if (e == Font::BOLD_ITALIC)
-        return luaEnumString_FontStyle_BOLD_ITALIC;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_FontStyle.h

@@ -1,15 +0,0 @@
-#ifndef LUA_FONTSTYLE_H_
-#define LUA_FONTSTYLE_H_
-
-#include "Font.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Font::Style.
-Font::Style lua_enumFromString_FontStyle(const char* s);
-const char* lua_stringFromEnum_FontStyle(Font::Style e);
-
-}
-
-#endif

gameplay/src/lua/lua_FontText.cpp

@@ -7,8 +7,6 @@
 #include "Font.h"
 #include "Game.h"
 #include "Ref.h"
-#include "lua_FontFormat.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {

gameplay/src/lua/lua_Form.cpp

@@ -27,15 +27,6 @@
 #include "TextBox.h"
 #include "Theme.h"
 #include "VerticalLayout.h"
-#include "lua_ContainerDirection.h"
-#include "lua_ContainerScroll.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
-#include "lua_LayoutType.h"
 
 namespace gameplay
 {
@@ -49,6 +40,7 @@ void luaRegister_Form()
         {"addRef", lua_Form_addRef},
         {"addScript", lua_Form_addScript},
         {"canFocus", lua_Form_canFocus},
+        {"clearScripts", lua_Form_clearScripts},
         {"createAnimation", lua_Form_createAnimation},
         {"createAnimationFromBy", lua_Form_createAnimationFromBy},
         {"createAnimationFromTo", lua_Form_createAnimationFromTo},
@@ -437,6 +429,38 @@ int lua_Form_canFocus(lua_State* state)
     return 0;
 }
 
+int lua_Form_clearScripts(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))
+            {
+                Form* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_Form_clearScripts - 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_Form_createAnimation(lua_State* state)
 {
     // Get the number of parameters.
@@ -526,7 +550,7 @@ int lua_Form_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -544,7 +568,7 @@ int lua_Form_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     Form* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -581,7 +605,7 @@ int lua_Form_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -605,7 +629,7 @@ int lua_Form_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     Form* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -655,7 +679,7 @@ int lua_Form_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -671,7 +695,7 @@ int lua_Form_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -723,7 +747,7 @@ int lua_Form_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -739,7 +763,7 @@ int lua_Form_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -965,7 +989,7 @@ int lua_Form_getAlignment(lua_State* state)
                 Control::Alignment result = instance->getAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAlignment(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1159,7 +1183,7 @@ int lua_Form_getAutoSize(lua_State* state)
                 Control::AutoSize result = instance->getAutoSize();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAutoSize(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1215,10 +1239,10 @@ int lua_Form_getBorder(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getBorder(param1));
@@ -1543,10 +1567,10 @@ int lua_Form_getCursorColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorColor(param1));
@@ -1591,10 +1615,10 @@ int lua_Form_getCursorRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorRegion(param1));
@@ -1639,10 +1663,10 @@ int lua_Form_getCursorUVs(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorUVs(param1));
@@ -1748,10 +1772,10 @@ int lua_Form_getFont(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)instance->getFont(param1);
@@ -1813,10 +1837,10 @@ int lua_Form_getFontSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 unsigned int result = instance->getFontSize(param1);
@@ -1923,13 +1947,13 @@ int lua_Form_getImageColor(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageColor(param1, param2));
@@ -1975,13 +1999,13 @@ int lua_Form_getImageRegion(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageRegion(param1, param2));
@@ -2027,13 +2051,13 @@ int lua_Form_getImageUVs(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageUVs(param1, param2));
@@ -2183,10 +2207,10 @@ int lua_Form_getOpacity(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 float result = instance->getOpacity(param1);
@@ -2350,7 +2374,7 @@ int lua_Form_getScroll(lua_State* state)
                 Container::Scroll result = instance->getScroll();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ContainerScroll(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2555,10 +2579,10 @@ int lua_Form_getSkinColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinColor(param1));
@@ -2629,10 +2653,10 @@ int lua_Form_getSkinRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinRegion(param1));
@@ -2682,7 +2706,7 @@ int lua_Form_getState(lua_State* state)
                 Control::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2761,7 +2785,7 @@ int lua_Form_getTextAlignment(lua_State* state)
                 Font::Justify result = instance->getTextAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2773,16 +2797,16 @@ int lua_Form_getTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 Font::Justify result = instance->getTextAlignment(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2838,10 +2862,10 @@ int lua_Form_getTextColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getTextColor(param1));
@@ -2903,10 +2927,10 @@ int lua_Form_getTextRightToLeft(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 bool result = instance->getTextRightToLeft(param1);
@@ -3786,10 +3810,10 @@ int lua_Form_moveFocus(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Container::Direction param1 = (Container::Direction)lua_enumFromString_ContainerDirection(luaL_checkstring(state, 2));
+                Container::Direction param1 = (Container::Direction)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 bool result = instance->moveFocus(param1);
@@ -4052,10 +4076,10 @@ int lua_Form_setAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::Alignment param1 = (Control::Alignment)lua_enumFromString_ControlAlignment(luaL_checkstring(state, 2));
+                Control::Alignment param1 = (Control::Alignment)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 instance->setAlignment(param1);
@@ -4166,10 +4190,10 @@ int lua_Form_setAutoSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::AutoSize param1 = (Control::AutoSize)lua_enumFromString_ControlAutoSize(luaL_checkstring(state, 2));
+                Control::AutoSize param1 = (Control::AutoSize)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 instance->setAutoSize(param1);
@@ -5011,10 +5035,10 @@ int lua_Form_setLayout(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Layout::Type param1 = (Layout::Type)lua_enumFromString_LayoutType(luaL_checkstring(state, 2));
+                Layout::Type param1 = (Layout::Type)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 instance->setLayout(param1);
@@ -5283,10 +5307,10 @@ int lua_Form_setScroll(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Container::Scroll param1 = (Container::Scroll)lua_enumFromString_ContainerScroll(luaL_checkstring(state, 2));
+                Container::Scroll param1 = (Container::Scroll)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 instance->setScroll(param1);
@@ -5727,10 +5751,10 @@ int lua_Form_setTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 Form* instance = getInstance(state);
                 instance->setTextAlignment(param1);
@@ -5745,11 +5769,11 @@ int lua_Form_setTextAlignment(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 unsigned char param2 = (unsigned char)luaL_checkunsigned(state, 3);
@@ -6392,7 +6416,7 @@ int lua_Form_static_create(lua_State* state)
             {
                 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) &&
-                    (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                    lua_type(state, 3) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(1, false);
@@ -6404,7 +6428,7 @@ int lua_Form_static_create(lua_State* state)
                         break;
 
                     // Get parameter 3 off the stack.
-                    Layout::Type param3 = (Layout::Type)lua_enumFromString_LayoutType(luaL_checkstring(state, 3));
+                    Layout::Type param3 = (Layout::Type)luaL_checkint(state, 3);
 
                     void* returnPtr = (void*)Form::create(param1, param2, param3);
                     if (returnPtr)

gameplay/src/lua/lua_Form.h

@@ -11,6 +11,7 @@ int lua_Form_addListener(lua_State* state);
 int lua_Form_addRef(lua_State* state);
 int lua_Form_addScript(lua_State* state);
 int lua_Form_canFocus(lua_State* state);
+int lua_Form_clearScripts(lua_State* state);
 int lua_Form_createAnimation(lua_State* state);
 int lua_Form_createAnimationFromBy(lua_State* state);
 int lua_Form_createAnimationFromTo(lua_State* state);

gameplay/src/lua/lua_Game.cpp

@@ -10,13 +10,6 @@
 #include "RenderState.h"
 #include "SceneLoader.h"
 #include "Theme.h"
-#include "lua_GameClearFlags.h"
-#include "lua_GameState.h"
-#include "lua_GamepadGamepadEvent.h"
-#include "lua_GestureGestureEvent.h"
-#include "lua_KeyboardKeyEvent.h"
-#include "lua_MouseMouseEvent.h"
-#include "lua_TouchTouchEvent.h"
 
 namespace gameplay
 {
@@ -189,13 +182,13 @@ int lua_Game_clear(lua_State* state)
             do
             {
                 if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                    (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                    lua_type(state, 2) == LUA_TNUMBER &&
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     lua_type(state, 4) == LUA_TNUMBER &&
                     lua_type(state, 5) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
-                    Game::ClearFlags param1 = (Game::ClearFlags)lua_enumFromString_GameClearFlags(luaL_checkstring(state, 2));
+                    Game::ClearFlags param1 = (Game::ClearFlags)luaL_checkint(state, 2);
 
                     // Get parameter 2 off the stack.
                     bool param2Valid;
@@ -225,7 +218,7 @@ int lua_Game_clear(lua_State* state)
             do
             {
                 if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                    (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                    lua_type(state, 2) == LUA_TNUMBER &&
                     lua_type(state, 3) == LUA_TNUMBER &&
                     lua_type(state, 4) == LUA_TNUMBER &&
                     lua_type(state, 5) == LUA_TNUMBER &&
@@ -234,7 +227,7 @@ int lua_Game_clear(lua_State* state)
                     lua_type(state, 8) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
-                    Game::ClearFlags param1 = (Game::ClearFlags)lua_enumFromString_GameClearFlags(luaL_checkstring(state, 2));
+                    Game::ClearFlags param1 = (Game::ClearFlags)luaL_checkint(state, 2);
 
                     // Get parameter 2 off the stack.
                     float param2 = (float)luaL_checknumber(state, 3);
@@ -418,11 +411,11 @@ int lua_Game_gamepadEvent(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TTABLE || lua_type(state, 3) == LUA_TNIL))
             {
                 // Get parameter 1 off the stack.
-                Gamepad::GamepadEvent param1 = (Gamepad::GamepadEvent)lua_enumFromString_GamepadGamepadEvent(luaL_checkstring(state, 2));
+                Gamepad::GamepadEvent param1 = (Gamepad::GamepadEvent)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 bool param2Valid;
@@ -1347,7 +1340,7 @@ int lua_Game_getState(lua_State* state)
                 Game::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_GameState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1561,10 +1554,10 @@ int lua_Game_isGestureRegistered(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Gesture::GestureEvent param1 = (Gesture::GestureEvent)lua_enumFromString_GestureGestureEvent(luaL_checkstring(state, 2));
+                Gesture::GestureEvent param1 = (Gesture::GestureEvent)luaL_checkint(state, 2);
 
                 Game* instance = getInstance(state);
                 bool result = instance->isGestureRegistered(param1);
@@ -1600,10 +1593,10 @@ int lua_Game_isGestureSupported(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Gesture::GestureEvent param1 = (Gesture::GestureEvent)lua_enumFromString_GestureGestureEvent(luaL_checkstring(state, 2));
+                Gesture::GestureEvent param1 = (Gesture::GestureEvent)luaL_checkint(state, 2);
 
                 Game* instance = getInstance(state);
                 bool result = instance->isGestureSupported(param1);
@@ -1779,11 +1772,11 @@ int lua_Game_keyEvent(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Keyboard::KeyEvent param1 = (Keyboard::KeyEvent)lua_enumFromString_KeyboardKeyEvent(luaL_checkstring(state, 2));
+                Keyboard::KeyEvent param1 = (Keyboard::KeyEvent)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 int param2 = (int)luaL_checkint(state, 3);
@@ -1858,13 +1851,13 @@ int lua_Game_mouseEvent(lua_State* state)
         case 5:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER &&
                 lua_type(state, 4) == LUA_TNUMBER &&
                 lua_type(state, 5) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Mouse::MouseEvent param1 = (Mouse::MouseEvent)lua_enumFromString_MouseMouseEvent(luaL_checkstring(state, 2));
+                Mouse::MouseEvent param1 = (Mouse::MouseEvent)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 int param2 = (int)luaL_checkint(state, 3);
@@ -1941,10 +1934,10 @@ int lua_Game_registerGesture(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Gesture::GestureEvent param1 = (Gesture::GestureEvent)lua_enumFromString_GestureGestureEvent(luaL_checkstring(state, 2));
+                Gesture::GestureEvent param1 = (Gesture::GestureEvent)luaL_checkint(state, 2);
 
                 Game* instance = getInstance(state);
                 instance->registerGesture(param1);
@@ -2465,13 +2458,13 @@ int lua_Game_touchEvent(lua_State* state)
         case 5:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER &&
                 lua_type(state, 4) == LUA_TNUMBER &&
                 lua_type(state, 5) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Touch::TouchEvent param1 = (Touch::TouchEvent)lua_enumFromString_TouchTouchEvent(luaL_checkstring(state, 2));
+                Touch::TouchEvent param1 = (Touch::TouchEvent)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 int param2 = (int)luaL_checkint(state, 3);
@@ -2513,10 +2506,10 @@ int lua_Game_unregisterGesture(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Gesture::GestureEvent param1 = (Gesture::GestureEvent)lua_enumFromString_GestureGestureEvent(luaL_checkstring(state, 2));
+                Gesture::GestureEvent param1 = (Gesture::GestureEvent)luaL_checkint(state, 2);
 
                 Game* instance = getInstance(state);
                 instance->unregisterGesture(param1);

gameplay/src/lua/lua_GameClearFlags.cpp

@@ -1,56 +0,0 @@
-#include "Base.h"
-#include "lua_GameClearFlags.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_GameClearFlags_CLEAR_COLOR = "CLEAR_COLOR";
-static const char* luaEnumString_GameClearFlags_CLEAR_DEPTH = "CLEAR_DEPTH";
-static const char* luaEnumString_GameClearFlags_CLEAR_STENCIL = "CLEAR_STENCIL";
-static const char* luaEnumString_GameClearFlags_CLEAR_COLOR_DEPTH = "CLEAR_COLOR_DEPTH";
-static const char* luaEnumString_GameClearFlags_CLEAR_COLOR_STENCIL = "CLEAR_COLOR_STENCIL";
-static const char* luaEnumString_GameClearFlags_CLEAR_DEPTH_STENCIL = "CLEAR_DEPTH_STENCIL";
-static const char* luaEnumString_GameClearFlags_CLEAR_COLOR_DEPTH_STENCIL = "CLEAR_COLOR_DEPTH_STENCIL";
-
-Game::ClearFlags lua_enumFromString_GameClearFlags(const char* s)
-{
-    if (strcmp(s, luaEnumString_GameClearFlags_CLEAR_COLOR) == 0)
-        return Game::CLEAR_COLOR;
-    if (strcmp(s, luaEnumString_GameClearFlags_CLEAR_DEPTH) == 0)
-        return Game::CLEAR_DEPTH;
-    if (strcmp(s, luaEnumString_GameClearFlags_CLEAR_STENCIL) == 0)
-        return Game::CLEAR_STENCIL;
-    if (strcmp(s, luaEnumString_GameClearFlags_CLEAR_COLOR_DEPTH) == 0)
-        return Game::CLEAR_COLOR_DEPTH;
-    if (strcmp(s, luaEnumString_GameClearFlags_CLEAR_COLOR_STENCIL) == 0)
-        return Game::CLEAR_COLOR_STENCIL;
-    if (strcmp(s, luaEnumString_GameClearFlags_CLEAR_DEPTH_STENCIL) == 0)
-        return Game::CLEAR_DEPTH_STENCIL;
-    if (strcmp(s, luaEnumString_GameClearFlags_CLEAR_COLOR_DEPTH_STENCIL) == 0)
-        return Game::CLEAR_COLOR_DEPTH_STENCIL;
-    return Game::CLEAR_COLOR;
-}
-
-const char* lua_stringFromEnum_GameClearFlags(Game::ClearFlags e)
-{
-    if (e == Game::CLEAR_COLOR)
-        return luaEnumString_GameClearFlags_CLEAR_COLOR;
-    if (e == Game::CLEAR_DEPTH)
-        return luaEnumString_GameClearFlags_CLEAR_DEPTH;
-    if (e == Game::CLEAR_STENCIL)
-        return luaEnumString_GameClearFlags_CLEAR_STENCIL;
-    if (e == Game::CLEAR_COLOR_DEPTH)
-        return luaEnumString_GameClearFlags_CLEAR_COLOR_DEPTH;
-    if (e == Game::CLEAR_COLOR_STENCIL)
-        return luaEnumString_GameClearFlags_CLEAR_COLOR_STENCIL;
-    if (e == Game::CLEAR_DEPTH_STENCIL)
-        return luaEnumString_GameClearFlags_CLEAR_DEPTH_STENCIL;
-    if (e == Game::CLEAR_COLOR_DEPTH_STENCIL)
-        return luaEnumString_GameClearFlags_CLEAR_COLOR_DEPTH_STENCIL;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_GameClearFlags.h

@@ -1,15 +0,0 @@
-#ifndef LUA_GAMECLEARFLAGS_H_
-#define LUA_GAMECLEARFLAGS_H_
-
-#include "Game.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Game::ClearFlags.
-Game::ClearFlags lua_enumFromString_GameClearFlags(const char* s);
-const char* lua_stringFromEnum_GameClearFlags(Game::ClearFlags e);
-
-}
-
-#endif

gameplay/src/lua/lua_GameState.cpp

@@ -1,36 +0,0 @@
-#include "Base.h"
-#include "lua_GameState.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_GameState_UNINITIALIZED = "UNINITIALIZED";
-static const char* luaEnumString_GameState_RUNNING = "RUNNING";
-static const char* luaEnumString_GameState_PAUSED = "PAUSED";
-
-Game::State lua_enumFromString_GameState(const char* s)
-{
-    if (strcmp(s, luaEnumString_GameState_UNINITIALIZED) == 0)
-        return Game::UNINITIALIZED;
-    if (strcmp(s, luaEnumString_GameState_RUNNING) == 0)
-        return Game::RUNNING;
-    if (strcmp(s, luaEnumString_GameState_PAUSED) == 0)
-        return Game::PAUSED;
-    return Game::UNINITIALIZED;
-}
-
-const char* lua_stringFromEnum_GameState(Game::State e)
-{
-    if (e == Game::UNINITIALIZED)
-        return luaEnumString_GameState_UNINITIALIZED;
-    if (e == Game::RUNNING)
-        return luaEnumString_GameState_RUNNING;
-    if (e == Game::PAUSED)
-        return luaEnumString_GameState_PAUSED;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_GameState.h

@@ -1,15 +0,0 @@
-#ifndef LUA_GAMESTATE_H_
-#define LUA_GAMESTATE_H_
-
-#include "Game.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Game::State.
-Game::State lua_enumFromString_GameState(const char* s);
-const char* lua_stringFromEnum_GameState(Game::State e);
-
-}
-
-#endif

gameplay/src/lua/lua_Gamepad.cpp

@@ -8,7 +8,6 @@
 #include "Gamepad.h"
 #include "JoystickControl.h"
 #include "Platform.h"
-#include "lua_GamepadButtonMapping.h"
 
 namespace gameplay
 {
@@ -463,10 +462,10 @@ int lua_Gamepad_isButtonDown(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Gamepad::ButtonMapping param1 = (Gamepad::ButtonMapping)lua_enumFromString_GamepadButtonMapping(luaL_checkstring(state, 2));
+                Gamepad::ButtonMapping param1 = (Gamepad::ButtonMapping)luaL_checkint(state, 2);
 
                 Gamepad* instance = getInstance(state);
                 bool result = instance->isButtonDown(param1);

gameplay/src/lua/lua_GamepadButtonMapping.cpp

@@ -1,121 +0,0 @@
-#include "Base.h"
-#include "lua_GamepadButtonMapping.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_A = "BUTTON_A";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_B = "BUTTON_B";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_C = "BUTTON_C";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_X = "BUTTON_X";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_Y = "BUTTON_Y";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_Z = "BUTTON_Z";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_MENU1 = "BUTTON_MENU1";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_MENU2 = "BUTTON_MENU2";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_MENU3 = "BUTTON_MENU3";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_MENU4 = "BUTTON_MENU4";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_L1 = "BUTTON_L1";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_L2 = "BUTTON_L2";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_L3 = "BUTTON_L3";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_R1 = "BUTTON_R1";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_R2 = "BUTTON_R2";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_R3 = "BUTTON_R3";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_UP = "BUTTON_UP";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_DOWN = "BUTTON_DOWN";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_LEFT = "BUTTON_LEFT";
-static const char* luaEnumString_GamepadButtonMapping_BUTTON_RIGHT = "BUTTON_RIGHT";
-
-Gamepad::ButtonMapping lua_enumFromString_GamepadButtonMapping(const char* s)
-{
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_A) == 0)
-        return Gamepad::BUTTON_A;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_B) == 0)
-        return Gamepad::BUTTON_B;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_C) == 0)
-        return Gamepad::BUTTON_C;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_X) == 0)
-        return Gamepad::BUTTON_X;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_Y) == 0)
-        return Gamepad::BUTTON_Y;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_Z) == 0)
-        return Gamepad::BUTTON_Z;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_MENU1) == 0)
-        return Gamepad::BUTTON_MENU1;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_MENU2) == 0)
-        return Gamepad::BUTTON_MENU2;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_MENU3) == 0)
-        return Gamepad::BUTTON_MENU3;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_MENU4) == 0)
-        return Gamepad::BUTTON_MENU4;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_L1) == 0)
-        return Gamepad::BUTTON_L1;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_L2) == 0)
-        return Gamepad::BUTTON_L2;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_L3) == 0)
-        return Gamepad::BUTTON_L3;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_R1) == 0)
-        return Gamepad::BUTTON_R1;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_R2) == 0)
-        return Gamepad::BUTTON_R2;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_R3) == 0)
-        return Gamepad::BUTTON_R3;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_UP) == 0)
-        return Gamepad::BUTTON_UP;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_DOWN) == 0)
-        return Gamepad::BUTTON_DOWN;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_LEFT) == 0)
-        return Gamepad::BUTTON_LEFT;
-    if (strcmp(s, luaEnumString_GamepadButtonMapping_BUTTON_RIGHT) == 0)
-        return Gamepad::BUTTON_RIGHT;
-    return Gamepad::BUTTON_A;
-}
-
-const char* lua_stringFromEnum_GamepadButtonMapping(Gamepad::ButtonMapping e)
-{
-    if (e == Gamepad::BUTTON_A)
-        return luaEnumString_GamepadButtonMapping_BUTTON_A;
-    if (e == Gamepad::BUTTON_B)
-        return luaEnumString_GamepadButtonMapping_BUTTON_B;
-    if (e == Gamepad::BUTTON_C)
-        return luaEnumString_GamepadButtonMapping_BUTTON_C;
-    if (e == Gamepad::BUTTON_X)
-        return luaEnumString_GamepadButtonMapping_BUTTON_X;
-    if (e == Gamepad::BUTTON_Y)
-        return luaEnumString_GamepadButtonMapping_BUTTON_Y;
-    if (e == Gamepad::BUTTON_Z)
-        return luaEnumString_GamepadButtonMapping_BUTTON_Z;
-    if (e == Gamepad::BUTTON_MENU1)
-        return luaEnumString_GamepadButtonMapping_BUTTON_MENU1;
-    if (e == Gamepad::BUTTON_MENU2)
-        return luaEnumString_GamepadButtonMapping_BUTTON_MENU2;
-    if (e == Gamepad::BUTTON_MENU3)
-        return luaEnumString_GamepadButtonMapping_BUTTON_MENU3;
-    if (e == Gamepad::BUTTON_MENU4)
-        return luaEnumString_GamepadButtonMapping_BUTTON_MENU4;
-    if (e == Gamepad::BUTTON_L1)
-        return luaEnumString_GamepadButtonMapping_BUTTON_L1;
-    if (e == Gamepad::BUTTON_L2)
-        return luaEnumString_GamepadButtonMapping_BUTTON_L2;
-    if (e == Gamepad::BUTTON_L3)
-        return luaEnumString_GamepadButtonMapping_BUTTON_L3;
-    if (e == Gamepad::BUTTON_R1)
-        return luaEnumString_GamepadButtonMapping_BUTTON_R1;
-    if (e == Gamepad::BUTTON_R2)
-        return luaEnumString_GamepadButtonMapping_BUTTON_R2;
-    if (e == Gamepad::BUTTON_R3)
-        return luaEnumString_GamepadButtonMapping_BUTTON_R3;
-    if (e == Gamepad::BUTTON_UP)
-        return luaEnumString_GamepadButtonMapping_BUTTON_UP;
-    if (e == Gamepad::BUTTON_DOWN)
-        return luaEnumString_GamepadButtonMapping_BUTTON_DOWN;
-    if (e == Gamepad::BUTTON_LEFT)
-        return luaEnumString_GamepadButtonMapping_BUTTON_LEFT;
-    if (e == Gamepad::BUTTON_RIGHT)
-        return luaEnumString_GamepadButtonMapping_BUTTON_RIGHT;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_GamepadButtonMapping.h

@@ -1,15 +0,0 @@
-#ifndef LUA_GAMEPADBUTTONMAPPING_H_
-#define LUA_GAMEPADBUTTONMAPPING_H_
-
-#include "Gamepad.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Gamepad::ButtonMapping.
-Gamepad::ButtonMapping lua_enumFromString_GamepadButtonMapping(const char* s);
-const char* lua_stringFromEnum_GamepadButtonMapping(Gamepad::ButtonMapping e);
-
-}
-
-#endif

gameplay/src/lua/lua_GamepadGamepadEvent.cpp

@@ -1,46 +0,0 @@
-#include "Base.h"
-#include "lua_GamepadGamepadEvent.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_GamepadGamepadEvent_CONNECTED_EVENT = "CONNECTED_EVENT";
-static const char* luaEnumString_GamepadGamepadEvent_DISCONNECTED_EVENT = "DISCONNECTED_EVENT";
-static const char* luaEnumString_GamepadGamepadEvent_BUTTON_EVENT = "BUTTON_EVENT";
-static const char* luaEnumString_GamepadGamepadEvent_JOYSTICK_EVENT = "JOYSTICK_EVENT";
-static const char* luaEnumString_GamepadGamepadEvent_TRIGGER_EVENT = "TRIGGER_EVENT";
-
-Gamepad::GamepadEvent lua_enumFromString_GamepadGamepadEvent(const char* s)
-{
-    if (strcmp(s, luaEnumString_GamepadGamepadEvent_CONNECTED_EVENT) == 0)
-        return Gamepad::CONNECTED_EVENT;
-    if (strcmp(s, luaEnumString_GamepadGamepadEvent_DISCONNECTED_EVENT) == 0)
-        return Gamepad::DISCONNECTED_EVENT;
-    if (strcmp(s, luaEnumString_GamepadGamepadEvent_BUTTON_EVENT) == 0)
-        return Gamepad::BUTTON_EVENT;
-    if (strcmp(s, luaEnumString_GamepadGamepadEvent_JOYSTICK_EVENT) == 0)
-        return Gamepad::JOYSTICK_EVENT;
-    if (strcmp(s, luaEnumString_GamepadGamepadEvent_TRIGGER_EVENT) == 0)
-        return Gamepad::TRIGGER_EVENT;
-    return Gamepad::CONNECTED_EVENT;
-}
-
-const char* lua_stringFromEnum_GamepadGamepadEvent(Gamepad::GamepadEvent e)
-{
-    if (e == Gamepad::CONNECTED_EVENT)
-        return luaEnumString_GamepadGamepadEvent_CONNECTED_EVENT;
-    if (e == Gamepad::DISCONNECTED_EVENT)
-        return luaEnumString_GamepadGamepadEvent_DISCONNECTED_EVENT;
-    if (e == Gamepad::BUTTON_EVENT)
-        return luaEnumString_GamepadGamepadEvent_BUTTON_EVENT;
-    if (e == Gamepad::JOYSTICK_EVENT)
-        return luaEnumString_GamepadGamepadEvent_JOYSTICK_EVENT;
-    if (e == Gamepad::TRIGGER_EVENT)
-        return luaEnumString_GamepadGamepadEvent_TRIGGER_EVENT;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_GamepadGamepadEvent.h

@@ -1,15 +0,0 @@
-#ifndef LUA_GAMEPADGAMEPADEVENT_H_
-#define LUA_GAMEPADGAMEPADEVENT_H_
-
-#include "Gamepad.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Gamepad::GamepadEvent.
-Gamepad::GamepadEvent lua_enumFromString_GamepadGamepadEvent(const char* s);
-const char* lua_stringFromEnum_GamepadGamepadEvent(Gamepad::GamepadEvent e);
-
-}
-
-#endif

gameplay/src/lua/lua_GestureGestureEvent.cpp

@@ -1,56 +0,0 @@
-#include "Base.h"
-#include "lua_GestureGestureEvent.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_GestureGestureEvent_GESTURE_TAP = "GESTURE_TAP";
-static const char* luaEnumString_GestureGestureEvent_GESTURE_SWIPE = "GESTURE_SWIPE";
-static const char* luaEnumString_GestureGestureEvent_GESTURE_PINCH = "GESTURE_PINCH";
-static const char* luaEnumString_GestureGestureEvent_GESTURE_LONG_TAP = "GESTURE_LONG_TAP";
-static const char* luaEnumString_GestureGestureEvent_GESTURE_DRAG = "GESTURE_DRAG";
-static const char* luaEnumString_GestureGestureEvent_GESTURE_DROP = "GESTURE_DROP";
-static const char* luaEnumString_GestureGestureEvent_GESTURE_ANY_SUPPORTED = "GESTURE_ANY_SUPPORTED";
-
-Gesture::GestureEvent lua_enumFromString_GestureGestureEvent(const char* s)
-{
-    if (strcmp(s, luaEnumString_GestureGestureEvent_GESTURE_TAP) == 0)
-        return Gesture::GESTURE_TAP;
-    if (strcmp(s, luaEnumString_GestureGestureEvent_GESTURE_SWIPE) == 0)
-        return Gesture::GESTURE_SWIPE;
-    if (strcmp(s, luaEnumString_GestureGestureEvent_GESTURE_PINCH) == 0)
-        return Gesture::GESTURE_PINCH;
-    if (strcmp(s, luaEnumString_GestureGestureEvent_GESTURE_LONG_TAP) == 0)
-        return Gesture::GESTURE_LONG_TAP;
-    if (strcmp(s, luaEnumString_GestureGestureEvent_GESTURE_DRAG) == 0)
-        return Gesture::GESTURE_DRAG;
-    if (strcmp(s, luaEnumString_GestureGestureEvent_GESTURE_DROP) == 0)
-        return Gesture::GESTURE_DROP;
-    if (strcmp(s, luaEnumString_GestureGestureEvent_GESTURE_ANY_SUPPORTED) == 0)
-        return Gesture::GESTURE_ANY_SUPPORTED;
-    return Gesture::GESTURE_TAP;
-}
-
-const char* lua_stringFromEnum_GestureGestureEvent(Gesture::GestureEvent e)
-{
-    if (e == Gesture::GESTURE_TAP)
-        return luaEnumString_GestureGestureEvent_GESTURE_TAP;
-    if (e == Gesture::GESTURE_SWIPE)
-        return luaEnumString_GestureGestureEvent_GESTURE_SWIPE;
-    if (e == Gesture::GESTURE_PINCH)
-        return luaEnumString_GestureGestureEvent_GESTURE_PINCH;
-    if (e == Gesture::GESTURE_LONG_TAP)
-        return luaEnumString_GestureGestureEvent_GESTURE_LONG_TAP;
-    if (e == Gesture::GESTURE_DRAG)
-        return luaEnumString_GestureGestureEvent_GESTURE_DRAG;
-    if (e == Gesture::GESTURE_DROP)
-        return luaEnumString_GestureGestureEvent_GESTURE_DROP;
-    if (e == Gesture::GESTURE_ANY_SUPPORTED)
-        return luaEnumString_GestureGestureEvent_GESTURE_ANY_SUPPORTED;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_GestureGestureEvent.h

@@ -1,15 +0,0 @@
-#ifndef LUA_GESTUREGESTUREEVENT_H_
-#define LUA_GESTUREGESTUREEVENT_H_
-
-#include "Gesture.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Gesture::GestureEvent.
-Gesture::GestureEvent lua_enumFromString_GestureGestureEvent(const char* s);
-const char* lua_stringFromEnum_GestureGestureEvent(Gesture::GestureEvent e);
-
-}
-
-#endif

gameplay/src/lua/lua_Global.h

@@ -1,66 +1,12 @@
 #ifndef LUA_GLOBAL_H_
 #define LUA_GLOBAL_H_
 
-#include "lua_AIMessageParameterType.h"
-#include "lua_AnimationClipListenerEventType.h"
-#include "lua_AudioSourceState.h"
-#include "lua_CameraType.h"
-#include "lua_ContainerDirection.h"
-#include "lua_ContainerScroll.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_DepthStencilTargetFormat.h"
-#include "lua_FontFormat.h"
-#include "lua_FontJustify.h"
-#include "lua_FontStyle.h"
-#include "lua_GameClearFlags.h"
-#include "lua_GameState.h"
-#include "lua_GamepadButtonMapping.h"
-#include "lua_GamepadGamepadEvent.h"
-#include "lua_GestureGestureEvent.h"
-#include "lua_ImageFormat.h"
-#include "lua_KeyboardKey.h"
-#include "lua_KeyboardKeyEvent.h"
-#include "lua_LayoutType.h"
-#include "lua_LightType.h"
-#include "lua_LoggerLevel.h"
-#include "lua_MeshIndexFormat.h"
-#include "lua_MeshPrimitiveType.h"
-#include "lua_MouseMouseEvent.h"
-#include "lua_NodeType.h"
-#include "lua_ParticleEmitterTextureBlending.h"
-#include "lua_PhysicsCollisionObjectCollisionListenerEventType.h"
-#include "lua_PhysicsCollisionObjectType.h"
-#include "lua_PhysicsCollisionShapeType.h"
-#include "lua_PhysicsControllerListenerEventType.h"
-#include "lua_PropertiesType.h"
-#include "lua_RenderStateAutoBinding.h"
-#include "lua_RenderStateBlend.h"
-#include "lua_RenderStateCullFaceSide.h"
-#include "lua_RenderStateDepthFunction.h"
-#include "lua_RenderStateFrontFace.h"
-#include "lua_RenderStateStencilFunction.h"
-#include "lua_RenderStateStencilOperation.h"
-#include "lua_TerrainFlags.h"
-#include "lua_TextBoxInputMode.h"
-#include "lua_TextureFilter.h"
-#include "lua_TextureFormat.h"
-#include "lua_TextureWrap.h"
-#include "lua_TouchTouchEvent.h"
-#include "lua_VertexFormatUsage.h"
-
 namespace gameplay
 {
 
 // Lua bindings for global functions.
 int lua__strcmpnocase(lua_State* state);
 
-// Global enum to string conversion function (used to pass enums to Lua from C++).
-const char* lua_stringFromEnumGlobal(std::string& enumname, unsigned int value);
-
 void luaRegister_lua_Global();
 
 }

gameplay/src/lua/lua_Image.cpp

@@ -6,7 +6,6 @@
 #include "Game.h"
 #include "Image.h"
 #include "Ref.h"
-#include "lua_ImageFormat.h"
 
 namespace gameplay
 {
@@ -126,7 +125,7 @@ int lua_Image_getFormat(lua_State* state)
                 Image::Format result = instance->getFormat();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ImageFormat(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -327,7 +326,7 @@ int lua_Image_static_create(lua_State* state)
             {
                 if (lua_type(state, 1) == LUA_TNUMBER &&
                     lua_type(state, 2) == LUA_TNUMBER &&
-                    (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                    lua_type(state, 3) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     unsigned int param1 = (unsigned int)luaL_checkunsigned(state, 1);
@@ -336,7 +335,7 @@ int lua_Image_static_create(lua_State* state)
                     unsigned int param2 = (unsigned int)luaL_checkunsigned(state, 2);
 
                     // Get parameter 3 off the stack.
-                    Image::Format param3 = (Image::Format)lua_enumFromString_ImageFormat(luaL_checkstring(state, 3));
+                    Image::Format param3 = (Image::Format)luaL_checkint(state, 3);
 
                     void* returnPtr = (void*)Image::create(param1, param2, param3);
                     if (returnPtr)
@@ -366,7 +365,7 @@ int lua_Image_static_create(lua_State* state)
             {
                 if (lua_type(state, 1) == LUA_TNUMBER &&
                     lua_type(state, 2) == LUA_TNUMBER &&
-                    (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL) &&
+                    lua_type(state, 3) == LUA_TNUMBER &&
                     (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA))
                 {
                     // Get parameter 1 off the stack.
@@ -376,7 +375,7 @@ int lua_Image_static_create(lua_State* state)
                     unsigned int param2 = (unsigned int)luaL_checkunsigned(state, 2);
 
                     // Get parameter 3 off the stack.
-                    Image::Format param3 = (Image::Format)lua_enumFromString_ImageFormat(luaL_checkstring(state, 3));
+                    Image::Format param3 = (Image::Format)luaL_checkint(state, 3);
 
                     // Get parameter 4 off the stack.
                     gameplay::ScriptUtil::LuaArray<unsigned char> param4 = gameplay::ScriptUtil::getUnsignedCharPointer(4);

gameplay/src/lua/lua_ImageControl.cpp

@@ -13,12 +13,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Theme.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {
@@ -31,6 +25,7 @@ void luaRegister_ImageControl()
         {"addRef", lua_ImageControl_addRef},
         {"addScript", lua_ImageControl_addScript},
         {"canFocus", lua_ImageControl_canFocus},
+        {"clearScripts", lua_ImageControl_clearScripts},
         {"createAnimation", lua_ImageControl_createAnimation},
         {"createAnimationFromBy", lua_ImageControl_createAnimationFromBy},
         {"createAnimationFromTo", lua_ImageControl_createAnimationFromTo},
@@ -345,6 +340,38 @@ int lua_ImageControl_canFocus(lua_State* state)
     return 0;
 }
 
+int lua_ImageControl_clearScripts(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))
+            {
+                ImageControl* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_ImageControl_clearScripts - 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_ImageControl_createAnimation(lua_State* state)
 {
     // Get the number of parameters.
@@ -434,7 +461,7 @@ int lua_ImageControl_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -452,7 +479,7 @@ int lua_ImageControl_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     ImageControl* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -489,7 +516,7 @@ int lua_ImageControl_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -513,7 +540,7 @@ int lua_ImageControl_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     ImageControl* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -563,7 +590,7 @@ int lua_ImageControl_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -579,7 +606,7 @@ int lua_ImageControl_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -631,7 +658,7 @@ int lua_ImageControl_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -647,7 +674,7 @@ int lua_ImageControl_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -794,7 +821,7 @@ int lua_ImageControl_getAlignment(lua_State* state)
                 Control::Alignment result = instance->getAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAlignment(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -988,7 +1015,7 @@ int lua_ImageControl_getAutoSize(lua_State* state)
                 Control::AutoSize result = instance->getAutoSize();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAutoSize(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1044,10 +1071,10 @@ int lua_ImageControl_getBorder(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getBorder(param1));
@@ -1259,10 +1286,10 @@ int lua_ImageControl_getCursorColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorColor(param1));
@@ -1307,10 +1334,10 @@ int lua_ImageControl_getCursorRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorRegion(param1));
@@ -1355,10 +1382,10 @@ int lua_ImageControl_getCursorUVs(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorUVs(param1));
@@ -1464,10 +1491,10 @@ int lua_ImageControl_getFont(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)instance->getFont(param1);
@@ -1529,10 +1556,10 @@ int lua_ImageControl_getFontSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 unsigned int result = instance->getFontSize(param1);
@@ -1639,13 +1666,13 @@ int lua_ImageControl_getImageColor(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageColor(param1, param2));
@@ -1691,13 +1718,13 @@ int lua_ImageControl_getImageRegion(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageRegion(param1, param2));
@@ -1743,13 +1770,13 @@ int lua_ImageControl_getImageUVs(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageUVs(param1, param2));
@@ -1855,10 +1882,10 @@ int lua_ImageControl_getOpacity(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 float result = instance->getOpacity(param1);
@@ -2131,10 +2158,10 @@ int lua_ImageControl_getSkinColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinColor(param1));
@@ -2205,10 +2232,10 @@ int lua_ImageControl_getSkinRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinRegion(param1));
@@ -2258,7 +2285,7 @@ int lua_ImageControl_getState(lua_State* state)
                 Control::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2337,7 +2364,7 @@ int lua_ImageControl_getTextAlignment(lua_State* state)
                 Font::Justify result = instance->getTextAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2349,16 +2376,16 @@ int lua_ImageControl_getTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 Font::Justify result = instance->getTextAlignment(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2414,10 +2441,10 @@ int lua_ImageControl_getTextColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getTextColor(param1));
@@ -2479,10 +2506,10 @@ int lua_ImageControl_getTextRightToLeft(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 bool result = instance->getTextRightToLeft(param1);
@@ -3289,10 +3316,10 @@ int lua_ImageControl_setAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::Alignment param1 = (Control::Alignment)lua_enumFromString_ControlAlignment(luaL_checkstring(state, 2));
+                Control::Alignment param1 = (Control::Alignment)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 instance->setAlignment(param1);
@@ -3403,10 +3430,10 @@ int lua_ImageControl_setAutoSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::AutoSize param1 = (Control::AutoSize)lua_enumFromString_ControlAutoSize(luaL_checkstring(state, 2));
+                Control::AutoSize param1 = (Control::AutoSize)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 instance->setAutoSize(param1);
@@ -4814,10 +4841,10 @@ int lua_ImageControl_setTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 ImageControl* instance = getInstance(state);
                 instance->setTextAlignment(param1);
@@ -4832,11 +4859,11 @@ int lua_ImageControl_setTextAlignment(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 unsigned char param2 = (unsigned char)luaL_checkunsigned(state, 3);

gameplay/src/lua/lua_ImageControl.h

@@ -10,6 +10,7 @@ int lua_ImageControl_addListener(lua_State* state);
 int lua_ImageControl_addRef(lua_State* state);
 int lua_ImageControl_addScript(lua_State* state);
 int lua_ImageControl_canFocus(lua_State* state);
+int lua_ImageControl_clearScripts(lua_State* state);
 int lua_ImageControl_createAnimation(lua_State* state);
 int lua_ImageControl_createAnimationFromBy(lua_State* state);
 int lua_ImageControl_createAnimationFromTo(lua_State* state);

gameplay/src/lua/lua_ImageFormat.cpp

@@ -1,31 +0,0 @@
-#include "Base.h"
-#include "lua_ImageFormat.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ImageFormat_RGB = "RGB";
-static const char* luaEnumString_ImageFormat_RGBA = "RGBA";
-
-Image::Format lua_enumFromString_ImageFormat(const char* s)
-{
-    if (strcmp(s, luaEnumString_ImageFormat_RGB) == 0)
-        return Image::RGB;
-    if (strcmp(s, luaEnumString_ImageFormat_RGBA) == 0)
-        return Image::RGBA;
-    return Image::RGB;
-}
-
-const char* lua_stringFromEnum_ImageFormat(Image::Format e)
-{
-    if (e == Image::RGB)
-        return luaEnumString_ImageFormat_RGB;
-    if (e == Image::RGBA)
-        return luaEnumString_ImageFormat_RGBA;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_ImageFormat.h

@@ -1,15 +0,0 @@
-#ifndef LUA_IMAGEFORMAT_H_
-#define LUA_IMAGEFORMAT_H_
-
-#include "Image.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Image::Format.
-Image::Format lua_enumFromString_ImageFormat(const char* s);
-const char* lua_stringFromEnum_ImageFormat(Image::Format e);
-
-}
-
-#endif

gameplay/src/lua/lua_Joint.cpp

@@ -20,9 +20,6 @@
 #include "ScriptTarget.h"
 #include "Terrain.h"
 #include "Transform.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_NodeType.h"
-#include "lua_PhysicsCollisionObjectType.h"
 
 namespace gameplay
 {
@@ -35,6 +32,7 @@ void luaRegister_Joint()
         {"addListener", lua_Joint_addListener},
         {"addRef", lua_Joint_addRef},
         {"addScript", lua_Joint_addScript},
+        {"clearScripts", lua_Joint_clearScripts},
         {"clone", lua_Joint_clone},
         {"createAnimation", lua_Joint_createAnimation},
         {"createAnimationFromBy", lua_Joint_createAnimationFromBy},
@@ -408,6 +406,38 @@ int lua_Joint_addScript(lua_State* state)
     return 0;
 }
 
+int lua_Joint_clearScripts(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))
+            {
+                Joint* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_Joint_clearScripts - 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_Joint_clone(lua_State* state)
 {
     // Get the number of parameters.
@@ -541,7 +571,7 @@ int lua_Joint_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -559,7 +589,7 @@ int lua_Joint_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     Joint* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -596,7 +626,7 @@ int lua_Joint_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -620,7 +650,7 @@ int lua_Joint_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     Joint* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -670,7 +700,7 @@ int lua_Joint_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -686,7 +716,7 @@ int lua_Joint_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -738,7 +768,7 @@ int lua_Joint_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -754,7 +784,7 @@ int lua_Joint_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -3417,7 +3447,7 @@ int lua_Joint_getType(lua_State* state)
                 Node::Type result = instance->getType();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_NodeType(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -4932,10 +4962,10 @@ int lua_Joint_setCollisionObject(lua_State* state)
             do
             {
                 if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                    (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                    lua_type(state, 2) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
-                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)lua_enumFromString_PhysicsCollisionObjectType(luaL_checkstring(state, 2));
+                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)luaL_checkint(state, 2);
 
                     Joint* instance = getInstance(state);
                     void* returnPtr = (void*)instance->setCollisionObject(param1);
@@ -5022,11 +5052,11 @@ int lua_Joint_setCollisionObject(lua_State* state)
             do
             {
                 if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                    (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                    lua_type(state, 2) == LUA_TNUMBER &&
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL))
                 {
                     // Get parameter 1 off the stack.
-                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)lua_enumFromString_PhysicsCollisionObjectType(luaL_checkstring(state, 2));
+                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)luaL_checkint(state, 2);
 
                     // Get parameter 2 off the stack.
                     bool param2Valid;
@@ -5062,12 +5092,12 @@ int lua_Joint_setCollisionObject(lua_State* state)
             do
             {
                 if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                    (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                    lua_type(state, 2) == LUA_TNUMBER &&
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TNIL))
                 {
                     // Get parameter 1 off the stack.
-                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)lua_enumFromString_PhysicsCollisionObjectType(luaL_checkstring(state, 2));
+                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)luaL_checkint(state, 2);
 
                     // Get parameter 2 off the stack.
                     bool param2Valid;
@@ -5109,13 +5139,13 @@ int lua_Joint_setCollisionObject(lua_State* state)
             do
             {
                 if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                    (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                    lua_type(state, 2) == LUA_TNUMBER &&
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TNIL) &&
                     lua_type(state, 5) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
-                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)lua_enumFromString_PhysicsCollisionObjectType(luaL_checkstring(state, 2));
+                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)luaL_checkint(state, 2);
 
                     // Get parameter 2 off the stack.
                     bool param2Valid;
@@ -5160,14 +5190,14 @@ int lua_Joint_setCollisionObject(lua_State* state)
             do
             {
                 if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                    (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                    lua_type(state, 2) == LUA_TNUMBER &&
                     (lua_type(state, 3) == LUA_TUSERDATA || lua_type(state, 3) == LUA_TNIL) &&
                     (lua_type(state, 4) == LUA_TUSERDATA || lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TNIL) &&
                     lua_type(state, 5) == LUA_TNUMBER &&
                     lua_type(state, 6) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
-                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)lua_enumFromString_PhysicsCollisionObjectType(luaL_checkstring(state, 2));
+                    PhysicsCollisionObject::Type param1 = (PhysicsCollisionObject::Type)luaL_checkint(state, 2);
 
                     // Get parameter 2 off the stack.
                     bool param2Valid;

gameplay/src/lua/lua_Joint.h

@@ -10,6 +10,7 @@ int lua_Joint_addChild(lua_State* state);
 int lua_Joint_addListener(lua_State* state);
 int lua_Joint_addRef(lua_State* state);
 int lua_Joint_addScript(lua_State* state);
+int lua_Joint_clearScripts(lua_State* state);
 int lua_Joint_clone(lua_State* state);
 int lua_Joint_createAnimation(lua_State* state);
 int lua_Joint_createAnimationFromBy(lua_State* state);

gameplay/src/lua/lua_JoystickControl.cpp

@@ -13,12 +13,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Theme.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {
@@ -31,6 +25,7 @@ void luaRegister_JoystickControl()
         {"addRef", lua_JoystickControl_addRef},
         {"addScript", lua_JoystickControl_addScript},
         {"canFocus", lua_JoystickControl_canFocus},
+        {"clearScripts", lua_JoystickControl_clearScripts},
         {"createAnimation", lua_JoystickControl_createAnimation},
         {"createAnimationFromBy", lua_JoystickControl_createAnimationFromBy},
         {"createAnimationFromTo", lua_JoystickControl_createAnimationFromTo},
@@ -348,6 +343,38 @@ int lua_JoystickControl_canFocus(lua_State* state)
     return 0;
 }
 
+int lua_JoystickControl_clearScripts(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))
+            {
+                JoystickControl* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_JoystickControl_clearScripts - 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_JoystickControl_createAnimation(lua_State* state)
 {
     // Get the number of parameters.
@@ -437,7 +464,7 @@ int lua_JoystickControl_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -455,7 +482,7 @@ int lua_JoystickControl_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     JoystickControl* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -492,7 +519,7 @@ int lua_JoystickControl_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -516,7 +543,7 @@ int lua_JoystickControl_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     JoystickControl* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -566,7 +593,7 @@ int lua_JoystickControl_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -582,7 +609,7 @@ int lua_JoystickControl_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -634,7 +661,7 @@ int lua_JoystickControl_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -650,7 +677,7 @@ int lua_JoystickControl_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -797,7 +824,7 @@ int lua_JoystickControl_getAlignment(lua_State* state)
                 Control::Alignment result = instance->getAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAlignment(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -991,7 +1018,7 @@ int lua_JoystickControl_getAutoSize(lua_State* state)
                 Control::AutoSize result = instance->getAutoSize();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAutoSize(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1047,10 +1074,10 @@ int lua_JoystickControl_getBorder(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getBorder(param1));
@@ -1262,10 +1289,10 @@ int lua_JoystickControl_getCursorColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorColor(param1));
@@ -1310,10 +1337,10 @@ int lua_JoystickControl_getCursorRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorRegion(param1));
@@ -1358,10 +1385,10 @@ int lua_JoystickControl_getCursorUVs(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorUVs(param1));
@@ -1467,10 +1494,10 @@ int lua_JoystickControl_getFont(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)instance->getFont(param1);
@@ -1532,10 +1559,10 @@ int lua_JoystickControl_getFontSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 unsigned int result = instance->getFontSize(param1);
@@ -1642,13 +1669,13 @@ int lua_JoystickControl_getImageColor(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageColor(param1, param2));
@@ -1694,13 +1721,13 @@ int lua_JoystickControl_getImageRegion(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageRegion(param1, param2));
@@ -1746,13 +1773,13 @@ int lua_JoystickControl_getImageUVs(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageUVs(param1, param2));
@@ -1937,10 +1964,10 @@ int lua_JoystickControl_getOpacity(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 float result = instance->getOpacity(param1);
@@ -2169,10 +2196,10 @@ int lua_JoystickControl_getSkinColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinColor(param1));
@@ -2243,10 +2270,10 @@ int lua_JoystickControl_getSkinRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinRegion(param1));
@@ -2296,7 +2323,7 @@ int lua_JoystickControl_getState(lua_State* state)
                 Control::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2375,7 +2402,7 @@ int lua_JoystickControl_getTextAlignment(lua_State* state)
                 Font::Justify result = instance->getTextAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2387,16 +2414,16 @@ int lua_JoystickControl_getTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 Font::Justify result = instance->getTextAlignment(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2452,10 +2479,10 @@ int lua_JoystickControl_getTextColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getTextColor(param1));
@@ -2517,10 +2544,10 @@ int lua_JoystickControl_getTextRightToLeft(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 bool result = instance->getTextRightToLeft(param1);
@@ -3406,10 +3433,10 @@ int lua_JoystickControl_setAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::Alignment param1 = (Control::Alignment)lua_enumFromString_ControlAlignment(luaL_checkstring(state, 2));
+                Control::Alignment param1 = (Control::Alignment)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 instance->setAlignment(param1);
@@ -3520,10 +3547,10 @@ int lua_JoystickControl_setAutoSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::AutoSize param1 = (Control::AutoSize)lua_enumFromString_ControlAutoSize(luaL_checkstring(state, 2));
+                Control::AutoSize param1 = (Control::AutoSize)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 instance->setAutoSize(param1);
@@ -4865,10 +4892,10 @@ int lua_JoystickControl_setTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 JoystickControl* instance = getInstance(state);
                 instance->setTextAlignment(param1);
@@ -4883,11 +4910,11 @@ int lua_JoystickControl_setTextAlignment(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 unsigned char param2 = (unsigned char)luaL_checkunsigned(state, 3);

gameplay/src/lua/lua_JoystickControl.h

@@ -10,6 +10,7 @@ int lua_JoystickControl_addListener(lua_State* state);
 int lua_JoystickControl_addRef(lua_State* state);
 int lua_JoystickControl_addScript(lua_State* state);
 int lua_JoystickControl_canFocus(lua_State* state);
+int lua_JoystickControl_clearScripts(lua_State* state);
 int lua_JoystickControl_createAnimation(lua_State* state);
 int lua_JoystickControl_createAnimationFromBy(lua_State* state);
 int lua_JoystickControl_createAnimationFromTo(lua_State* state);

gameplay/src/lua/lua_KeyboardKey.cpp

@@ -1,801 +0,0 @@
-#include "Base.h"
-#include "lua_KeyboardKey.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_KeyboardKey_KEY_NONE = "KEY_NONE";
-static const char* luaEnumString_KeyboardKey_KEY_PAUSE = "KEY_PAUSE";
-static const char* luaEnumString_KeyboardKey_KEY_SCROLL_LOCK = "KEY_SCROLL_LOCK";
-static const char* luaEnumString_KeyboardKey_KEY_PRINT = "KEY_PRINT";
-static const char* luaEnumString_KeyboardKey_KEY_SYSREQ = "KEY_SYSREQ";
-static const char* luaEnumString_KeyboardKey_KEY_BREAK = "KEY_BREAK";
-static const char* luaEnumString_KeyboardKey_KEY_ESCAPE = "KEY_ESCAPE";
-static const char* luaEnumString_KeyboardKey_KEY_BACKSPACE = "KEY_BACKSPACE";
-static const char* luaEnumString_KeyboardKey_KEY_TAB = "KEY_TAB";
-static const char* luaEnumString_KeyboardKey_KEY_BACK_TAB = "KEY_BACK_TAB";
-static const char* luaEnumString_KeyboardKey_KEY_RETURN = "KEY_RETURN";
-static const char* luaEnumString_KeyboardKey_KEY_CAPS_LOCK = "KEY_CAPS_LOCK";
-static const char* luaEnumString_KeyboardKey_KEY_SHIFT = "KEY_SHIFT";
-static const char* luaEnumString_KeyboardKey_KEY_CTRL = "KEY_CTRL";
-static const char* luaEnumString_KeyboardKey_KEY_ALT = "KEY_ALT";
-static const char* luaEnumString_KeyboardKey_KEY_MENU = "KEY_MENU";
-static const char* luaEnumString_KeyboardKey_KEY_HYPER = "KEY_HYPER";
-static const char* luaEnumString_KeyboardKey_KEY_INSERT = "KEY_INSERT";
-static const char* luaEnumString_KeyboardKey_KEY_HOME = "KEY_HOME";
-static const char* luaEnumString_KeyboardKey_KEY_PG_UP = "KEY_PG_UP";
-static const char* luaEnumString_KeyboardKey_KEY_DELETE = "KEY_DELETE";
-static const char* luaEnumString_KeyboardKey_KEY_END = "KEY_END";
-static const char* luaEnumString_KeyboardKey_KEY_PG_DOWN = "KEY_PG_DOWN";
-static const char* luaEnumString_KeyboardKey_KEY_LEFT_ARROW = "KEY_LEFT_ARROW";
-static const char* luaEnumString_KeyboardKey_KEY_RIGHT_ARROW = "KEY_RIGHT_ARROW";
-static const char* luaEnumString_KeyboardKey_KEY_UP_ARROW = "KEY_UP_ARROW";
-static const char* luaEnumString_KeyboardKey_KEY_DOWN_ARROW = "KEY_DOWN_ARROW";
-static const char* luaEnumString_KeyboardKey_KEY_NUM_LOCK = "KEY_NUM_LOCK";
-static const char* luaEnumString_KeyboardKey_KEY_KP_PLUS = "KEY_KP_PLUS";
-static const char* luaEnumString_KeyboardKey_KEY_KP_MINUS = "KEY_KP_MINUS";
-static const char* luaEnumString_KeyboardKey_KEY_KP_MULTIPLY = "KEY_KP_MULTIPLY";
-static const char* luaEnumString_KeyboardKey_KEY_KP_DIVIDE = "KEY_KP_DIVIDE";
-static const char* luaEnumString_KeyboardKey_KEY_KP_ENTER = "KEY_KP_ENTER";
-static const char* luaEnumString_KeyboardKey_KEY_KP_HOME = "KEY_KP_HOME";
-static const char* luaEnumString_KeyboardKey_KEY_KP_UP = "KEY_KP_UP";
-static const char* luaEnumString_KeyboardKey_KEY_KP_PG_UP = "KEY_KP_PG_UP";
-static const char* luaEnumString_KeyboardKey_KEY_KP_LEFT = "KEY_KP_LEFT";
-static const char* luaEnumString_KeyboardKey_KEY_KP_FIVE = "KEY_KP_FIVE";
-static const char* luaEnumString_KeyboardKey_KEY_KP_RIGHT = "KEY_KP_RIGHT";
-static const char* luaEnumString_KeyboardKey_KEY_KP_END = "KEY_KP_END";
-static const char* luaEnumString_KeyboardKey_KEY_KP_DOWN = "KEY_KP_DOWN";
-static const char* luaEnumString_KeyboardKey_KEY_KP_PG_DOWN = "KEY_KP_PG_DOWN";
-static const char* luaEnumString_KeyboardKey_KEY_KP_INSERT = "KEY_KP_INSERT";
-static const char* luaEnumString_KeyboardKey_KEY_KP_DELETE = "KEY_KP_DELETE";
-static const char* luaEnumString_KeyboardKey_KEY_F1 = "KEY_F1";
-static const char* luaEnumString_KeyboardKey_KEY_F2 = "KEY_F2";
-static const char* luaEnumString_KeyboardKey_KEY_F3 = "KEY_F3";
-static const char* luaEnumString_KeyboardKey_KEY_F4 = "KEY_F4";
-static const char* luaEnumString_KeyboardKey_KEY_F5 = "KEY_F5";
-static const char* luaEnumString_KeyboardKey_KEY_F6 = "KEY_F6";
-static const char* luaEnumString_KeyboardKey_KEY_F7 = "KEY_F7";
-static const char* luaEnumString_KeyboardKey_KEY_F8 = "KEY_F8";
-static const char* luaEnumString_KeyboardKey_KEY_F9 = "KEY_F9";
-static const char* luaEnumString_KeyboardKey_KEY_F10 = "KEY_F10";
-static const char* luaEnumString_KeyboardKey_KEY_F11 = "KEY_F11";
-static const char* luaEnumString_KeyboardKey_KEY_F12 = "KEY_F12";
-static const char* luaEnumString_KeyboardKey_KEY_SPACE = "KEY_SPACE";
-static const char* luaEnumString_KeyboardKey_KEY_EXCLAM = "KEY_EXCLAM";
-static const char* luaEnumString_KeyboardKey_KEY_QUOTE = "KEY_QUOTE";
-static const char* luaEnumString_KeyboardKey_KEY_NUMBER = "KEY_NUMBER";
-static const char* luaEnumString_KeyboardKey_KEY_DOLLAR = "KEY_DOLLAR";
-static const char* luaEnumString_KeyboardKey_KEY_PERCENT = "KEY_PERCENT";
-static const char* luaEnumString_KeyboardKey_KEY_CIRCUMFLEX = "KEY_CIRCUMFLEX";
-static const char* luaEnumString_KeyboardKey_KEY_AMPERSAND = "KEY_AMPERSAND";
-static const char* luaEnumString_KeyboardKey_KEY_APOSTROPHE = "KEY_APOSTROPHE";
-static const char* luaEnumString_KeyboardKey_KEY_LEFT_PARENTHESIS = "KEY_LEFT_PARENTHESIS";
-static const char* luaEnumString_KeyboardKey_KEY_RIGHT_PARENTHESIS = "KEY_RIGHT_PARENTHESIS";
-static const char* luaEnumString_KeyboardKey_KEY_ASTERISK = "KEY_ASTERISK";
-static const char* luaEnumString_KeyboardKey_KEY_PLUS = "KEY_PLUS";
-static const char* luaEnumString_KeyboardKey_KEY_COMMA = "KEY_COMMA";
-static const char* luaEnumString_KeyboardKey_KEY_MINUS = "KEY_MINUS";
-static const char* luaEnumString_KeyboardKey_KEY_PERIOD = "KEY_PERIOD";
-static const char* luaEnumString_KeyboardKey_KEY_SLASH = "KEY_SLASH";
-static const char* luaEnumString_KeyboardKey_KEY_ZERO = "KEY_ZERO";
-static const char* luaEnumString_KeyboardKey_KEY_ONE = "KEY_ONE";
-static const char* luaEnumString_KeyboardKey_KEY_TWO = "KEY_TWO";
-static const char* luaEnumString_KeyboardKey_KEY_THREE = "KEY_THREE";
-static const char* luaEnumString_KeyboardKey_KEY_FOUR = "KEY_FOUR";
-static const char* luaEnumString_KeyboardKey_KEY_FIVE = "KEY_FIVE";
-static const char* luaEnumString_KeyboardKey_KEY_SIX = "KEY_SIX";
-static const char* luaEnumString_KeyboardKey_KEY_SEVEN = "KEY_SEVEN";
-static const char* luaEnumString_KeyboardKey_KEY_EIGHT = "KEY_EIGHT";
-static const char* luaEnumString_KeyboardKey_KEY_NINE = "KEY_NINE";
-static const char* luaEnumString_KeyboardKey_KEY_COLON = "KEY_COLON";
-static const char* luaEnumString_KeyboardKey_KEY_SEMICOLON = "KEY_SEMICOLON";
-static const char* luaEnumString_KeyboardKey_KEY_LESS_THAN = "KEY_LESS_THAN";
-static const char* luaEnumString_KeyboardKey_KEY_EQUAL = "KEY_EQUAL";
-static const char* luaEnumString_KeyboardKey_KEY_GREATER_THAN = "KEY_GREATER_THAN";
-static const char* luaEnumString_KeyboardKey_KEY_QUESTION = "KEY_QUESTION";
-static const char* luaEnumString_KeyboardKey_KEY_AT = "KEY_AT";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_A = "KEY_CAPITAL_A";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_B = "KEY_CAPITAL_B";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_C = "KEY_CAPITAL_C";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_D = "KEY_CAPITAL_D";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_E = "KEY_CAPITAL_E";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_F = "KEY_CAPITAL_F";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_G = "KEY_CAPITAL_G";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_H = "KEY_CAPITAL_H";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_I = "KEY_CAPITAL_I";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_J = "KEY_CAPITAL_J";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_K = "KEY_CAPITAL_K";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_L = "KEY_CAPITAL_L";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_M = "KEY_CAPITAL_M";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_N = "KEY_CAPITAL_N";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_O = "KEY_CAPITAL_O";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_P = "KEY_CAPITAL_P";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_Q = "KEY_CAPITAL_Q";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_R = "KEY_CAPITAL_R";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_S = "KEY_CAPITAL_S";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_T = "KEY_CAPITAL_T";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_U = "KEY_CAPITAL_U";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_V = "KEY_CAPITAL_V";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_W = "KEY_CAPITAL_W";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_X = "KEY_CAPITAL_X";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_Y = "KEY_CAPITAL_Y";
-static const char* luaEnumString_KeyboardKey_KEY_CAPITAL_Z = "KEY_CAPITAL_Z";
-static const char* luaEnumString_KeyboardKey_KEY_LEFT_BRACKET = "KEY_LEFT_BRACKET";
-static const char* luaEnumString_KeyboardKey_KEY_BACK_SLASH = "KEY_BACK_SLASH";
-static const char* luaEnumString_KeyboardKey_KEY_RIGHT_BRACKET = "KEY_RIGHT_BRACKET";
-static const char* luaEnumString_KeyboardKey_KEY_UNDERSCORE = "KEY_UNDERSCORE";
-static const char* luaEnumString_KeyboardKey_KEY_GRAVE = "KEY_GRAVE";
-static const char* luaEnumString_KeyboardKey_KEY_A = "KEY_A";
-static const char* luaEnumString_KeyboardKey_KEY_B = "KEY_B";
-static const char* luaEnumString_KeyboardKey_KEY_C = "KEY_C";
-static const char* luaEnumString_KeyboardKey_KEY_D = "KEY_D";
-static const char* luaEnumString_KeyboardKey_KEY_E = "KEY_E";
-static const char* luaEnumString_KeyboardKey_KEY_F = "KEY_F";
-static const char* luaEnumString_KeyboardKey_KEY_G = "KEY_G";
-static const char* luaEnumString_KeyboardKey_KEY_H = "KEY_H";
-static const char* luaEnumString_KeyboardKey_KEY_I = "KEY_I";
-static const char* luaEnumString_KeyboardKey_KEY_J = "KEY_J";
-static const char* luaEnumString_KeyboardKey_KEY_K = "KEY_K";
-static const char* luaEnumString_KeyboardKey_KEY_L = "KEY_L";
-static const char* luaEnumString_KeyboardKey_KEY_M = "KEY_M";
-static const char* luaEnumString_KeyboardKey_KEY_N = "KEY_N";
-static const char* luaEnumString_KeyboardKey_KEY_O = "KEY_O";
-static const char* luaEnumString_KeyboardKey_KEY_P = "KEY_P";
-static const char* luaEnumString_KeyboardKey_KEY_Q = "KEY_Q";
-static const char* luaEnumString_KeyboardKey_KEY_R = "KEY_R";
-static const char* luaEnumString_KeyboardKey_KEY_S = "KEY_S";
-static const char* luaEnumString_KeyboardKey_KEY_T = "KEY_T";
-static const char* luaEnumString_KeyboardKey_KEY_U = "KEY_U";
-static const char* luaEnumString_KeyboardKey_KEY_V = "KEY_V";
-static const char* luaEnumString_KeyboardKey_KEY_W = "KEY_W";
-static const char* luaEnumString_KeyboardKey_KEY_X = "KEY_X";
-static const char* luaEnumString_KeyboardKey_KEY_Y = "KEY_Y";
-static const char* luaEnumString_KeyboardKey_KEY_Z = "KEY_Z";
-static const char* luaEnumString_KeyboardKey_KEY_LEFT_BRACE = "KEY_LEFT_BRACE";
-static const char* luaEnumString_KeyboardKey_KEY_BAR = "KEY_BAR";
-static const char* luaEnumString_KeyboardKey_KEY_RIGHT_BRACE = "KEY_RIGHT_BRACE";
-static const char* luaEnumString_KeyboardKey_KEY_TILDE = "KEY_TILDE";
-static const char* luaEnumString_KeyboardKey_KEY_EURO = "KEY_EURO";
-static const char* luaEnumString_KeyboardKey_KEY_POUND = "KEY_POUND";
-static const char* luaEnumString_KeyboardKey_KEY_YEN = "KEY_YEN";
-static const char* luaEnumString_KeyboardKey_KEY_MIDDLE_DOT = "KEY_MIDDLE_DOT";
-static const char* luaEnumString_KeyboardKey_KEY_SEARCH = "KEY_SEARCH";
-
-Keyboard::Key lua_enumFromString_KeyboardKey(const char* s)
-{
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_NONE) == 0)
-        return Keyboard::KEY_NONE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_PAUSE) == 0)
-        return Keyboard::KEY_PAUSE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SCROLL_LOCK) == 0)
-        return Keyboard::KEY_SCROLL_LOCK;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_PRINT) == 0)
-        return Keyboard::KEY_PRINT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SYSREQ) == 0)
-        return Keyboard::KEY_SYSREQ;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_BREAK) == 0)
-        return Keyboard::KEY_BREAK;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_ESCAPE) == 0)
-        return Keyboard::KEY_ESCAPE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_BACKSPACE) == 0)
-        return Keyboard::KEY_BACKSPACE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_TAB) == 0)
-        return Keyboard::KEY_TAB;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_BACK_TAB) == 0)
-        return Keyboard::KEY_BACK_TAB;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_RETURN) == 0)
-        return Keyboard::KEY_RETURN;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPS_LOCK) == 0)
-        return Keyboard::KEY_CAPS_LOCK;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SHIFT) == 0)
-        return Keyboard::KEY_SHIFT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CTRL) == 0)
-        return Keyboard::KEY_CTRL;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_ALT) == 0)
-        return Keyboard::KEY_ALT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_MENU) == 0)
-        return Keyboard::KEY_MENU;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_HYPER) == 0)
-        return Keyboard::KEY_HYPER;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_INSERT) == 0)
-        return Keyboard::KEY_INSERT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_HOME) == 0)
-        return Keyboard::KEY_HOME;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_PG_UP) == 0)
-        return Keyboard::KEY_PG_UP;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_DELETE) == 0)
-        return Keyboard::KEY_DELETE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_END) == 0)
-        return Keyboard::KEY_END;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_PG_DOWN) == 0)
-        return Keyboard::KEY_PG_DOWN;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_LEFT_ARROW) == 0)
-        return Keyboard::KEY_LEFT_ARROW;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_RIGHT_ARROW) == 0)
-        return Keyboard::KEY_RIGHT_ARROW;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_UP_ARROW) == 0)
-        return Keyboard::KEY_UP_ARROW;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_DOWN_ARROW) == 0)
-        return Keyboard::KEY_DOWN_ARROW;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_NUM_LOCK) == 0)
-        return Keyboard::KEY_NUM_LOCK;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_PLUS) == 0)
-        return Keyboard::KEY_KP_PLUS;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_MINUS) == 0)
-        return Keyboard::KEY_KP_MINUS;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_MULTIPLY) == 0)
-        return Keyboard::KEY_KP_MULTIPLY;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_DIVIDE) == 0)
-        return Keyboard::KEY_KP_DIVIDE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_ENTER) == 0)
-        return Keyboard::KEY_KP_ENTER;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_HOME) == 0)
-        return Keyboard::KEY_KP_HOME;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_UP) == 0)
-        return Keyboard::KEY_KP_UP;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_PG_UP) == 0)
-        return Keyboard::KEY_KP_PG_UP;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_LEFT) == 0)
-        return Keyboard::KEY_KP_LEFT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_FIVE) == 0)
-        return Keyboard::KEY_KP_FIVE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_RIGHT) == 0)
-        return Keyboard::KEY_KP_RIGHT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_END) == 0)
-        return Keyboard::KEY_KP_END;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_DOWN) == 0)
-        return Keyboard::KEY_KP_DOWN;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_PG_DOWN) == 0)
-        return Keyboard::KEY_KP_PG_DOWN;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_INSERT) == 0)
-        return Keyboard::KEY_KP_INSERT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_KP_DELETE) == 0)
-        return Keyboard::KEY_KP_DELETE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F1) == 0)
-        return Keyboard::KEY_F1;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F2) == 0)
-        return Keyboard::KEY_F2;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F3) == 0)
-        return Keyboard::KEY_F3;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F4) == 0)
-        return Keyboard::KEY_F4;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F5) == 0)
-        return Keyboard::KEY_F5;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F6) == 0)
-        return Keyboard::KEY_F6;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F7) == 0)
-        return Keyboard::KEY_F7;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F8) == 0)
-        return Keyboard::KEY_F8;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F9) == 0)
-        return Keyboard::KEY_F9;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F10) == 0)
-        return Keyboard::KEY_F10;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F11) == 0)
-        return Keyboard::KEY_F11;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F12) == 0)
-        return Keyboard::KEY_F12;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SPACE) == 0)
-        return Keyboard::KEY_SPACE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_EXCLAM) == 0)
-        return Keyboard::KEY_EXCLAM;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_QUOTE) == 0)
-        return Keyboard::KEY_QUOTE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_NUMBER) == 0)
-        return Keyboard::KEY_NUMBER;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_DOLLAR) == 0)
-        return Keyboard::KEY_DOLLAR;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_PERCENT) == 0)
-        return Keyboard::KEY_PERCENT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CIRCUMFLEX) == 0)
-        return Keyboard::KEY_CIRCUMFLEX;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_AMPERSAND) == 0)
-        return Keyboard::KEY_AMPERSAND;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_APOSTROPHE) == 0)
-        return Keyboard::KEY_APOSTROPHE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_LEFT_PARENTHESIS) == 0)
-        return Keyboard::KEY_LEFT_PARENTHESIS;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_RIGHT_PARENTHESIS) == 0)
-        return Keyboard::KEY_RIGHT_PARENTHESIS;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_ASTERISK) == 0)
-        return Keyboard::KEY_ASTERISK;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_PLUS) == 0)
-        return Keyboard::KEY_PLUS;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_COMMA) == 0)
-        return Keyboard::KEY_COMMA;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_MINUS) == 0)
-        return Keyboard::KEY_MINUS;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_PERIOD) == 0)
-        return Keyboard::KEY_PERIOD;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SLASH) == 0)
-        return Keyboard::KEY_SLASH;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_ZERO) == 0)
-        return Keyboard::KEY_ZERO;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_ONE) == 0)
-        return Keyboard::KEY_ONE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_TWO) == 0)
-        return Keyboard::KEY_TWO;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_THREE) == 0)
-        return Keyboard::KEY_THREE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_FOUR) == 0)
-        return Keyboard::KEY_FOUR;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_FIVE) == 0)
-        return Keyboard::KEY_FIVE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SIX) == 0)
-        return Keyboard::KEY_SIX;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SEVEN) == 0)
-        return Keyboard::KEY_SEVEN;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_EIGHT) == 0)
-        return Keyboard::KEY_EIGHT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_NINE) == 0)
-        return Keyboard::KEY_NINE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_COLON) == 0)
-        return Keyboard::KEY_COLON;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SEMICOLON) == 0)
-        return Keyboard::KEY_SEMICOLON;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_LESS_THAN) == 0)
-        return Keyboard::KEY_LESS_THAN;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_EQUAL) == 0)
-        return Keyboard::KEY_EQUAL;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_GREATER_THAN) == 0)
-        return Keyboard::KEY_GREATER_THAN;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_QUESTION) == 0)
-        return Keyboard::KEY_QUESTION;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_AT) == 0)
-        return Keyboard::KEY_AT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_A) == 0)
-        return Keyboard::KEY_CAPITAL_A;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_B) == 0)
-        return Keyboard::KEY_CAPITAL_B;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_C) == 0)
-        return Keyboard::KEY_CAPITAL_C;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_D) == 0)
-        return Keyboard::KEY_CAPITAL_D;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_E) == 0)
-        return Keyboard::KEY_CAPITAL_E;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_F) == 0)
-        return Keyboard::KEY_CAPITAL_F;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_G) == 0)
-        return Keyboard::KEY_CAPITAL_G;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_H) == 0)
-        return Keyboard::KEY_CAPITAL_H;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_I) == 0)
-        return Keyboard::KEY_CAPITAL_I;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_J) == 0)
-        return Keyboard::KEY_CAPITAL_J;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_K) == 0)
-        return Keyboard::KEY_CAPITAL_K;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_L) == 0)
-        return Keyboard::KEY_CAPITAL_L;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_M) == 0)
-        return Keyboard::KEY_CAPITAL_M;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_N) == 0)
-        return Keyboard::KEY_CAPITAL_N;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_O) == 0)
-        return Keyboard::KEY_CAPITAL_O;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_P) == 0)
-        return Keyboard::KEY_CAPITAL_P;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_Q) == 0)
-        return Keyboard::KEY_CAPITAL_Q;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_R) == 0)
-        return Keyboard::KEY_CAPITAL_R;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_S) == 0)
-        return Keyboard::KEY_CAPITAL_S;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_T) == 0)
-        return Keyboard::KEY_CAPITAL_T;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_U) == 0)
-        return Keyboard::KEY_CAPITAL_U;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_V) == 0)
-        return Keyboard::KEY_CAPITAL_V;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_W) == 0)
-        return Keyboard::KEY_CAPITAL_W;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_X) == 0)
-        return Keyboard::KEY_CAPITAL_X;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_Y) == 0)
-        return Keyboard::KEY_CAPITAL_Y;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_CAPITAL_Z) == 0)
-        return Keyboard::KEY_CAPITAL_Z;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_LEFT_BRACKET) == 0)
-        return Keyboard::KEY_LEFT_BRACKET;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_BACK_SLASH) == 0)
-        return Keyboard::KEY_BACK_SLASH;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_RIGHT_BRACKET) == 0)
-        return Keyboard::KEY_RIGHT_BRACKET;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_UNDERSCORE) == 0)
-        return Keyboard::KEY_UNDERSCORE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_GRAVE) == 0)
-        return Keyboard::KEY_GRAVE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_A) == 0)
-        return Keyboard::KEY_A;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_B) == 0)
-        return Keyboard::KEY_B;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_C) == 0)
-        return Keyboard::KEY_C;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_D) == 0)
-        return Keyboard::KEY_D;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_E) == 0)
-        return Keyboard::KEY_E;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_F) == 0)
-        return Keyboard::KEY_F;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_G) == 0)
-        return Keyboard::KEY_G;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_H) == 0)
-        return Keyboard::KEY_H;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_I) == 0)
-        return Keyboard::KEY_I;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_J) == 0)
-        return Keyboard::KEY_J;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_K) == 0)
-        return Keyboard::KEY_K;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_L) == 0)
-        return Keyboard::KEY_L;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_M) == 0)
-        return Keyboard::KEY_M;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_N) == 0)
-        return Keyboard::KEY_N;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_O) == 0)
-        return Keyboard::KEY_O;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_P) == 0)
-        return Keyboard::KEY_P;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_Q) == 0)
-        return Keyboard::KEY_Q;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_R) == 0)
-        return Keyboard::KEY_R;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_S) == 0)
-        return Keyboard::KEY_S;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_T) == 0)
-        return Keyboard::KEY_T;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_U) == 0)
-        return Keyboard::KEY_U;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_V) == 0)
-        return Keyboard::KEY_V;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_W) == 0)
-        return Keyboard::KEY_W;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_X) == 0)
-        return Keyboard::KEY_X;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_Y) == 0)
-        return Keyboard::KEY_Y;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_Z) == 0)
-        return Keyboard::KEY_Z;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_LEFT_BRACE) == 0)
-        return Keyboard::KEY_LEFT_BRACE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_BAR) == 0)
-        return Keyboard::KEY_BAR;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_RIGHT_BRACE) == 0)
-        return Keyboard::KEY_RIGHT_BRACE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_TILDE) == 0)
-        return Keyboard::KEY_TILDE;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_EURO) == 0)
-        return Keyboard::KEY_EURO;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_POUND) == 0)
-        return Keyboard::KEY_POUND;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_YEN) == 0)
-        return Keyboard::KEY_YEN;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_MIDDLE_DOT) == 0)
-        return Keyboard::KEY_MIDDLE_DOT;
-    if (strcmp(s, luaEnumString_KeyboardKey_KEY_SEARCH) == 0)
-        return Keyboard::KEY_SEARCH;
-    return Keyboard::KEY_NONE;
-}
-
-const char* lua_stringFromEnum_KeyboardKey(Keyboard::Key e)
-{
-    if (e == Keyboard::KEY_NONE)
-        return luaEnumString_KeyboardKey_KEY_NONE;
-    if (e == Keyboard::KEY_PAUSE)
-        return luaEnumString_KeyboardKey_KEY_PAUSE;
-    if (e == Keyboard::KEY_SCROLL_LOCK)
-        return luaEnumString_KeyboardKey_KEY_SCROLL_LOCK;
-    if (e == Keyboard::KEY_PRINT)
-        return luaEnumString_KeyboardKey_KEY_PRINT;
-    if (e == Keyboard::KEY_SYSREQ)
-        return luaEnumString_KeyboardKey_KEY_SYSREQ;
-    if (e == Keyboard::KEY_BREAK)
-        return luaEnumString_KeyboardKey_KEY_BREAK;
-    if (e == Keyboard::KEY_ESCAPE)
-        return luaEnumString_KeyboardKey_KEY_ESCAPE;
-    if (e == Keyboard::KEY_BACKSPACE)
-        return luaEnumString_KeyboardKey_KEY_BACKSPACE;
-    if (e == Keyboard::KEY_TAB)
-        return luaEnumString_KeyboardKey_KEY_TAB;
-    if (e == Keyboard::KEY_BACK_TAB)
-        return luaEnumString_KeyboardKey_KEY_BACK_TAB;
-    if (e == Keyboard::KEY_RETURN)
-        return luaEnumString_KeyboardKey_KEY_RETURN;
-    if (e == Keyboard::KEY_CAPS_LOCK)
-        return luaEnumString_KeyboardKey_KEY_CAPS_LOCK;
-    if (e == Keyboard::KEY_SHIFT)
-        return luaEnumString_KeyboardKey_KEY_SHIFT;
-    if (e == Keyboard::KEY_CTRL)
-        return luaEnumString_KeyboardKey_KEY_CTRL;
-    if (e == Keyboard::KEY_ALT)
-        return luaEnumString_KeyboardKey_KEY_ALT;
-    if (e == Keyboard::KEY_MENU)
-        return luaEnumString_KeyboardKey_KEY_MENU;
-    if (e == Keyboard::KEY_HYPER)
-        return luaEnumString_KeyboardKey_KEY_HYPER;
-    if (e == Keyboard::KEY_INSERT)
-        return luaEnumString_KeyboardKey_KEY_INSERT;
-    if (e == Keyboard::KEY_HOME)
-        return luaEnumString_KeyboardKey_KEY_HOME;
-    if (e == Keyboard::KEY_PG_UP)
-        return luaEnumString_KeyboardKey_KEY_PG_UP;
-    if (e == Keyboard::KEY_DELETE)
-        return luaEnumString_KeyboardKey_KEY_DELETE;
-    if (e == Keyboard::KEY_END)
-        return luaEnumString_KeyboardKey_KEY_END;
-    if (e == Keyboard::KEY_PG_DOWN)
-        return luaEnumString_KeyboardKey_KEY_PG_DOWN;
-    if (e == Keyboard::KEY_LEFT_ARROW)
-        return luaEnumString_KeyboardKey_KEY_LEFT_ARROW;
-    if (e == Keyboard::KEY_RIGHT_ARROW)
-        return luaEnumString_KeyboardKey_KEY_RIGHT_ARROW;
-    if (e == Keyboard::KEY_UP_ARROW)
-        return luaEnumString_KeyboardKey_KEY_UP_ARROW;
-    if (e == Keyboard::KEY_DOWN_ARROW)
-        return luaEnumString_KeyboardKey_KEY_DOWN_ARROW;
-    if (e == Keyboard::KEY_NUM_LOCK)
-        return luaEnumString_KeyboardKey_KEY_NUM_LOCK;
-    if (e == Keyboard::KEY_KP_PLUS)
-        return luaEnumString_KeyboardKey_KEY_KP_PLUS;
-    if (e == Keyboard::KEY_KP_MINUS)
-        return luaEnumString_KeyboardKey_KEY_KP_MINUS;
-    if (e == Keyboard::KEY_KP_MULTIPLY)
-        return luaEnumString_KeyboardKey_KEY_KP_MULTIPLY;
-    if (e == Keyboard::KEY_KP_DIVIDE)
-        return luaEnumString_KeyboardKey_KEY_KP_DIVIDE;
-    if (e == Keyboard::KEY_KP_ENTER)
-        return luaEnumString_KeyboardKey_KEY_KP_ENTER;
-    if (e == Keyboard::KEY_KP_HOME)
-        return luaEnumString_KeyboardKey_KEY_KP_HOME;
-    if (e == Keyboard::KEY_KP_UP)
-        return luaEnumString_KeyboardKey_KEY_KP_UP;
-    if (e == Keyboard::KEY_KP_PG_UP)
-        return luaEnumString_KeyboardKey_KEY_KP_PG_UP;
-    if (e == Keyboard::KEY_KP_LEFT)
-        return luaEnumString_KeyboardKey_KEY_KP_LEFT;
-    if (e == Keyboard::KEY_KP_FIVE)
-        return luaEnumString_KeyboardKey_KEY_KP_FIVE;
-    if (e == Keyboard::KEY_KP_RIGHT)
-        return luaEnumString_KeyboardKey_KEY_KP_RIGHT;
-    if (e == Keyboard::KEY_KP_END)
-        return luaEnumString_KeyboardKey_KEY_KP_END;
-    if (e == Keyboard::KEY_KP_DOWN)
-        return luaEnumString_KeyboardKey_KEY_KP_DOWN;
-    if (e == Keyboard::KEY_KP_PG_DOWN)
-        return luaEnumString_KeyboardKey_KEY_KP_PG_DOWN;
-    if (e == Keyboard::KEY_KP_INSERT)
-        return luaEnumString_KeyboardKey_KEY_KP_INSERT;
-    if (e == Keyboard::KEY_KP_DELETE)
-        return luaEnumString_KeyboardKey_KEY_KP_DELETE;
-    if (e == Keyboard::KEY_F1)
-        return luaEnumString_KeyboardKey_KEY_F1;
-    if (e == Keyboard::KEY_F2)
-        return luaEnumString_KeyboardKey_KEY_F2;
-    if (e == Keyboard::KEY_F3)
-        return luaEnumString_KeyboardKey_KEY_F3;
-    if (e == Keyboard::KEY_F4)
-        return luaEnumString_KeyboardKey_KEY_F4;
-    if (e == Keyboard::KEY_F5)
-        return luaEnumString_KeyboardKey_KEY_F5;
-    if (e == Keyboard::KEY_F6)
-        return luaEnumString_KeyboardKey_KEY_F6;
-    if (e == Keyboard::KEY_F7)
-        return luaEnumString_KeyboardKey_KEY_F7;
-    if (e == Keyboard::KEY_F8)
-        return luaEnumString_KeyboardKey_KEY_F8;
-    if (e == Keyboard::KEY_F9)
-        return luaEnumString_KeyboardKey_KEY_F9;
-    if (e == Keyboard::KEY_F10)
-        return luaEnumString_KeyboardKey_KEY_F10;
-    if (e == Keyboard::KEY_F11)
-        return luaEnumString_KeyboardKey_KEY_F11;
-    if (e == Keyboard::KEY_F12)
-        return luaEnumString_KeyboardKey_KEY_F12;
-    if (e == Keyboard::KEY_SPACE)
-        return luaEnumString_KeyboardKey_KEY_SPACE;
-    if (e == Keyboard::KEY_EXCLAM)
-        return luaEnumString_KeyboardKey_KEY_EXCLAM;
-    if (e == Keyboard::KEY_QUOTE)
-        return luaEnumString_KeyboardKey_KEY_QUOTE;
-    if (e == Keyboard::KEY_NUMBER)
-        return luaEnumString_KeyboardKey_KEY_NUMBER;
-    if (e == Keyboard::KEY_DOLLAR)
-        return luaEnumString_KeyboardKey_KEY_DOLLAR;
-    if (e == Keyboard::KEY_PERCENT)
-        return luaEnumString_KeyboardKey_KEY_PERCENT;
-    if (e == Keyboard::KEY_CIRCUMFLEX)
-        return luaEnumString_KeyboardKey_KEY_CIRCUMFLEX;
-    if (e == Keyboard::KEY_AMPERSAND)
-        return luaEnumString_KeyboardKey_KEY_AMPERSAND;
-    if (e == Keyboard::KEY_APOSTROPHE)
-        return luaEnumString_KeyboardKey_KEY_APOSTROPHE;
-    if (e == Keyboard::KEY_LEFT_PARENTHESIS)
-        return luaEnumString_KeyboardKey_KEY_LEFT_PARENTHESIS;
-    if (e == Keyboard::KEY_RIGHT_PARENTHESIS)
-        return luaEnumString_KeyboardKey_KEY_RIGHT_PARENTHESIS;
-    if (e == Keyboard::KEY_ASTERISK)
-        return luaEnumString_KeyboardKey_KEY_ASTERISK;
-    if (e == Keyboard::KEY_PLUS)
-        return luaEnumString_KeyboardKey_KEY_PLUS;
-    if (e == Keyboard::KEY_COMMA)
-        return luaEnumString_KeyboardKey_KEY_COMMA;
-    if (e == Keyboard::KEY_MINUS)
-        return luaEnumString_KeyboardKey_KEY_MINUS;
-    if (e == Keyboard::KEY_PERIOD)
-        return luaEnumString_KeyboardKey_KEY_PERIOD;
-    if (e == Keyboard::KEY_SLASH)
-        return luaEnumString_KeyboardKey_KEY_SLASH;
-    if (e == Keyboard::KEY_ZERO)
-        return luaEnumString_KeyboardKey_KEY_ZERO;
-    if (e == Keyboard::KEY_ONE)
-        return luaEnumString_KeyboardKey_KEY_ONE;
-    if (e == Keyboard::KEY_TWO)
-        return luaEnumString_KeyboardKey_KEY_TWO;
-    if (e == Keyboard::KEY_THREE)
-        return luaEnumString_KeyboardKey_KEY_THREE;
-    if (e == Keyboard::KEY_FOUR)
-        return luaEnumString_KeyboardKey_KEY_FOUR;
-    if (e == Keyboard::KEY_FIVE)
-        return luaEnumString_KeyboardKey_KEY_FIVE;
-    if (e == Keyboard::KEY_SIX)
-        return luaEnumString_KeyboardKey_KEY_SIX;
-    if (e == Keyboard::KEY_SEVEN)
-        return luaEnumString_KeyboardKey_KEY_SEVEN;
-    if (e == Keyboard::KEY_EIGHT)
-        return luaEnumString_KeyboardKey_KEY_EIGHT;
-    if (e == Keyboard::KEY_NINE)
-        return luaEnumString_KeyboardKey_KEY_NINE;
-    if (e == Keyboard::KEY_COLON)
-        return luaEnumString_KeyboardKey_KEY_COLON;
-    if (e == Keyboard::KEY_SEMICOLON)
-        return luaEnumString_KeyboardKey_KEY_SEMICOLON;
-    if (e == Keyboard::KEY_LESS_THAN)
-        return luaEnumString_KeyboardKey_KEY_LESS_THAN;
-    if (e == Keyboard::KEY_EQUAL)
-        return luaEnumString_KeyboardKey_KEY_EQUAL;
-    if (e == Keyboard::KEY_GREATER_THAN)
-        return luaEnumString_KeyboardKey_KEY_GREATER_THAN;
-    if (e == Keyboard::KEY_QUESTION)
-        return luaEnumString_KeyboardKey_KEY_QUESTION;
-    if (e == Keyboard::KEY_AT)
-        return luaEnumString_KeyboardKey_KEY_AT;
-    if (e == Keyboard::KEY_CAPITAL_A)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_A;
-    if (e == Keyboard::KEY_CAPITAL_B)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_B;
-    if (e == Keyboard::KEY_CAPITAL_C)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_C;
-    if (e == Keyboard::KEY_CAPITAL_D)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_D;
-    if (e == Keyboard::KEY_CAPITAL_E)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_E;
-    if (e == Keyboard::KEY_CAPITAL_F)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_F;
-    if (e == Keyboard::KEY_CAPITAL_G)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_G;
-    if (e == Keyboard::KEY_CAPITAL_H)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_H;
-    if (e == Keyboard::KEY_CAPITAL_I)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_I;
-    if (e == Keyboard::KEY_CAPITAL_J)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_J;
-    if (e == Keyboard::KEY_CAPITAL_K)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_K;
-    if (e == Keyboard::KEY_CAPITAL_L)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_L;
-    if (e == Keyboard::KEY_CAPITAL_M)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_M;
-    if (e == Keyboard::KEY_CAPITAL_N)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_N;
-    if (e == Keyboard::KEY_CAPITAL_O)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_O;
-    if (e == Keyboard::KEY_CAPITAL_P)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_P;
-    if (e == Keyboard::KEY_CAPITAL_Q)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_Q;
-    if (e == Keyboard::KEY_CAPITAL_R)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_R;
-    if (e == Keyboard::KEY_CAPITAL_S)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_S;
-    if (e == Keyboard::KEY_CAPITAL_T)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_T;
-    if (e == Keyboard::KEY_CAPITAL_U)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_U;
-    if (e == Keyboard::KEY_CAPITAL_V)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_V;
-    if (e == Keyboard::KEY_CAPITAL_W)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_W;
-    if (e == Keyboard::KEY_CAPITAL_X)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_X;
-    if (e == Keyboard::KEY_CAPITAL_Y)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_Y;
-    if (e == Keyboard::KEY_CAPITAL_Z)
-        return luaEnumString_KeyboardKey_KEY_CAPITAL_Z;
-    if (e == Keyboard::KEY_LEFT_BRACKET)
-        return luaEnumString_KeyboardKey_KEY_LEFT_BRACKET;
-    if (e == Keyboard::KEY_BACK_SLASH)
-        return luaEnumString_KeyboardKey_KEY_BACK_SLASH;
-    if (e == Keyboard::KEY_RIGHT_BRACKET)
-        return luaEnumString_KeyboardKey_KEY_RIGHT_BRACKET;
-    if (e == Keyboard::KEY_UNDERSCORE)
-        return luaEnumString_KeyboardKey_KEY_UNDERSCORE;
-    if (e == Keyboard::KEY_GRAVE)
-        return luaEnumString_KeyboardKey_KEY_GRAVE;
-    if (e == Keyboard::KEY_A)
-        return luaEnumString_KeyboardKey_KEY_A;
-    if (e == Keyboard::KEY_B)
-        return luaEnumString_KeyboardKey_KEY_B;
-    if (e == Keyboard::KEY_C)
-        return luaEnumString_KeyboardKey_KEY_C;
-    if (e == Keyboard::KEY_D)
-        return luaEnumString_KeyboardKey_KEY_D;
-    if (e == Keyboard::KEY_E)
-        return luaEnumString_KeyboardKey_KEY_E;
-    if (e == Keyboard::KEY_F)
-        return luaEnumString_KeyboardKey_KEY_F;
-    if (e == Keyboard::KEY_G)
-        return luaEnumString_KeyboardKey_KEY_G;
-    if (e == Keyboard::KEY_H)
-        return luaEnumString_KeyboardKey_KEY_H;
-    if (e == Keyboard::KEY_I)
-        return luaEnumString_KeyboardKey_KEY_I;
-    if (e == Keyboard::KEY_J)
-        return luaEnumString_KeyboardKey_KEY_J;
-    if (e == Keyboard::KEY_K)
-        return luaEnumString_KeyboardKey_KEY_K;
-    if (e == Keyboard::KEY_L)
-        return luaEnumString_KeyboardKey_KEY_L;
-    if (e == Keyboard::KEY_M)
-        return luaEnumString_KeyboardKey_KEY_M;
-    if (e == Keyboard::KEY_N)
-        return luaEnumString_KeyboardKey_KEY_N;
-    if (e == Keyboard::KEY_O)
-        return luaEnumString_KeyboardKey_KEY_O;
-    if (e == Keyboard::KEY_P)
-        return luaEnumString_KeyboardKey_KEY_P;
-    if (e == Keyboard::KEY_Q)
-        return luaEnumString_KeyboardKey_KEY_Q;
-    if (e == Keyboard::KEY_R)
-        return luaEnumString_KeyboardKey_KEY_R;
-    if (e == Keyboard::KEY_S)
-        return luaEnumString_KeyboardKey_KEY_S;
-    if (e == Keyboard::KEY_T)
-        return luaEnumString_KeyboardKey_KEY_T;
-    if (e == Keyboard::KEY_U)
-        return luaEnumString_KeyboardKey_KEY_U;
-    if (e == Keyboard::KEY_V)
-        return luaEnumString_KeyboardKey_KEY_V;
-    if (e == Keyboard::KEY_W)
-        return luaEnumString_KeyboardKey_KEY_W;
-    if (e == Keyboard::KEY_X)
-        return luaEnumString_KeyboardKey_KEY_X;
-    if (e == Keyboard::KEY_Y)
-        return luaEnumString_KeyboardKey_KEY_Y;
-    if (e == Keyboard::KEY_Z)
-        return luaEnumString_KeyboardKey_KEY_Z;
-    if (e == Keyboard::KEY_LEFT_BRACE)
-        return luaEnumString_KeyboardKey_KEY_LEFT_BRACE;
-    if (e == Keyboard::KEY_BAR)
-        return luaEnumString_KeyboardKey_KEY_BAR;
-    if (e == Keyboard::KEY_RIGHT_BRACE)
-        return luaEnumString_KeyboardKey_KEY_RIGHT_BRACE;
-    if (e == Keyboard::KEY_TILDE)
-        return luaEnumString_KeyboardKey_KEY_TILDE;
-    if (e == Keyboard::KEY_EURO)
-        return luaEnumString_KeyboardKey_KEY_EURO;
-    if (e == Keyboard::KEY_POUND)
-        return luaEnumString_KeyboardKey_KEY_POUND;
-    if (e == Keyboard::KEY_YEN)
-        return luaEnumString_KeyboardKey_KEY_YEN;
-    if (e == Keyboard::KEY_MIDDLE_DOT)
-        return luaEnumString_KeyboardKey_KEY_MIDDLE_DOT;
-    if (e == Keyboard::KEY_SEARCH)
-        return luaEnumString_KeyboardKey_KEY_SEARCH;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_KeyboardKey.h

@@ -1,15 +0,0 @@
-#ifndef LUA_KEYBOARDKEY_H_
-#define LUA_KEYBOARDKEY_H_
-
-#include "Keyboard.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Keyboard::Key.
-Keyboard::Key lua_enumFromString_KeyboardKey(const char* s);
-const char* lua_stringFromEnum_KeyboardKey(Keyboard::Key e);
-
-}
-
-#endif

gameplay/src/lua/lua_KeyboardKeyEvent.cpp

@@ -1,36 +0,0 @@
-#include "Base.h"
-#include "lua_KeyboardKeyEvent.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_KeyboardKeyEvent_KEY_PRESS = "KEY_PRESS";
-static const char* luaEnumString_KeyboardKeyEvent_KEY_RELEASE = "KEY_RELEASE";
-static const char* luaEnumString_KeyboardKeyEvent_KEY_CHAR = "KEY_CHAR";
-
-Keyboard::KeyEvent lua_enumFromString_KeyboardKeyEvent(const char* s)
-{
-    if (strcmp(s, luaEnumString_KeyboardKeyEvent_KEY_PRESS) == 0)
-        return Keyboard::KEY_PRESS;
-    if (strcmp(s, luaEnumString_KeyboardKeyEvent_KEY_RELEASE) == 0)
-        return Keyboard::KEY_RELEASE;
-    if (strcmp(s, luaEnumString_KeyboardKeyEvent_KEY_CHAR) == 0)
-        return Keyboard::KEY_CHAR;
-    return Keyboard::KEY_PRESS;
-}
-
-const char* lua_stringFromEnum_KeyboardKeyEvent(Keyboard::KeyEvent e)
-{
-    if (e == Keyboard::KEY_PRESS)
-        return luaEnumString_KeyboardKeyEvent_KEY_PRESS;
-    if (e == Keyboard::KEY_RELEASE)
-        return luaEnumString_KeyboardKeyEvent_KEY_RELEASE;
-    if (e == Keyboard::KEY_CHAR)
-        return luaEnumString_KeyboardKeyEvent_KEY_CHAR;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_KeyboardKeyEvent.h

@@ -1,15 +0,0 @@
-#ifndef LUA_KEYBOARDKEYEVENT_H_
-#define LUA_KEYBOARDKEYEVENT_H_
-
-#include "Keyboard.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Keyboard::KeyEvent.
-Keyboard::KeyEvent lua_enumFromString_KeyboardKeyEvent(const char* s);
-const char* lua_stringFromEnum_KeyboardKeyEvent(Keyboard::KeyEvent e);
-
-}
-
-#endif

gameplay/src/lua/lua_Label.cpp

@@ -13,12 +13,6 @@
 #include "ScriptController.h"
 #include "ScriptTarget.h"
 #include "Theme.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_FontJustify.h"
 
 namespace gameplay
 {
@@ -31,6 +25,7 @@ void luaRegister_Label()
         {"addRef", lua_Label_addRef},
         {"addScript", lua_Label_addScript},
         {"canFocus", lua_Label_canFocus},
+        {"clearScripts", lua_Label_clearScripts},
         {"createAnimation", lua_Label_createAnimation},
         {"createAnimationFromBy", lua_Label_createAnimationFromBy},
         {"createAnimationFromTo", lua_Label_createAnimationFromTo},
@@ -342,6 +337,38 @@ int lua_Label_canFocus(lua_State* state)
     return 0;
 }
 
+int lua_Label_clearScripts(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))
+            {
+                Label* instance = getInstance(state);
+                instance->clearScripts();
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_Label_clearScripts - 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_Label_createAnimation(lua_State* state)
 {
     // Get the number of parameters.
@@ -431,7 +458,7 @@ int lua_Label_createAnimation(lua_State* state)
                     lua_type(state, 4) == LUA_TNUMBER &&
                     (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 7) == LUA_TSTRING || lua_type(state, 7) == LUA_TNIL))
+                    lua_type(state, 7) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -449,7 +476,7 @@ int lua_Label_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param5 = gameplay::ScriptUtil::getFloatPointer(6);
 
                     // Get parameter 6 off the stack.
-                    Curve::InterpolationType param6 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 7));
+                    Curve::InterpolationType param6 = (Curve::InterpolationType)luaL_checkint(state, 7);
 
                     Label* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6);
@@ -486,7 +513,7 @@ int lua_Label_createAnimation(lua_State* state)
                     (lua_type(state, 6) == LUA_TTABLE || lua_type(state, 6) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 7) == LUA_TTABLE || lua_type(state, 7) == LUA_TLIGHTUSERDATA) &&
                     (lua_type(state, 8) == LUA_TTABLE || lua_type(state, 8) == LUA_TLIGHTUSERDATA) &&
-                    (lua_type(state, 9) == LUA_TSTRING || lua_type(state, 9) == LUA_TNIL))
+                    lua_type(state, 9) == LUA_TNUMBER)
                 {
                     // Get parameter 1 off the stack.
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
@@ -510,7 +537,7 @@ int lua_Label_createAnimation(lua_State* state)
                     gameplay::ScriptUtil::LuaArray<float> param7 = gameplay::ScriptUtil::getFloatPointer(8);
 
                     // Get parameter 8 off the stack.
-                    Curve::InterpolationType param8 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 9));
+                    Curve::InterpolationType param8 = (Curve::InterpolationType)luaL_checkint(state, 9);
 
                     Label* instance = getInstance(state);
                     void* returnPtr = (void*)instance->createAnimation(param1, param2, param3, param4, param5, param6, param7, param8);
@@ -560,7 +587,7 @@ int lua_Label_createAnimationFromBy(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -576,7 +603,7 @@ int lua_Label_createAnimationFromBy(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -628,7 +655,7 @@ int lua_Label_createAnimationFromTo(lua_State* state)
                 lua_type(state, 3) == LUA_TNUMBER &&
                 (lua_type(state, 4) == LUA_TTABLE || lua_type(state, 4) == LUA_TLIGHTUSERDATA) &&
                 (lua_type(state, 5) == LUA_TTABLE || lua_type(state, 5) == LUA_TLIGHTUSERDATA) &&
-                (lua_type(state, 6) == LUA_TSTRING || lua_type(state, 6) == LUA_TNIL) &&
+                lua_type(state, 6) == LUA_TNUMBER &&
                 lua_type(state, 7) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
@@ -644,7 +671,7 @@ int lua_Label_createAnimationFromTo(lua_State* state)
                 gameplay::ScriptUtil::LuaArray<float> param4 = gameplay::ScriptUtil::getFloatPointer(5);
 
                 // Get parameter 5 off the stack.
-                Curve::InterpolationType param5 = (Curve::InterpolationType)lua_enumFromString_CurveInterpolationType(luaL_checkstring(state, 6));
+                Curve::InterpolationType param5 = (Curve::InterpolationType)luaL_checkint(state, 6);
 
                 // Get parameter 6 off the stack.
                 unsigned long param6 = (unsigned long)luaL_checkunsigned(state, 7);
@@ -791,7 +818,7 @@ int lua_Label_getAlignment(lua_State* state)
                 Control::Alignment result = instance->getAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAlignment(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -985,7 +1012,7 @@ int lua_Label_getAutoSize(lua_State* state)
                 Control::AutoSize result = instance->getAutoSize();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlAutoSize(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -1041,10 +1068,10 @@ int lua_Label_getBorder(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getBorder(param1));
@@ -1256,10 +1283,10 @@ int lua_Label_getCursorColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorColor(param1));
@@ -1304,10 +1331,10 @@ int lua_Label_getCursorRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorRegion(param1));
@@ -1352,10 +1379,10 @@ int lua_Label_getCursorUVs(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getCursorUVs(param1));
@@ -1461,10 +1488,10 @@ int lua_Label_getFont(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)instance->getFont(param1);
@@ -1526,10 +1553,10 @@ int lua_Label_getFontSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 unsigned int result = instance->getFontSize(param1);
@@ -1636,13 +1663,13 @@ int lua_Label_getImageColor(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageColor(param1, param2));
@@ -1688,13 +1715,13 @@ int lua_Label_getImageRegion(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageRegion(param1, param2));
@@ -1740,13 +1767,13 @@ int lua_Label_getImageUVs(lua_State* state)
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
                 (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
-                (lua_type(state, 3) == LUA_TSTRING || lua_type(state, 3) == LUA_TNIL))
+                lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
                 const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                 // Get parameter 2 off the stack.
-                Control::State param2 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 3));
+                Control::State param2 = (Control::State)luaL_checkint(state, 3);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getImageUVs(param1, param2));
@@ -1852,10 +1879,10 @@ int lua_Label_getOpacity(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 float result = instance->getOpacity(param1);
@@ -2040,10 +2067,10 @@ int lua_Label_getSkinColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinColor(param1));
@@ -2114,10 +2141,10 @@ int lua_Label_getSkinRegion(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getSkinRegion(param1));
@@ -2167,7 +2194,7 @@ int lua_Label_getState(lua_State* state)
                 Control::State result = instance->getState();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_ControlState(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2281,7 +2308,7 @@ int lua_Label_getTextAlignment(lua_State* state)
                 Font::Justify result = instance->getTextAlignment();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2293,16 +2320,16 @@ int lua_Label_getTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 Font::Justify result = instance->getTextAlignment(param1);
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_FontJustify(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }
@@ -2358,10 +2385,10 @@ int lua_Label_getTextColor(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 void* returnPtr = (void*)&(instance->getTextColor(param1));
@@ -2423,10 +2450,10 @@ int lua_Label_getTextRightToLeft(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::State param1 = (Control::State)lua_enumFromString_ControlState(luaL_checkstring(state, 2));
+                Control::State param1 = (Control::State)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 bool result = instance->getTextRightToLeft(param1);
@@ -3233,10 +3260,10 @@ int lua_Label_setAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::Alignment param1 = (Control::Alignment)lua_enumFromString_ControlAlignment(luaL_checkstring(state, 2));
+                Control::Alignment param1 = (Control::Alignment)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 instance->setAlignment(param1);
@@ -3347,10 +3374,10 @@ int lua_Label_setAutoSize(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Control::AutoSize param1 = (Control::AutoSize)lua_enumFromString_ControlAutoSize(luaL_checkstring(state, 2));
+                Control::AutoSize param1 = (Control::AutoSize)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 instance->setAutoSize(param1);
@@ -4608,10 +4635,10 @@ int lua_Label_setTextAlignment(lua_State* state)
         case 2:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL))
+                lua_type(state, 2) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 Label* instance = getInstance(state);
                 instance->setTextAlignment(param1);
@@ -4626,11 +4653,11 @@ int lua_Label_setTextAlignment(lua_State* state)
         case 3:
         {
             if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                (lua_type(state, 2) == LUA_TSTRING || lua_type(state, 2) == LUA_TNIL) &&
+                lua_type(state, 2) == LUA_TNUMBER &&
                 lua_type(state, 3) == LUA_TNUMBER)
             {
                 // Get parameter 1 off the stack.
-                Font::Justify param1 = (Font::Justify)lua_enumFromString_FontJustify(luaL_checkstring(state, 2));
+                Font::Justify param1 = (Font::Justify)luaL_checkint(state, 2);
 
                 // Get parameter 2 off the stack.
                 unsigned char param2 = (unsigned char)luaL_checkunsigned(state, 3);

gameplay/src/lua/lua_Label.h

@@ -10,6 +10,7 @@ int lua_Label_addListener(lua_State* state);
 int lua_Label_addRef(lua_State* state);
 int lua_Label_addScript(lua_State* state);
 int lua_Label_canFocus(lua_State* state);
+int lua_Label_clearScripts(lua_State* state);
 int lua_Label_createAnimation(lua_State* state);
 int lua_Label_createAnimationFromBy(lua_State* state);
 int lua_Label_createAnimationFromTo(lua_State* state);

gameplay/src/lua/lua_Layout.cpp

@@ -7,7 +7,6 @@
 #include "Game.h"
 #include "Layout.h"
 #include "Ref.h"
-#include "lua_LayoutType.h"
 
 namespace gameplay
 {
@@ -156,7 +155,7 @@ int lua_Layout_getType(lua_State* state)
                 Layout::Type result = instance->getType();
 
                 // Push the return value onto the stack.
-                lua_pushstring(state, lua_stringFromEnum_LayoutType(result));
+                lua_pushnumber(state, (int)result);
 
                 return 1;
             }

gameplay/src/lua/lua_LayoutType.cpp

@@ -1,36 +0,0 @@
-#include "Base.h"
-#include "lua_LayoutType.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_LayoutType_LAYOUT_FLOW = "LAYOUT_FLOW";
-static const char* luaEnumString_LayoutType_LAYOUT_VERTICAL = "LAYOUT_VERTICAL";
-static const char* luaEnumString_LayoutType_LAYOUT_ABSOLUTE = "LAYOUT_ABSOLUTE";
-
-Layout::Type lua_enumFromString_LayoutType(const char* s)
-{
-    if (strcmp(s, luaEnumString_LayoutType_LAYOUT_FLOW) == 0)
-        return Layout::LAYOUT_FLOW;
-    if (strcmp(s, luaEnumString_LayoutType_LAYOUT_VERTICAL) == 0)
-        return Layout::LAYOUT_VERTICAL;
-    if (strcmp(s, luaEnumString_LayoutType_LAYOUT_ABSOLUTE) == 0)
-        return Layout::LAYOUT_ABSOLUTE;
-    return Layout::LAYOUT_FLOW;
-}
-
-const char* lua_stringFromEnum_LayoutType(Layout::Type e)
-{
-    if (e == Layout::LAYOUT_FLOW)
-        return luaEnumString_LayoutType_LAYOUT_FLOW;
-    if (e == Layout::LAYOUT_VERTICAL)
-        return luaEnumString_LayoutType_LAYOUT_VERTICAL;
-    if (e == Layout::LAYOUT_ABSOLUTE)
-        return luaEnumString_LayoutType_LAYOUT_ABSOLUTE;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_LayoutType.h

@@ -1,15 +0,0 @@
-#ifndef LUA_LAYOUTTYPE_H_
-#define LUA_LAYOUTTYPE_H_
-
-#include "Layout.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for Layout::Type.
-Layout::Type lua_enumFromString_LayoutType(const char* s);
-const char* lua_stringFromEnum_LayoutType(Layout::Type e);
-
-}
-
-#endif