Skip to content
This repository has been archived by the owner on Nov 8, 2019. It is now read-only.

Commit

Permalink
Disable cardboard audio listener by default in main prefab to work
Browse files Browse the repository at this point in the history
around a bug in Unity's audio spatializer.
  • Loading branch information
smdol committed Jan 14, 2016
1 parent 65cb71f commit cc42435
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 26 deletions.
20 changes: 13 additions & 7 deletions Cardboard/DemoScene/DemoScene.unity
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ NavMeshSettings:
minRegionArea: 2
widthInaccuracy: 16.666666
heightInaccuracy: 10
tileSizeHint: 0
m_NavMesh: {fileID: 0}
--- !u!1 &159634548
GameObject:
Expand Down Expand Up @@ -504,8 +503,9 @@ MonoBehaviour:
--- !u!114 &417382011
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabParentObject: {fileID: 11400000, guid: b8b03d395f5734e98af91ccf44f9bf47,
type: 2}
m_PrefabInternal: {fileID: 437064765}
m_GameObject: {fileID: 417382008}
m_Enabled: 1
m_EditorHideFlags: 0
Expand Down Expand Up @@ -641,6 +641,10 @@ Prefab:
propertyPath: vrModeEnabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 11400000, guid: b8b03d395f5734e98af91ccf44f9bf47, type: 2}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 11417550, guid: b8b03d395f5734e98af91ccf44f9bf47, type: 2}
m_ParentPrefab: {fileID: 100100000, guid: b8b03d395f5734e98af91ccf44f9bf47, type: 2}
Expand Down Expand Up @@ -1251,8 +1255,9 @@ MonoBehaviour:
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_Priority: 3
ignoreReversedGraphics: 1
blockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4286578683
Expand Down Expand Up @@ -2784,8 +2789,9 @@ MonoBehaviour:
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_Priority: 3
ignoreReversedGraphics: 1
blockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4286578683
Expand Down
6 changes: 3 additions & 3 deletions Cardboard/Prefabs/CardboardHead.prefab
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ GameObject:
- 124: {fileID: 12400004}
- 92: {fileID: 9246874}
- 81: {fileID: 8100000}
- 114: {fileID: 11427708}
- 114: {fileID: 11400006}
- 114: {fileID: 11400008}
m_Layer: 0
m_Name: Camera
m_TagString: Untagged
Expand Down Expand Up @@ -302,13 +302,13 @@ MonoBehaviour:
screenParallax: 0
stereoPaddingX: 0
stereoPaddingY: 0
--- !u!114 &11427708
--- !u!114 &11400008
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b1156c073149742478887bb24456f32d, type: 3}
m_Name:
Expand Down
31 changes: 15 additions & 16 deletions Cardboard/Prefabs/CardboardMain.prefab
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ GameObject:
- 124: {fileID: 12400004}
- 92: {fileID: 9200004}
- 81: {fileID: 8100000}
- 114: {fileID: 11417550}
- 114: {fileID: 11400006}
- 114: {fileID: 11400000}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -423,6 +423,20 @@ Behaviour:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 150432}
m_Enabled: 1
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b1156c073149742478887bb24456f32d, type: 3}
m_Name:
m_EditorClassIdentifier:
globalGainDb: 0
worldScale: 1
quality: 1
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -511,26 +525,11 @@ MonoBehaviour:
neckModelScale: 1
autoDriftCorrection: 1
electronicDisplayStabilization: 0
syncWithCardboardApp: 0
autoUntiltHead: 1
UseUnityRemoteInput: 0
screenSize: 0
deviceType: 1
stereoScreenScale: 1
--- !u!114 &11417550
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b1156c073149742478887bb24456f32d, type: 3}
m_Name:
m_EditorClassIdentifier:
globalGainDb: 0
worldScale: 1
quality: 1
--- !u!114 &11450432
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
Binary file modified CardboardDemoForUnity.unitypackage
Binary file not shown.
Binary file modified CardboardSDKForUnity.unitypackage
Binary file not shown.

0 comments on commit cc42435

Please sign in to comment.