History

Working on adding rendering from the workload

samcake committed 8 years ago

Commit 9441bb41 parent 6d347cf4 files · +82 −4Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+5−2
@@ -2209,7 +2209,8 @@ Application::~Application() { · 2208 unmodified lines
22092209 // shutdown render engine
22102210 _main3DScene = nullptr;
22112211 _renderEngine = nullptr;
2212− _infinityEngine = nullptr;
2212+
2213+ _gameWorkload.shutdown();
22132214
22142215 DependencyManager::destroy<Preferences>();
22152216
@@ -2332,6 +2333,8 @@ void Application::initializeGL() { · 116 unmodified lines
23322333 DependencyManager::get<GeometryCache>()->initializeShapePipelines();
23332334 });
23342335
2336+ _gameWorkload.startup();
2337+
23352338 _offscreenContext = new OffscreenGLCanvas();
23362339 _offscreenContext->setObjectName("MainThreadContext");
23372340 _offscreenContext->create(_glWidget->qglContext());
@@ -4099,7 +4102,7 @@ void Application::idle() { · 1761 unmodified lines
40994102 }
41004103
41014104 {
4102− _infinityEngine->run();
4105+ _gameWorkload._engine->run();
41034106 }
41044107 {
41054108 PerformanceTimer perfTimer("update");