Skip to content

Commit 233a908

Browse files
Merge pull request #65 from Strife-AI/macos-fixes
Update ML submodule and add fixes for macOS
2 parents ae3dc92 + 0e418a1 commit 233a908

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

src/Renderer/SdlManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void SdlManager::SetupOpenGl(bool isHeadless)
178178

179179
#if __APPLE__
180180
float defaultDpi = 72;
181-
fullscreenType = SDL_WINDOW_FULLSCREEN_DESKTOP;
181+
auto fullscreenType = SDL_WINDOW_FULLSCREEN_DESKTOP;
182182
#else
183183
float defaultDpi = 96;
184184
#endif

src/Renderer/SpriteAtlas.hpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include <vector>
34
#include <functional>
45
#include <utility>
56

@@ -8,11 +9,18 @@
89
#include "Memory/StringId.hpp"
910
#include "Math/Vector2.hpp"
1011

12+
1113
class Renderer;
1214
class Sprite;
13-
struct AtlasAnimation;
1415
struct SpriteResource;
1516

17+
struct AtlasAnimation
18+
{
19+
StringId name;
20+
int fps;
21+
std::vector<int> frames;
22+
};
23+
1624
class SpriteAtlas
1725
{
1826
public:
@@ -45,11 +53,4 @@ class SpriteAtlas
4553
const StringId _atlasType;
4654
const Vector2 _topLeftCornerSize;
4755
Vector2 _cellSize;
48-
};
49-
50-
struct AtlasAnimation
51-
{
52-
StringId name;
53-
int fps;
54-
std::vector<int> frames;
5556
};

0 commit comments

Comments
 (0)