Ver código fonte

Minor fixes to gameplay-tests
Removes CodeBlocks IDE projects.

setaylor 13 anos atrás
pai
commit
981308b80d
5 arquivos alterados com 27 adições e 614 exclusões
  1. 25 7
      CHANGES.md
  2. 1 1
      README.md
  3. 0 605
      gameplay/gameplay.cbp
  4. 1 0
      gameplay/src/Gamepad.h
  5. 0 1
      gameplay/src/Slider.cpp

+ 25 - 7
CHANGES.md

@@ -1,25 +1,43 @@
 ## v1.6.0
 - Adds file Stream interface for reading/writing files instead of using fread/fwrite. 
-- Adds additional gameplay-tests for billboards and forms.
+- Adds Terrain class to support for heightmap based terrains featuring LOD, multiple surface layers, loading from PNG, RAW8/16, full transform, physics, patch culling and verticle skirt for cracks.
+- Adds object-space normal map generation to gameplay-encoder for terrain normal map generation.
+- Adds scene support for loading .terrain files in .scene files.
+- Adds scene support for inline cameras to .scene files.
+- Adds suppoft for defining .scene files without 'path' to gpb. New node can not be create in .scene file.
+- Adds static Scene::getScene(const char*) to query currently active scenes in a game, helpful for script access.
+- Adds support for multiple translate, rotate and scale commands in a single node entity within .scene files, processed in-order they are defined.
+- Adds scene support for material auto binding scene ambient color, light color and light direction.
+- Adds support for setting the depth compare function on materials.
+- Adds support for texture/sampler arrays being passed to materials.
+- Adds support for loading uncompressed DDS textures for the following formats: R8G8B8, A8R8G8B8, A8B8G8R8, X8R8G8B8, X8B8G8R8
+- Adds improvments to prefer higher quality mipmap generation.
+- Adds improved Gamepad API support for button enumeration, triggers and some mobile Gamepad support on BlackBerry.
+- Adds additional gameplay-tests for billboards, forms, gamepads and lights.
 - Adds support for launching the browser via launchURL(const char*).
 - Adds physics support for setLinearFactor and setAngularFactor  on rigid bodies.
+- Adds methods to PhysicsCollisionObject to allow conversion to subclass types (i.e. PhysicsRigidBody, PhysicsCharacter, etc) from script.
 - Adds option for fullscreen without width/height config to use native desktop resolution.
 - Adds Linux support for OpenAL PulseAudio back-end.
 - Adds support for latest Bullet Physics 2.81 with NEON optimizations for mobile targets.
+- Adds support for preprocessor directive NO_LUA_BINDINGS in the gameplay project to omit inclusion of generated lua bindings in compilation for developer mode value. 
+- Adds optimizations to Lua generator to only write generated files if they differ from existing files, reducing both build times and committing of unchanged script binding files.
 - Adds Windows 7 64-bit support.
 - Fixes to external-deps to reduce the size of the libraries on Windows.
 - Fixes for Android to no longer need to copy files to the SD card before reading them. None of the Android samples require an SD card.
 - Fixes for animation of opacity on UI and fonts.
-- Fixes in UI for removing controls and also setVisible(bool)
+- Fixes in UI for removing controls and also setVisible(bool).
 - Fixes for UI controls missing on MacOSX.
 - Fixes for setting UI alignment programmatically.
-- Fixes for directional and spotlight shaders.
+- Fixes for lighting shaders.
+- Fixes to the texture minification mode from GL_LINEAR_MIPMAP_LINEAR to GL_NEAREST_MIPMAP_LINEAR for newly created textures with mipmaps.
+- Fixes minor memory leaks and possible access violations when calling Game::exit() from script.
+- Fixes physics debug drawing for large scenes causing the internal MeshBatch to grow to an enormous size.
 
 ## v1.5.0
 
 - Linux support. (tested on Ubuntu 12)
 - CMake support for makefile generation for Linux.
-- CodeBlocks 10 IDE support for Linux.
 - Gamepad API support for desktops.
 - Touch gesture support for tap, swipe and pinch.
 - Vehicle physics support via new PhysicsVehicle and PhysicsVehicleWheel classes.
@@ -33,7 +51,7 @@
 - Adds Game/Platform::canExit for testing device capabilities to quit. (only ios)
 - Web community forums at http://www.gameplay3d.org/forums.
 - Changed keyTimes from unsigned long[]  to unsigned int[]. (breaks compat. in AnimationTarget and Animation::Channel)
-- Fixed inconsistencies from Bundle::getObjectID() to Bundle::getObjectId() (breaks compat. in Bundle)
+- Fixes inconsistencies from Bundle::getObjectID() to Bundle::getObjectId() (breaks compat. in Bundle)
 - Fixes the texture coordinates of Mesh::createQuad(float x, float y, float width, float height).
 - Fixes line-wise distortion when loading RGB png's into textures that are non-power of two.
 - Fixes inconsistencies in createXXXX methods.  (breaks compat. in Scene)
@@ -41,7 +59,7 @@
 - Fixes Lua print logging.
 - Fixes Lua errors to be treated as runtime warnings.
 - Fixes setVertexData to pointers instead of constant data.
-- Fixed AudioSource so that it doesn't loop by default.
+- Fixes AudioSource so that it doesn't loop by default.
 - Fixes minor UI scrolling issues.
 
 ## v1.4.0
@@ -64,7 +82,7 @@
 - Fixes to FrameBuffer, RenderTarget and DepthStencilTarget.
 - Fixes user switching in MacOSX to other applications with Apple-Tab.
 - Fixes measureText with empty string to be proper size.
