mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-22 20:21:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/profiles

Browse Source
This commit is contained in:
GPayne
2020-05-14 19:31:19 -06:00
parent dfb61097b2 7c24a96b9e
commit 0f06f9d233
146 changed files with 2966 additions and 2511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/engine/openspaceengine.cpp
View File

@@ -403,11 +403,6 @@ void OpenSpaceEngine::initializeGL() {
rendering::helper::initialize();
// clear the screen so the user doesn't have to see old buffer contents left on the
// graphics card
LDEBUG("Clearing all Windows");
global::windowDelegate.clearAllWindows(glm::vec4(0.f, 0.f, 0.f, 1.f));
LDEBUG("Adding system components");
// Detect and log OpenCL and OpenGL versions and available devices
SysCap.addComponent(
@@ -656,9 +651,9 @@ void OpenSpaceEngine::initializeGL() {
global::moduleEngine.initializeGL();
for (const std::function<void()>& func : global::callback::initializeGL) {
ZoneScopedN("[Module] initializeGL")
func();
}
@@ -1392,10 +1387,7 @@ void OpenSpaceEngine::mouseButtonCallback(MouseButton button,
// Check if the user clicked on one of the 'buttons' the RenderEngine is drawing
if (action == MouseAction::Press) {
bool isConsumed = global::renderEngine.mouseActivationCallback(
global::windowDelegate.mousePosition()
);
bool isConsumed = global::renderEngine.mouseActivationCallback(_mousePosition);
if (isConsumed) {
return;
}
@@ -1415,6 +1407,8 @@ void OpenSpaceEngine::mousePositionCallback(double x, double y) {
global::navigationHandler.mousePositionCallback(x, y);
global::interactionMonitor.markInteraction();
_mousePosition = glm::vec2(static_cast<float>(x), static_cast<float>(y));
}
void OpenSpaceEngine::mouseScrollWheelCallback(double posX, double posY) {
@@ -1466,14 +1460,14 @@ void OpenSpaceEngine::touchExitCallback(TouchInput input) {
}
std::vector<char> OpenSpaceEngine::encode() {
std::vector<std::byte> OpenSpaceEngine::encode() {
ZoneScoped
std::vector<char> buffer = global::syncEngine.encodeSyncables();
std::vector<std::byte> buffer = global::syncEngine.encodeSyncables();
return buffer;
}
void OpenSpaceEngine::decode(std::vector<char> data) {
void OpenSpaceEngine::decode(std::vector<std::byte> data) {
ZoneScoped
global::syncEngine.decodeSyncables(std::move(data));
@@ -1561,15 +1555,6 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
"Returns whether the current OpenSpace instance is the master node of a "
"cluster configuration. If this instance is not part of a cluster, this "
"function also returns 'true'."
},
{
"clusterId",
&luascriptfunctions::clusterId,
{},
"",
"Returns the zero-based identifier for this OpenSpace instance in a "
"cluster configuration. If this instance is not part of a cluster, this "
"identifier is always 0."
}
},
{