Bugfixes & Cleanup

.gitignore

@@ -191,6 +191,8 @@ xcuserdata/
 /game/assets/gui/feedback_fill.png
 /game/assets/gui/feedback_outer.png
 /game/assets/snow.png
+# Ignore all native iOS UI assets.
+/game/assets/app/ios/
 # 0.7.0
 /game/assets/armor/chain_1.png
 /game/assets/armor/chain_2.png

platforms/android/AppPlatform_android.cpp

@@ -179,7 +179,7 @@ void AppPlatform_android::initSoundSystem()
 		LOG_E("Trying to initialize SoundSystem more than once!");
 }
 
-bool AppPlatform_android::isTouchscreen()
+bool AppPlatform_android::isTouchscreen() const
 {
 	return true;
 }

platforms/android/AppPlatform_android.hpp

@@ -56,7 +56,7 @@ class AppPlatform_android : public AppPlatform
 
 	SoundSystem* const getSoundSystem() const override;
 	void initSoundSystem() override;
-	bool isTouchscreen() override;
+	bool isTouchscreen() const override;
 
 	void setScreenSize(int width, int height);
 	void initAndroidApp(android_app* ptr);

platforms/ios/AppPlatform_iOS.h

@@ -31,7 +31,7 @@ class AppPlatform_iOS : public AppPlatform
 	int getScreenHeight() const override;
 	Texture loadTexture(const std::string& path, bool b = false) override;
 	int getUserInputStatus() override;
-	bool isTouchscreen() override;
+	bool isTouchscreen() const override;
 	std::string getAssetPath(const std::string &path) const override;
 	std::string getPatchData() override;
 	SoundSystem* const getSoundSystem() const override { return m_pSoundSystem; }

platforms/ios/AppPlatform_iOS.mm

@@ -136,7 +136,7 @@
 	return -1;
 }
 
-bool AppPlatform_iOS::isTouchscreen()
+bool AppPlatform_iOS::isTouchscreen() const
 {
 	return true;
 }

platforms/openal/SoundSystemAL.cpp

@@ -7,7 +7,6 @@ SoundSystemAL::SoundSystemAL()
 {
 	_initialized = false;
     _listenerVolume = 1.0;
-    _audioMuted = false;
 
     startEngine();
 }
@@ -190,7 +189,7 @@ void SoundSystemAL::playAt(const SoundDesc& sound, float x, float y, float z, fl
 		return;
 	}
 
-	if (_audioMuted || volume <= 0.0f)
+	if (volume <= 0.0f)
 		return;
 
 	bool bIsGUI = AL_FALSE;
@@ -346,14 +345,4 @@ void SoundSystemAL::stopEngine()
     _initialized = false;
 }
 
-void SoundSystemAL::muteAudio()
-{
-    _audioMuted = true;
-}
-
-void SoundSystemAL::unMuteAudio()
-{
-    _audioMuted = false;
-}
-
 #endif

platforms/openal/SoundSystemAL.hpp

@@ -38,8 +38,6 @@ class SoundSystemAL : public SoundSystem
 
     virtual void startEngine();
     virtual void stopEngine();
-    virtual void muteAudio();
-    virtual void unMuteAudio();
 
 private:
 	void delete_sources();
@@ -55,7 +53,6 @@ class SoundSystemAL : public SoundSystem
 
 	Vec3 _lastListenerPos;
     float _listenerVolume;
-    bool _audioMuted;
 };
 
 #endif

platforms/sdl/base/AppPlatform_sdl_base.cpp

@@ -1,10 +1,10 @@
-#include "AppPlatform_sdl_base.hpp"
-
 #include <sstream>
 #include <fstream>
 #include <sys/stat.h>
 #include <cstdlib>
 
+#include "AppPlatform_sdl_base.hpp"
+
 #ifdef __EMSCRIPTEN__
 #include <emscripten.h>
 #else
@@ -13,7 +13,9 @@
 
 #include "common/Utils.hpp"
 
