godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-06 17:25:19 +00:00
Code Releases Wiki Activity

Add platform lifecycle callbacks to CameraServer base class

Browse Source
This commit is contained in:
KOGA Mitsuhiro
2025-11-29 07:14:40 +09:00
parent f5918a9d35
commit 85ec5b9f42
8 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/apple_embedded/godot_view_controller.mm
View File

@@ -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 @@
// 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;

6
modules/camera/camera_android.cpp
View File

@@ -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()) {

6
modules/camera/camera_android.h
View File

@@ -113,9 +113,9 @@ private:
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();
};

2
platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt
View File

@@ -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

3
platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java
View File

@@ -297,8 +297,9 @@ public class GodotLib {
/**
* 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

31
platform/android/java_godot_lib_jni.cpp
View File

@@ -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) {

2
platform/android/java_godot_lib_jni.h
View File

@@ -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);

5
servers/camera/camera_server.h
View File

@@ -111,6 +111,11 @@ public:
// 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();
};