seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104232 from Ivorforce/camera-server-shutdown

Browse Source 
Deactivate the `CameraServer` by default.
This commit is contained in:
Rémi Verschelde
2025-03-21 13:03:32 +01:00
parent 3ceb84f5b2 54685c3037
commit f51ea67fb5
7 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
servers/camera_server.cpp
View File

@ -39,6 +39,10 @@
CameraServer::CreateFunc CameraServer::create_func = nullptr;
void CameraServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_monitoring_feeds", "is_monitoring_feeds"), &CameraServer::set_monitoring_feeds);
ClassDB::bind_method(D_METHOD("is_monitoring_feeds"), &CameraServer::is_monitoring_feeds);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitoring_feeds"), "set_monitoring_feeds", "is_monitoring_feeds");
ClassDB::bind_method(D_METHOD("get_feed", "index"), &CameraServer::get_feed);
ClassDB::bind_method(D_METHOD("get_feed_count"), &CameraServer::get_feed_count);
ClassDB::bind_method(D_METHOD("feeds"), &CameraServer::get_feeds);
@ -61,6 +65,10 @@ CameraServer *CameraServer::get_singleton() {
return singleton;
}
void CameraServer::set_monitoring_feeds(bool p_monitoring_feeds) {
monitoring_feeds = p_monitoring_feeds;
}
int CameraServer::get_free_id() {
bool id_exists = true;
int newid = 0;
@ -80,6 +88,8 @@ int CameraServer::get_free_id() {
}
int CameraServer::get_feed_index(int p_id) {
ERR_FAIL_COND_V_MSG(!monitoring_feeds, -1, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
for (int i = 0; i < feeds.size(); i++) {
if (feeds[i]->get_id() == p_id) {
return i;
@ -90,6 +100,8 @@ int CameraServer::get_feed_index(int p_id) {
}
Ref<CameraFeed> CameraServer::get_feed_by_id(int p_id) {
ERR_FAIL_COND_V_MSG(!monitoring_feeds, nullptr, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
int index = get_feed_index(p_id);
if (index == -1) {
@ -129,16 +141,19 @@ void CameraServer::remove_feed(const Ref<CameraFeed> &p_feed) {
}
Ref<CameraFeed> CameraServer::get_feed(int p_index) {
ERR_FAIL_COND_V_MSG(!monitoring_feeds, nullptr, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
ERR_FAIL_INDEX_V(p_index, feeds.size(), nullptr);
return feeds[p_index];
}
int CameraServer::get_feed_count() {
ERR_FAIL_COND_V_MSG(!monitoring_feeds, 0, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
return feeds.size();
}
TypedArray<CameraFeed> CameraServer::get_feeds() {
ERR_FAIL_COND_V_MSG(!monitoring_feeds, {}, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
TypedArray<CameraFeed> return_feeds;
int cc = get_feed_count();
return_feeds.resize(cc);
@ -151,6 +166,7 @@ TypedArray<CameraFeed> CameraServer::get_feeds() {
}
RID CameraServer::feed_texture(int p_id, CameraServer::FeedImage p_texture) {
ERR_FAIL_COND_V_MSG(!monitoring_feeds, RID(), "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
int index = get_feed_index(p_id);
ERR_FAIL_COND_V(index == -1, RID());

4
servers/camera_server.h
View File

@ -64,6 +64,7 @@ private:
protected:
static CreateFunc create_func;
bool monitoring_feeds = false;
Vector<Ref<CameraFeed>> feeds;
static CameraServer *singleton;
@ -88,6 +89,9 @@ public:
return server;
}
virtual void set_monitoring_feeds(bool p_monitoring_feeds);
_FORCE_INLINE_ bool is_monitoring_feeds() const { return monitoring_feeds; }
// Right now we identify our feed by it's ID when it's used in the background.
// May see if we can change this to purely relying on CameraFeed objects or by name.
int get_free_id();