Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more correct bounding sphere around avatar for SafeLanding query

Browse source
This commit is contained in:
Andrew Meadows 2019-07-01 15:53:42 -07:00
parent 0d8fdf51c5
commit 4bbfd7cad1
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -6937,8 +6937,9 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType) {
bool interstitialModeEnabled = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled(); bool interstitialModeEnabled = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
ConicalViewFrustum sphericalView; ConicalViewFrustum sphericalView;
sphericalView.set(_viewFrustum); AABox box = getMyAvatar()->getGlobalBoundingBox();
sphericalView.setSimpleRadius(INITIAL_QUERY_RADIUS); float radius = glm::max(INITIAL_QUERY_RADIUS, 0.5f * glm::length(box.getDimensions()));
sphericalView.setPositionAndSimpleRadius(box.calcCenter(), radius);
if (interstitialModeEnabled) { if (interstitialModeEnabled) {
ConicalViewFrustum farView; ConicalViewFrustum farView;

3
libraries/shared/src/shared/ConicalViewFrustum.cpp
View file

@ -145,7 +145,8 @@ int ConicalViewFrustum::deserialize(const unsigned char* sourceBuffer) {
return sourceBuffer - startPosition; return sourceBuffer - startPosition;
} }
void ConicalViewFrustum::setSimpleRadius(float radius) { void ConicalViewFrustum::setPositionAndSimpleRadius(const glm::vec3& position, float radius) {
_position = position;
_radius = radius; _radius = radius;
_farClip = radius / 2.0f; _farClip = radius / 2.0f;
} }

2
libraries/shared/src/shared/ConicalViewFrustum.h
View file

@ -55,7 +55,7 @@ public:
int deserialize(const unsigned char* sourceBuffer); int deserialize(const unsigned char* sourceBuffer);
// Just test for within radius. // Just test for within radius.
void setSimpleRadius(float radius); void setPositionAndSimpleRadius(const glm::vec3& position, float radius);
private: private:
glm::vec3 _position { 0.0f, 0.0f, 0.0f }; glm::vec3 _position { 0.0f, 0.0f, 0.0f };