diff --git a/.gitignore b/.gitignore index e1d60e6..390e353 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ AerofoilMac/DerivedData/ SDL2-2.0.12/Xcode/SDL/SDL.xcodeproj/xcuserdata/* AerofoilMac/Resources/*.gpf AerofoilMac/Resources/Houses/*.gpf +AerofoilMac/*.xcodeproj/project.xcworkspace/xcuserdata diff --git a/AerofoilPortable/GpSystemServices_POSIX.cpp b/AerofoilPortable/GpSystemServices_POSIX.cpp index 83e0078..1566a4f 100644 --- a/AerofoilPortable/GpSystemServices_POSIX.cpp +++ b/AerofoilPortable/GpSystemServices_POSIX.cpp @@ -59,7 +59,7 @@ uint64_t GpSystemServices_POSIX::GetFreeMemoryCosmetic() const return (long) usermem; } - return 0; + return 0; #else long pages = sysconf(_SC_AVPHYS_PAGES); long pageSize = sysconf(_SC_PAGE_SIZE); diff --git a/AerofoilSDL/ShaderCode/CopyQuadP.cpp b/AerofoilSDL/ShaderCode/CopyQuadP.cpp index fab2c71..ec59dab 100644 --- a/AerofoilSDL/ShaderCode/CopyQuadP.cpp +++ b/AerofoilSDL/ShaderCode/CopyQuadP.cpp @@ -12,10 +12,5 @@ namespace GpBinarizedShaders { - //macos does not support precision in OpenGLES2 - #ifdef __MACOS__ - const char *g_copyQuadP_GL2 = GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_COPYQUADP_GLSL; - #else const char *g_copyQuadP_GL2 = GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_COPYQUADP_GLSL; - #endif } diff --git a/AerofoilSDL/ShaderCode/DrawQuad32P.cpp b/AerofoilSDL/ShaderCode/DrawQuad32P.cpp index 1422afe..8280e09 100644 --- a/AerofoilSDL/ShaderCode/DrawQuad32P.cpp +++ b/AerofoilSDL/ShaderCode/DrawQuad32P.cpp @@ -28,16 +28,8 @@ namespace GpBinarizedShaders { - //macos does not support precision in OpenGLES2 - #ifdef __MACOS__ - const char *g_drawQuad32PF_GL2 = "#define ENABLE_FLICKER\n" GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUAD32P_GLSL; - const char *g_drawQuad32PNF_GL2 = GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUAD32P_GLSL; - const char *g_drawQuad32ICCPF_GL2 = "#define USE_ICC_PROFILE\n" "#define ENABLE_FLICKER\n" GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUAD32P_GLSL; - const char *g_drawQuad32ICCPNF_GL2 = "#define USE_ICC_PROFILE\n" GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUAD32P_GLSL; - #else const char *g_drawQuad32PF_GL2 = "#define ENABLE_FLICKER\n" GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUAD32P_GLSL; const char *g_drawQuad32PNF_GL2 = GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUAD32P_GLSL; const char *g_drawQuad32ICCPF_GL2 = "#define USE_ICC_PROFILE\n" "#define ENABLE_FLICKER\n" GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUAD32P_GLSL; const char *g_drawQuad32ICCPNF_GL2 = "#define USE_ICC_PROFILE\n" GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUAD32P_GLSL; - #endif } diff --git a/AerofoilSDL/ShaderCode/DrawQuadPaletteP.cpp b/AerofoilSDL/ShaderCode/DrawQuadPaletteP.cpp index d9111d3..07e83a0 100644 --- a/AerofoilSDL/ShaderCode/DrawQuadPaletteP.cpp +++ b/AerofoilSDL/ShaderCode/DrawQuadPaletteP.cpp @@ -29,16 +29,8 @@ namespace GpBinarizedShaders { - //macos does not support precision in OpenGLES2 - #ifdef __MACOS__ - const char *g_drawQuadPalettePF_GL2 = "#define ENABLE_FLICKER\n" GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUADPALETTEP_GLSL; - const char *g_drawQuadPalettePNF_GL2 = GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUADPALETTEP_GLSL; - const char *g_drawQuadPaletteICCPF_GL2 = "#define USE_ICC_PROFILE\n" "#define ENABLE_FLICKER\n" GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUADPALETTEP_GLSL; - const char *g_drawQuadPaletteICCPNF_GL2 = "#define USE_ICC_PROFILE\n" GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUADPALETTEP_GLSL; - #else const char *g_drawQuadPalettePF_GL2 = "#define ENABLE_FLICKER\n" GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUADPALETTEP_GLSL; const char *g_drawQuadPalettePNF_GL2 = GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUADPALETTEP_GLSL; const char *g_drawQuadPaletteICCPF_GL2 = "#define USE_ICC_PROFILE\n" "#define ENABLE_FLICKER\n" GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUADPALETTEP_GLSL; const char *g_drawQuadPaletteICCPNF_GL2 = "#define USE_ICC_PROFILE\n" GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_DRAWQUADPIXELCONSTANTS_H GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_DRAWQUADPALETTEP_GLSL; - #endif } diff --git a/AerofoilSDL/ShaderCode/Functions.h b/AerofoilSDL/ShaderCode/Functions.h index bb05cad..6c7956d 100644 --- a/AerofoilSDL/ShaderCode/Functions.h +++ b/AerofoilSDL/ShaderCode/Functions.h @@ -1,7 +1,10 @@ -#define GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX "precision mediump float;\n"\ - -#define GP_GL_SHADER_CODE_HIGH_PRECISION_PREFIX "precision highp float;\n"\ - +#ifdef __MACOS__ + #define GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX "" + #define GP_GL_SHADER_CODE_HIGH_PRECISION_PREFIX "" +#else + #define GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX "precision mediump float;\n" + #define GP_GL_SHADER_CODE_HIGH_PRECISION_PREFIX "precision highp float;\n" +#endif #define GP_GL_SHADER_CODE_FUNCTIONS_H "vec3 pow3(vec3 v, float ex)\n"\ "{\n"\ diff --git a/AerofoilSDL/ShaderCode/ScaleQuadP.cpp b/AerofoilSDL/ShaderCode/ScaleQuadP.cpp index 34640d2..014575b 100644 --- a/AerofoilSDL/ShaderCode/ScaleQuadP.cpp +++ b/AerofoilSDL/ShaderCode/ScaleQuadP.cpp @@ -14,12 +14,7 @@ namespace GpBinarizedShaders { - //macos does not support precision in OpenGLES2 - #ifdef __MACOS__ - const char *g_scaleQuadP_GL2 = GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_SCALEQUADP_GLSL; - #else const char *g_scaleQuadP_GL2 = GP_GL_SHADER_CODE_MEDIUM_PRECISION_PREFIX GP_GL_SHADER_CODE_FUNCTIONS_H GP_GL_SHADER_CODE_SCALEQUADP_GLSL; - #endif extern const char *g_drawQuadRGBP_GL2; extern const char *g_drawQuad15BitP_GL2; diff --git a/AerofoilX/GpLogDriver_X.cpp b/AerofoilX/GpLogDriver_X.cpp index b2c48fd..1d5267a 100644 --- a/AerofoilX/GpLogDriver_X.cpp +++ b/AerofoilX/GpLogDriver_X.cpp @@ -20,7 +20,7 @@ void GpLogDriver_X::Init() void GpLogDriver_X::VPrintf(Category category, const char *fmt, va_list args) { - size_t fmtSize = 0; + size_t fmtSize = 0; bool hasFormatting = false; for (const char *fmtCheck = fmt; *fmtCheck; fmtCheck++) { @@ -64,9 +64,9 @@ void GpLogDriver_X::VPrintf(Category category, const char *fmt, va_list args) } else { - //a copy is needed if using va_list multiple times (otherwise unexpected output) - va_list args_copy; - va_copy(args_copy, args); + //a copy is needed if using va_list multiple times (otherwise unexpected output) + va_list args_copy; + va_copy(args_copy, args); int formattedSize = vsnprintf(nullptr, 0, fmt, args); if (formattedSize <= 0) @@ -77,7 +77,7 @@ void GpLogDriver_X::VPrintf(Category category, const char *fmt, va_list args) return; vsnprintf(charBuff, formattedSize + 1, fmt, args_copy); - va_end(args_copy); + va_end(args_copy); if (m_stream) m_stream->Write(charBuff, formattedSize); diff --git a/AerofoilX/GpMain_SDL_X.cpp b/AerofoilX/GpMain_SDL_X.cpp index 7216973..f5d5880 100644 --- a/AerofoilX/GpMain_SDL_X.cpp +++ b/AerofoilX/GpMain_SDL_X.cpp @@ -58,7 +58,7 @@ SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]) drivers->SetDriver(GpFileSystem_X::GetInstance()); drivers->SetDriver(GpSystemServices_X::GetInstance()); drivers->SetDriver(GpLogDriver_X::GetInstance()); - drivers->SetDriver(GpAllocator_C::GetInstance()); + drivers->SetDriver(GpAllocator_C::GetInstance()); g_gpGlobalConfig.m_displayDriverType = EGpDisplayDriverType_SDL_GL2; g_gpGlobalConfig.m_audioDriverType = EGpAudioDriverType_SDL2; @@ -75,7 +75,7 @@ SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]) g_gpGlobalConfig.m_osGlobals = &g_gpXGlobals; g_gpGlobalConfig.m_logger = logger; g_gpGlobalConfig.m_systemServices = GpSystemServices_X::GetInstance(); - g_gpGlobalConfig.m_allocator = GpAllocator_C::GetInstance(); + g_gpGlobalConfig.m_allocator = GpAllocator_C::GetInstance(); GpDisplayDriverFactory::RegisterDisplayDriverFactory(EGpDisplayDriverType_SDL_GL2, GpDriver_CreateDisplayDriver_SDL_GL2); GpAudioDriverFactory::RegisterAudioDriverFactory(EGpAudioDriverType_SDL2, GpDriver_CreateAudioDriver_SDL); diff --git a/AerofoilX/GpSystemServices_X.cpp b/AerofoilX/GpSystemServices_X.cpp index 6b8bbe2..d8439dd 100644 --- a/AerofoilX/GpSystemServices_X.cpp +++ b/AerofoilX/GpSystemServices_X.cpp @@ -91,11 +91,7 @@ bool GpSystemServices_X::IsTextInputObstructive() const } bool GpSystemServices_X::IsFullscreenPreferred() const -{ - #ifdef __MACOS__ - return false; - #endif - +{ return true; } diff --git a/PortabilityLayer/BinarySearch.h b/PortabilityLayer/BinarySearch.h index 6f9f393..cf11265 100644 --- a/PortabilityLayer/BinarySearch.h +++ b/PortabilityLayer/BinarySearch.h @@ -3,9 +3,7 @@ #define __PL_BINARY_SEARCH_H__ #include -#ifdef __MACOS__ #include -#endif namespace PortabilityLayer {