diff --git a/.gitignore b/.gitignore index a051f3b..4478c48 100644 --- a/.gitignore +++ b/.gitignore @@ -53,5 +53,8 @@ install_manifest.txt ## Xcode projects AerofoilMac/xcuserdata/ +AerofoilMac/*.xcodeproj/xcuserdata/ AerofoilMac/build/ -AerofoilMac/DerivedData/ \ No newline at end of file +AerofoilMac/DerivedData/ +*.xcuserstate +SDL2-2.0.12/Xcode/SDL/SDL.xcodeproj/xcuserdata/* diff --git a/AerofoilMac/AerofoilMac.xcodeproj/project.xcworkspace/xcuserdata/thijsv.xcuserdatad/UserInterfaceState.xcuserstate b/AerofoilMac/AerofoilMac.xcodeproj/project.xcworkspace/xcuserdata/thijsv.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index c09e0c6..0000000 Binary files a/AerofoilMac/AerofoilMac.xcodeproj/project.xcworkspace/xcuserdata/thijsv.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/AerofoilMac/AerofoilMac.xcodeproj/xcuserdata/thijsv.xcuserdatad/xcschemes/xcschememanagement.plist b/AerofoilMac/AerofoilMac.xcodeproj/xcuserdata/thijsv.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 12492d5..0000000 --- a/AerofoilMac/AerofoilMac.xcodeproj/xcuserdata/thijsv.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,27 +0,0 @@ - - - - - SchemeUserState - - AerofoilMac.xcscheme_^#shared#^_ - - orderHint - 1 - - AerofoilShared.xcscheme_^#shared#^_ - - orderHint - 0 - - - SuppressBuildableAutocreation - - 5C54D0952629B42100AB55E0 - - primary - - - - - diff --git a/AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp b/AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp index 3d45ccb..56d93c6 100644 --- a/AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp +++ b/AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp @@ -2539,54 +2539,29 @@ bool GpDisplayDriver_SDL_GL2::InitResources(uint32_t physicalWidth, uint32_t phy } GpComPtr> drawQuadVertexShader = CreateShader(GpBinarizedShaders::g_drawQuadV_GL2); - GpComPtr> drawQuadPaletteFlickerPixelShader = CreateShader(GpBinarizedShaders::g_drawQuadPalettePF_GL2); - if (drawQuadPaletteFlickerPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "drawQuadPaletteFlickerPixelShader"); - GpComPtr> drawQuadPaletteNoFlickerPixelShader = CreateShader(GpBinarizedShaders::g_drawQuadPalettePNF_GL2); - if (drawQuadPaletteNoFlickerPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "drawQuadPaletteNoFlickerPixelShader"); - GpComPtr> drawQuad32FlickerPixelShader = CreateShader(GpBinarizedShaders::g_drawQuad32PF_GL2); - if (drawQuad32FlickerPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "drawQuad32FlickerPixelShader"); GpComPtr> drawQuad32NoFlickerPixelShader = CreateShader(GpBinarizedShaders::g_drawQuad32PNF_GL2); - if (drawQuad32NoFlickerPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "drawQuad32NoFlickerPixelShader"); - GpComPtr> drawQuadPaletteICCFPixelShader = CreateShader(GpBinarizedShaders::g_drawQuadPaletteICCPF_GL2); - if (drawQuadPaletteICCFPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "drawQuadPaletteICCFPixelShader"); GpComPtr> drawQuadPaletteICCNFPixelShader = CreateShader(GpBinarizedShaders::g_drawQuadPaletteICCPNF_GL2); - if (drawQuadPaletteICCNFPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "drawQuadPaletteICCNFPixelShader"); GpComPtr> drawQuad32ICCFPixelShader = CreateShader(GpBinarizedShaders::g_drawQuad32ICCPF_GL2); - if (drawQuad32ICCFPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "drawQuad32ICCFPixelShader"); GpComPtr> drawQuad32ICCNFPixelShader = CreateShader(GpBinarizedShaders::g_drawQuad32ICCPNF_GL2); - if (drawQuad32ICCNFPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "drawQuad32ICCNFPixelShader"); - GpComPtr> scaleQuadPixelShader = CreateShader(GpBinarizedShaders::g_scaleQuadP_GL2); - if (scaleQuadPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "scaleQuadPixelShader"); GpComPtr> copyQuadPixelShader = CreateShader(GpBinarizedShaders::g_copyQuadP_GL2); - if (copyQuadPixelShader == nullptr) - logger->Printf(IGpLogDriver::Category_Error, "GpDisplayDriver_SDL_GL2::InitResources: %s failed to create!", "copyQuadPixelShader"); + - if (//!m_res.m_drawQuadPaletteFlickerProgram.Link(this, drawQuadVertexShader, drawQuadPaletteFlickerPixelShader) - //|| + if (!m_res.m_drawQuadPaletteFlickerProgram.Link(this, drawQuadVertexShader, drawQuadPaletteFlickerPixelShader) || !m_res.m_drawQuadPaletteNoFlickerProgram.Link(this, drawQuadVertexShader, drawQuadPaletteNoFlickerPixelShader) - //|| !m_res.m_drawQuad32FlickerProgram.Link(this, drawQuadVertexShader, drawQuad32FlickerPixelShader) + || !m_res.m_drawQuad32FlickerProgram.Link(this, drawQuadVertexShader, drawQuad32FlickerPixelShader) || !m_res.m_drawQuad32NoFlickerProgram.Link(this, drawQuadVertexShader, drawQuad32NoFlickerPixelShader) - //|| !m_res.m_drawQuadPaletteICCFlickerProgram.Link(this, drawQuadVertexShader, drawQuadPaletteICCFPixelShader) + || !m_res.m_drawQuadPaletteICCFlickerProgram.Link(this, drawQuadVertexShader, drawQuadPaletteICCFPixelShader) || !m_res.m_drawQuadPaletteICCNoFlickerProgram.Link(this, drawQuadVertexShader, drawQuadPaletteICCNFPixelShader) - //|| !m_res.m_drawQuad32ICCFlickerProgram.Link(this, drawQuadVertexShader, drawQuad32ICCFPixelShader) + || !m_res.m_drawQuad32ICCFlickerProgram.Link(this, drawQuadVertexShader, drawQuad32ICCFPixelShader) || !m_res.m_drawQuad32ICCNoFlickerProgram.Link(this, drawQuadVertexShader, drawQuad32ICCNFPixelShader) - //|| !m_drawQuadRGBICCProgram.Link(this, drawQuadVertexShader, drawQuadRGBICCPixelShader) - //|| !m_drawQuad15BitICCProgram.Link(this, drawQuadVertexShader, drawQuad15BitICCPixelShader) +// || !m_drawQuadRGBICCProgram.Link(this, drawQuadVertexShader, drawQuadRGBICCPixelShader) +// || !m_drawQuad15BitICCProgram.Link(this, drawQuadVertexShader, drawQuad15BitICCPixelShader) || !m_res.m_scaleQuadProgram.Link(this, drawQuadVertexShader, scaleQuadPixelShader) || !m_res.m_copyQuadProgram.Link(this, drawQuadVertexShader, copyQuadPixelShader)) return false; diff --git a/GpApp/Main.cpp b/GpApp/Main.cpp index e229e82..42a31f2 100644 --- a/GpApp/Main.cpp +++ b/GpApp/Main.cpp @@ -529,11 +529,6 @@ int AppStartup() PL_Init(); - IGpLogDriver *logger = PLDrivers::GetLogDriver(); - - if (logger) - logger->Printf(IGpLogDriver::Category_Information, "Init phase 1..."); - ToolBoxInit(); CheckOurEnvirons(); @@ -551,15 +546,9 @@ int AppStartup() LoadCursors(); ReadInPrefs(); - if (logger) - logger->Printf(IGpLogDriver::Category_Information, "Init phase 2..."); - SpinCursor(2); // Tick once to let the display driver flush any resolution changes from prefs FlushResolutionChange(); - if (logger) - logger->Printf(IGpLogDriver::Category_Information, "Init phase 3..."); - #if defined COMPILEDEMO copyGood = true; #elif defined COMPILENOCP @@ -584,9 +573,6 @@ int AppStartup() InitSrcRects(); CreateOffscreens(); - if (logger) - logger->Printf(IGpLogDriver::Category_Information, "Init phase 3..."); - bool resolutionChanged = false; if (!isPrefsLoaded) @@ -599,7 +585,7 @@ int AppStartup() FlushResolutionChange(); } - //ShowInitialLaunchDisclaimer(); + ShowInitialLaunchDisclaimer(); } if (thisMac.isResolutionDirty) @@ -613,14 +599,10 @@ int AppStartup() if (isDoColorFade) PortabilityLayer::WindowManager::GetInstance()->SetWindowDesaturation(mainWindow, 1.0); - if (logger) - logger->Printf(IGpLogDriver::Category_Information, "Init phase 4..."); InitSound(); SpinCursor(2); InitMusic(); SpinCursor(2); - if (logger) - logger->Printf(IGpLogDriver::Category_Information, "Init phase 5..."); BuildHouseList(); OpenHouse(true); @@ -636,9 +618,6 @@ int AppStartup() // HideMenuBarOld(); #endif - if (logger) - logger->Printf(IGpLogDriver::Category_Information, "Initialization completed"); - if (isDoColorFade) WashColorIn(); diff --git a/SDL2-2.0.12/Xcode-iOS/SDL/SDL.xcodeproj/project.xcworkspace/xcuserdata/thijsv.xcuserdatad/UserInterfaceState.xcuserstate b/SDL2-2.0.12/Xcode-iOS/SDL/SDL.xcodeproj/project.xcworkspace/xcuserdata/thijsv.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 5a28902..0000000 Binary files a/SDL2-2.0.12/Xcode-iOS/SDL/SDL.xcodeproj/project.xcworkspace/xcuserdata/thijsv.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/SDL2-2.0.12/Xcode/SDL/SDL.xcodeproj/xcuserdata/thijsv.xcuserdatad/xcschemes/xcschememanagement.plist b/SDL2-2.0.12/Xcode/SDL/SDL.xcodeproj/xcuserdata/thijsv.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index ee542fa..0000000 --- a/SDL2-2.0.12/Xcode/SDL/SDL.xcodeproj/xcuserdata/thijsv.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,168 +0,0 @@ - - - - - SchemeUserState - - Framework-iOS.xcscheme_^#shared#^_ - - isShown - - orderHint - 9 - - Framework-tvOS.xcscheme_^#shared#^_ - - isShown - - orderHint - 5 - - Framework.xcscheme_^#shared#^_ - - isShown - - orderHint - 10 - - Shared Library-iOS.xcscheme_^#shared#^_ - - isShown - - orderHint - 14 - - Shared Library-tvOS.xcscheme_^#shared#^_ - - isShown - - orderHint - 6 - - Shared Library.xcscheme_^#shared#^_ - - isShown - - orderHint - 2 - - Standard DMG.xcscheme_^#shared#^_ - - isShown - - orderHint - 7 - - Static Library-iOS.xcscheme_^#shared#^_ - - isShown - - orderHint - 11 - - Static Library-tvOS.xcscheme_^#shared#^_ - - isShown - - orderHint - 12 - - Static Library.xcscheme_^#shared#^_ - - isShown - - orderHint - 8 - - hidapi-iOS.xcscheme_^#shared#^_ - - isShown - - orderHint - 3 - - hidapi-tvOS.xcscheme_^#shared#^_ - - isShown - - orderHint - 4 - - hidapi.xcscheme_^#shared#^_ - - isShown - - orderHint - 13 - - - SuppressBuildableAutocreation - - A75FCCFB23E25AB700529352 - - primary - - - A75FCEB423E25AC700529352 - - primary - - - A75FDB4823E399AC00529352 - - primary - - - A75FDB6223E3A2C900529352 - - primary - - - A75FDB8023E4C74400529352 - - primary - - - A769B08223E259AE00872273 - - primary - - - A7D88A1423E2437C00DCD162 - - primary - - - A7D88BC923E24BED00DCD162 - - primary - - - A7D88D1723E24D3B00DCD162 - - primary - - - BECDF5FE0761BA81005FE872 - - primary - - - BECDF66D0761BA81005FE872 - - primary - - - BECDF6BB0761BA81005FE872 - - primary - - - DB313F7217554B71006C0E22 - - primary - - - - -