Procházet zdrojové kódy

Code cleanup on screen joystick to make Input.h easier to include.

Yao Wei Tjong 姚伟忠 před 11 roky
rodič
revize
4cf5ffd6db

+ 2 - 2
Source/Engine/Input/Input.h

@@ -58,7 +58,7 @@ struct JoystickState
 {
     /// Construct with defaults.
     JoystickState() :
-        joystick_(0), controller_(0)
+        joystick_(0), controller_(0), screenJoystick_(0)
     {
     }
 
@@ -86,7 +86,7 @@ struct JoystickState
     /// SDL game controller.
     SDL_GameController* controller_;
     /// UI element containing the screen joystick.
-    SharedPtr<UIElement> screenJoystick_;
+    UIElement* screenJoystick_;
     /// Joystick name.
     String name_;
     /// Button up/down state.

+ 0 - 1
Source/Engine/LuaScript/pkgs/Input/Input.pkg

@@ -1,6 +1,5 @@
 $#include "File.h"
 $#include "Input.h"
-$#include "UIElement.h"
 
 struct TouchState
 {

+ 0 - 1
Source/Samples/18_CharacterDemo/Touch.cpp

@@ -26,7 +26,6 @@
 #include "Input.h"
 #include "Renderer.h"
 #include "Touch.h"
-#include "UIElement.h"
 
 const float TOUCH_SENSITIVITY = 5.0f;
 const float GYROSCOPE_THRESHOLD = 0.1f;