mirror of
https://github.com/overte-org/overte.git
synced 2025-04-21 06:44:06 +02:00
move view frustum calculation into VoxelAgentData, added last known and current
This commit is contained in:
parent
fa37b88fa8
commit
2ff8da2b46
2 changed files with 14 additions and 11 deletions
|
@ -53,21 +53,21 @@ VoxelAgentData* VoxelAgentData::clone() const {
|
|||
|
||||
void VoxelAgentData::updateViewFrustum() {
|
||||
// save our currentViewFrustum into our lastKnownViewFrustum
|
||||
lastKnownViewFrustum = currentViewFrustum;
|
||||
_lastKnownViewFrustum = _currentViewFrustum;
|
||||
|
||||
// get position and orientation details from the camera
|
||||
currentViewFrustum.setPosition(getCameraPosition());
|
||||
currentViewFrustum.setOrientation(getCameraDirection(), getCameraUp(), getCameraRight());
|
||||
_currentViewFrustum.setPosition(getCameraPosition());
|
||||
_currentViewFrustum.setOrientation(getCameraDirection(), getCameraUp(), getCameraRight());
|
||||
|
||||
// Also make sure it's got the correct lens details from the camera
|
||||
currentViewFrustum.setFieldOfView(getCameraFov());
|
||||
currentViewFrustum.setAspectRatio(getCameraAspectRatio());
|
||||
currentViewFrustum.setNearClip(getCameraNearClip());
|
||||
currentViewFrustum.setFarClip(getCameraFarClip());
|
||||
_currentViewFrustum.setFieldOfView(getCameraFov());
|
||||
_currentViewFrustum.setAspectRatio(getCameraAspectRatio());
|
||||
_currentViewFrustum.setNearClip(getCameraNearClip());
|
||||
_currentViewFrustum.setFarClip(getCameraFarClip());
|
||||
|
||||
// if there has been a change, then recalculate
|
||||
if (!lastKnownViewFrustum.matches(currentViewFrustum)) {
|
||||
currentViewFrustum.calculate();
|
||||
if (!_lastKnownViewFrustum.matches(_currentViewFrustum)) {
|
||||
_currentViewFrustum.calculate();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -41,8 +41,8 @@ public:
|
|||
|
||||
VoxelNodeBag nodeBag;
|
||||
|
||||
ViewFrustum currentViewFrustum;
|
||||
ViewFrustum lastKnownViewFrustum;
|
||||
ViewFrustum& getCurrentViewFrustum() { return _currentViewFrustum; };
|
||||
ViewFrustum& getLastKnownViewFrustum() { return _lastKnownViewFrustum; };
|
||||
|
||||
void updateViewFrustum();
|
||||
|
||||
|
@ -53,6 +53,9 @@ private:
|
|||
bool _voxelPacketWaiting;
|
||||
int _maxSearchLevel;
|
||||
int _maxLevelReachedInLastSearch;
|
||||
ViewFrustum _currentViewFrustum;
|
||||
ViewFrustum _lastKnownViewFrustum;
|
||||
|
||||
};
|
||||
|
||||
#endif /* defined(__hifi__VoxelAgentData__) */
|
||||
|
|
Loading…
Reference in a new issue