Skip to content

Commit 2345e4d

Browse files
committed
more corrections
1 parent 60336e8 commit 2345e4d

2 files changed

Lines changed: 20 additions & 17 deletions

File tree

Basis/Packages/com.basis.framework/Settings/BasisTextureQualityModule.cs

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
using Basis.BasisUI;
22
using UnityEngine;
3+
using UnityEngine.Serialization;
4+
35
public class BasisTextureQualityModule : BasisSettingsBase
46
{
57
public int StreamingMipmapsMaxLevelReduction = 4;
6-
public int treamingMipmapsMaxFileIORequests = 512;
8+
9+
[FormerlySerializedAs("treamingMipmapsMaxFileIORequests")]
10+
public int StreamingMipmapsMaxFileIORequests = 512;
11+
712
public override void ValidSettingsChange(string matchedSettingName, string optionValue)
813
{
9-
if (matchedSettingName == BasisSettingsDefaults.MemoryAllocation.BindingKey)
10-
{
11-
QualitySettings.streamingMipmapsActive = true;
12-
QualitySettings.streamingMipmapsAddAllCameras = true;
13-
QualitySettings.streamingMipmapsMaxLevelReduction = StreamingMipmapsMaxLevelReduction;
14-
QualitySettings.streamingMipmapsMaxFileIORequests = treamingMipmapsMaxFileIORequests;
15-
if (int.TryParse(optionValue, out int mem))
16-
{
17-
QualitySettings.streamingMipmapsMemoryBudget = mem;
18-
}
19-
else
20-
{
21-
QualitySettings.streamingMipmapsMemoryBudget = SystemInfo.graphicsMemorySize;
22-
}
23-
}
14+
if (matchedSettingName != BasisSettingsDefaults.MemoryAllocation.BindingKey)
15+
return;
16+
17+
QualitySettings.streamingMipmapsActive = true;
18+
QualitySettings.streamingMipmapsAddAllCameras = true;
19+
QualitySettings.streamingMipmapsMaxLevelReduction = StreamingMipmapsMaxLevelReduction;
20+
QualitySettings.streamingMipmapsMaxFileIORequests = StreamingMipmapsMaxFileIORequests;
21+
22+
int hardwareCap = SystemInfo.graphicsMemorySize / 4;
23+
int requested = int.TryParse(optionValue, out int mem) ? mem : hardwareCap;
24+
QualitySettings.streamingMipmapsMemoryBudget = Mathf.Min(requested, hardwareCap);
2425
}
26+
2527
public override void ChangedSettings()
2628
{
2729
}

Basis/Packages/com.basis.openxr/BasisOpenXRManagement.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ private void PollHMDPresence()
330330
{
331331
_headDevices.Clear();
332332
UnityEngine.XR.InputDevices.GetDevicesAtXRNode(UnityEngine.XR.XRNode.Head, _headDevices);
333-
for (int i = 0; i < _headDevices.Count; i++)
333+
int Count = _headDevices.Count;
334+
for (int i = 0; i < Count; i++)
334335
{
335336
if (_headDevices[i].TryGetFeatureValue(UnityEngine.XR.CommonUsages.userPresence, out bool present))
336337
{

0 commit comments

Comments
 (0)