mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-13 23:40:27 -06:00
Cleaning up window delegate
This commit is contained in:
@@ -420,11 +420,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(
|
||||
@@ -1378,10 +1373,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;
|
||||
}
|
||||
@@ -1401,6 +1393,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) {
|
||||
@@ -1547,15 +1541,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."
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user