macOS Support & AppPlatform Cleanup (#57)

* macOS Support & Cleanup * Fix malformed comments in build-wasm.bat * Emscripten Fixes * * Add shebang to the grabsounds.py script Since it was changed from rw- to rwx, I'll add the shebang so that it actually runs properly. * * Re-add the patch_data and readme files. * * Remove sound data. * Fix some more things. * Think it's ready to pull now... --------- Co-authored-by: BrentDaMage <BrentDaMage@users.noreply.github.com> Co-authored-by: iProgramInCpp <iprogramincpp@gmail.com>
2026-09-23 20:09:46 +03:00 · 2023-08-17 03:20:59 -05:00
parent 906b96edd8
commit 5ac3aa6d9e
60 changed files with 3145 additions and 274 deletions
--- a/platforms/sdl/AppPlatform_sdlbase.cpp
+++ b/platforms/sdl/AppPlatform_sdlbase.cpp
@@ -0,0 +1,122 @@
+#include "AppPlatform_sdlbase.hpp"
+
+#include <sstream>
+#include <fstream>
+#include <sys/stat.h>
+
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#else
+#include <png.h>
+
+#include "compat/GL.hpp"
+#endif
+
+#include "client/common/Utils.hpp"
+
+void AppPlatform_sdlbase::_init(std::string storageDir, SDL_Window *window)
+{
+    _storageDir = storageDir;
+    _window = window;
+    
+    _iconTexture = nullptr;
+    _icon = nullptr;
+    
+    m_bShiftPressed[0] = false;
+    m_bShiftPressed[1] = false;
+}
+
+void AppPlatform_sdlbase::_init(std::string storageDir, SDL_Window *window, const Texture& icon)
+{
+    _init(storageDir, window);
+    
+    _iconTexture = new Texture(icon);
+    _icon = getSurfaceForTexture(_iconTexture);
+    if (_icon)
+        SDL_SetWindowIcon(window, _icon);
+}
+
+AppPlatform_sdlbase::~AppPlatform_sdlbase()
+{
+    SDL_FreeSurface(_icon);
+    delete _iconTexture;
+}
+
+SDL_Surface* AppPlatform_sdlbase::getSurfaceForTexture(const Texture* const texture)
+{
+    if (!texture) return nullptr;
+    
+    void * const pixels = texture->m_pixels;
+    const int width = texture->m_width;
+    const int height = texture->m_height;
+    const int depth = 32; // Color depth (32-bit by default)
+    SDL_Surface* surface = SDL_CreateRGBSurfaceFrom(
+            pixels, width, height, depth,
+            width * 4, // Pitch
+            0x000000FF, 0x0000FF00, 0x00FF0000,
+            0xFF000000
+    );
+    if (!surface)
+        LogMsg("Error loading SDL_Surface from Texture: %s", SDL_GetError());
+    
+    return surface;
+}
+
+int AppPlatform_sdlbase::checkLicense()
+{
+	// we own the game!!
+	return 1;
+}
+
+int AppPlatform_sdlbase::getScreenWidth() const
+{
+	int width;
+	SDL_GL_GetDrawableSize(_window, &width, nullptr);
+	return width;
+}
+
+int AppPlatform_sdlbase::getScreenHeight() const
+{
+	int height;
+	SDL_GL_GetDrawableSize(_window, nullptr, &height);
+	return height;
+}
+
+void AppPlatform_sdlbase::setMouseGrabbed(bool b)
+{
+	SDL_SetWindowGrab(_window, b ? SDL_TRUE : SDL_FALSE);
+	SDL_SetRelativeMouseMode(b ? SDL_TRUE : SDL_FALSE);
+}
+
+void AppPlatform_sdlbase::setMouseDiff(int x, int y)
+{
+	xrel = x;
+	yrel = y;
+}
+
+void AppPlatform_sdlbase::getMouseDiff(int& x, int& y)
+{
+	x = xrel;
+	y = yrel;
+}
+
+void AppPlatform_sdlbase::clearDiff()
+{
+	xrel = 0;
+	yrel = 0;
+}
+
+bool AppPlatform_sdlbase::shiftPressed()
+{
+	return m_bShiftPressed[0] || m_bShiftPressed[1];
+}
+
+void AppPlatform_sdlbase::setShiftPressed(bool b, bool isLeft)
+{
+	m_bShiftPressed[isLeft ? 0 : 1] = b;
+}
+
+int AppPlatform_sdlbase::getUserInputStatus()
+{
+	return -1;
+}