-#include "platforms/openal/SoundSystemAL.hpp"
+#include "SoundSystemAL.hpp"
+
+#include "client/player/input/Controller.hpp"
 
 void AppPlatform_sdl_base::_init(std::string storageDir, SDL_Window *window)
 {
@@ -53,6 +55,9 @@ void AppPlatform_sdl_base::_init(std::string storageDir, SDL_Window *window)
 			m_bIsTouchscreen = false;
 		}
 	}
+
+	// Look for a pre-existing controller
+	_controller = findGameController();
 }
 
 void AppPlatform_sdl_base::initSoundSystem()
@@ -112,6 +117,17 @@ AppPlatform_sdl_base::~AppPlatform_sdl_base()
 	SAFE_DELETE(m_pLogger);
 }
 
+SDL_GameController* AppPlatform_sdl_base::findGameController()
+{
+	for (int i = 0; i < SDL_NumJoysticks(); i++) {
+		if (SDL_IsGameController(i)) {
+			return SDL_GameControllerOpen(i);
+		}
+	}
+
+	return nullptr;
+}
+
 SDL_Surface* AppPlatform_sdl_base::getSurfaceForTexture(const Texture* const texture)
 {
 	if (!texture) return nullptr;
@@ -233,9 +249,9 @@ int AppPlatform_sdl_base::getUserInputStatus()
 	return -1;
 }
 
-MouseButtonType AppPlatform_sdl_base::GetMouseButtonType(SDL_Event event)
+MouseButtonType AppPlatform_sdl_base::GetMouseButtonType(SDL_MouseButtonEvent event)
 {
-	switch (event.button.button)
+	switch (event.button)
 	{
 		case SDL_BUTTON_LEFT:
 			return BUTTON_LEFT;
@@ -283,9 +299,9 @@ bool AppPlatform_sdl_base::GetMouseButtonState(SDL_Event event)
 	return result;
 }
 
-Keyboard::KeyState AppPlatform_sdl_base::GetKeyState(SDL_Event event)
+Keyboard::KeyState AppPlatform_sdl_base::GetKeyState(uint8_t state)
 {
-	switch (event.key.state)
+	switch (state)
 	{
 		case SDL_RELEASED:
 			return Keyboard::UP;
@@ -318,6 +334,100 @@ void AppPlatform_sdl_base::hideKeyboard()
 	}
 }
 
-bool AppPlatform_sdl_base::isTouchscreen() {
+bool AppPlatform_sdl_base::isTouchscreen() const
+{
     return m_bIsTouchscreen;
 }
+
+bool AppPlatform_sdl_base::hasGamepad() const
+{
+	return _controller != nullptr;
+}
+
+void AppPlatform_sdl_base::gameControllerAdded(int32_t index)
+{
+	if (!getPrimaryGameController())
+	{
+		setPrimaryGameController(SDL_GameControllerOpen(index));
+		Controller::reset();
+	}
+}
+
+void AppPlatform_sdl_base::gameControllerRemoved(int32_t index)
+{
+	SDL_GameController* controller = getPrimaryGameController();
+	SDL_JoystickID joystickId = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller));
+	// Check if current controller has been removed
+	if (controller && index == joystickId)
+	{
+		SDL_GameControllerClose(controller);
+		// Hunt for a new primary controller
+		setPrimaryGameController(findGameController());
+	}
+}
+
+void AppPlatform_sdl_base::handleKeyEvent(int key, uint8_t state)
+{
+	// This really should be handled somewhere else.
+	// Unforunately, there is no global keyboard handler.
+	// Keyboard events are either handled in Screen::keyboardEvent
+	// when a Screen is visible, or in Minecraft::tickInput
+	// when LocalPlayer exists.
+	switch (key)
+	{
+	case SDLVK_F2:
+		if (state == SDL_PRESSED)
+			saveScreenshot("", -1, -1);
+		return;
+	case SDLVK_AC_BACK:
+		// Android Back Button
+		// @TODO: handleBack function in AppPlatform that calls back to App via function pointer
+		//g_pApp->handleBack(event.key.state == SDL_PRESSED);
+		return;
+	case SDLVK_BACKSPACE:
+		// Text Editing
+		/*if (state == SDL_PRESSED)
+			g_pApp->handleCharInput('\b');*/
+		break;
+	case SDLVK_LSHIFT:
+	case SDLVK_RSHIFT:
+		setShiftPressed(state == SDL_PRESSED, key == SDLVK_LSHIFT);
+		break;
+	}
+
+	// Normal Key Press
+	Keyboard::feed(AppPlatform_sdl_base::GetKeyState(state), key);
+}
+
+void AppPlatform_sdl_base::handleButtonEvent(SDL_JoystickID controllerIndex, uint8_t button, uint8_t state)
+{
+	// Normal Key Press
+	Keyboard::feed(AppPlatform_sdl_base::GetKeyState(state), button);
+}
+
+void AppPlatform_sdl_base::handleControllerAxisEvent(SDL_JoystickID controllerIndex, uint8_t axis, int16_t value)
+{
+	float val = value / 30000.0f; // -32768 to 32767
+
+	switch (axis)
+	{
+	case SDL_CONTROLLER_AXIS_LEFTX:
+		Controller::feedStickX(1, 1, val);
+		break;
+	case SDL_CONTROLLER_AXIS_LEFTY:
+		Controller::feedStickY(1, 1, val);
+		break;
+	case SDL_CONTROLLER_AXIS_RIGHTX:
+		Controller::feedStickX(2, 1, val);
+		break;
+	case SDL_CONTROLLER_AXIS_RIGHTY:
+		Controller::feedStickY(2, 1, val);
+		break;
+	case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
+		Controller::feedTrigger(1, val);
+		break;
+	case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
+		Controller::feedTrigger(2, val);
+		break;
+	}
+}

