Skip to content
Snippets Groups Projects
Commit 5ec515d4 authored by mhby1g21's avatar mhby1g21
Browse files

added xr origin (xr rig) as prefab and modified kt test that contains it

parent dba910f6
Branches
No related tags found
2 merge requests!7added #if UNITY_EDITOR #endif directives to all editor related scripts,!6added subjective and objective evaluation scenes, with improvements on meshdimension script and xr origin prefab
Show whitespace changes
Inline Side-by-side
AVVR/Assets/Prefabs/XR Origin (XR Rig) Variant.prefab 0 → 100644
+ 140
− 0
View file @ 5ec515d4
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &5394735570684412465
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.x
value: 1.585
objectReference: {fileID: 0}
- target: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.y
value: 0.3435601
objectReference: {fileID: 0}
- target: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.z
value: 4.1
objectReference: {fileID: 0}
- target: {fileID: 1767192439, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_Depth
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1767192439, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: near clip plane
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 1178791450436251564, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503725, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_Name
value: XR Origin (XR Rig) Variant
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6232745470614056083, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 785240573026610109, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1767192433, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
insertIndex: -1
addedObject: {fileID: 6290209298691883206}
- targetCorrespondingSourceObject: {fileID: 1767192433, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
insertIndex: -1
addedObject: {fileID: 4616110610360006785}
m_SourcePrefab: {fileID: 100100000, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
--- !u!1 &5394735570261521728 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1767192433, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
m_PrefabInstance: {fileID: 5394735570684412465}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6290209298691883206
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5394735570261521728}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6fd9ebf1401392e4bbd47fea32f47642, type: 3}
m_Name:
m_EditorClassIdentifier:
currentBakedListener: {fileID: 0}
applyReverb: 1
reverbType: 0
useAllProbeBatches: 0
probeBatches: []
mTotalDataSize: 0
mProbeDataSizes:
mIdentifier:
type: 0
variation: 0
endpointInfluence:
center:
x: 0
y: 0
z: 0
radius: 0
mProbeBatchesUsed: []
--- !u!114 &4616110610360006785
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5394735570261521728}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67c591a8ad9cb69498451d2b153af2be, type: 3}
m_Name:
m_EditorClassIdentifier:
AVVR/Assets/Prefabs/XR Origin (XR Rig) Variant.prefab.meta 0 → 100644
+ 7
− 0
View file @ 5ec515d4
fileFormatVersion: 2
guid: 4ef948422ff8ae248b9452a599857747
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AVVR/Assets/Scenes/SteamAudioScenes/KT-Test.unity
+ 61
− 141
View file @ 5ec515d4
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.17276844, g: 0.21589245, b: 0.2978263, a: 1} m_IndirectSpecularColor: {r: 0.17276844, g: 0.21589246, b: 0.2978263, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
...@@ -2320,148 +2320,11 @@ MeshRenderer: ...@@ -2320,148 +2320,11 @@ MeshRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!1001 &1668271124
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.x
value: 1.585
objectReference: {fileID: 0}
- target: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.y
value: 0.3435601
objectReference: {fileID: 0}
- target: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.z
value: 4.1
objectReference: {fileID: 0}
- target: {fileID: 1767192439, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_Depth
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1767192439, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: near clip plane
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 1178791450436251564, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503725, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_Name
value: XR Origin (XR Rig)
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6232745470614056083, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1767192433, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
insertIndex: -1
addedObject: {fileID: 1668271126}
- targetCorrespondingSourceObject: {fileID: 1767192433, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
insertIndex: -1
addedObject: {fileID: 1668271132}
m_SourcePrefab: {fileID: 100100000, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
--- !u!1 &1668271125 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1767192433, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3}
m_PrefabInstance: {fileID: 1668271124}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1668271126
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1668271125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6fd9ebf1401392e4bbd47fea32f47642, type: 3}
m_Name:
m_EditorClassIdentifier:
currentBakedListener: {fileID: 0}
applyReverb: 1
reverbType: 0
useAllProbeBatches: 0
probeBatches: []
mTotalDataSize: 0
mProbeDataSizes:
mIdentifier:
type: 0
variation: 0
endpointInfluence:
center:
x: 0
y: 0
z: 0
radius: 0
mProbeBatchesUsed: []
--- !u!20 &1668271127 stripped --- !u!20 &1668271127 stripped
Camera: Camera:
m_CorrespondingSourceObject: {fileID: 1767192439, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} m_CorrespondingSourceObject: {fileID: 5394735570261521734, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
m_PrefabInstance: {fileID: 1668271124} m_PrefabInstance: {fileID: 732955269648720805}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &1668271132
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1668271125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67c591a8ad9cb69498451d2b153af2be, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &1893593778 --- !u!21 &1893593778
Material: Material:
serializedVersion: 8 serializedVersion: 8
...@@ -3586,6 +3449,63 @@ Material: ...@@ -3586,6 +3449,63 @@ Material:
- _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1}
- _SpecColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!1001 &732955269648720805
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6704335892741778460, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_Name
value: XR Origin (XR Rig)
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6704335892741778463, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4ef948422ff8ae248b9452a599857747, type: 3}
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -3593,7 +3513,7 @@ SceneRoots: ...@@ -3593,7 +3513,7 @@ SceneRoots:
- {fileID: 141974696} - {fileID: 141974696}
- {fileID: 77058138} - {fileID: 77058138}
- {fileID: 2131905968} - {fileID: 2131905968}
- {fileID: 1668271124} - {fileID: 732955269648720805}
- {fileID: 1924134494} - {fileID: 1924134494}
- {fileID: 532126009} - {fileID: 532126009}
- {fileID: 2034660951} - {fileID: 2034660951}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment