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

Merge branch 'workload' of https://github.com/highfidelity/hifi into workload

Browse source
This commit is contained in:
samcake 2018-03-06 18:03:07 -08:00
commit e2ac5353b1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/workload/src/workload/Space.cpp
View file

@ -69,12 +69,14 @@ void Space::categorizeAndGetChanges(std::vector<Space::Change>& changes) {
for (uint32_t i = 0; i < numProxies; ++i) { for (uint32_t i = 0; i < numProxies; ++i) {
Proxy& proxy = _proxies[i]; Proxy& proxy = _proxies[i];
if (proxy.region < Region::INVALID) { if (proxy.region < Region::INVALID) {
glm::vec3 proxyCenter = glm::vec3(proxy.sphere);
float proxyRadius = proxy.sphere.w;
uint8_t region = Region::UNKNOWN; uint8_t region = Region::UNKNOWN;
for (uint32_t j = 0; j < numViews; ++j) { for (uint32_t j = 0; j < numViews; ++j) {
auto& view = _views[j]; auto& view = _views[j];
glm::vec3 distance2(glm::distance2(proxy.sphere, view.regions[0]), glm::distance2(proxy.sphere, view.regions[1]), glm::distance2(proxy.sphere, view.regions[2])); glm::vec3 distance2(glm::distance2(proxyCenter, glm::vec3(view.regions[0])), glm::distance2(proxyCenter, glm::vec3(view.regions[1])), glm::distance2(proxyCenter, glm::vec3(view.regions[2])));
glm::vec3 regionRadii2(view.regions[0].w + proxy.sphere.w, view.regions[1].w + proxy.sphere.w, view.regions[2].w + proxy.sphere.w); glm::vec3 regionRadii2(view.regions[0].w + proxyRadius, view.regions[1].w + proxyRadius, view.regions[2].w + proxyRadius);
regionRadii2 *= regionRadii2; regionRadii2 *= regionRadii2;
auto touchTests = glm::lessThanEqual(distance2, regionRadii2); auto touchTests = glm::lessThanEqual(distance2, regionRadii2);