Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix simplifiedUI stuck on wrong LOD value

Browse source
This commit is contained in:
sabrina-shanman 2019-07-24 16:27:24 -07:00
parent d49fabf370
commit 9d93a2f502
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/LODManager.h
View file

@ -62,6 +62,8 @@ class LODManager : public QObject, public Dependency {
Q_PROPERTY(float lodQualityLevel READ getLODQualityLevel WRITE setLODQualityLevel NOTIFY lodQualityLevelChanged) Q_PROPERTY(float lodQualityLevel READ getLODQualityLevel WRITE setLODQualityLevel NOTIFY lodQualityLevelChanged)
Q_PROPERTY(float octreeSizeScale READ getOctreeSizeScale WRITE setOctreeSizeScale)
Q_PROPERTY(bool automaticLODAdjust READ getAutomaticLODAdjust WRITE setAutomaticLODAdjust NOTIFY autoLODChanged) Q_PROPERTY(bool automaticLODAdjust READ getAutomaticLODAdjust WRITE setAutomaticLODAdjust NOTIFY autoLODChanged)
Q_PROPERTY(float presentTime READ getPresentTime) Q_PROPERTY(float presentTime READ getPresentTime)
@ -150,6 +152,12 @@ 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

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

@ -531,21 +531,21 @@ function maybeUpdateOutputDeviceMutedOverlay() {
var oldAutomaticLODAdjust; var oldAutomaticLODAdjust;
var oldLODLevel; var oldOctreeSizeScale;
var DEFAULT_AUTO_LOD_ADJUST = false; var DEFAULT_AUTO_LOD_ADJUST = false;
var DEFAULT_LOD_LEVEL = 0.5; var DEFAULT_OCTREE_SIZE_SCALE = LODManager.getDefaultOctreeSizeScale();
function modifyLODSettings() { function modifyLODSettings() {
oldAutomaticLODAdjust = LODManager.automaticLODAdjust; oldAutomaticLODAdjust = LODManager.automaticLODAdjust;
oldLODLevel = LODManager.lodQualityLevel; oldOctreeSizeScale = LODManager.octreeSizeScale;
LODManager.automaticLODAdjust = DEFAULT_AUTO_LOD_ADJUST; LODManager.automaticLODAdjust = DEFAULT_AUTO_LOD_ADJUST;
LODManager.lodQualityLevel = DEFAULT_LOD_LEVEL; LODManager.octreeSizeScale = DEFAULT_OCTREE_SIZE_SCALE;
} }
function restoreLODSettings() { function restoreLODSettings() {
LODManager.automaticLODAdjust = oldAutomaticLODAdjust; LODManager.automaticLODAdjust = oldAutomaticLODAdjust;
LODManager.lodQualityLevel = oldLODLevel; LODManager.octreeSizeScale = oldOctreeSizeScale;
} }