Add platform lifecycle callbacks to CameraServer base class

shiena · shiena · commit 85ec5b9f42a7 · 2025-12-02T00:31:51.000+09:00
diff --git a/drivers/apple_embedded/godot_view_controller.mm b/drivers/apple_embedded/godot_view_controller.mm
@@ -38,6 +38,7 @@
 #import "os_apple_embedded.h"
 
 #include "core/config/project_settings.h"
+#include "servers/camera/camera_server.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <GameController/GameController.h>
@@ -238,6 +239,24 @@ - (void)dealloc {
 
 // MARK: Orientation
 
+#if TARGET_OS_IPHONE
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
+	[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+
+	[coordinator animateAlongsideTransition:nil
+								 completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+									 // Get the new interface orientation after rotation completes (iOS only)
+									 UIInterfaceOrientation orientation = self.view.window.windowScene.interfaceOrientation;
+
+									 // Notify camera server of orientation change
+									 CameraServer *camera_server = CameraServer::get_singleton();
+									 if (camera_server) {
+										 camera_server->handle_display_rotation_change((int)orientation);
+									 }
+								 }];
+}
+#endif // TARGET_OS_IPHONE
+
 - (UIRectEdge)preferredScreenEdgesDeferringSystemGestures {
 	if (GLOBAL_GET("display/window/ios/suppress_ui_gesture")) {
 		return UIRectEdgeAll;
diff --git a/modules/camera/camera_android.cpp b/modules/camera/camera_android.cpp
@@ -622,7 +622,7 @@ void CameraAndroid::set_monitoring_feeds(bool p_monitoring_feeds) {
 	}
 }
 
-void CameraAndroid::handle_pause() {
+void CameraAndroid::handle_application_pause() {
 	for (int i = 0; i < feeds.size(); i++) {
 		Ref<CameraFeedAndroid> feed = feeds[i];
 		if (feed.is_valid()) {
@@ -631,7 +631,7 @@ void CameraAndroid::handle_pause() {
 	}
 }
 
-void CameraAndroid::handle_resume() {
+void CameraAndroid::handle_application_resume() {
 	for (int i = 0; i < feeds.size(); i++) {
 		Ref<CameraFeedAndroid> feed = feeds[i];
 		if (feed.is_valid()) {
@@ -640,7 +640,7 @@ void CameraAndroid::handle_resume() {
 	}
 }
 
-void CameraAndroid::handle_rotation_change() {
+void CameraAndroid::handle_display_rotation_change(int) {
 	for (int i = 0; i < feeds.size(); i++) {
 		Ref<CameraFeedAndroid> feed = feeds[i];
 		if (feed.is_valid()) {
diff --git a/modules/camera/camera_android.h b/modules/camera/camera_android.h
@@ -113,9 +113,9 @@ class CameraAndroid : public CameraServer {
 
 public:
 	void set_monitoring_feeds(bool p_monitoring_feeds) override;
-	void handle_pause();
-	void handle_resume();
-	void handle_rotation_change();
+	void handle_application_pause() override;
+	void handle_application_resume() override;
+	void handle_display_rotation_change(int p_orientation) override;
 
 	~CameraAndroid();
 };
diff --git a/platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt
@@ -766,7 +766,7 @@ class Godot private constructor(val context: Context) {
 
 		if (currentConfig.orientation != newConfig.orientation) {
 			runOnRenderThread {
-				GodotLib.onScreenRotationChange()
+				GodotLib.onScreenRotationChange(newConfig.orientation)
 			}
 		}
 		currentConfig = newConfig
diff --git a/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java b/platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java
@@ -297,8 +297,9 @@ public static void calldeferred(long p_id, String p_method, Object[] p_params) {
 
 	/**
 	 * Invoked when the screen orientation changes.
+	 * @param orientation the new screen orientation
 	 */
-	static native void onScreenRotationChange();
+	static native void onScreenRotationChange(int orientation);
 
 	/**
 	 * @return true if input must be dispatched from the render thread. If false, input is
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp
@@ -53,12 +53,7 @@
 #include "main/main.h"
 #include "servers/rendering/rendering_server.h"
 
-#include "modules/modules_enabled.gen.h" // For camera.
-
-#ifdef MODULE_CAMERA_ENABLED
-#include "modules/camera/camera_android.h"
 #include "servers/camera/camera_server.h"
-#endif
 
 #ifndef XR_DISABLED
 #include "servers/xr/xr_server.h"
@@ -606,12 +601,10 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNI
 
 	// We force redraw to ensure we render at least once when resuming the app.
 	Main::force_redraw();
-#ifdef MODULE_CAMERA_ENABLED
-	CameraAndroid *camera_android = Object::cast_to<CameraAndroid>(CameraServer::get_singleton());
-	if (camera_android) {
-		camera_android->handle_resume();
+	CameraServer *camera_server = CameraServer::get_singleton();
+	if (camera_server) {
+		camera_server->handle_application_resume();
 	}
-#endif // MODULE_CAMERA_ENABLED
 	if (os_android->get_main_loop()) {
 		os_android->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_RESUMED);
 	}
@@ -622,29 +615,25 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIE
 		return;
 	}
 
-#ifdef MODULE_CAMERA_ENABLED
-	CameraAndroid *camera_android = Object::cast_to<CameraAndroid>(CameraServer::get_singleton());
-	if (camera_android) {
-		camera_android->handle_pause();
+	CameraServer *camera_server = CameraServer::get_singleton();
+	if (camera_server) {
+		camera_server->handle_application_pause();
 	}
-#endif // MODULE_CAMERA_ENABLED
 
 	if (os_android->get_main_loop()) {
 		os_android->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_PAUSED);
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChange(JNIEnv *env, jclass clazz) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChange(JNIEnv *env, jclass clazz, jint p_orientation) {
 	if (step.get() <= STEP_SETUP) {
 		return;
 	}
 
-#ifdef MODULE_CAMERA_ENABLED
-	CameraAndroid *camera_android = Object::cast_to<CameraAndroid>(CameraServer::get_singleton());
-	if (camera_android) {
-		camera_android->handle_rotation_change();
+	CameraServer *camera_server = CameraServer::get_singleton();
+	if (camera_server) {
+		camera_server->handle_display_rotation_change(p_orientation);
 	}
-#endif // MODULE_CAMERA_ENABLED
 }
 
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz) {
diff --git a/platform/android/java_godot_lib_jni.h b/platform/android/java_godot_lib_jni.h
@@ -72,7 +72,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hardwareKeyboardConne
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz);
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChange(JNIEnv *env, jclass clazz);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChange(JNIEnv *env, jclass clazz, jint p_orientation);
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz);
 JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getProjectResourceDir(JNIEnv *env, jclass clazz);
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isEditorHint(JNIEnv *env, jclass clazz);
diff --git a/servers/camera/camera_server.h b/servers/camera/camera_server.h
@@ -111,6 +111,11 @@ class CameraServer : public Object {
 	// Intended for use with custom CameraServer implementation.
 	RID feed_texture(int p_id, FeedImage p_texture);
 
+	// Platform lifecycle callbacks (virtual, default empty implementation).
+	virtual void handle_application_pause() {}
+	virtual void handle_application_resume() {}
+	virtual void handle_display_rotation_change(int p_orientation) { (void)p_orientation; }
+
 	CameraServer();
 	~CameraServer();
 };

Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@ void CameraAndroid::set_monitoring_feeds(bool p_monitoring_feeds) {`
`622`	`622`	`}`
`623`	`623`	`}`
`624`	`624`
`625`		`-void CameraAndroid::handle_pause() {`
	`625`	`+void CameraAndroid::handle_application_pause() {`
`626`	`626`	`for (int i = 0; i < feeds.size(); i++) {`
`627`	`627`	`Ref<CameraFeedAndroid> feed = feeds[i];`
`628`	`628`	`if (feed.is_valid()) {`
`@@ -631,7 +631,7 @@ void CameraAndroid::handle_pause() {`
`631`	`631`	`}`
`632`	`632`	`}`
`633`	`633`
`634`		`-void CameraAndroid::handle_resume() {`
	`634`	`+void CameraAndroid::handle_application_resume() {`
`635`	`635`	`for (int i = 0; i < feeds.size(); i++) {`
`636`	`636`	`Ref<CameraFeedAndroid> feed = feeds[i];`
`637`	`637`	`if (feed.is_valid()) {`
`@@ -640,7 +640,7 @@ void CameraAndroid::handle_resume() {`
`640`	`640`	`}`
`641`	`641`	`}`
`642`	`642`
`643`		`-void CameraAndroid::handle_rotation_change() {`
	`643`	`+void CameraAndroid::handle_display_rotation_change(int) {`
`644`	`644`	`for (int i = 0; i < feeds.size(); i++) {`
`645`	`645`	`Ref<CameraFeedAndroid> feed = feeds[i];`
`646`	`646`	`if (feed.is_valid()) {`
Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ class Godot private constructor(val context: Context) {`
`766`	`766`
`767`	`767`	`if (currentConfig.orientation != newConfig.orientation) {`
`768`	`768`	`runOnRenderThread {`
`769`		`- GodotLib.onScreenRotationChange()`
	`769`	`+ GodotLib.onScreenRotationChange(newConfig.orientation)`
`770`	`770`	`}`
`771`	`771`	`}`
`772`	`772`	`currentConfig = newConfig`