Skip to content

Commit 389dedd

Browse files
committed
Fixed broken master clock, this is 0.25 on ALPHA
1 parent 11c0b4e commit 389dedd

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

Assets/Materials/uncategorized/WaveformDisplaymat.mat

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: WaveformDisplayMat
10+
m_Name: WaveformDisplaymat
1111
m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
1212
m_ShaderKeywords: _EMISSION
1313
m_LightmapFlags: 1

Assets/Resources/OVRBuildConfig.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3}
1313
m_Name: OVRBuildConfig
1414
m_EditorClassIdentifier:
15-
androidSDKPath: C:\Program Files\Unity\Hub\Editor\2019.3.0f6\Editor\Data\PlaybackEngines\AndroidPlayer\SDK
15+
androidSDKPath:
1616
gradlePath:
1717
jdkPath:

Assets/Scripts/masterControl.cs

+12-9
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,24 @@ void Awake() {
7171
_sampleDuration = 1.0 / AudioSettings.outputSampleRate;
7272

7373
var configuration = AudioSettings.GetConfiguration();
74-
if(configuration.sampleRate == 48000){
74+
if (configuration.sampleRate == 48000)
75+
{
7576
Debug.Log("Unity sample rate is " + configuration.sampleRate);
76-
} else {
77+
}
78+
else
79+
{
7780
Debug.LogWarning("Unity sample rate is " + configuration.sampleRate);
7881
}
7982

8083
if (Application.platform == RuntimePlatform.Android)
8184
{
82-
Debug.Log("Buffer size was: " + AudioSettings.GetConfiguration().dspBufferSize);
83-
configuration = AudioSettings.GetConfiguration();
84-
configuration.dspBufferSize = 256;
85-
AudioSettings.Reset(configuration);
85+
Debug.Log("Buffer size is: " + AudioSettings.GetConfiguration().dspBufferSize);
86+
//configuration = AudioSettings.GetConfiguration();
87+
//configuration.dspBufferSize = 256;
88+
//AudioSettings.Reset(configuration);
8689

87-
configuration = AudioSettings.GetConfiguration();
88-
Debug.Log("Buffer size is now set to: " + AudioSettings.GetConfiguration().dspBufferSize);
90+
//configuration = AudioSettings.GetConfiguration();
91+
//Debug.Log("Buffer size is now set to: " + AudioSettings.GetConfiguration().dspBufferSize);
8992

9093
//OVRPlugin.systemDisplayFrequency = 72;
9194
Debug.Log("Current cpuLevel: " + OVRManager.cpuLevel + ", gpuLevel: " + OVRManager.gpuLevel);
@@ -95,7 +98,7 @@ void Awake() {
9598
Debug.Log("New cpuLevel: " + OVRManager.cpuLevel + ", gpuLevel: " + OVRManager.gpuLevel);
9699
}
97100

98-
AudioSettings.Reset(configuration);
101+
//AudioSettings.Reset(configuration); // DO NOT RE-ENABLE THIS, this fried the OnAudioFilterRead hook on the mastercontrol clock
99102

100103
if (!PlayerPrefs.HasKey("glowVal")) PlayerPrefs.SetFloat("glowVal", 1);
101104
if (!PlayerPrefs.HasKey("envSound")) PlayerPrefs.SetInt("envSound", 1);

Assets/main.meta

+1-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/main.unity

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ LightmapSettings:
9898
m_ExportTrainingData: 0
9999
m_TrainingDataDestination: TrainingData
100100
m_LightProbeSampleCountMultiplier: 4
101-
m_LightingDataAsset: {fileID: 112000000, guid: 060ddb2e2647f174ebb97b32d18bf2d8,
101+
m_LightingDataAsset: {fileID: 112000000, guid: fc7701f2f9092834ab8759d3f18863dc,
102102
type: 2}
103103
m_UseShadowmask: 0
104104
--- !u!196 &4

ProjectSettings/ProjectSettings.asset

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ PlayerSettings:
119119
16:9: 1
120120
Others: 1
121121
bundleVersion: 0.25
122-
preloadedAssets: []
122+
preloadedAssets:
123+
- {fileID: 8207365043489784020, guid: 93c4f4428c8e3814dbf9d469c39e85d4, type: 2}
123124
metroInputSource: 0
124125
wsaTransparentSwapchain: 0
125126
m_HolographicPauseOnTrackingLoss: 1

0 commit comments

Comments
 (0)