Showing the changes to interface/src/Application.cpp (1 of 26 files). Show all
Unified · Split
| @@ -2076,10 +2076,10 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 2075 unmodified lines | |||
| 2076 | if (rootCode) { | 2076 | if (rootCode) { |
| 2077 | VoxelPositionSize rootDetails; | 2077 | VoxelPositionSize rootDetails; |
| 2078 | voxelDetailsForCode(rootCode, rootDetails); | 2078 | voxelDetailsForCode(rootCode, rootDetails); |
| 2079 | AABox serverBounds(glm::vec3(rootDetails.x, rootDetails.y, rootDetails.z), rootDetails.s); | 2079 | AACube serverBounds(glm::vec3(rootDetails.x, rootDetails.y, rootDetails.z), rootDetails.s); |
| 2080 | serverBounds.scale(TREE_SCALE); | 2080 | serverBounds.scale(TREE_SCALE); |
| 2081 | 2081 | ||
| 2082 | ViewFrustum::location serverFrustumLocation = _viewFrustum.boxInFrustum(serverBounds); | 2082 | ViewFrustum::location serverFrustumLocation = _viewFrustum.cubeInFrustum(serverBounds); |
| 2083 | 2083 | ||
| 2084 | if (serverFrustumLocation != ViewFrustum::OUTSIDE) { | 2084 | if (serverFrustumLocation != ViewFrustum::OUTSIDE) { |
| 2085 | inViewServers++; | 2085 | inViewServers++; |
| @@ -2142,10 +2142,10 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 56 unmodified lines | |||
| 2142 | if (rootCode) { | 2142 | if (rootCode) { |
| 2143 | VoxelPositionSize rootDetails; | 2143 | VoxelPositionSize rootDetails; |
| 2144 | voxelDetailsForCode(rootCode, rootDetails); | 2144 | voxelDetailsForCode(rootCode, rootDetails); |
| 2145 | AABox serverBounds(glm::vec3(rootDetails.x, rootDetails.y, rootDetails.z), rootDetails.s); | 2145 | AACube serverBounds(glm::vec3(rootDetails.x, rootDetails.y, rootDetails.z), rootDetails.s); |
| 2146 | serverBounds.scale(TREE_SCALE); | 2146 | serverBounds.scale(TREE_SCALE); |
| 2147 | 2147 | ||
| 2148 | ViewFrustum::location serverFrustumLocation = _viewFrustum.boxInFrustum(serverBounds); | 2148 | ViewFrustum::location serverFrustumLocation = _viewFrustum.cubeInFrustum(serverBounds); |
| 2149 | if (serverFrustumLocation != ViewFrustum::OUTSIDE) { | 2149 | if (serverFrustumLocation != ViewFrustum::OUTSIDE) { |
| 2150 | inView = true; | 2150 | inView = true; |
| 2151 | } else { | 2151 | } else { |