[Scummvm-git-logs] scummvm master -> 866dc5727ee077a576d3ed2f332aece72f2a8c74
larsamannen
noreply at scummvm.org
Fri Sep 25 21:01:41 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
fa73b72307 IOS7: Check the 3D status when applying touch settings
a195872bfa CREATE_PROJECT: Add wintermute shaders for iOS and tvOS
866dc5727e CREATE_PROJECT: Increase deployment target versions for iOS and tvOS
Commit: fa73b72307937dcab70013326454722ca013dda3
https://github.com/scummvm/scummvm/commit/fa73b72307937dcab70013326454722ca013dda3
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2026-09-25T23:01:35+02:00
Commit Message:
IOS7: Check the 3D status when applying touch settings
After merging the 2D and 3D graphics managers into one, the state if
in 3D has to be checked when applying the touch settings. This is
already done in the Android port in commit
ae2e6a6a272d322756724dedb45aac9e9ed11467
Do the same in the iOS port.
Changed paths:
backends/graphics/ios/ios-graphics.cpp
backends/graphics/ios/ios-graphics.h
diff --git a/backends/graphics/ios/ios-graphics.cpp b/backends/graphics/ios/ios-graphics.cpp
index b31cf3484d4..f776dd765ca 100644
--- a/backends/graphics/ios/ios-graphics.cpp
+++ b/backends/graphics/ios/ios-graphics.cpp
@@ -48,8 +48,9 @@ void iOSGraphicsManager::initSurface() {
_old_touch_mode = kTouchModeTouchpad;
- // not in 3D, not in GUI
- sys->applyTouchSettings(false, false);
+ _rendering3d = (_renderer3d != nullptr);
+ // maybe in 3D, not in GUI
+ sys->applyTouchSettings(_rendering3d, false);
}
void iOSGraphicsManager::deinitSurface() {
@@ -68,6 +69,14 @@ bool iOSGraphicsManager::loadVideoMode(uint requestedWidth, uint requestedHeight
warning("Requesting antialiased video mode while not available");
}
+ const bool render3d = (_renderer3d != nullptr);
+ if (_rendering3d != render3d) {
+ _rendering3d = render3d;
+ }
+ // 3D status may have changed: refresh the touch mode
+ applyTouchSettings();
+
+
/* The iOS and tvOS video modes are always full screen */
return true;
}
@@ -79,8 +88,8 @@ void iOSGraphicsManager::showOverlay(bool inGUI) {
// Don't change touch mode when not changing mouse coordinates
if (inGUI) {
_old_touch_mode = dynamic_cast<OSystem_iOS7 *>(g_system)->getCurrentTouchMode();
- // not in 3D, in overlay
- dynamic_cast<OSystem_iOS7 *>(g_system)->applyTouchSettings(false, true);
+ // maybe in 3D, in overlay
+ dynamic_cast<OSystem_iOS7 *>(g_system)->applyTouchSettings(_renderer3d != nullptr, true);
} else if (_overlayInGUI) {
// Restore touch mode active before overlay was shown
dynamic_cast<OSystem_iOS7 *>(g_system)->setCurrentTouchMode(static_cast<TouchMode>(_old_touch_mode));
@@ -98,6 +107,11 @@ void iOSGraphicsManager::hideOverlay() {
OpenGL::OpenGLGraphicsManager::hideOverlay();
}
+void iOSGraphicsManager::applyTouchSettings() const {
+ // maybe in 3D, maybe in GUI
+ dynamic_cast<OSystem_iOS7 *>(g_system)->applyTouchSettings(_renderer3d != nullptr, _overlayVisible && _overlayInGUI);
+}
+
float iOSGraphicsManager::getHiDPIScreenFactor() const {
return dynamic_cast<OSystem_iOS7 *>(g_system)->getSystemHiDPIScreenFactor();
}
diff --git a/backends/graphics/ios/ios-graphics.h b/backends/graphics/ios/ios-graphics.h
index 2c7f6caf1ec..a4cd6cc499c 100644
--- a/backends/graphics/ios/ios-graphics.h
+++ b/backends/graphics/ios/ios-graphics.h
@@ -52,10 +52,12 @@ protected:
bool loadVideoMode(uint requestedWidth, uint requestedHeight, bool resizable, int antialiasing) override;
void showOverlay(bool inGUI) override;
void hideOverlay() override;
+ void applyTouchSettings() const;
void refreshScreen() override;
int _old_touch_mode;
+ bool _rendering3d;
WindowedGraphicsManager::Insets _insets;
};
Commit: a195872bfad9f007a906c6ea7a212f0968ccfbf9
https://github.com/scummvm/scummvm/commit/a195872bfad9f007a906c6ea7a212f0968ccfbf9
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2026-09-25T23:01:35+02:00
Commit Message:
CREATE_PROJECT: Add wintermute shaders for iOS and tvOS
The shader files for wintermute engine games were missed to be added
to the create_project for xcode. Add them.
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index fff6bdfc278..6fa50bffe0f 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1112,6 +1112,10 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
files.push_back("engines/stark/shaders/stark_shadow.vertex");
}
if (CONTAINS_DEFINE(setup.defines, "ENABLE_WINTERMUTE")) {
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_brightness_julia.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_brightness_julia.vertex");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_brightness_oknytt.fragment");
+ files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_brightness_oknytt.vertex");
files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment");
files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_fade.vertex");
files.push_back("engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.fragment");
Commit: 866dc5727ee077a576d3ed2f332aece72f2a8c74
https://github.com/scummvm/scummvm/commit/866dc5727ee077a576d3ed2f332aece72f2a8c74
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2026-09-25T23:01:35+02:00
Commit Message:
CREATE_PROJECT: Increase deployment target versions for iOS and tvOS
The recommended and minimum deployment target version for iOS is now
13.0. All iOS applications must have a minimum version of 13.0 to be
allowed to be uploaded to App Store Connect or submitted for
distribution.
For tvOS the minimum version is 15.0.
Unfortunately the RECOMMENDED_IPHONEOS_DEPLOYMENT_TARGET cannot be
used when building the Xcode project because the target is then macOS
and not iOS.
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 6fa50bffe0f..eec924ae0ba 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1502,7 +1502,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING(iPhone_Debug, "ONLY_ACTIVE_ARCH", "YES");
ADD_SETTING(iPhone_Debug, "PRODUCT_NAME", PROJECT_NAME);
ADD_SETTING(iPhone_Debug, "PRODUCT_BUNDLE_IDENTIFIER", "\"org.scummvm.${PRODUCT_NAME}\"");
- ADD_SETTING(iPhone_Debug, "IPHONEOS_DEPLOYMENT_TARGET", "9.0");
+ ADD_SETTING(iPhone_Debug, "IPHONEOS_DEPLOYMENT_TARGET", "13.0");
ADD_SETTING_QUOTE_VAR(iPhone_Debug, "PROVISIONING_PROFILE[sdk=iphoneos*]", "");
ADD_SETTING(iPhone_Debug, "SDKROOT", "iphoneos");
ADD_SETTING_QUOTE(iPhone_Debug, "TARGETED_DEVICE_FAMILY", "1,2");
@@ -1585,7 +1585,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING(tvOS_Debug, "ONLY_ACTIVE_ARCH", "YES");
ADD_SETTING(tvOS_Debug, "PRODUCT_NAME", PROJECT_NAME);
ADD_SETTING(tvOS_Debug, "PRODUCT_BUNDLE_IDENTIFIER", "\"org.scummvm.${PRODUCT_NAME}\"");
- ADD_SETTING(tvOS_Debug, "TVOS_DEPLOYMENT_TARGET", "9.0");
+ ADD_SETTING(tvOS_Debug, "TVOS_DEPLOYMENT_TARGET", "15.0");
ADD_SETTING_QUOTE_VAR(tvOS_Debug, "PROVISIONING_PROFILE[sdk=appletvos*]", "");
ADD_SETTING(tvOS_Debug, "SDKROOT", "appletvos");
ADD_SETTING_QUOTE(tvOS_Debug, "TARGETED_DEVICE_FAMILY", "3");
More information about the Scummvm-git-logs
mailing list