caleb-brown/UDRIGEEKCup2024
1
0
Fork 0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-21 22:58:50 -05:00
Code Releases Activity

Last minute updates (from yesterday)

Browse Source
This commit is contained in:
cbrown 2024-04-26 08:52:12 -04:00
parent 8657ab340b
commit a2c73d32e5
9 changed files with 213 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Obstacles/Floor_Ramp.prefab
View File

@ -218,7 +218,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
forceDirection: {fileID: 6001174377072405942}
forceScale: 4
forceScale: 3
--- !u!1 &8425720233487652251
GameObject:
m_ObjectHideFlags: 0

60
Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-01.prefab
View File

@ -212,6 +212,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1169738019552920513, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1209360984555405499, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_LocalPosition.y
@ -257,6 +262,11 @@ PrefabInstance:
propertyPath: m_Center.z
value: 0.4941498
objectReference: {fileID: 0}
- target: {fileID: 3240247476525965360, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_LocalPosition.x
@ -307,6 +317,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -90
objectReference: {fileID: 0}
- target: {fileID: 4191037610752015884, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_LocalPosition.y
value: -5.02
objectReference: {fileID: 0}
- target: {fileID: 4191037610752015884, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_LocalRotation.w
@ -377,6 +392,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 5.731
objectReference: {fileID: 0}
- target: {fileID: 5850256488884041628, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.105
objectReference: {fileID: 0}
- target: {fileID: 5853657065098520206, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Size.x
@ -422,9 +442,39 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0.686
objectReference: {fileID: 0}
- target: {fileID: 6544865661792784232, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Size.z
value: 0.86109626
objectReference: {fileID: 0}
- target: {fileID: 6544865661792784232, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6544865661792784232, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Center.x
value: -0.15593609
objectReference: {fileID: 0}
- target: {fileID: 6544865661792784232, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Center.y
value: 0.08906881
objectReference: {fileID: 0}
- target: {fileID: 6544865661792784232, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Center.z
value: 0.17790541
objectReference: {fileID: 0}
- target: {fileID: 6770967778482584083, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7522530758458839301, guid: 7fadbf24dc7c14173a60e008099ea15f,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8620182177577009638, guid: 7fadbf24dc7c14173a60e008099ea15f,
@ -485,17 +535,17 @@ PrefabInstance:
- target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
type: 3}
propertyPath: m_LocalPosition.x
value: 1.9954756
value: -2.159
objectReference: {fileID: 0}
- target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.637
value: 1.988
objectReference: {fileID: 0}
- target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
type: 3}
propertyPath: m_LocalPosition.z
value: 2.207
value: 0.279
objectReference: {fileID: 0}
- target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
type: 3}
@ -510,7 +560,7 @@ PrefabInstance:
- target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.7071068
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
type: 3}
@ -525,7 +575,7 @@ PrefabInstance:
- target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2856798523656824157, guid: 43969d21369fb28449867f790ad23f48,
type: 3}

125
Assets/Samples/MAVRIC.GEEKCup/QRCode/Prefabs/course-03.prefab
View File

@ -433,6 +433,59 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &7657614754933495763
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1053743609781317934}
- component: {fileID: 2981269952084374670}
m_Layer: 0
m_Name: BallBumpers (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1053743609781317934
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7657614754933495763}
serializedVersion: 2
m_LocalRotation: {x: 0.70710677, y: 0, z: 0, w: 0.70710677}
m_LocalPosition: {x: -6.484, y: -3.778, z: 0}
m_LocalScale: {x: 0.7499999, y: 0.74999994, z: 0.7499999}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5830848552883750001}
m_LocalEulerAnglesHint: {x: 90, y: -90, z: -90}
--- !u!65 &2981269952084374670
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7657614754933495763}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 2.0412073, y: 2.346152, z: 0.554375}
m_Center: {x: -0.52233446, y: 1.1730759, z: 0.29123563}
--- !u!1 &9029269653538476387
GameObject:
m_ObjectHideFlags: 0
@ -522,11 +575,56 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1071230023525651534, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1958109294796491478, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_LocalScale.x
value: 0.84000003
objectReference: {fileID: 0}
- target: {fileID: 1958109294796491478, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_LocalScale.y
value: 0.94
objectReference: {fileID: 0}
- target: {fileID: 1958109294796491478, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_LocalScale.z
value: 0.84000003
objectReference: {fileID: 0}
- target: {fileID: 1958109294796491478, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_LocalPosition.y
value: -5.416
objectReference: {fileID: 0}
- target: {fileID: 1958109294796491478, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.005
objectReference: {fileID: 0}
- target: {fileID: 1958109294796491478, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3974055811102851262, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4554585646848063292, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_Size.z
value: 0.045
objectReference: {fileID: 0}
- target: {fileID: 4554585646848063292, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4908809923922535070, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_Name
@ -537,6 +635,21 @@ PrefabInstance:
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6889530016278719217, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.188
objectReference: {fileID: 0}
- target: {fileID: 6889530016278719217, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_LocalPosition.y
value: 3.198
objectReference: {fileID: 0}
- target: {fileID: 6889530016278719217, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_LocalPosition.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8232610969819635902, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
propertyPath: m_Enabled
@ -544,7 +657,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4949201069512689525, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
insertIndex: -1
addedObject: {fileID: 1053743609781317934}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c2d73280f95e463cb0a553c52a488a7, type: 3}
--- !u!4 &1340525268588729369 stripped
@ -553,3 +670,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1460377919807619844}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5830848552883750001 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4949201069512689525, guid: 0c2d73280f95e463cb0a553c52a488a7,
type: 3}
m_PrefabInstance: {fileID: 1460377919807619844}
m_PrefabAsset: {fileID: 0}

4
Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/CoursesImageLibrary.asset
View File

File diff suppressed because one or more lines are too long

4
Assets/Samples/MAVRIC.GEEKCup/QRCode/References/ImageLibraries/ReferenceImageLibrary.asset
View File

File diff suppressed because one or more lines are too long

4
Assets/Samples/MAVRIC.GEEKCup/QRCode/XREnvironment/ImageTracking.prefab
View File

@ -25,14 +25,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 630791235770037808}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0.21183735, y: -0.04565226, z: -0.20566364, w: 0.9543287}
m_LocalPosition: {x: 0.125, y: 0.5, z: 0.75}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7995260994058949992}
m_Father: {fileID: 4365528357719543085}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 22.678, y: -10.887, z: -26.513}
--- !u!114 &4953792460831877230
MonoBehaviour:
m_ObjectHideFlags: 0

2
Assets/Scenes/Loading-Course.unity
View File

@ -360,7 +360,7 @@ MonoBehaviour:
_constant: {fileID: 0}
_variable: {fileID: 11400000, guid: a4a6ccb6b3f244b0ca8da90699997ce5, type: 2}
_variableInstancer: {fileID: 0}
isOneShot: 1
isOneShot: 0
--- !u!1 &573055496
GameObject:
m_ObjectHideFlags: 0

2
Assets/Scripts/AR/TrackedImageChanged.cs
View File

@ -94,6 +94,8 @@ namespace MAVRIC.GEEKCup
var position = trackedImage.transform.position;
var rotation = trackedImage.transform.rotation;
rotation.x = 0f;
rotation.z = 0f;
foreach (var plane in planeManager.trackables)
{

27
Assets/UnityXRContent/Common/ReferenceShapes/Prefab/TransformDebugAxes.prefab Executable file → Normal file
View File

@ -23,16 +23,17 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1273508384157506}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4745596755230894}
- {fileID: 4638421763500462}
- {fileID: 4996044233736546}
- {fileID: 4421577059232150}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1298767457708356
GameObject:
@ -59,12 +60,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1298767457708356}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0.5}
m_LocalScale: {x: 0.05, y: 0.5, z: 0.05}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4364731056812884}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &33549278390950506
MeshFilter:
@ -85,10 +87,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 4294967295
m_RendererPriority: 0
m_Materials:
@ -113,6 +117,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1312820055641268
GameObject:
m_ObjectHideFlags: 0
@ -138,12 +143,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1312820055641268}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4364731056812884}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33034099392370584
MeshFilter:
@ -164,10 +170,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 4294967295
m_RendererPriority: 0
m_Materials:
@ -192,6 +200,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1475385274619790
GameObject:
m_ObjectHideFlags: 0
@ -217,12 +226,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1475385274619790}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.5, z: 0}
m_LocalScale: {x: 0.05, y: 0.5, z: 0.05}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4364731056812884}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33609297216079512
MeshFilter:
@ -243,10 +253,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 4294967295
m_RendererPriority: 0
m_Materials:
@ -271,6 +283,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1642828159801702
GameObject:
m_ObjectHideFlags: 0
@ -296,12 +309,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1642828159801702}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0.5, y: 0, z: 0}
m_LocalScale: {x: 0.05, y: 0.5, z: 0.05}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4364731056812884}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!33 &33594179922192778
MeshFilter:
@ -322,10 +336,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 4294967295
m_RendererPriority: 0
m_Materials:
@ -350,3 +366,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}