Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 10:26:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Define ViewFrustums type alias

Browse source
This commit is contained in:
Clement 2018-04-23 15:57:21 -07:00
parent 1b2b70b769
commit 538f24162f
7 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/avatars/AvatarMixerClientData.h
View file

@ -110,7 +110,7 @@ public:
bool getRequestsDomainListData() { return _requestsDomainListData; }
void setRequestsDomainListData(bool requesting) { _requestsDomainListData = requesting; }
const std::vector<ViewFrustum>& getViewFrustums() const { return _currentViewFrustums; }
const ViewFrustums& getViewFrustums() const { return _currentViewFrustums; }
uint64_t getLastOtherAvatarEncodeTime(QUuid otherAvatar) const;
void setLastOtherAvatarEncodeTime(const QUuid& otherAvatar, uint64_t time);
@ -150,7 +150,7 @@ private:
SimpleMovingAverage _avgOtherAvatarDataRate;
std::unordered_set<QUuid> _radiusIgnoredOthers;
std::vector<ViewFrustum> _currentViewFrustums;
ViewFrustums _currentViewFrustums;
int _recentOtherAvatarsInView { 0 };
int _recentOtherAvatarsOutOfView { 0 };

2
interface/src/avatar/AvatarManager.cpp
View file

@ -156,7 +156,7 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
};
std::vector<ViewFrustum> views;
ViewFrustums views;
ViewFrustum view;
qApp->copyCurrentViewFrustum(view);

4
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -296,7 +296,7 @@ void EntityTreeRenderer::addPendingEntities(const render::ScenePointer& scene, r
}
}
void EntityTreeRenderer::updateChangedEntities(const render::ScenePointer& scene, const std::vector<ViewFrustum>& views,
void EntityTreeRenderer::updateChangedEntities(const render::ScenePointer& scene, const ViewFrustums& views,
render::Transaction& transaction) {
PROFILE_RANGE_EX(simulation_physics, "ChangeInScene", 0xffff00ff, (uint64_t)_changedEntities.size());
PerformanceTimer pt("change");
@ -417,7 +417,7 @@ void EntityTreeRenderer::update(bool simulate) {
render::Transaction transaction;
addPendingEntities(scene, transaction);
std::vector<ViewFrustum> views;
ViewFrustums views;
ViewFrustum view;
_viewState->copyViewFrustum(view);

2
libraries/entities-renderer/src/EntityTreeRenderer.h
View file

@ -148,7 +148,7 @@ protected:
private:
void addPendingEntities(const render::ScenePointer& scene, render::Transaction& transaction);
void updateChangedEntities(const render::ScenePointer& scene, const std::vector<ViewFrustum>& views,
void updateChangedEntities(const render::ScenePointer& scene, const ViewFrustums& views,
render::Transaction& transaction);
EntityRendererPointer renderableForEntity(const EntityItemPointer& entity) const { return renderableForEntityId(entity->getID()); }
render::ItemID renderableIdForEntity(const EntityItemPointer& entity) const { return renderableIdForEntityId(entity->getID()); }

2
libraries/entities/src/DiffTraversal.h
View file

@ -36,7 +36,7 @@ public:
bool isVerySimilar(const View& view) const;
ViewFrustum::intersection calculateIntersection(const AACube& cube) const;
std::vector<ViewFrustum> viewFrustums;
ViewFrustums viewFrustums;
uint64_t startTime { 0 };
float lodScaleFactor { 1.0f };
};

10
libraries/shared/src/PrioritySortUtil.h
View file

@ -83,15 +83,13 @@ namespace PrioritySortUtil {
template <typename T>
class PriorityQueue {
public:
using Views = std::vector<ViewFrustum>;
PriorityQueue() = delete;
PriorityQueue(const Views& views) : _views(views) { }
PriorityQueue(const Views& views, float angularWeight, float centerWeight, float ageWeight)
PriorityQueue(const ViewFrustums& views) : _views(views) { }
PriorityQueue(const ViewFrustums& views, float angularWeight, float centerWeight, float ageWeight)
: _views(views), _angularWeight(angularWeight), _centerWeight(centerWeight), _ageWeight(ageWeight)
{ }
void setViews(const Views& views) { _views = views; }
void setViews(const ViewFrustums& views) { _views = views; }
void setWeights(float angularWeight, float centerWeight, float ageWeight) {
_angularWeight = angularWeight;
@ -154,7 +152,7 @@ namespace PrioritySortUtil {
return priority;
}
Views _views;
ViewFrustums _views;
std::priority_queue<T> _queue;
float _angularWeight { DEFAULT_ANGULAR_COEF };
float _centerWeight { DEFAULT_CENTER_COEF };

1
libraries/shared/src/ViewFrustum.h
View file

@ -189,5 +189,6 @@ private:
};
using ViewFrustumPointer = std::shared_ptr<ViewFrustum>;
using ViewFrustums = std::vector<ViewFrustum>;
#endif // hifi_ViewFrustum_h