Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -369,7 +369,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 368 unmodified lines | ||
| 369 | 369 | _bookmarks = new Bookmarks(); // Before setting up the menu |
| 370 | 370 | |
| 371 | 371 | _runningScriptsWidget = new RunningScriptsWidget(_window); |
| 372 | − | |
| 372 | + | |
| 373 | + | |
| 374 | + _renderEngine->buildStandardTaskPipeline(); | |
| 375 | + _renderEngine->registerScene(_main3DScene); | |
| 376 | + | |
| 373 | 377 | // start the nodeThread so its event loop is running |
| 374 | 378 | QThread* nodeThread = new QThread(this); |
| 375 | 379 | nodeThread->setObjectName("Datagram Processor Thread"); |
| @@ -3145,6 +3149,22 @@ const ViewFrustum* Application::getDisplayViewFrustum() const { · 2769 unmodified lines | ||
| 3145 | 3149 | return &_displayViewFrustum; |
| 3146 | 3150 | } |
| 3147 | 3151 | |
| 3152 | +class MyFirstStuff { | |
| 3153 | +public: | |
| 3154 | + typedef render::Payload<MyFirstStuff> Payload; | |
| 3155 | + typedef std::shared_ptr<MyFirstStuff> Pointer; | |
| 3156 | + | |
| 3157 | +}; | |
| 3158 | + | |
| 3159 | +template <> const render::ItemKey render::payloadGetKey(const MyFirstStuff::Pointer& stuff) { return ItemKey::Builder::opaqueShape(); } | |
| 3160 | +template <> const render::Item::Bound render::payloadGetBound(const MyFirstStuff::Pointer& stuff) { return Item::Bound(); } | |
| 3161 | +template <> void render::payloadRender(const MyFirstStuff::Pointer& stuff, RenderArgs* args) { | |
| 3162 | + if (args) { | |
| 3163 | + args->_elementsTouched ++; | |
| 3164 | + } | |
| 3165 | +} | |
| 3166 | + | |
| 3167 | + | |
| 3148 | 3168 | void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs::RenderSide renderSide) { |
| 3149 | 3169 | activeRenderingThread = QThread::currentThread(); |
| 3150 | 3170 | PROFILE_RANGE(__FUNCTION__); |
| @@ -3362,6 +3382,23 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 211 unmodified lines | ||
| 3362 | 3382 | false, selfAvatarOnly); |
| 3363 | 3383 | } |
| 3364 | 3384 | |
| 3385 | + static render::ItemID myFirstRenderItem = 0; | |
| 3386 | + | |
| 3387 | + if (myFirstRenderItem == 0) { | |
| 3388 | + std::shared_ptr<MyFirstStuff::Payload> myFirstPayload(new MyFirstStuff::Payload(std::shared_ptr<MyFirstStuff>(new MyFirstStuff()))); | |
| 3389 | + myFirstRenderItem = _main3DScene->allocateID(); | |
| 3390 | + | |
| 3391 | + render::Scene::PendingChanges pendingChanges; | |
| 3392 | + pendingChanges.resetItem(myFirstRenderItem, myFirstPayload); | |
| 3393 | + | |
| 3394 | + _main3DScene->enqueuePendingChanges(pendingChanges); | |
| 3395 | + } | |
| 3396 | + | |
| 3397 | + _main3DScene->processPendingChangesQueue(); | |
| 3398 | + | |
| 3399 | + // Before the deferred pass, let's try to use the render engine | |
| 3400 | + _renderEngine->run(); | |
| 3401 | + | |
| 3365 | 3402 | { |
| 3366 | 3403 | DependencyManager::get<DeferredLightingEffect>()->setAmbientLightMode(getRenderAmbientLight()); |
| 3367 | 3404 | auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); |