mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/globals handling (#1352)

Browse Source 
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
This commit is contained in:
Alexander Bock
2020-10-21 22:30:05 +02:00
committed by GitHub
parent 1525a0490d
commit efffc25ce0
164 changed files with 1484 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/server/src/topics/flightcontrollertopic.cpp
+17 -17
View File
@@ -159,20 +159,20 @@ namespace openspace {
FlightControllerTopic::FlightControllerTopic() {
for (auto it = AxisIndexMap.begin(); it != AxisIndexMap.end(); ++it) {
global::navigationHandler.setWebsocketAxisMapping(
global::navigationHandler->setWebsocketAxisMapping(
int(std::distance(AxisIndexMap.begin(), it)),
it->second
);
}
// Add WebsocketInputState to global states
global::websocketInputStates[_topicId] = &_inputState;
(*global::websocketInputStates)[_topicId] = &_inputState;
}
FlightControllerTopic::~FlightControllerTopic() {
// Reset global websocketInputStates
global::websocketInputStates.erase(_topicId);
global::websocketInputStates = interaction::WebsocketInputStates();
global::websocketInputStates->erase(_topicId);
*global::websocketInputStates = interaction::WebsocketInputStates();
}
bool FlightControllerTopic::isDone() const {
@@ -234,7 +234,7 @@ void FlightControllerTopic::connect() {
void FlightControllerTopic::setFocusNodes() {
// Get all scene nodes
std::vector<SceneGraphNode*> nodes =
global::renderEngine.scene()->allSceneGraphNodes();
global::renderEngine->scene()->allSceneGraphNodes();
// Remove all nodes with no renderable
nodes.erase(
@@ -271,7 +271,7 @@ void FlightControllerTopic::setFocusNodes() {
void FlightControllerTopic::setInterestingTimes() {
std::vector<Scene::InterestingTime> times =
global::renderEngine.scene()->interestingTimes();
global::renderEngine->scene()->interestingTimes();
std::sort(
times.begin(),
@@ -323,30 +323,30 @@ void FlightControllerTopic::changeFocus(const nlohmann::json& json) const {
const bool retargetAnchor = json[RetargetAnchorKey];
const bool retargetAim = json[RetargetAimKey];
Scene* scene = global::renderEngine.scene();
Scene* scene = global::renderEngine->scene();
const SceneGraphNode* focusNode = scene->sceneGraphNode(focus);
const SceneGraphNode* aimNode = scene->sceneGraphNode(aim);
const SceneGraphNode* anchorNode = scene->sceneGraphNode(anchor);
if (focusNode) {
global::navigationHandler.orbitalNavigator().setFocusNode(
global::navigationHandler->orbitalNavigator().setFocusNode(
focusNode,
resetVelocities
);
}
else {
if (aimNode) {
global::navigationHandler.orbitalNavigator().setAimNode(aim);
global::navigationHandler->orbitalNavigator().setAimNode(aim);
}
if (anchorNode) {
global::navigationHandler.orbitalNavigator().setAnchorNode(anchor);
global::navigationHandler->orbitalNavigator().setAnchorNode(anchor);
}
}
if (retargetAnchor) {
global::navigationHandler.orbitalNavigator().startRetargetAnchor();
global::navigationHandler->orbitalNavigator().startRetargetAnchor();
}
if (retargetAim) {
global::navigationHandler.orbitalNavigator().startRetargetAim();
global::navigationHandler->orbitalNavigator().startRetargetAim();
}
}
@@ -362,7 +362,7 @@ void FlightControllerTopic::setRenderableEnabled(const nlohmann::json& json) con
const std::string name = json[RenderableKey][SceneNodeName];
const bool enabled = json[RenderableKey][SceneNodeEnabled];
const SceneGraphNode* node = global::renderEngine.scene()->sceneGraphNode(name);
const SceneGraphNode* node = global::renderEngine->scene()->sceneGraphNode(name);
if (node && node->renderable() != nullptr) {
node->renderable()->property(RenderableEnabled)->set(enabled);
}
@@ -370,8 +370,8 @@ void FlightControllerTopic::setRenderableEnabled(const nlohmann::json& json) con
void FlightControllerTopic::disconnect() {
// Reset global websocketInputStates
global::websocketInputStates.erase(_topicId);
global::websocketInputStates = interaction::WebsocketInputStates();
global::websocketInputStates->erase(_topicId);
*global::websocketInputStates = interaction::WebsocketInputStates();
// Update FlightController
nlohmann::json j;
@@ -388,7 +388,7 @@ void FlightControllerTopic::setFriction(bool all) const {
void FlightControllerTopic::setFriction(bool roll, bool rotation, bool zoom) const {
const interaction::OrbitalNavigator& navigator =
global::navigationHandler.orbitalNavigator();
global::navigationHandler->orbitalNavigator();
navigator.property(RollFriction)->set(roll);
navigator.property(RotationalFriction)->set(rotation);
@@ -476,7 +476,7 @@ void FlightControllerTopic::processInputState(const nlohmann::json& json) {
void FlightControllerTopic::processLua(const nlohmann::json &json) {
const std::string script = json[LuaScript];
global::scriptEngine.queueScript(
global::scriptEngine->queueScript(
script,
openspace::scripting::ScriptEngine::RemoteScripting::Yes
);