-- Fixed for aliased text by applying linear filtering by default on Fonts.
+- Fixes for aliased text by applying linear filtering by default on Fonts.
 - Fixes RenderState::StateBlock::bindNoRestore() issue where blend function was not restored to the proper defaults.
 - Fixes some inconsistencies in Game event method names for menuEvent. (breaks compat. in Game)
 - Fixes some inconsistencies with AnimationClip::getID() to be same as Node::getId() and other classes. (breaks compat. in AnimationClip)

+ 1 - 1
README.md

@@ -18,7 +18,7 @@ GamePlay3D is an open-source, cross-platform 3D native C++ game framework making
 ## Supported Desktop Platforms
 - Microsoft Windows 7 (using Microsoft Visual Studio 2010)
 - Apple MacOS X (using Apple XCode 4)
-- Linux (using CMake or CodeBlocks 10)
+- Linux (using CMake)
 
 ## Roadmap for 'next' branch
 - [Version 1.7.0 Milestone](https://github.com/blackberry/GamePlay/issues?milestone=4)

+ 0 - 605
gameplay/gameplay.cbp

@@ -1,605 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="gameplay" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="Debug/libgameplay" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="Debug/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="Release/libgameplay" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="Release/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-pedantic" />
-			<Add option="-Wswitch" />
-			<Add option="-Wunused-variable" />
-			<Add directory="../external-deps/zlib/include" />
-			<Add directory="../external-deps/lua/include" />
-			<Add directory="../external-deps/libpng/include" />
-			<Add directory="../external-deps/bullet/include" />
-			<Add directory="../external-deps/oggvorbis/include" />
-			<Add directory="../gameplay/src" />
-		</Compiler>
-		<Linker>
-			<Add directory="../external-deps/lua/lib/linux" />
-			<Add directory="../external-deps/libpng/lib/linux" />
-			<Add directory="../external-deps/bullet/lib/linux" />
-			<Add directory="../external-deps/oggvorbis/lib/linux" />
-		</Linker>
-		<Unit filename="src/AIAgent.cpp" />
-		<Unit filename="src/AIAgent.h" />
-		<Unit filename="src/AIController.cpp" />
-		<Unit filename="src/AIController.h" />
-		<Unit filename="src/AIMessage.cpp" />
-		<Unit filename="src/AIMessage.h" />
-		<Unit filename="src/AIState.cpp" />
-		<Unit filename="src/AIState.h" />
-		<Unit filename="src/AIStateMachine.cpp" />
-		<Unit filename="src/AIStateMachine.h" />
-		<Unit filename="src/AbsoluteLayout.cpp" />
-		<Unit filename="src/AbsoluteLayout.h" />
-		<Unit filename="src/Animation.cpp" />
-		<Unit filename="src/Animation.h" />
-		<Unit filename="src/AnimationClip.cpp" />
-		<Unit filename="src/AnimationClip.h" />
-		<Unit filename="src/AnimationController.cpp" />
-		<Unit filename="src/AnimationController.h" />
-		<Unit filename="src/AnimationTarget.cpp" />
-		<Unit filename="src/AnimationTarget.h" />
-		<Unit filename="src/AnimationValue.cpp" />
-		<Unit filename="src/AnimationValue.h" />
-		<Unit filename="src/AudioBuffer.cpp" />
-		<Unit filename="src/AudioBuffer.h" />
-		<Unit filename="src/AudioController.cpp" />
-		<Unit filename="src/AudioController.h" />
-		<Unit filename="src/AudioListener.cpp" />
-		<Unit filename="src/AudioListener.h" />
-		<Unit filename="src/AudioSource.cpp" />
-		<Unit filename="src/AudioSource.h" />
-		<Unit filename="src/Base.h" />
-		<Unit filename="src/BoundingBox.cpp" />
-		<Unit filename="src/BoundingBox.h" />
-		<Unit filename="src/BoundingSphere.cpp" />
-		<Unit filename="src/BoundingSphere.h" />
-		<Unit filename="src/Bundle.cpp" />
-		<Unit filename="src/Bundle.h" />
-		<Unit filename="src/Button.cpp" />
-		<Unit filename="src/Button.h" />
-		<Unit filename="src/Camera.cpp" />
-		<Unit filename="src/Camera.h" />
-		<Unit filename="src/CheckBox.cpp" />
-		<Unit filename="src/CheckBox.h" />
-		<Unit filename="src/Container.cpp" />
-		<Unit filename="src/Container.h" />
-		<Unit filename="src/Control.cpp" />
-		<Unit filename="src/Control.h" />
-		<Unit filename="src/Curve.cpp" />
-		<Unit filename="src/Curve.h" />
-		<Unit filename="src/DebugNew.cpp" />
-		<Unit filename="src/DebugNew.h" />
-		<Unit filename="src/DepthStencilTarget.cpp" />
-		<Unit filename="src/DepthStencilTarget.h" />
-		<Unit filename="src/Effect.cpp" />
-		<Unit filename="src/Effect.h" />
-		<Unit filename="src/FileSystem.cpp" />
-		<Unit filename="src/FileSystem.h" />
-		<Unit filename="src/FlowLayout.cpp" />
-		<Unit filename="src/FlowLayout.h" />
-		<Unit filename="src/Font.cpp" />
-		<Unit filename="src/Font.h" />
-		<Unit filename="src/Form.cpp" />
-		<Unit filename="src/Form.h" />
-		<Unit filename="src/FrameBuffer.cpp" />
-		<Unit filename="src/FrameBuffer.h" />
-		<Unit filename="src/Frustum.cpp" />
-		<Unit filename="src/Frustum.h" />
-		<Unit filename="src/Game.cpp" />
-		<Unit filename="src/Game.h" />
-		<Unit filename="src/Gamepad.cpp" />
-		<Unit filename="src/Gamepad.h" />
-		<Unit filename="src/gameplay.h" />
-		<Unit filename="src/gameplay-main-android.cpp" />
-		<Unit filename="src/gameplay-main-blackberry.cpp" />
-		<Unit filename="src/gameplay-main-linux.cpp" />
-		<Unit filename="src/gameplay-main-windows.cpp" />
-		<Unit filename="src/Gesture.h" />
-		<Unit filename="src/HeightField.cpp" />
-		<Unit filename="src/HeightField.h" />
-		<Unit filename="src/Image.cpp" />
-		<Unit filename="src/Image.h" />
-		<Unit filename="src/Joint.cpp" />
-		<Unit filename="src/Joint.h" />
-		<Unit filename="src/Joystick.cpp" />
-		<Unit filename="src/Joystick.h" />
-		<Unit filename="src/Keyboard.h" />
-		<Unit filename="src/Label.cpp" />
-		<Unit filename="src/Label.h" />
-		<Unit filename="src/Layout.cpp" />
-		<Unit filename="src/Layout.h" />
-		<Unit filename="src/Light.cpp" />
-		<Unit filename="src/Light.h" />
-		<Unit filename="src/Logger.cpp" />
-		<Unit filename="src/Logger.h" />
-		<Unit filename="src/Material.cpp" />
-		<Unit filename="src/Material.h" />
-		<Unit filename="src/MaterialParameter.cpp" />
-		<Unit filename="src/MaterialParameter.h" />
-		<Unit filename="src/MathUtil.cpp" />
-		<Unit filename="src/MathUtil.h" />
-		<Unit filename="src/Matrix.cpp" />
-		<Unit filename="src/Matrix.h" />
-		<Unit filename="src/Mesh.cpp" />
-		<Unit filename="src/Mesh.h" />
-		<Unit filename="src/MeshBatch.cpp" />
-		<Unit filename="src/MeshBatch.h" />
-		<Unit filename="src/MeshPart.cpp" />
-		<Unit filename="src/MeshPart.h" />
-		<Unit filename="src/MeshSkin.cpp" />
-		<Unit filename="src/MeshSkin.h" />
-		<Unit filename="src/Model.cpp" />
-		<Unit filename="src/Model.h" />
-		<Unit filename="src/Mouse.h" />
-		<Unit filename="src/Node.cpp" />
-		<Unit filename="src/Node.h" />
-		<Unit filename="src/ParticleEmitter.cpp" />
-		<Unit filename="src/ParticleEmitter.h" />
-		<Unit filename="src/Pass.cpp" />
-		<Unit filename="src/Pass.h" />
-		<Unit filename="src/PhysicsCharacter.cpp" />
-		<Unit filename="src/PhysicsCharacter.h" />
-		<Unit filename="src/PhysicsCollisionObject.cpp" />
-		<Unit filename="src/PhysicsCollisionObject.h" />
-		<Unit filename="src/PhysicsCollisionShape.cpp" />
-		<Unit filename="src/PhysicsCollisionShape.h" />
-		<Unit filename="src/PhysicsConstraint.cpp" />
-		<Unit filename="src/PhysicsConstraint.h" />
-		<Unit filename="src/PhysicsController.cpp" />
-		<Unit filename="src/PhysicsController.h" />
-		<Unit filename="src/PhysicsFixedConstraint.cpp" />
-		<Unit filename="src/PhysicsFixedConstraint.h" />
-		<Unit filename="src/PhysicsGenericConstraint.cpp" />
-		<Unit filename="src/PhysicsGenericConstraint.h" />
-		<Unit filename="src/PhysicsGhostObject.cpp" />
-		<Unit filename="src/PhysicsGhostObject.h" />
-		<Unit filename="src/PhysicsHingeConstraint.cpp" />
-		<Unit filename="src/PhysicsHingeConstraint.h" />
-		<Unit filename="src/PhysicsRigidBody.cpp" />
-		<Unit filename="src/PhysicsRigidBody.h" />
-		<Unit filename="src/PhysicsSocketConstraint.cpp" />
-		<Unit filename="src/PhysicsSocketConstraint.h" />
-		<Unit filename="src/PhysicsSpringConstraint.cpp" />
-		<Unit filename="src/PhysicsSpringConstraint.h" />
-		<Unit filename="src/PhysicsVehicle.cpp" />
-		<Unit filename="src/PhysicsVehicle.h" />
-		<Unit filename="src/PhysicsVehicleWheel.cpp" />
-		<Unit filename="src/PhysicsVehicleWheel.h" />
-		<Unit filename="src/Plane.cpp" />
-		<Unit filename="src/Plane.h" />
-		<Unit filename="src/Platform.h" />
-		<Unit filename="src/PlatformAndroid.cpp" />
-		<Unit filename="src/PlatformBlackBerry.cpp" />
-		<Unit filename="src/PlatformLinux.cpp" />
-		<Unit filename="src/PlatformWindows.cpp" />
-		<Unit filename="src/Properties.cpp" />
-		<Unit filename="src/Properties.h" />
-		<Unit filename="src/Quaternion.cpp" />
-		<Unit filename="src/Quaternion.h" />
-		<Unit filename="src/RadioButton.cpp" />
-		<Unit filename="src/RadioButton.h" />
-		<Unit filename="src/Ray.cpp" />
-		<Unit filename="src/Ray.h" />
-		<Unit filename="src/Rectangle.cpp" />
-		<Unit filename="src/Rectangle.h" />
-		<Unit filename="src/Ref.cpp" />
-		<Unit filename="src/Ref.h" />
-		<Unit filename="src/RenderState.cpp" />
-		<Unit filename="src/RenderState.h" />
-		<Unit filename="src/RenderTarget.cpp" />
-		<Unit filename="src/RenderTarget.h" />
-		<Unit filename="src/Scene.cpp" />
-		<Unit filename="src/Scene.h" />
-		<Unit filename="src/SceneLoader.cpp" />
-		<Unit filename="src/SceneLoader.h" />
-		<Unit filename="src/ScreenDisplayer.cpp" />
-		<Unit filename="src/ScreenDisplayer.h" />
-		<Unit filename="src/ScriptController.cpp" />
-		<Unit filename="src/ScriptController.h" />
-		<Unit filename="src/ScriptTarget.cpp" />
-		<Unit filename="src/ScriptTarget.h" />
-		<Unit filename="src/Slider.cpp" />
-		<Unit filename="src/Slider.h" />
-		<Unit filename="src/SpriteBatch.cpp" />
-		<Unit filename="src/SpriteBatch.h" />
-		<Unit filename="src/Technique.cpp" />
-		<Unit filename="src/Technique.h" />
-		<Unit filename="src/Terrain.cpp" />
-		<Unit filename="src/Terrain.h" />
-		<Unit filename="src/TerrainPatch.cpp" />
-		<Unit filename="src/TerrainPatch.h" />
-		<Unit filename="src/TextBox.cpp" />
-		<Unit filename="src/TextBox.h" />
-		<Unit filename="src/Texture.cpp" />
-		<Unit filename="src/Texture.h" />
-		<Unit filename="src/Theme.cpp" />
-		<Unit filename="src/Theme.h" />
-		<Unit filename="src/ThemeStyle.cpp" />
-		<Unit filename="src/ThemeStyle.h" />
-		<Unit filename="src/TimeListener.h" />
-		<Unit filename="src/Touch.h" />
-		<Unit filename="src/Transform.cpp" />
-		<Unit filename="src/Transform.h" />
-		<Unit filename="src/Vector2.cpp" />
-		<Unit filename="src/Vector2.h" />
-		<Unit filename="src/Vector3.cpp" />
-		<Unit filename="src/Vector3.h" />
-		<Unit filename="src/Vector4.cpp" />
-		<Unit filename="src/Vector4.h" />
-		<Unit filename="src/VertexAttributeBinding.cpp" />
-		<Unit filename="src/VertexAttributeBinding.h" />
-		<Unit filename="src/VertexFormat.cpp" />
-		<Unit filename="src/VertexFormat.h" />
-		<Unit filename="src/VerticalLayout.cpp" />
-		<Unit filename="src/VerticalLayout.h" />
-		<Unit filename="src/lua/lua_AIAgent.cpp" />
-		<Unit filename="src/lua/lua_AIAgent.h" />
-		<Unit filename="src/lua/lua_AIAgentListener.cpp" />
-		<Unit filename="src/lua/lua_AIAgentListener.h" />
-		<Unit filename="src/lua/lua_AIController.cpp" />
-		<Unit filename="src/lua/lua_AIController.h" />
-		<Unit filename="src/lua/lua_AIMessage.cpp" />
-		<Unit filename="src/lua/lua_AIMessage.h" />
-		<Unit filename="src/lua/lua_AIMessageParameterType.cpp" />
-		<Unit filename="src/lua/lua_AIMessageParameterType.h" />
-		<Unit filename="src/lua/lua_AIState.cpp" />
-		<Unit filename="src/lua/lua_AIState.h" />
-		<Unit filename="src/lua/lua_AIStateListener.cpp" />
-		<Unit filename="src/lua/lua_AIStateListener.h" />
-		<Unit filename="src/lua/lua_AIStateMachine.cpp" />
-		<Unit filename="src/lua/lua_AIStateMachine.h" />
-		<Unit filename="src/lua/lua_AbsoluteLayout.cpp" />
-		<Unit filename="src/lua/lua_AbsoluteLayout.h" />
-		<Unit filename="src/lua/lua_Animation.cpp" />
-		<Unit filename="src/lua/lua_Animation.h" />
-		<Unit filename="src/lua/lua_AnimationClip.cpp" />
-		<Unit filename="src/lua/lua_AnimationClip.h" />
-		<Unit filename="src/lua/lua_AnimationClipListener.cpp" />
-		<Unit filename="src/lua/lua_AnimationClipListener.h" />
-		<Unit filename="src/lua/lua_AnimationClipListenerEventType.cpp" />
-		<Unit filename="src/lua/lua_AnimationClipListenerEventType.h" />
-		<Unit filename="src/lua/lua_AnimationController.cpp" />
-		<Unit filename="src/lua/lua_AnimationController.h" />
-		<Unit filename="src/lua/lua_AnimationTarget.cpp" />
-		<Unit filename="src/lua/lua_AnimationTarget.h" />
-		<Unit filename="src/lua/lua_AnimationValue.cpp" />
-		<Unit filename="src/lua/lua_AnimationValue.h" />
-		<Unit filename="src/lua/lua_AudioBuffer.cpp" />
-		<Unit filename="src/lua/lua_AudioBuffer.h" />
-		<Unit filename="src/lua/lua_AudioController.cpp" />
-		<Unit filename="src/lua/lua_AudioController.h" />
-		<Unit filename="src/lua/lua_AudioListener.cpp" />
-		<Unit filename="src/lua/lua_AudioListener.h" />
-		<Unit filename="src/lua/lua_AudioSource.cpp" />
-		<Unit filename="src/lua/lua_AudioSource.h" />
-		<Unit filename="src/lua/lua_AudioSourceState.cpp" />
-		<Unit filename="src/lua/lua_AudioSourceState.h" />
-		<Unit filename="src/lua/lua_BoundingBox.cpp" />
-		<Unit filename="src/lua/lua_BoundingBox.h" />
-		<Unit filename="src/lua/lua_BoundingSphere.cpp" />
-		<Unit filename="src/lua/lua_BoundingSphere.h" />
-		<Unit filename="src/lua/lua_Bundle.cpp" />
-		<Unit filename="src/lua/lua_Bundle.h" />
-		<Unit filename="src/lua/lua_Button.cpp" />
-		<Unit filename="src/lua/lua_Button.h" />
-		<Unit filename="src/lua/lua_Camera.cpp" />
-		<Unit filename="src/lua/lua_Camera.h" />
-		<Unit filename="src/lua/lua_CameraType.cpp" />
-		<Unit filename="src/lua/lua_CameraType.h" />
-		<Unit filename="src/lua/lua_CheckBox.cpp" />
-		<Unit filename="src/lua/lua_CheckBox.h" />
-		<Unit filename="src/lua/lua_Container.cpp" />
-		<Unit filename="src/lua/lua_Container.h" />
-		<Unit filename="src/lua/lua_ContainerScroll.cpp" />
-		<Unit filename="src/lua/lua_ContainerScroll.h" />
-		<Unit filename="src/lua/lua_Control.cpp" />
-		<Unit filename="src/lua/lua_Control.h" />
-		<Unit filename="src/lua/lua_ControlAlignment.cpp" />
-		<Unit filename="src/lua/lua_ControlAlignment.h" />
-		<Unit filename="src/lua/lua_ControlListener.cpp" />
-		<Unit filename="src/lua/lua_ControlListener.h" />
-		<Unit filename="src/lua/lua_ControlListenerEventType.cpp" />
-		<Unit filename="src/lua/lua_ControlListenerEventType.h" />
-		<Unit filename="src/lua/lua_ControlState.cpp" />
-		<Unit filename="src/lua/lua_ControlState.h" />
-		<Unit filename="src/lua/lua_Curve.cpp" />
-		<Unit filename="src/lua/lua_Curve.h" />
-		<Unit filename="src/lua/lua_CurveInterpolationType.cpp" />
-		<Unit filename="src/lua/lua_CurveInterpolationType.h" />
-		<Unit filename="src/lua/lua_DepthStencilTarget.cpp" />
-		<Unit filename="src/lua/lua_DepthStencilTarget.h" />
-		<Unit filename="src/lua/lua_DepthStencilTargetFormat.cpp" />
-		<Unit filename="src/lua/lua_DepthStencilTargetFormat.h" />
-		<Unit filename="src/lua/lua_Effect.cpp" />
-		<Unit filename="src/lua/lua_Effect.h" />
-		<Unit filename="src/lua/lua_FileSystem.cpp" />
-		<Unit filename="src/lua/lua_FileSystem.h" />
-		<Unit filename="src/lua/lua_FlowLayout.cpp" />
-		<Unit filename="src/lua/lua_FlowLayout.h" />
-		<Unit filename="src/lua/lua_Font.cpp" />
-		<Unit filename="src/lua/lua_Font.h" />
-		<Unit filename="src/lua/lua_FontJustify.cpp" />
-		<Unit filename="src/lua/lua_FontJustify.h" />
-		<Unit filename="src/lua/lua_FontStyle.cpp" />
-		<Unit filename="src/lua/lua_FontStyle.h" />
-		<Unit filename="src/lua/lua_FontText.cpp" />
-		<Unit filename="src/lua/lua_FontText.h" />
-		<Unit filename="src/lua/lua_Form.cpp" />
-		<Unit filename="src/lua/lua_Form.h" />
-		<Unit filename="src/lua/lua_FrameBuffer.cpp" />
-		<Unit filename="src/lua/lua_FrameBuffer.h" />
-		<Unit filename="src/lua/lua_Frustum.cpp" />
-		<Unit filename="src/lua/lua_Frustum.h" />
-		<Unit filename="src/lua/lua_Game.cpp" />
-		<Unit filename="src/lua/lua_Game.h" />
-		<Unit filename="src/lua/lua_GameClearFlags.cpp" />
-		<Unit filename="src/lua/lua_GameClearFlags.h" />
-		<Unit filename="src/lua/lua_GameState.cpp" />
-		<Unit filename="src/lua/lua_GameState.h" />
-		<Unit filename="src/lua/lua_Gamepad.cpp" />
-		<Unit filename="src/lua/lua_Gamepad.h" />
-		<Unit filename="src/lua/lua_GamepadButtonState.cpp" />
-		<Unit filename="src/lua/lua_GamepadButtonState.h" />
-		<Unit filename="src/lua/lua_GamepadGamepadEvent.cpp" />
-		<Unit filename="src/lua/lua_GamepadGamepadEvent.h" />
-		<Unit filename="src/lua/lua_Gesture.cpp" />
-		<Unit filename="src/lua/lua_Gesture.h" />
-		<Unit filename="src/lua/lua_GestureGestureEvent.cpp" />
-		<Unit filename="src/lua/lua_GestureGestureEvent.h" />
-		<Unit filename="src/lua/lua_Global.cpp" />
-		<Unit filename="src/lua/lua_Global.h" />
-		<Unit filename="src/lua/lua_HeightField.cpp" />
-		<Unit filename="src/lua/lua_HeightField.h" />
-		<Unit filename="src/lua/lua_Image.cpp" />
-		<Unit filename="src/lua/lua_Image.h" />
-		<Unit filename="src/lua/lua_ImageFormat.cpp" />
-		<Unit filename="src/lua/lua_ImageFormat.h" />
-		<Unit filename="src/lua/lua_Joint.cpp" />
-		<Unit filename="src/lua/lua_Joint.h" />
-		<Unit filename="src/lua/lua_Joystick.cpp" />
-		<Unit filename="src/lua/lua_Joystick.h" />
-		<Unit filename="src/lua/lua_Keyboard.cpp" />
-		<Unit filename="src/lua/lua_Keyboard.h" />
-		<Unit filename="src/lua/lua_KeyboardKey.cpp" />
-		<Unit filename="src/lua/lua_KeyboardKey.h" />
-		<Unit filename="src/lua/lua_KeyboardKeyEvent.cpp" />
-		<Unit filename="src/lua/lua_KeyboardKeyEvent.h" />
-		<Unit filename="src/lua/lua_Label.cpp" />
-		<Unit filename="src/lua/lua_Label.h" />
-		<Unit filename="src/lua/lua_Layout.cpp" />
-		<Unit filename="src/lua/lua_Layout.h" />
-		<Unit filename="src/lua/lua_LayoutType.cpp" />
-		<Unit filename="src/lua/lua_LayoutType.h" />
-		<Unit filename="src/lua/lua_Light.cpp" />
-		<Unit filename="src/lua/lua_Light.h" />
-		<Unit filename="src/lua/lua_LightType.cpp" />
-		<Unit filename="src/lua/lua_LightType.h" />
-		<Unit filename="src/lua/lua_Logger.cpp" />
-		<Unit filename="src/lua/lua_Logger.h" />
-		<Unit filename="src/lua/lua_LoggerLevel.cpp" />
-		<Unit filename="src/lua/lua_LoggerLevel.h" />
-		<Unit filename="src/lua/lua_Material.cpp" />
-		<Unit filename="src/lua/lua_Material.h" />
-		<Unit filename="src/lua/lua_MaterialParameter.cpp" />
-		<Unit filename="src/lua/lua_MaterialParameter.h" />
-		<Unit filename="src/lua/lua_MathUtil.cpp" />
-		<Unit filename="src/lua/lua_MathUtil.h" />
-		<Unit filename="src/lua/lua_Matrix.cpp" />
-		<Unit filename="src/lua/lua_Matrix.h" />
-		<Unit filename="src/lua/lua_Mesh.cpp" />
-		<Unit filename="src/lua/lua_Mesh.h" />
-		<Unit filename="src/lua/lua_MeshBatch.cpp" />
-		<Unit filename="src/lua/lua_MeshBatch.h" />
-		<Unit filename="src/lua/lua_MeshIndexFormat.cpp" />
-		<Unit filename="src/lua/lua_MeshIndexFormat.h" />
-		<Unit filename="src/lua/lua_MeshPart.cpp" />
-		<Unit filename="src/lua/lua_MeshPart.h" />
-		<Unit filename="src/lua/lua_MeshPrimitiveType.cpp" />
-		<Unit filename="src/lua/lua_MeshPrimitiveType.h" />
-		<Unit filename="src/lua/lua_MeshSkin.cpp" />
-		<Unit filename="src/lua/lua_MeshSkin.h" />
-		<Unit filename="src/lua/lua_Model.cpp" />
-		<Unit filename="src/lua/lua_Model.h" />
-		<Unit filename="src/lua/lua_Mouse.cpp" />
-		<Unit filename="src/lua/lua_Mouse.h" />
-		<Unit filename="src/lua/lua_MouseMouseEvent.cpp" />
-		<Unit filename="src/lua/lua_MouseMouseEvent.h" />
-		<Unit filename="src/lua/lua_Node.cpp" />
-		<Unit filename="src/lua/lua_Node.h" />
-		<Unit filename="src/lua/lua_NodeCloneContext.cpp" />
-		<Unit filename="src/lua/lua_NodeCloneContext.h" />
-		<Unit filename="src/lua/lua_NodeType.cpp" />
-		<Unit filename="src/lua/lua_NodeType.h" />
-		<Unit filename="src/lua/lua_ParticleEmitter.cpp" />
-		<Unit filename="src/lua/lua_ParticleEmitter.h" />
-		<Unit filename="src/lua/lua_ParticleEmitterTextureBlending.cpp" />
-		<Unit filename="src/lua/lua_ParticleEmitterTextureBlending.h" />
-		<Unit filename="src/lua/lua_Pass.cpp" />
-		<Unit filename="src/lua/lua_Pass.h" />
-		<Unit filename="src/lua/lua_PhysicsCharacter.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCharacter.h" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObject.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObject.h" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObjectCollisionListener.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObjectCollisionListener.h" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObjectCollisionListenerEventType.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObjectCollisionListenerEventType.h" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObjectCollisionPair.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObjectCollisionPair.h" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObjectType.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCollisionObjectType.h" />
-		<Unit filename="src/lua/lua_PhysicsCollisionShape.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCollisionShape.h" />
-		<Unit filename="src/lua/lua_PhysicsCollisionShapeDefinition.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCollisionShapeDefinition.h" />
-		<Unit filename="src/lua/lua_PhysicsCollisionShapeType.cpp" />
-		<Unit filename="src/lua/lua_PhysicsCollisionShapeType.h" />
-		<Unit filename="src/lua/lua_PhysicsConstraint.cpp" />
-		<Unit filename="src/lua/lua_PhysicsConstraint.h" />
-		<Unit filename="src/lua/lua_PhysicsController.cpp" />
-		<Unit filename="src/lua/lua_PhysicsController.h" />
-		<Unit filename="src/lua/lua_PhysicsControllerHitFilter.cpp" />
-		<Unit filename="src/lua/lua_PhysicsControllerHitFilter.h" />
-		<Unit filename="src/lua/lua_PhysicsControllerHitResult.cpp" />
-		<Unit filename="src/lua/lua_PhysicsControllerHitResult.h" />
-		<Unit filename="src/lua/lua_PhysicsControllerListener.cpp" />
-		<Unit filename="src/lua/lua_PhysicsControllerListener.h" />
-		<Unit filename="src/lua/lua_PhysicsControllerListenerEventType.cpp" />
-		<Unit filename="src/lua/lua_PhysicsControllerListenerEventType.h" />
-		<Unit filename="src/lua/lua_PhysicsFixedConstraint.cpp" />
-		<Unit filename="src/lua/lua_PhysicsFixedConstraint.h" />
-		<Unit filename="src/lua/lua_PhysicsGenericConstraint.cpp" />
-		<Unit filename="src/lua/lua_PhysicsGenericConstraint.h" />
-		<Unit filename="src/lua/lua_PhysicsGhostObject.cpp" />
-		<Unit filename="src/lua/lua_PhysicsGhostObject.h" />
-		<Unit filename="src/lua/lua_PhysicsHingeConstraint.cpp" />
-		<Unit filename="src/lua/lua_PhysicsHingeConstraint.h" />
-		<Unit filename="src/lua/lua_PhysicsRigidBody.cpp" />
-		<Unit filename="src/lua/lua_PhysicsRigidBody.h" />
-		<Unit filename="src/lua/lua_PhysicsRigidBodyParameters.cpp" />
-		<Unit filename="src/lua/lua_PhysicsRigidBodyParameters.h" />
-		<Unit filename="src/lua/lua_PhysicsSocketConstraint.cpp" />
-		<Unit filename="src/lua/lua_PhysicsSocketConstraint.h" />
-		<Unit filename="src/lua/lua_PhysicsSpringConstraint.cpp" />
-		<Unit filename="src/lua/lua_PhysicsSpringConstraint.h" />
-		<Unit filename="src/lua/lua_PhysicsVehicle.cpp" />
-		<Unit filename="src/lua/lua_PhysicsVehicle.h" />
-		<Unit filename="src/lua/lua_PhysicsVehicleWheel.cpp" />
-		<Unit filename="src/lua/lua_PhysicsVehicleWheel.h" />
-		<Unit filename="src/lua/lua_Plane.cpp" />
-		<Unit filename="src/lua/lua_Plane.h" />
-		<Unit filename="src/lua/lua_Platform.cpp" />
-		<Unit filename="src/lua/lua_Platform.h" />
-		<Unit filename="src/lua/lua_Properties.cpp" />
-		<Unit filename="src/lua/lua_Properties.h" />
-		<Unit filename="src/lua/lua_PropertiesType.cpp" />
-		<Unit filename="src/lua/lua_PropertiesType.h" />
-		<Unit filename="src/lua/lua_Quaternion.cpp" />
-		<Unit filename="src/lua/lua_Quaternion.h" />
-		<Unit filename="src/lua/lua_RadioButton.cpp" />
-		<Unit filename="src/lua/lua_RadioButton.h" />
-		<Unit filename="src/lua/lua_Ray.cpp" />
-		<Unit filename="src/lua/lua_Ray.h" />
-		<Unit filename="src/lua/lua_Rectangle.cpp" />
-		<Unit filename="src/lua/lua_Rectangle.h" />
-		<Unit filename="src/lua/lua_Ref.cpp" />
-		<Unit filename="src/lua/lua_Ref.h" />
-		<Unit filename="src/lua/lua_RenderState.cpp" />
-		<Unit filename="src/lua/lua_RenderState.h" />
-		<Unit filename="src/lua/lua_RenderStateAutoBinding.cpp" />
-		<Unit filename="src/lua/lua_RenderStateAutoBinding.h" />
-		<Unit filename="src/lua/lua_RenderStateBlend.cpp" />
-		<Unit filename="src/lua/lua_RenderStateBlend.h" />
-		<Unit filename="src/lua/lua_RenderStateDepthFunction.cpp" />
-		<Unit filename="src/lua/lua_RenderStateDepthFunction.h" />
-		<Unit filename="src/lua/lua_RenderStateStateBlock.cpp" />
-		<Unit filename="src/lua/lua_RenderStateStateBlock.h" />
-		<Unit filename="src/lua/lua_RenderTarget.cpp" />
-		<Unit filename="src/lua/lua_RenderTarget.h" />
-		<Unit filename="src/lua/lua_Scene.cpp" />
-		<Unit filename="src/lua/lua_Scene.h" />
-		<Unit filename="src/lua/lua_SceneDebugFlags.cpp" />
-		<Unit filename="src/lua/lua_SceneDebugFlags.h" />
-		<Unit filename="src/lua/lua_ScreenDisplayer.cpp" />
-		<Unit filename="src/lua/lua_ScreenDisplayer.h" />
-		<Unit filename="src/lua/lua_ScriptController.cpp" />
-		<Unit filename="src/lua/lua_ScriptController.h" />
-		<Unit filename="src/lua/lua_ScriptTarget.cpp" />
-		<Unit filename="src/lua/lua_ScriptTarget.h" />
-		<Unit filename="src/lua/lua_Slider.cpp" />
-		<Unit filename="src/lua/lua_Slider.h" />
-		<Unit filename="src/lua/lua_SpriteBatch.cpp" />
-		<Unit filename="src/lua/lua_SpriteBatch.h" />
-		<Unit filename="src/lua/lua_Technique.cpp" />
-		<Unit filename="src/lua/lua_Technique.h" />
-		<Unit filename="src/lua/lua_Terrain.cpp" />
-		<Unit filename="src/lua/lua_Terrain.h" />
-		<Unit filename="src/lua/lua_TerrainFlags.cpp" />
-		<Unit filename="src/lua/lua_TerrainFlags.h" />
-		<Unit filename="src/lua/lua_TextBox.cpp" />
-		<Unit filename="src/lua/lua_TextBox.h" />
-		<Unit filename="src/lua/lua_Texture.cpp" />
-		<Unit filename="src/lua/lua_Texture.h" />
-		<Unit filename="src/lua/lua_TextureFilter.cpp" />
-		<Unit filename="src/lua/lua_TextureFilter.h" />
-		<Unit filename="src/lua/lua_TextureFormat.cpp" />
-		<Unit filename="src/lua/lua_TextureFormat.h" />
-		<Unit filename="src/lua/lua_TextureSampler.cpp" />
-		<Unit filename="src/lua/lua_TextureSampler.h" />
-		<Unit filename="src/lua/lua_TextureWrap.cpp" />
-		<Unit filename="src/lua/lua_TextureWrap.h" />
-		<Unit filename="src/lua/lua_Theme.cpp" />
-		<Unit filename="src/lua/lua_Theme.h" />
-		<Unit filename="src/lua/lua_ThemeSideRegions.cpp" />
-		<Unit filename="src/lua/lua_ThemeSideRegions.h" />
-		<Unit filename="src/lua/lua_ThemeStyle.cpp" />
-		<Unit filename="src/lua/lua_ThemeStyle.h" />
-		<Unit filename="src/lua/lua_ThemeThemeImage.cpp" />
-		<Unit filename="src/lua/lua_ThemeThemeImage.h" />
-		<Unit filename="src/lua/lua_ThemeUVs.cpp" />
-		<Unit filename="src/lua/lua_ThemeUVs.h" />
-		<Unit filename="src/lua/lua_Touch.cpp" />
-		<Unit filename="src/lua/lua_Touch.h" />
-		<Unit filename="src/lua/lua_TouchTouchEvent.cpp" />
-		<Unit filename="src/lua/lua_TouchTouchEvent.h" />
-		<Unit filename="src/lua/lua_Transform.cpp" />
-		<Unit filename="src/lua/lua_Transform.h" />
-		<Unit filename="src/lua/lua_TransformListener.cpp" />
-		<Unit filename="src/lua/lua_TransformListener.h" />
-		<Unit filename="src/lua/lua_Uniform.cpp" />
-		<Unit filename="src/lua/lua_Uniform.h" />
-		<Unit filename="src/lua/lua_Vector2.cpp" />
-		<Unit filename="src/lua/lua_Vector2.h" />
-		<Unit filename="src/lua/lua_Vector3.cpp" />
-		<Unit filename="src/lua/lua_Vector3.h" />
-		<Unit filename="src/lua/lua_Vector4.cpp" />
-		<Unit filename="src/lua/lua_Vector4.h" />
-		<Unit filename="src/lua/lua_VertexAttributeBinding.cpp" />
-		<Unit filename="src/lua/lua_VertexAttributeBinding.h" />
-		<Unit filename="src/lua/lua_VertexFormat.cpp" />
-		<Unit filename="src/lua/lua_VertexFormat.h" />
-		<Unit filename="src/lua/lua_VertexFormatElement.cpp" />
-		<Unit filename="src/lua/lua_VertexFormatElement.h" />
-		<Unit filename="src/lua/lua_VertexFormatUsage.cpp" />
-		<Unit filename="src/lua/lua_VertexFormatUsage.h" />
-		<Unit filename="src/lua/lua_VerticalLayout.cpp" />
-		<Unit filename="src/lua/lua_VerticalLayout.h" />
-		<Unit filename="src/lua/lua_all_bindings.cpp" />
-		<Unit filename="src/lua/lua_all_bindings.h" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

+ 1 - 0
gameplay/src/Gamepad.h

@@ -178,6 +178,7 @@ public:
      */
     void draw();
 
+
 private:
 
     /**

+ 0 - 1
gameplay/src/Slider.cpp

@@ -182,7 +182,6 @@ bool Slider::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contac
             {
                 notifyListeners(Listener::VALUE_CHANGED);
             }
-
             _dirty = true;
         }
         break;