platforms/sdl/base/AppPlatform_sdl_base.hpp

@@ -42,18 +42,30 @@ class AppPlatform_sdl_base : public AppPlatform
 	bool shiftPressed() override;
 	void setShiftPressed(bool b, bool isLeft);
 
-	static MouseButtonType GetMouseButtonType(SDL_Event event);
+	static MouseButtonType GetMouseButtonType(SDL_MouseButtonEvent event);
 	static bool GetMouseButtonState(SDL_Event event);
-	static Keyboard::KeyState GetKeyState(SDL_Event event);
+	static Keyboard::KeyState GetKeyState(uint8_t state);
 
 	// On-screen keyboard
 	void showKeyboard(int x, int y, int w, int h) override;
 	void hideKeyboard() override;
 
 	// Configure Touchscreen
-	bool isTouchscreen() override;
+	bool isTouchscreen() const override;
+
+	// Game controller
+	bool hasGamepad() const override;
+	SDL_GameController* getPrimaryGameController() const { return _controller; }
+	void setPrimaryGameController(SDL_GameController* controller) { _controller = controller; }
+	void gameControllerAdded(int32_t index);
+	void gameControllerRemoved(int32_t index);
+
+	void handleKeyEvent(int key, uint8_t state);
+	void handleButtonEvent(SDL_JoystickID controllerIndex, uint8_t button, uint8_t state);
+	void handleControllerAxisEvent(SDL_JoystickID controllerIndex, uint8_t axis, int16_t value);
 private:
 	SDL_Window *_window;
+	SDL_GameController* _controller;
 
 	const Texture *_iconTexture;
 	SDL_Surface *_icon;
@@ -71,6 +83,8 @@ class AppPlatform_sdl_base : public AppPlatform
 
 	bool m_bIsTouchscreen;
 
+	SDL_GameController* findGameController();
+
 	static SDL_Surface* getSurfaceForTexture(const Texture* const texture);
 protected:
 	std::string _storageDir;

platforms/sdl/desktop/AppPlatform_sdl.cpp

@@ -1,12 +1,12 @@
-#include "AppPlatform_sdl.hpp"
-
 #include <fstream>
 #include <sstream>
 #include <sys/stat.h>
 #include <cerrno>
 
-#include "thirdparty/stb_image/include/stb_image.h"
-#include "thirdparty/stb_image/include/stb_image_write.h"
+#include "stb_image.h"
+#include "stb_image_write.h"
+
+#include "AppPlatform_sdl.hpp"
 
 #include "thirdparty/GL/GL.hpp"