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
2209 // shutdown render engine2209 // shutdown render engine
2210 _main3DScene = nullptr;2210 _main3DScene = nullptr;
2211 _renderEngine = nullptr;2211 _renderEngine = nullptr;
2212 _infinityEngine = nullptr;2212
2213 _gameWorkload.shutdown();
2213 2214
2214 DependencyManager::destroy<Preferences>();2215 DependencyManager::destroy<Preferences>();
2215 2216
@@ -2332,6 +2333,8 @@ void Application::initializeGL() { · 116 unmodified lines
2332 DependencyManager::get<GeometryCache>()->initializeShapePipelines();2333 DependencyManager::get<GeometryCache>()->initializeShapePipelines();
2333 });2334 });
2334 2335
2336 _gameWorkload.startup();
2337
2335 _offscreenContext = new OffscreenGLCanvas();2338 _offscreenContext = new OffscreenGLCanvas();
2336 _offscreenContext->setObjectName("MainThreadContext");2339 _offscreenContext->setObjectName("MainThreadContext");
2337 _offscreenContext->create(_glWidget->qglContext());2340 _offscreenContext->create(_glWidget->qglContext());
@@ -4099,7 +4102,7 @@ void Application::idle() { · 1761 unmodified lines
4099 }4102 }
4100 4103
4101 {4104 {
4102 _infinityEngine->run();4105 _gameWorkload._engine->run();
4103 }4106 }
4104 {4107 {
4105 PerformanceTimer perfTimer("update");4108 PerformanceTimer perfTimer("update");