Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 17:18:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move view frustum calculation into VoxelAgentData, added last known and current

Browse source
This commit is contained in:
ZappoMan 2013-05-14 09:03:38 -07:00
parent fa37b88fa8
commit 2ff8da2b46
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
voxel-server/src/VoxelAgentData.cpp
View file

@ -53,21 +53,21 @@ VoxelAgentData* VoxelAgentData::clone() const {
void VoxelAgentData::updateViewFrustum() { void VoxelAgentData::updateViewFrustum() {
// save our currentViewFrustum into our lastKnownViewFrustum // save our currentViewFrustum into our lastKnownViewFrustum
lastKnownViewFrustum = currentViewFrustum; _lastKnownViewFrustum = _currentViewFrustum;
// get position and orientation details from the camera // get position and orientation details from the camera
currentViewFrustum.setPosition(getCameraPosition()); _currentViewFrustum.setPosition(getCameraPosition());
currentViewFrustum.setOrientation(getCameraDirection(), getCameraUp(), getCameraRight()); _currentViewFrustum.setOrientation(getCameraDirection(), getCameraUp(), getCameraRight());
// Also make sure it's got the correct lens details from the camera // Also make sure it's got the correct lens details from the camera
currentViewFrustum.setFieldOfView(getCameraFov()); _currentViewFrustum.setFieldOfView(getCameraFov());
currentViewFrustum.setAspectRatio(getCameraAspectRatio()); _currentViewFrustum.setAspectRatio(getCameraAspectRatio());
currentViewFrustum.setNearClip(getCameraNearClip()); _currentViewFrustum.setNearClip(getCameraNearClip());
currentViewFrustum.setFarClip(getCameraFarClip()); _currentViewFrustum.setFarClip(getCameraFarClip());
// if there has been a change, then recalculate // if there has been a change, then recalculate
if (!lastKnownViewFrustum.matches(currentViewFrustum)) { if (!_lastKnownViewFrustum.matches(_currentViewFrustum)) {
currentViewFrustum.calculate(); _currentViewFrustum.calculate();
} }
} }

7
voxel-server/src/VoxelAgentData.h
View file

@ -41,8 +41,8 @@ public:
VoxelNodeBag nodeBag; VoxelNodeBag nodeBag;
ViewFrustum currentViewFrustum; ViewFrustum& getCurrentViewFrustum() { return _currentViewFrustum; };
ViewFrustum lastKnownViewFrustum; ViewFrustum& getLastKnownViewFrustum() { return _lastKnownViewFrustum; };
void updateViewFrustum(); void updateViewFrustum();
@ -53,6 +53,9 @@ private:
bool _voxelPacketWaiting; bool _voxelPacketWaiting;
int _maxSearchLevel; int _maxSearchLevel;
int _maxLevelReachedInLastSearch; int _maxLevelReachedInLastSearch;
ViewFrustum _currentViewFrustum;
ViewFrustum _lastKnownViewFrustum;
}; };
#endif /* defined(__hifi__VoxelAgentData__) */ #endif /* defined(__hifi__VoxelAgentData__) */