History

renaming of AABox to AACube, introduction of actual AABox

ZappoMan committed 12 years ago

Commit 39ed7f71 parent 9188b9a26 files · +383 −256Browse files

Showing the changes to interface/src/Application.cpp (1 of 26 files). Show all

Unified · Split

interface/src/Application.cpp+4−4
@@ -2076,10 +2076,10 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 2075 unmodified lines
20762076 if (rootCode) {
20772077 VoxelPositionSize rootDetails;
20782078 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);
20802080 serverBounds.scale(TREE_SCALE);
20812081
2082− ViewFrustum::location serverFrustumLocation = _viewFrustum.boxInFrustum(serverBounds);
2082+ ViewFrustum::location serverFrustumLocation = _viewFrustum.cubeInFrustum(serverBounds);
20832083
20842084 if (serverFrustumLocation != ViewFrustum::OUTSIDE) {
20852085 inViewServers++;
@@ -2142,10 +2142,10 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 56 unmodified lines
21422142 if (rootCode) {
21432143 VoxelPositionSize rootDetails;
21442144 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);
21462146 serverBounds.scale(TREE_SCALE);
21472147
2148− ViewFrustum::location serverFrustumLocation = _viewFrustum.boxInFrustum(serverBounds);
2148+ ViewFrustum::location serverFrustumLocation = _viewFrustum.cubeInFrustum(serverBounds);
21492149 if (serverFrustumLocation != ViewFrustum::OUTSIDE) {
21502150 inView = true;
21512151 } else {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t