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

Merge pull request #7207 from AndrewMeadows/fix-setKeyholeRadius

Browse source 
legacy support for EntityViewer.setKeyholeRadius()
This commit is contained in:
Brad Hefta-Gaub 2016-02-25 22:48:33 -08:00
commit a2140f7048
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/acScripts/entitySpawnerAC.js
View file

@ -95,9 +95,9 @@ EntityViewer.setPosition({
y: 0, y: 0,
z: 0 z: 0
}); });
EntityViewer.setKeyholeRadius(60000); EntityViewer.setCenterRadius(60000);
var octreeQueryInterval = Script.setInterval(function() { var octreeQueryInterval = Script.setInterval(function() {
EntityViewer.queryOctree(); EntityViewer.queryOctree();
}, 1000); }, 1000);
Script.update.connect(update); Script.update.connect(update);

2
examples/audioExamples/acAudioSearching/ACAudioSearchAndInject.js
View file

@ -45,7 +45,7 @@ function debug() { // Display the arguments not just [Object object].
//print.apply(null, [].map.call(arguments, JSON.stringify)); //print.apply(null, [].map.call(arguments, JSON.stringify));
} }
EntityViewer.setKeyholeRadius(QUERY_RADIUS); EntityViewer.setCenterRadius(QUERY_RADIUS);
// ENTITY DATA CACHE // ENTITY DATA CACHE
// //

1
libraries/octree/src/OctreeHeadlessViewer.h
View file

@ -47,6 +47,7 @@ public slots:
void setPosition(const glm::vec3& position) { _viewFrustum.setPosition(position); } void setPosition(const glm::vec3& position) { _viewFrustum.setPosition(position); }
void setOrientation(const glm::quat& orientation) { _viewFrustum.setOrientation(orientation); } void setOrientation(const glm::quat& orientation) { _viewFrustum.setOrientation(orientation); }
void setCenterRadius(float radius) { _viewFrustum.setCenterRadius(radius); } void setCenterRadius(float radius) { _viewFrustum.setCenterRadius(radius); }
void setKeyholeRadius(float radius) { _viewFrustum.setCenterRadius(radius); } // TODO: remove this legacy support
// setters for LOD and PPS // setters for LOD and PPS
void setVoxelSizeScale(float sizeScale) { _voxelSizeScale = sizeScale; } void setVoxelSizeScale(float sizeScale) { _voxelSizeScale = sizeScale; }