Merge pull request #10643 from BastiaanOlij/camera_server

CameraServer class
This commit is contained in:
Rémi Verschelde 2019-06-16 10:22:26 +02:00 committed by GitHub
commit baab976d0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 2384 additions and 5 deletions

View file

@ -956,6 +956,8 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
VisualServer *visual_server = memnew(VisualServerRaster());
input = memnew(InputDefault);
camera_server = memnew(CameraServer);
EMSCRIPTEN_RESULT result;
#define EM_CHECK(ev) \
if (result != EMSCRIPTEN_RESULT_SUCCESS) \
@ -1090,6 +1092,7 @@ void OS_JavaScript::delete_main_loop() {
void OS_JavaScript::finalize() {
memdelete(camera_server);
memdelete(input);
}