From f972e84d6cca5a512a658e079c045696d936343c Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 27 May 2015 12:40:26 -0700 Subject: [PATCH] Move avatar renedering to Scene --- interface/src/Application.cpp | 21 -------- interface/src/Application.h | 2 + interface/src/avatar/Avatar.cpp | 19 +++++++ interface/src/avatar/Avatar.h | 11 +++- interface/src/avatar/AvatarManager.cpp | 70 +++++++++++--------------- interface/src/avatar/AvatarManager.h | 2 - interface/src/avatar/MyAvatar.h | 8 +-- 7 files changed, 64 insertions(+), 69 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8733226bbc..878de9981d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3027,11 +3027,6 @@ void Application::updateShadowMap(RenderArgs* renderArgs) { glEnable(GL_POLYGON_OFFSET_FILL); glPolygonOffset(1.1f, 4.0f); // magic numbers courtesy http://www.eecs.berkeley.edu/~ravir/6160/papers/shadowmaps.ppt - { - PerformanceTimer perfTimer("avatarManager"); - DependencyManager::get()->renderAvatars(renderArgs); - } - { PerformanceTimer perfTimer("entities"); _entities.render(renderArgs); @@ -3404,15 +3399,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se } } - bool mirrorMode = (theCamera.getMode() == CAMERA_MODE_MIRROR); - - { - PerformanceTimer perfTimer("avatars"); - renderArgs->_renderMode = mirrorMode ? RenderArgs::MIRROR_RENDER_MODE : RenderArgs::NORMAL_RENDER_MODE; - DependencyManager::get()->renderAvatars(renderArgs, false, selfAvatarOnly); - renderArgs->_renderMode = RenderArgs::NORMAL_RENDER_MODE; - } - static render::ItemID myFirstRenderItem = 0; if (myFirstRenderItem == 0) { @@ -3443,13 +3429,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se PerformanceTimer perfTimer("lighting"); DependencyManager::get()->render(); } - - { - PerformanceTimer perfTimer("avatarsPostLighting"); - renderArgs->_renderMode = mirrorMode ? RenderArgs::MIRROR_RENDER_MODE : RenderArgs::NORMAL_RENDER_MODE; - DependencyManager::get()->renderAvatars(renderArgs, true, selfAvatarOnly); - renderArgs->_renderMode = RenderArgs::NORMAL_RENDER_MODE; - } //Render the sixense lasers if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) { diff --git a/interface/src/Application.h b/interface/src/Application.h index 79a75eef43..457f9dec69 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -349,6 +349,8 @@ public: void setMaxOctreePacketsPerSecond(int maxOctreePPS); int getMaxOctreePacketsPerSecond(); + render::ScenePointer getMain3DScene() const { return _main3DScene; } + signals: /// Fired when we're simulating; allows external parties to hook in. diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 4d950d4386..326909c2ce 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -60,6 +60,21 @@ const float DISPLAYNAME_FADE_FACTOR = pow(0.01f, 1.0f / DISPLAYNAME_FADE_TIME); const float DISPLAYNAME_ALPHA = 0.95f; const float DISPLAYNAME_BACKGROUND_ALPHA = 0.4f; +namespace render { + template <> const ItemKey payloadGetKey(const AvatarSharedPointer& avatar) { + return ItemKey::Builder::opaqueShape(); + } + template <> const Item::Bound payloadGetBound(const AvatarSharedPointer& avatar) { + return static_cast(avatar.get())->getBounds(); + } + template <> void payloadRender(const AvatarSharedPointer& avatar, RenderArgs* args) { + if (static_cast(avatar.get())->isInitialized() && args) { + static_cast(avatar.get())->render(args, Application::getInstance()->getCamera()->getPosition()); + args->_elementsTouched++; + } + } +} + Avatar::Avatar() : AvatarData(), _skeletonModel(this), @@ -116,6 +131,10 @@ glm::quat Avatar::getWorldAlignedOrientation () const { return computeRotationFromBodyToWorldUp() * getOrientation(); } +AABox Avatar::getBounds() const { + return AABox(); +} + float Avatar::getLODDistance() const { return DependencyManager::get()->getAvatarLODDistanceMultiplier() * glm::distance(qApp->getCamera()->getPosition(), _position) / _scale; diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index b912a159af..895150bddc 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -20,6 +20,8 @@ #include #include +#include + #include "Hand.h" #include "Head.h" #include "InterfaceConfig.h" @@ -66,6 +68,10 @@ public: Avatar(); ~Avatar(); + typedef render::Payload Payload; + typedef std::shared_ptr PayloadPointer; + typedef Payload::DataPointer Pointer; + void init(); void simulate(float deltaTime); @@ -87,6 +93,8 @@ public: Hand* getHand() { return static_cast(_handData); } glm::quat getWorldAlignedOrientation() const; + AABox getBounds() const; + /// Returns the distance to use as a LOD parameter. float getLODDistance() const; @@ -220,9 +228,10 @@ protected: virtual void renderAttachments(RenderArgs* args); virtual void updateJointMappings(); + + render::ItemID _renderItemID; private: - bool _initialized; NetworkTexturePointer _billboardTexture; bool _shouldRenderBillboard; diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index b9d5043834..a4b437c009 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -55,12 +55,22 @@ AvatarManager::AvatarManager(QObject* parent) : _avatarFades() { // register a meta type for the weak pointer we'll use for the owning avatar mixer for each avatar qRegisterMetaType >("NodeWeakPointer"); - _myAvatar = QSharedPointer(new MyAvatar()); + _myAvatar = std::shared_ptr(new MyAvatar()); } void AvatarManager::init() { _myAvatar->init(); _avatarHash.insert(MY_AVATAR_KEY, _myAvatar); + + render::ScenePointer scene = Application::getInstance()->getMain3DScene(); + auto avatarPayload = new render::Payload(_myAvatar); + auto avatarPayloadPointer = Avatar::PayloadPointer(avatarPayload); + static_cast(_myAvatar.get())->_renderItemID = scene->allocateID(); + + render::Scene::PendingChanges pendingChanges; + pendingChanges.resetItem(static_cast(_myAvatar.get())->_renderItemID, avatarPayloadPointer); + + scene->enqueuePendingChanges(pendingChanges); } void AvatarManager::updateMyAvatar(float deltaTime) { @@ -92,9 +102,9 @@ void AvatarManager::updateOtherAvatars(float deltaTime) { // simulate avatars AvatarHash::iterator avatarIterator = _avatarHash.begin(); while (avatarIterator != _avatarHash.end()) { - Avatar* avatar = reinterpret_cast(avatarIterator.value().data()); + Avatar* avatar = reinterpret_cast(avatarIterator.value().get()); - if (avatar == _myAvatar || !avatar->isInitialized()) { + if (avatar == _myAvatar.get() || !avatar->isInitialized()) { // DO NOT update _myAvatar! Its update has already been done earlier in the main loop. // DO NOT update or fade out uninitialized Avatars ++avatarIterator; @@ -111,32 +121,6 @@ void AvatarManager::updateOtherAvatars(float deltaTime) { simulateAvatarFades(deltaTime); } -void AvatarManager::renderAvatars(RenderArgs* renderArgs, bool postLighting, bool selfAvatarOnly) { - PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), - "Application::renderAvatars()"); - bool renderLookAtVectors = Menu::getInstance()->isOptionChecked(MenuOption::RenderLookAtVectors); - - glm::vec3 cameraPosition = Application::getInstance()->getCamera()->getPosition(); - - if (!selfAvatarOnly) { - if (DependencyManager::get()->shouldRenderAvatars()) { - foreach (const AvatarSharedPointer& avatarPointer, _avatarHash) { - Avatar* avatar = static_cast(avatarPointer.data()); - if (!avatar->isInitialized()) { - continue; - } - avatar->render(renderArgs, cameraPosition, postLighting); - avatar->setDisplayingLookatVectors(renderLookAtVectors); - } - renderAvatarFades(renderArgs, cameraPosition); - } - } else { - // just render myAvatar - _myAvatar->render(renderArgs, cameraPosition, postLighting); - _myAvatar->setDisplayingLookatVectors(renderLookAtVectors); - } -} - void AvatarManager::simulateAvatarFades(float deltaTime) { QVector::iterator fadingIterator = _avatarFades.begin(); @@ -155,18 +139,6 @@ void AvatarManager::simulateAvatarFades(float deltaTime) { } } -void AvatarManager::renderAvatarFades(RenderArgs* renderArgs, const glm::vec3& cameraPosition) { - // render avatar fades - Glower glower(renderArgs, renderArgs->_renderMode == RenderArgs::NORMAL_RENDER_MODE ? 1.0f : 0.0f); - - foreach(const AvatarSharedPointer& fadingAvatar, _avatarFades) { - avatar->render(renderArgs, cameraPosition); - Avatar* avatar = static_cast(fadingAvatar.get()); - if (avatar != static_cast(_myAvatar.get()) && avatar->isInitialized()) { - } - } -} - AvatarSharedPointer AvatarManager::newSharedAvatar() { return AvatarSharedPointer(new Avatar()); } @@ -174,6 +146,17 @@ AvatarSharedPointer AvatarManager::newSharedAvatar() { // virtual AvatarSharedPointer AvatarManager::addAvatar(const QUuid& sessionUUID, const QWeakPointer& mixerWeakPointer) { AvatarSharedPointer avatar = AvatarHashMap::addAvatar(sessionUUID, mixerWeakPointer); + + render::ScenePointer scene = Application::getInstance()->getMain3DScene(); + auto avatarPayload = new render::Payload(avatar); + auto avatarPayloadPointer = Avatar::PayloadPointer(avatarPayload); + static_cast(avatar.get())->_renderItemID = scene->allocateID(); + + render::Scene::PendingChanges pendingChanges; + pendingChanges.resetItem(static_cast(avatar.get())->_renderItemID, avatarPayloadPointer); + + scene->enqueuePendingChanges(pendingChanges); + return avatar; } @@ -201,6 +184,11 @@ void AvatarManager::removeAvatar(const QUuid& sessionUUID) { _avatarFades.push_back(avatarIterator.value()); _avatarHash.erase(avatarIterator); } + + render::ScenePointer scene = Application::getInstance()->getMain3DScene(); + render::Scene::PendingChanges pendingChanges; + pendingChanges.removeItem(avatar->_renderItemID); + scene->enqueuePendingChanges(pendingChanges); } } diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h index 15b69426c2..b4482c5a34 100644 --- a/interface/src/avatar/AvatarManager.h +++ b/interface/src/avatar/AvatarManager.h @@ -39,7 +39,6 @@ public: void updateMyAvatar(float deltaTime); void updateOtherAvatars(float deltaTime); - void renderAvatars(RenderArgs* renderArgs, bool postLighting = false, bool selfAvatarOnly = false); void clearOtherAvatars(); @@ -70,7 +69,6 @@ private: AvatarManager(const AvatarManager& other); void simulateAvatarFades(float deltaTime); - void renderAvatarFades(RenderArgs* renderArgs, const glm::vec3& cameraPosition); // virtual overrides virtual AvatarSharedPointer newSharedAvatar(); diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index eaaf595030..4a4763131a 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -37,10 +37,10 @@ public: void simulate(float deltaTime); void updateFromTrackers(float deltaTime); - void render(RenderArgs* renderArgs, const glm::vec3& cameraPosition, bool postLighting = false); - void renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, bool postLighting, float glowLevel = 0.0f); - bool shouldRenderHead(const RenderArgs* renderArgs, const glm::vec3& cameraPosition) const override; - void renderDebugBodyPoints(); + virtual void render(RenderArgs* renderArgs, const glm::vec3& cameraPosition, bool postLighting = false); + virtual void renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, bool postLighting, float glowLevel = 0.0f); + virtual bool shouldRenderHead(const RenderArgs* renderArgs, const glm::vec3& cameraPosition) const override; + virtual void renderDebugBodyPoints(); // setters void setLeanScale(float scale) { _leanScale = scale; }