Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 10:49:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

try to cull wearables with avatars

Browse source
This commit is contained in:
SamGondelman 2019-02-17 02:10:25 -08:00
parent e77cdfc0d2
commit 935d827421
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -75,10 +75,22 @@ namespace render {
} }
template <> uint32_t metaFetchMetaSubItems(const AvatarSharedPointer& avatar, ItemIDs& subItems) { template <> uint32_t metaFetchMetaSubItems(const AvatarSharedPointer& avatar, ItemIDs& subItems) {
auto avatarPtr = static_pointer_cast<Avatar>(avatar); auto avatarPtr = static_pointer_cast<Avatar>(avatar);
if (avatarPtr->getSkeletonModel()) { if (avatarPtr) {
auto& metaSubItems = avatarPtr->getSkeletonModel()->fetchRenderItemIDs(); uint32_t total = 0;
subItems.insert(subItems.end(), metaSubItems.begin(), metaSubItems.end()); if (avatarPtr->getSkeletonModel()) {
return (uint32_t) metaSubItems.size(); auto& metaSubItems = avatarPtr->getSkeletonModel()->fetchRenderItemIDs();
subItems.insert(subItems.end(), metaSubItems.begin(), metaSubItems.end());
total += (uint32_t)metaSubItems.size();
}
auto& attachmentModels = avatarPtr->getAttachmentModels();
for (auto& attachmentModel : attachmentModels) {
if (attachmentModel && attachmentModel->isRenderable()) {
auto& metaSubItems = attachmentModel->fetchRenderItemIDs();
subItems.insert(subItems.end(), metaSubItems.begin(), metaSubItems.end());
total += (uint32_t)metaSubItems.size();
}
}
return total;
} }
return 0; return 0;
} }
@ -629,7 +641,7 @@ void Avatar::addToScene(AvatarSharedPointer self, const render::ScenePointer& sc
for (auto& attachmentModel : _attachmentModels) { for (auto& attachmentModel : _attachmentModels) {
attachmentModel->addToScene(scene, transaction); attachmentModel->addToScene(scene, transaction);
attachmentModel->setTagMask(render::hifi::TAG_ALL_VIEWS); attachmentModel->setTagMask(render::hifi::TAG_ALL_VIEWS);
attachmentModel->setGroupCulled(false); attachmentModel->setGroupCulled(true);
attachmentModel->setCanCastShadow(true); attachmentModel->setCanCastShadow(true);
attachmentModel->setVisibleInScene(_isMeshVisible, scene); attachmentModel->setVisibleInScene(_isMeshVisible, scene);
} }
@ -861,7 +873,7 @@ void Avatar::fixupModelsInScene(const render::ScenePointer& scene) {
attachmentModel->addToScene(scene, transaction); attachmentModel->addToScene(scene, transaction);
attachmentModel->setTagMask(render::hifi::TAG_ALL_VIEWS); attachmentModel->setTagMask(render::hifi::TAG_ALL_VIEWS);
attachmentModel->setGroupCulled(false); attachmentModel->setGroupCulled(true);
attachmentModel->setCanCastShadow(true); attachmentModel->setCanCastShadow(true);
attachmentModel->setVisibleInScene(_isMeshVisible, scene); attachmentModel->setVisibleInScene(_isMeshVisible, scene);
} }

1
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -149,6 +149,7 @@ public:
void removeAvatarEntitiesFromTree(); void removeAvatarEntitiesFromTree();
virtual void simulate(float deltaTime, bool inView) = 0; virtual void simulate(float deltaTime, bool inView) = 0;
virtual void simulateAttachments(float deltaTime); virtual void simulateAttachments(float deltaTime);
const std::vector<std::shared_ptr<Model>>& getAttachmentModels() const { return _attachmentModels; }
virtual void render(RenderArgs* renderArgs); virtual void render(RenderArgs* renderArgs);