-
-
Notifications
You must be signed in to change notification settings - Fork 21.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Worked with Faless(Fabio Alessandrelli) to update server platform. #16653
Changes from all commits
c0dce6e
8699f64
72ef766
6784d74
2de10aa
4e1923a
2e66730
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
#!/usr/bin/env python | ||
|
||
Import('env') | ||
|
||
env.add_source_files(env.drivers_sources, "*.cpp") |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/*************************************************************************/ | ||
/* audio_driver_dummy.h */ | ||
/*************************************************************************/ | ||
/* This file is part of: */ | ||
/* GODOT ENGINE */ | ||
/* https://godotengine.org */ | ||
/*************************************************************************/ | ||
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ | ||
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ | ||
/* */ | ||
/* Permission is hereby granted, free of charge, to any person obtaining */ | ||
/* a copy of this software and associated documentation files (the */ | ||
/* "Software"), to deal in the Software without restriction, including */ | ||
/* without limitation the rights to use, copy, modify, merge, publish, */ | ||
/* distribute, sublicense, and/or sell copies of the Software, and to */ | ||
/* permit persons to whom the Software is furnished to do so, subject to */ | ||
/* the following conditions: */ | ||
/* */ | ||
/* The above copyright notice and this permission notice shall be */ | ||
/* included in all copies or substantial portions of the Software. */ | ||
/* */ | ||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ | ||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ | ||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ | ||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ | ||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ | ||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ | ||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
/*************************************************************************/ | ||
|
||
#ifndef AUDIO_DRIVER_DUMMY_H | ||
#define AUDIO_DRIVER_DUMMY_H | ||
|
||
#include "core/os/mutex.h" | ||
#include "core/os/thread.h" | ||
#include "servers/audio_server.h" | ||
|
||
class AudioDriverDummy : public AudioDriver { | ||
public: | ||
const char *get_name() const { | ||
return "Dummy"; | ||
}; | ||
|
||
virtual Error init() { return OK; } | ||
virtual void start(){}; | ||
virtual int get_mix_rate() const {}; | ||
virtual SpeakerMode get_speaker_mode() const {}; | ||
virtual void lock(){}; | ||
virtual void unlock(){}; | ||
virtual void finish(){}; | ||
|
||
virtual float get_latency(){}; | ||
|
||
AudioDriverDummy(){}; | ||
~AudioDriverDummy(){}; | ||
}; | ||
|
||
#endif // AUDIO_DRIVER_DUMMY_H |
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -12,9 +12,6 @@ def get_name(): | |||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||
def can_build(): | ||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||
# Doesn't build against Godot 3.0 for now, disable to avoid confusing users | ||||||||||||||||||||||||||||
return False | ||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||
if (os.name != "posix" or sys.platform == "darwin"): | ||||||||||||||||||||||||||||
return False | ||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||
|
@@ -31,6 +28,7 @@ def get_opts(): | |||||||||||||||||||||||||||
def get_flags(): | ||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||
return [ | ||||||||||||||||||||||||||||
("module_mobile_vr_enabled", False), | ||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why are we doing this? There is a problem here. The The code that registers the class is the following: godot/modules/mobile_vr/register_types.cpp Lines 35 to 41 in c432ce4
I can imagine three different situations and the possible solutions:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you missed the irc conversation, fales replied. <fales> neikeq seems like VR module uses GLES header <fales> which is of course not avail in server platform <fales> it uses LensDistortedShaderGLES3 which is defined "shaders/lens_distorted.glsl.gen.h" maybe we could guard the functions by defines. Not sure what the best solution is. There's also a comment from Mux213 about that shader and its todo state for GLES2 support. Not sure if anything changed There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That would be the third possibility I mentioned. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @neikeq yes to both. godot/modules/mobile_vr/mobile_vr_interface.cpp Lines 300 to 305 in 4226d56
In the meantime I'll see if we can have a dummy implementation of the interface. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I hope to finally have time for this on my trip to Europe next week. That said, for the server platform, why not change the detect.py so the module is not included on the server installation? VR is not really applicable on the server so.. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @BastiaanOlij we're already doing that right now, and that's the problem. The mobile_vr module exposes the class There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Yes, for people who uses the |
||||||||||||||||||||||||||||
] | ||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||
|
@@ -133,3 +131,4 @@ def configure(env): | |||||||||||||||||||||||||||
env.Append(CPPPATH=['#platform/server']) | ||||||||||||||||||||||||||||
env.Append(CPPFLAGS=['-DSERVER_ENABLED', '-DUNIX_ENABLED']) | ||||||||||||||||||||||||||||
env.Append(LIBS=['pthread']) | ||||||||||||||||||||||||||||
env.Append(LIBS=['dl']) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Waiting for
linuxbsd
platform to cleanup this mess :P