mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 18:38:20 -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
src/network/parallelpeer_lua.inl
+8 -8
View File
@@ -27,8 +27,8 @@ namespace openspace::luascriptfunctions {
int connect(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::connect");
if (global::windowDelegate.isMaster()) {
global::parallelPeer.connect();
if (global::windowDelegate->isMaster()) {
global::parallelPeer->connect();
}
ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
@@ -38,8 +38,8 @@ int connect(lua_State* L) {
int disconnect(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::disconnect");
if (global::windowDelegate.isMaster()) {
global::parallelPeer.connect();
if (global::windowDelegate->isMaster()) {
global::parallelPeer->connect();
}
ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
@@ -49,8 +49,8 @@ int disconnect(lua_State* L) {
int requestHostship(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::requestHostship");
if (global::windowDelegate.isMaster()) {
global::parallelPeer.requestHostship();
if (global::windowDelegate->isMaster()) {
global::parallelPeer->requestHostship();
}
ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
@@ -60,8 +60,8 @@ int requestHostship(lua_State* L) {
int resignHostship(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::resignHostship");
if (global::windowDelegate.isMaster()) {
global::parallelPeer.resignHostship();
if (global::windowDelegate->isMaster()) {
global::parallelPeer->resignHostship();
}
ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");