From ef433c0e011cc7107dc8664dc6bf59e6f2c7bc99 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 25 Feb 2016 22:24:37 -0800 Subject: [PATCH] legacy support for EntityViewer.setKeyholeRadius() --- examples/acScripts/entitySpawnerAC.js | 4 ++-- .../audioExamples/acAudioSearching/ACAudioSearchAndInject.js | 2 +- libraries/octree/src/OctreeHeadlessViewer.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/acScripts/entitySpawnerAC.js b/examples/acScripts/entitySpawnerAC.js index 8fb2e259bb..2baf732258 100644 --- a/examples/acScripts/entitySpawnerAC.js +++ b/examples/acScripts/entitySpawnerAC.js @@ -95,9 +95,9 @@ EntityViewer.setPosition({ y: 0, z: 0 }); -EntityViewer.setKeyholeRadius(60000); +EntityViewer.setCenterRadius(60000); var octreeQueryInterval = Script.setInterval(function() { EntityViewer.queryOctree(); }, 1000); -Script.update.connect(update); \ No newline at end of file +Script.update.connect(update); diff --git a/examples/audioExamples/acAudioSearching/ACAudioSearchAndInject.js b/examples/audioExamples/acAudioSearching/ACAudioSearchAndInject.js index 2be59365b8..de7baba267 100644 --- a/examples/audioExamples/acAudioSearching/ACAudioSearchAndInject.js +++ b/examples/audioExamples/acAudioSearching/ACAudioSearchAndInject.js @@ -45,7 +45,7 @@ function debug() { // Display the arguments not just [Object object]. //print.apply(null, [].map.call(arguments, JSON.stringify)); } -EntityViewer.setKeyholeRadius(QUERY_RADIUS); +EntityViewer.setCenterRadius(QUERY_RADIUS); // ENTITY DATA CACHE // diff --git a/libraries/octree/src/OctreeHeadlessViewer.h b/libraries/octree/src/OctreeHeadlessViewer.h index 4efdb8546e..780b68b848 100644 --- a/libraries/octree/src/OctreeHeadlessViewer.h +++ b/libraries/octree/src/OctreeHeadlessViewer.h @@ -47,6 +47,7 @@ public slots: void setPosition(const glm::vec3& position) { _viewFrustum.setPosition(position); } void setOrientation(const glm::quat& orientation) { _viewFrustum.setOrientation(orientation); } void setCenterRadius(float radius) { _viewFrustum.setCenterRadius(radius); } + void setKeyholeRadius(float radius) { _viewFrustum.setCenterRadius(radius); } // TODO: remove this legacy support // setters for LOD and PPS void setVoxelSizeScale(float sizeScale) { _voxelSizeScale = sizeScale; }