CameraServer is needed for editor node

- Editor asks ClassDB for docs
 - ClassDB asks CameraFeed for default parameters
 - In CameraFeed's constructor, polls CameraServer
This commit is contained in:
Cameron Reikes 2019-07-16 15:40:59 -07:00
parent 22c843b0c4
commit 0584911f9f
2 changed files with 5 additions and 0 deletions

View file

@ -88,6 +88,8 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int
visual_server = memnew(VisualServerRaster); visual_server = memnew(VisualServerRaster);
visual_server->init(); visual_server->init();
camera_server = memnew(CameraServer);
AudioDriverManager::initialize(p_audio_driver); AudioDriverManager::initialize(p_audio_driver);
input = memnew(InputDefault); input = memnew(InputDefault);
@ -117,6 +119,8 @@ void OS_Server::finalize() {
memdelete(input); memdelete(input);
memdelete(camera_server);
memdelete(power_manager); memdelete(power_manager);
ResourceLoader::remove_resource_format_loader(resource_loader_dummy); ResourceLoader::remove_resource_format_loader(resource_loader_dummy);

View file

@ -74,6 +74,7 @@ class OS_Server : public OS_Unix {
#endif #endif
CrashHandler crash_handler; CrashHandler crash_handler;
CameraServer *camera_server;
int video_driver_index; int video_driver_index;