Merge remote-tracking branch 'Github/development' into raycastarrow

This commit is contained in:
Abraham Blain 2023-07-26 17:29:33 -04:00
commit 3af1d3cb53
35 changed files with 2087 additions and 50 deletions

5
.gitignore vendored
View File

@ -80,4 +80,7 @@ crashlytics-build.properties
/Assets/Plugins/Sirenix/Demos/* /Assets/Plugins/Sirenix/Demos/*
# But keep the demo packages themselves. # But keep the demo packages themselves.
!/Assets/Plugins/Sirenix/Demos/*.unitypackage !/Assets/Plugins/Sirenix/Demos/*.unitypackage
.DS_Store
.vsconfig

View File

@ -0,0 +1,63 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &1825078435496435566
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}
propertyPath: m_Name
value: Cartridge_Hologram_Simplified
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1333a7e41788e2640a52b6a8e895fc56, type: 3}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 62f2984cb49273d45880bbdfcbb03763
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 1333a7e41788e2640a52b6a8e895fc56
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 0
importLights: 0
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,63 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &3772240681913673538
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}
propertyPath: m_Name
value: Cartridge_Hologram_Simplified_V2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a3e2dc318d3ffbf4ebbbb42c309f2f49, type: 3}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b1f3156876b7d7d4599e139b490cbd9b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: a3e2dc318d3ffbf4ebbbb42c309f2f49
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 0
importLights: 0
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,63 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &3330098620546834498
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}
propertyPath: m_Name
value: Cartridge_Hologram_Simplified_V3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 25dfdc9dcdc84824c85c64d4a012d2d4, type: 3}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5a794a34163bf6a45ad2c264bb705098
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 25dfdc9dcdc84824c85c64d4a012d2d4
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 0
importLights: 0
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -145,41 +145,25 @@ MonoBehaviour:
m_PositionInput: m_PositionInput:
m_UseReference: 0 m_UseReference: 0
m_Action: m_Action:
m_Name: Position Input m_Name:
m_Type: 0 m_Type: 0
m_ExpectedControlType: m_ExpectedControlType:
m_Id: 9d857d62-5af5-4471-824a-f6ba04f4bdc1 m_Id:
m_Processors: m_Processors:
m_Interactions: m_Interactions:
m_SingletonActionBindings: m_SingletonActionBindings: []
- m_Name:
m_Id: a90916f7-9340-4d5e-8208-d16db5c2e185
m_Path: <HandheldARInputDevice>/devicePosition
m_Interactions:
m_Processors:
m_Groups:
m_Action: Position Input
m_Flags: 0
m_Flags: 0 m_Flags: 0
m_Reference: {fileID: 0} m_Reference: {fileID: 0}
m_RotationInput: m_RotationInput:
m_UseReference: 0 m_UseReference: 0
m_Action: m_Action:
m_Name: Rotation Input m_Name:
m_Type: 0 m_Type: 0
m_ExpectedControlType: m_ExpectedControlType:
m_Id: 02a43bed-bcef-471d-b519-2587b1a16682 m_Id:
m_Processors: m_Processors:
m_Interactions: m_Interactions:
m_SingletonActionBindings: m_SingletonActionBindings: []
- m_Name:
m_Id: f9cabcd3-2373-4881-be3a-5031aaa1b34e
m_Path: <HandheldARInputDevice>/deviceRotation
m_Interactions:
m_Processors:
m_Groups:
m_Action: Rotation Input
m_Flags: 0
m_Flags: 0 m_Flags: 0
m_Reference: {fileID: 0} m_Reference: {fileID: 0}
m_TrackingStateInput: m_TrackingStateInput:
@ -1017,8 +1001,10 @@ Transform:
- {fileID: 4979778874725930329} - {fileID: 4979778874725930329}
- {fileID: 1286257645179894439} - {fileID: 1286257645179894439}
- {fileID: 8341203594378053561} - {fileID: 8341203594378053561}
- {fileID: 5249926601536933133}
- {fileID: 5670418887884598570}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7467876242708846740 --- !u!1 &7467876242708846740
GameObject: GameObject:
@ -1790,6 +1776,10 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0] propertyPath: m_Materials.Array.data[0]
value: value:
objectReference: {fileID: 2100000, guid: 051cd3b0800bfc34c9d53822a066f5a2, type: 2} objectReference: {fileID: 2100000, guid: 051cd3b0800bfc34c9d53822a066f5a2, type: 2}
- target: {fileID: 2729551218143262954, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3848796925145863350, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3} - target: {fileID: 3848796925145863350, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
@ -1872,6 +1862,158 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3} m_CorrespondingSourceObject: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
m_PrefabInstance: {fileID: 3938762051458252784} m_PrefabInstance: {fileID: 3938762051458252784}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &6197584457675535752
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2995049788487289996}
m_Modifications:
- target: {fileID: 1554466429186646591, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_Name
value: Cartridge_Hologram_Simplified Model Variant
objectReference: {fileID: 0}
- target: {fileID: 1554466429186646591, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalPosition.y
value: -0.156
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalRotation.w
value: -0.5085644
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalRotation.x
value: 0.49128634
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalRotation.y
value: -0.5085644
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalRotation.z
value: 0.49128634
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3796240935305614475, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 051cd3b0800bfc34c9d53822a066f5a2, type: 2}
- target: {fileID: 7130498405180112833, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 051cd3b0800bfc34c9d53822a066f5a2, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
--- !u!4 &5249926601536933133 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2222880835269359749, guid: 62f2984cb49273d45880bbdfcbb03763, type: 3}
m_PrefabInstance: {fileID: 6197584457675535752}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7425597542304180867
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2995049788487289996}
m_Modifications:
- target: {fileID: 2519635196798262547, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_Name
value: Cartridge_Hologram_Simplified_V3 Model Variant
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalPosition.y
value: -0.156
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalRotation.w
value: -0.5085644
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalRotation.x
value: 0.49128634
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalRotation.y
value: -0.5085644
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalRotation.z
value: 0.49128634
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3032431402004138573, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 051cd3b0800bfc34c9d53822a066f5a2, type: 2}
- target: {fileID: 6165857398854779117, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 051cd3b0800bfc34c9d53822a066f5a2, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
--- !u!4 &5670418887884598570 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3007378089300395945, guid: 5a794a34163bf6a45ad2c264bb705098, type: 3}
m_PrefabInstance: {fileID: 7425597542304180867}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8715878347926190244 --- !u!1001 &8715878347926190244
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1894,7 +2036,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 247.5665 value: 431.76572
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -1902,7 +2044,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -164.72906 value: -279.85358
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@ -1918,7 +2060,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 80.945816 value: 103.97072
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -1926,7 +2068,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -328.9852 value: -547.7218
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
@ -2026,7 +2168,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 40.945816 value: 63.97072
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -2034,7 +2176,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -40.472908 value: -51.98536
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@ -2050,7 +2192,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 40.945816 value: 63.97072
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -2058,7 +2200,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -40.472908 value: -51.98536
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@ -2074,7 +2216,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 40.945816 value: 63.97072
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -2082,7 +2224,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -40.472908 value: -51.98536
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6130414054276300538, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 6130414054276300538, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -2102,7 +2244,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 40.945816 value: 63.97072
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -2110,7 +2252,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -40.472908 value: -51.98536
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@ -2126,7 +2268,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 40.945816 value: 63.97072
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -2134,7 +2276,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -40.472908 value: -51.98536
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@ -2150,7 +2292,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 40.945812 value: 63.970715
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
@ -2158,7 +2300,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3} - target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -20.472906 value: -31.985357
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d47ff5da1602bfc4f8deb5230c973c73
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: f78c16008a764b039db892dd6c229d55
timeCreated: 1690373516

View File

@ -0,0 +1,47 @@
using UnityEngine;
using UnityEngine.InputSystem;
namespace MAVRIC.Input
{
public class MAVRICCinemachineInputProvider : Cinemachine.CinemachineInputProvider
{
public override float GetAxisValue(int axis)
{
if (enabled)
{
var action = ResolveForPlayer(axis, axis == 2 ? ZAxis : XYAxis);
if (action != null)
{
switch (axis)
{
case 0:
return ReadXAxis(action);
case 1:
return ReadYAxis(action);
case 2:
return ReadZAxis(action);
}
}
}
return 0;
}
protected virtual float ReadXAxis(in InputAction action)
{
return action.ReadValue<Vector2>().x;
}
protected virtual float ReadYAxis(in InputAction action)
{
return action.ReadValue<Vector2>().y;
}
protected virtual float ReadZAxis(in InputAction action)
{
var inputValue = action.ReadValue<float>();
Debug.Log($"ZAxis: {inputValue}");
return inputValue;
}
}
}

View File

@ -0,0 +1,13 @@
fileFormatVersion: 2
guid: 31ec3ac7f025b4046a531484dceb935c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences:
- XYAxis: {fileID: 5355366149960190905, guid: 60132311316fe1d4fbf004b791401886, type: 3}
- ZAxis: {fileID: 2265345372146452755, guid: 60132311316fe1d4fbf004b791401886, type: 3}
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -18,4 +18,4 @@ MonoBehaviour:
document: {fileID: 2800000, guid: c35e9f69e2d2ebd48878c668a619a026, type: 3} document: {fileID: 2800000, guid: c35e9f69e2d2ebd48878c668a619a026, type: 3}
animationClip: {fileID: 7400000, guid: b56f457f5c8a04c488f1a2b0c12ffd5a, type: 2} animationClip: {fileID: 7400000, guid: b56f457f5c8a04c488f1a2b0c12ffd5a, type: 2}
guideClip: {fileID: 7400000, guid: b56f457f5c8a04c488f1a2b0c12ffd5a, type: 2} guideClip: {fileID: 7400000, guid: b56f457f5c8a04c488f1a2b0c12ffd5a, type: 2}
video: {fileID: 32900000, guid: 78e311787720534498287be30f58fe7e, type: 3} video: {fileID: 32900000, guid: 78aee64c717624c63a694388eec4a673, type: 3}

8
Assets/Scripts/UI.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 185abe3ead7ed39458ac3c3db107c922
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 7e46dbb60c9a4ccca21c3c40e02dec39
timeCreated: 1690370576

View File

@ -0,0 +1,86 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
namespace MAVRIC.UI.Utilies
{
public class UISafeArea : MonoBehaviour
{
public bool ignoreLeft, ignoreRight, ignoreTop, ignoreBottom;
[SerializeField, ReadOnly] private RectTransform rectTransform;
private Rect currentArea;
private void Awake()
{
if (this.rectTransform is null)
{
GetComponents();
}
}
private void OnEnable()
{
UpdateUI(true);
}
private void Update()
{
UpdateUI();
}
private void GetComponents()
{
TryGetComponent(out this.rectTransform);
}
public void UpdateUI(bool forceUpdate = false)
{
UpdateRectSize(Screen.safeArea, forceUpdate);
}
private void UpdateRectSize(Rect area, bool forceUpdate = false)
{
if (this.rectTransform is null) return;
if (forceUpdate is false && currentArea == area) return;
var anchorMin = area.position;
var anchorMax = area.position + area.size;
anchorMin.x /= Screen.width;
anchorMin.y /= Screen.height;
anchorMax.x /= Screen.width;
anchorMax.y /= Screen.height;
if (ignoreLeft)
{
anchorMin.x = 0f;
}
if (ignoreRight)
{
anchorMax.x = 1f;
}
if (ignoreTop)
{
anchorMax.y = 1f;
}
if (ignoreBottom)
{
anchorMin.y = 0f;
}
rectTransform.anchoredPosition = Vector2.zero;
rectTransform.sizeDelta = Vector2.zero;
rectTransform.anchorMin = anchorMin;
rectTransform.anchorMax = anchorMax;
currentArea = area;
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 168fc1abe5906ee408df7120f6e4124a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

8
Assets/Settings.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fd38190998cdd4d41853c992c027e50b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 19aec48db6761764a91e3971485ef364
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,137 @@
{
"name": "GeneralInput",
"maps": [
{
"name": "Player",
"id": "a648116e-30a4-4385-b1b3-c68313a99118",
"actions": [
{
"name": "Look",
"type": "Value",
"id": "66b1943a-5f5d-4468-8927-cf27d673a48d",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Zoom",
"type": "Value",
"id": "629b760e-aea2-43b1-bab8-82a63af8926a",
"expectedControlType": "Analog",
"processors": "",
"interactions": "",
"initialStateCheck": true
}
],
"bindings": [
{
"name": "",
"id": "89a12f40-df5f-4fb3-9b97-2c0e44d94221",
"path": "<Gamepad>/rightStick",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "One Modifier",
"id": "6e497863-3638-48e9-9613-117acaa7fa74",
"path": "OneModifier",
"interactions": "",
"processors": "",
"groups": "",
"action": "Look",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "modifier",
"id": "850418d7-0e8a-4c18-97af-84abbc55a230",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "Look",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "binding",
"id": "c975f272-be60-4cb0-9ca7-9a0314601f4c",
"path": "<Pointer>/delta",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Look",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "e5cbb455-b6d3-4a9c-a4a2-7188510d7aa4",
"path": "<Touchscreen>/primaryTouch/delta",
"interactions": "",
"processors": "",
"groups": "Touch",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ed328ea2-92b4-4229-9fbc-16aad7be7d70",
"path": "<Mouse>/scroll/y",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Zoom",
"isComposite": false,
"isPartOfComposite": false
}
]
}
],
"controlSchemes": [
{
"name": "Keyboard&Mouse",
"bindingGroup": "Keyboard&Mouse",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Mouse>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Gamepad",
"bindingGroup": "Gamepad",
"devices": [
{
"devicePath": "<Gamepad>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Touch",
"bindingGroup": "Touch",
"devices": [
{
"devicePath": "<Touchscreen>",
"isOptional": false,
"isOR": false
}
]
}
]
}

View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 60132311316fe1d4fbf004b791401886
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
generateWrapperCode: 0
wrapperCodePath:
wrapperClassName:
wrapperCodeNamespace:

BIN
Assets/Video/Fortus/HandlingInformation.mp4 (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 78aee64c717624c63a694388eec4a673
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -571,12 +571,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3} m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3}
m_Name: OpenXR Package Settings m_Name: OpenXR Package Settings
m_EditorClassIdentifier: m_EditorClassIdentifier:
Keys: 0100000004000000070000000e000000 Keys: 0100000004000000070000000e0000000d000000
Values: Values:
- {fileID: 1558751085254723522} - {fileID: 1558751085254723522}
- {fileID: -5643329498234956570} - {fileID: -5643329498234956570}
- {fileID: 6165854303103985} - {fileID: 6165854303103985}
- {fileID: 541360891861413509} - {fileID: 541360891861413509}
- {fileID: 5729719189864865850}
--- !u!114 &6165854303103985 --- !u!114 &6165854303103985
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -933,6 +934,21 @@ MonoBehaviour:
company: Microsoft company: Microsoft
priority: 0 priority: 0
required: 0 required: 0
--- !u!114 &5729719189864865850
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
m_Name: WebGL
m_EditorClassIdentifier:
features: []
m_renderMode: 1
m_depthSubmissionMode: 0
--- !u!114 &5830279873133698105 --- !u!114 &5830279873133698105
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -26,6 +26,7 @@
"com.microsoft.mrtk.uxcore": "file:MixedReality/com.microsoft.mrtk.uxcore-3.0.0-pre.16.tgz", "com.microsoft.mrtk.uxcore": "file:MixedReality/com.microsoft.mrtk.uxcore-3.0.0-pre.16.tgz",
"com.microsoft.mrtk.windowsspeech": "file:MixedReality/com.microsoft.mrtk.windowsspeech-3.0.0-pre.16.tgz", "com.microsoft.mrtk.windowsspeech": "file:MixedReality/com.microsoft.mrtk.windowsspeech-3.0.0-pre.16.tgz",
"com.microsoft.spatialaudio.spatializer.unity": "file:MixedReality/com.microsoft.spatialaudio.spatializer.unity-2.0.37.tgz", "com.microsoft.spatialaudio.spatializer.unity": "file:MixedReality/com.microsoft.spatialaudio.spatializer.unity-2.0.37.tgz",
"com.unity.cinemachine": "2.9.7",
"com.unity.feature.development": "1.0.1", "com.unity.feature.development": "1.0.1",
"com.unity.netcode.gameobjects": "1.5.1", "com.unity.netcode.gameobjects": "1.5.1",
"com.unity.textmeshpro": "3.0.6", "com.unity.textmeshpro": "3.0.6",

View File

@ -159,6 +159,15 @@
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.cinemachine": {
"version": "2.9.7",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.31"
},
"url": "https://packages.unity.com"
},
"com.unity.collections": { "com.unity.collections": {
"version": "1.2.4", "version": "1.2.4",
"depth": 2, "depth": 2,

View File

@ -138,6 +138,12 @@ PlayerSettings:
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 4800000, guid: e7c77f6eaab324a819efdc13b8125a39, type: 3}
- {fileID: 4800000, guid: 6743a50a812740be8c0aa3fccc46fae9, type: 3}
- {fileID: -8091937080874747369, guid: e6aaa94396b17264791d972a69c1873e, type: 2}
- {fileID: 11400000, guid: 4602a861915eb4f4b897d24e48435c09, type: 2}
- {fileID: -5643329498234956570, guid: a700e85e08e15cc42afa43b723945cc8, type: 2}
- {fileID: 11400000, guid: c677e5c4eb85b7849a8da406775c299d, type: 2}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1