History

update to new enabling method

Dante Ruiz committed 8 years ago

Commit 7e138eb1 parent fa5dfb63 files · +11 −7Browse files

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

Unified · Split

interface/src/Application.cpp+9−4
@@ -6240,14 +6240,19 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType) { · 6239 unmodified lines
6240 const bool isModifiedQuery = !_physicsEnabled;6240 const bool isModifiedQuery = !_physicsEnabled;
6241 if (isModifiedQuery) {6241 if (isModifiedQuery) {
6242 // Create modified view that is a simple sphere.6242 // Create modified view that is a simple sphere.
6243 bool interstitialModeEnabled = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
6243 6244
6244 ConicalViewFrustum sphericalView;6245 ConicalViewFrustum sphericalView;
6245 ConicalViewFrustum farView;6246 sphericalView.setSimpleRadius(INITIAL_QUERY_RADIUS);
6246 6247
6247 farView.set(_viewFrustum);6248 if (interstitialModeEnabled) {
6249 ConicalViewFrustum farView;
6250 farView.set(_viewFrustum);
6251 _octreeQuery.setConicalViews({ sphericalView, farView });
6252 } else {
6253 _octreeQuery.setConicalViews({ sphericalView });
6254 }
6248 6255
6249 sphericalView.setSimpleRadius(INITIAL_QUERY_RADIUS);
6250 _octreeQuery.setConicalViews({ sphericalView, farView });
6251 _octreeQuery.setOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE);6256 _octreeQuery.setOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE);
6252 static constexpr float MIN_LOD_ADJUST = -20.0f;6257 static constexpr float MIN_LOD_ADJUST = -20.0f;
6253 _octreeQuery.setBoundaryLevelAdjust(MIN_LOD_ADJUST);6258 _octreeQuery.setBoundaryLevelAdjust(MIN_LOD_ADJUST);

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