mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06: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

8
tests/test_assetloader.cpp
View File

@@ -52,7 +52,7 @@ namespace {
TEST_CASE("AssetLoader: Assertion", "[assetloader]") {
openspace::Scene scene(std::make_unique<openspace::SingleThreadedSceneInitializer>());
ghoul::lua::LuaState* state = openspace::global::scriptEngine.luaState();
ghoul::lua::LuaState* state = openspace::global::scriptEngine->luaState();
openspace::SynchronizationWatcher syncWatcher;
openspace::AssetLoader assetLoader(
state,
@@ -66,7 +66,7 @@ TEST_CASE("AssetLoader: Assertion", "[assetloader]") {
TEST_CASE("AssetLoader: Basic Export Import", "[assetloader]") {
openspace::Scene scene(std::make_unique<openspace::SingleThreadedSceneInitializer>());
ghoul::lua::LuaState* state = openspace::global::scriptEngine.luaState();
ghoul::lua::LuaState* state = openspace::global::scriptEngine->luaState();
openspace::SynchronizationWatcher syncWatcher;
openspace::AssetLoader assetLoader(
state,
@@ -79,7 +79,7 @@ TEST_CASE("AssetLoader: Basic Export Import", "[assetloader]") {
TEST_CASE("AssetLoader: Asset Functions", "[assetloader]") {
openspace::Scene scene(std::make_unique<openspace::SingleThreadedSceneInitializer>());
ghoul::lua::LuaState* state = openspace::global::scriptEngine.luaState();
ghoul::lua::LuaState* state = openspace::global::scriptEngine->luaState();
openspace::SynchronizationWatcher syncWatcher;
openspace::AssetLoader assetLoader(
state,
@@ -92,7 +92,7 @@ TEST_CASE("AssetLoader: Asset Functions", "[assetloader]") {
TEST_CASE("AssetLoader: Asset Initialization", "[assetloader]") {
openspace::Scene scene(std::make_unique<openspace::SingleThreadedSceneInitializer>());
ghoul::lua::LuaState* state = openspace::global::scriptEngine.luaState();
ghoul::lua::LuaState* state = openspace::global::scriptEngine->luaState();
openspace::SynchronizationWatcher syncWatcher;
openspace::AssetLoader assetLoader(
state,