Tidy up

wivlaro · Dec 15, 2024 · 910c28b · 910c28b
1 parent 4efeff8
commit 910c28b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 39 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -28,7 +28,7 @@ add_executable(MagnumGameApp MagnumGameApp.cpp
         MagnumGameApp.h
         DebugLines.cpp
         DebugLines.h
-        MagnumGameApp_text.cpp
+        MagnumGameApp_ui.cpp
         MagnumGameApp_input.cpp
         Tweakables.cpp
         Tweakables.h

diff --git a/src/GameAssets.cpp b/src/GameAssets.cpp
@@ -21,7 +21,6 @@ namespace MagnumGame {
 
     using namespace Magnum::Math::Literals;
 
-
     static Containers::Optional<Containers::String> findDirectory(Containers::StringView dirName) {
         using namespace Corrade::Utility;
 

diff --git a/src/MagnumGameApp.h b/src/MagnumGameApp.h
@@ -40,8 +40,6 @@ namespace MagnumGame {
 
         explicit MagnumGameApp(const Arguments &arguments);
 
-        static Containers::Optional<Containers::String> findDirectory(Containers::StringView dirName);
-
         enum ControllerKeys {
             KEY_NONE = 0,
             KEY_FORWARD = 1,
@@ -70,7 +68,6 @@ namespace MagnumGame {
         void anyEvent(SDL_Event &event) override;
 #endif
 
-        bool isPlaying();
 
         GL::Framebuffer _framebuffer{NoCreate};
         GL::Renderbuffer _color{NoCreate}, _objectId{NoCreate}, _depth{NoCreate};
@@ -100,21 +97,20 @@ namespace MagnumGame {
         Containers::Pointer<Tweakables> _tweakables;
 
         int _controllerKeysHeld;
-        std::unordered_map<int,Vector2> _pointerPressLocations{};
+        std::unordered_map<Long,Vector2> _pointerPressLocations{};
 
+        static ControllerKeys getKeyBit(Key key);
         Vector2 getPlayerControlVector() const;
 
         void updateStatusText();
 
+        bool isPlaying();
         void startGame();
 
         void setupUserInterface();
 
-        void renderTextBuffer(const Matrix3 & matrix3, const Color3& color3, const Color3& outlineColour, GL::Mesh &mesh);
-
         UnsignedInt pickObjectIdAt(Vector2 eventPosition);
 
-        static ControllerKeys getKeyBit(Key key);
     };
 
 }
diff --git a/src/MagnumGameApp_input.cpp b/src/MagnumGameApp_input.cpp
@@ -37,19 +37,24 @@ namespace MagnumGame {
         return keyBit;
     }
 
+
+    Vector2 MagnumGameApp::getPlayerControlVector() const {
+        return {
+            ((_controllerKeysHeld&KEY_RIGHT)?1.0f:0.0f) - ((_controllerKeysHeld&KEY_LEFT)?1.0f:0.0f),
+            ((_controllerKeysHeld&KEY_FORWARD)?1.0f:0.0f) - ((_controllerKeysHeld&KEY_BACKWARD)?1.0f:0.0f),
+        };
+    }
+
+
     void MagnumGameApp::keyPressEvent(KeyEvent &event) {
         auto key = event.key();
-        if (_debugScreen) {
-            if (_debugScreen->handleKeyPress(key, event.modifiers())) {
-                event.setAccepted();
-                return;
-            }
+        if (_debugScreen && _debugScreen->handleKeyPress(key, event.modifiers())) {
+            event.setAccepted();
+            return;
         }
-        if (_currentScreen) {
-            if (_currentScreen->handleKeyPress(key, event.modifiers())) {
-                event.setAccepted();
-                return;
-            }
+        if (_currentScreen && _currentScreen->handleKeyPress(key, event.modifiers())) {
+            event.setAccepted();
+            return;
         }
 
         auto keyBit = getKeyBit(key);
@@ -78,6 +83,7 @@ namespace MagnumGame {
         auto keyBit = getKeyBit(event.key());
         if (keyBit) {
             _controllerKeysHeld &= ~keyBit;
+            event.setAccepted();
         }
     }
 

diff --git a/src/MagnumGameApp_text.cpp → src/MagnumGameApp_ui.cpp b/src/MagnumGameApp_text.cpp → src/MagnumGameApp_ui.cpp
@@ -17,18 +17,11 @@ namespace MagnumGame {
 
 
     void MagnumGameApp::setupUserInterface() {
-        using namespace Corrade::Utility;
         auto font = _fontManager.loadAndInstantiate("StbTrueTypeFont");
         assert(font);
 
-        auto fontsDir = _assets->getFontsDir();
-        for (auto& file : *list(fontsDir, Path::ListFlag::SkipDirectories | Path::ListFlag::SkipDotAndDotDot)) {
-            auto fontFileName = Path::join(fontsDir, file);
-            if (font->openFile(fontFileName, 80.0f)) {
-
-                _ui.emplace(std::move(font));
-                break;
-            }
+        if (font->openFile(Utility::Path::join(_assets->getFontsDir(), "Roboto-Regular.ttf"), 80.0f)) {
+            _ui.emplace(std::move(font));
         }
 
         _hudScreen.emplace();
@@ -55,13 +48,6 @@ namespace MagnumGame {
         });
     }
 
-    Vector2 MagnumGameApp::getPlayerControlVector() const {
-        return {
-            ((_controllerKeysHeld&KEY_RIGHT)?1.0f:0.0f) - ((_controllerKeysHeld&KEY_LEFT)?1.0f:0.0f),
-            ((_controllerKeysHeld&KEY_FORWARD)?1.0f:0.0f) - ((_controllerKeysHeld&KEY_BACKWARD)?1.0f:0.0f),
-        };
-    }
-
     void MagnumGameApp::updateStatusText() {
         std::ostringstream oss;
         if (_gameState && _gameState->getPlayer()->getBody()) {

diff --git a/src/UserInterface.h b/src/UserInterface.h
@@ -19,7 +19,6 @@ namespace MagnumGame {
     using namespace Corrade;
     using namespace Magnum;
 
-
     static inline Color4 textColour = 0xffffff_rgbf;
     static inline Color4 selectedTextColour = 0xffccaa_rgbf;
     static inline Color4 outlineColour = 0x111111_rgbf;
@@ -135,9 +134,6 @@ namespace MagnumGame {
         int _selectedItemIndex{-1};
     };
 
-
-
-
     class UserInterface {
     public:
         explicit UserInterface(Containers::Pointer<Text::AbstractFont>&& font);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,7 +21,6 @@ namespace MagnumGame {

		using namespace Magnum::Math::Literals;


		static Containers::Optional<Containers::String> findDirectory(Containers::StringView dirName) {
		using namespace Corrade::Utility;

Expand Down