Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

On second thought, do not expose default octree size scale

Browse source
This commit is contained in:
sabrina-shanman 2019-07-24 17:30:08 -07:00
parent 772eb57898
commit 3a4ce44633
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/LODManager.h
View file

@ -145,12 +145,6 @@ public:
*/ */
Q_INVOKABLE float getOctreeSizeScale() const { return _octreeSizeScale; } Q_INVOKABLE float getOctreeSizeScale() const { return _octreeSizeScale; }
/**jsdoc
* @function LODManager.getDefaultOctreeSizeScale
* @param {number} sizeScale
*/
Q_INVOKABLE float getDefaultOctreeSizeScale() const { return DEFAULT_OCTREE_SIZE_SCALE; }
/**jsdoc /**jsdoc
* @function LODManager.setBoundaryLevelAdjust * @function LODManager.setBoundaryLevelAdjust
* @param {number} boundaryLevelAdjust * @param {number} boundaryLevelAdjust

8
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -532,14 +532,14 @@ function maybeUpdateOutputDeviceMutedOverlay() {
var oldAutomaticLODAdjust; var oldAutomaticLODAdjust;
var oldOctreeSizeScale; var oldOctreeSizeScale;
var DEFAULT_AUTO_LOD_ADJUST = false; var SIMPLIFIED_UI_AUTO_LOD_ADJUST = false;
var DEFAULT_OCTREE_SIZE_SCALE = LODManager.getDefaultOctreeSizeScale(); var SIMPLIFIED_UI_OCTREE_SIZE_SCALE = 32768 * 916; // Octree cell size in meters (constant) * distance in meters at which we want a 1 meter cube to be visible
function modifyLODSettings() { function modifyLODSettings() {
oldAutomaticLODAdjust = LODManager.automaticLODAdjust; oldAutomaticLODAdjust = LODManager.automaticLODAdjust;
oldOctreeSizeScale = LODManager.octreeSizeScale; oldOctreeSizeScale = LODManager.octreeSizeScale;
LODManager.automaticLODAdjust = DEFAULT_AUTO_LOD_ADJUST; LODManager.automaticLODAdjust = SIMPLIFIED_UI_AUTO_LOD_ADJUST;
LODManager.octreeSizeScale = DEFAULT_OCTREE_SIZE_SCALE; LODManager.octreeSizeScale = SIMPLIFIED_UI_OCTREE_SIZE_SCALE;
} }