From 25761466327e36271109bf146a44a3c6122f539a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Sch=C3=B6ner?= <tobias.stonehead@gmail.com>
Date: Fri, 17 Jun 2022 11:36:16 +0200
Subject: [PATCH] Changed Fact visualisation colliders to triggers
Otherwise you could eg walk on the circle visualisation
---
Assets/Resources/Prefabs/Facts/Angle.prefab | 10 +-
.../Resources/Prefabs/Facts/Angle_Old.prefab | 118 +++++-------------
Assets/Resources/Prefabs/Facts/Circle.prefab | 4 +-
Assets/Resources/Prefabs/Facts/Line.prefab | 4 +-
Assets/Resources/Prefabs/Facts/Ray.prefab | 4 +-
Assets/Resources/Prefabs/Facts/Sphere.prefab | 4 +-
6 files changed, 46 insertions(+), 98 deletions(-)
diff --git a/Assets/Resources/Prefabs/Facts/Angle.prefab b/Assets/Resources/Prefabs/Facts/Angle.prefab
index 201b2d09..c0ade93c 100644
--- a/Assets/Resources/Prefabs/Facts/Angle.prefab
+++ b/Assets/Resources/Prefabs/Facts/Angle.prefab
@@ -263,10 +263,10 @@ MeshCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3394522495515098197}
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
- m_Convex: 0
+ m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 0}
--- !u!114 &3394522495515098196
@@ -295,7 +295,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
- Id: 0
+ URI:
--- !u!1 &3394522496185282000
GameObject:
m_ObjectHideFlags: 0
@@ -390,10 +390,10 @@ MeshCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3394522496185282000}
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
- m_Convex: 0
+ m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 0}
--- !u!114 &3394522496185282007
diff --git a/Assets/Resources/Prefabs/Facts/Angle_Old.prefab b/Assets/Resources/Prefabs/Facts/Angle_Old.prefab
index 350822ee..8db326a7 100644
--- a/Assets/Resources/Prefabs/Facts/Angle_Old.prefab
+++ b/Assets/Resources/Prefabs/Facts/Angle_Old.prefab
@@ -10,7 +10,6 @@ GameObject:
m_Component:
- component: {fileID: 776204628661091474}
- component: {fileID: 1611341617565119760}
- - component: {fileID: 5847986162312327669}
- component: {fileID: 3727883962287805668}
- component: {fileID: 8678993674720081185}
m_Layer: 12
@@ -54,6 +53,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -78,14 +78,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
---- !u!33 &5847986162312327669
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1047820262597827614}
- m_Mesh: {fileID: 0}
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!222 &3727883962287805668
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -109,6 +102,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -134,13 +128,12 @@ MonoBehaviour:
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
m_fontSize: 2
m_fontSizeBase: 2
m_fontWeight: 400
@@ -148,7 +141,9 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
- m_textAlignment: 514
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -158,10 +153,8 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
+ parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
@@ -169,42 +162,23 @@ MonoBehaviour:
m_parseCtrlCharacters: 1
m_isOrthographic: 0
m_isCullingEnabled: 0
- m_ignoreRectMaskCulling: 0
- m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
- m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 8678993674720081185}
- characterCount: 4
- spriteCount: 0
- spaceCount: 0
- wordCount: 1
- linkCount: 0
- lineCount: 1
- pageCount: 1
- materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
- m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_renderer: {fileID: 1611341617565119760}
- m_subTextObjects:
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
m_maskType: 0
+ _SortingLayer: 0
+ _SortingLayerID: 0
+ _SortingOrder: 0
--- !u!1 &4650993678488610235
GameObject:
m_ObjectHideFlags: 0
@@ -263,6 +237,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -287,6 +262,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &4650993678488610230
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -299,7 +275,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
- Id: 0
+ URI:
--- !u!64 &4650993678488610231
MeshCollider:
m_ObjectHideFlags: 0
@@ -308,10 +284,10 @@ MeshCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4650993678488610235}
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
- m_Convex: 0
+ m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: 4fe93ee2ed2d8c64389611c85232bf23, type: 2}
--- !u!1 &4650993679089994827
@@ -403,6 +379,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -427,6 +404,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &7310199272454353937
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -439,10 +417,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a6b9fc46f5bfe6b4eb4adf01e6b65bac, type: 3}
m_Name:
m_EditorClassIdentifier:
- meshRendererToChange: {fileID: 4650993679319476102}
- animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1}
- animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1}
- animateDuration: 5
--- !u!1 &7003220517868882106
GameObject:
m_ObjectHideFlags: 0
@@ -453,7 +427,6 @@ GameObject:
m_Component:
- component: {fileID: 6834100498144429849}
- component: {fileID: 2708246422010202965}
- - component: {fileID: 9133314279872122108}
- component: {fileID: 8080899974220995652}
- component: {fileID: 3620593617881097249}
m_Layer: 12
@@ -497,6 +470,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -521,14 +495,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
---- !u!33 &9133314279872122108
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7003220517868882106}
- m_Mesh: {fileID: 0}
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!222 &8080899974220995652
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -552,6 +519,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -577,13 +545,12 @@ MonoBehaviour:
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
m_fontSize: 2
m_fontSizeBase: 2
m_fontWeight: 400
@@ -591,7 +558,9 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
- m_textAlignment: 514
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
@@ -601,10 +570,8 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
+ parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
@@ -612,39 +579,20 @@ MonoBehaviour:
m_parseCtrlCharacters: 1
m_isOrthographic: 0
m_isCullingEnabled: 0
- m_ignoreRectMaskCulling: 0
- m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
- m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 3620593617881097249}
- characterCount: 4
- spriteCount: 0
- spaceCount: 0
- wordCount: 1
- linkCount: 0
- lineCount: 1
- pageCount: 1
- materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
- m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_renderer: {fileID: 2708246422010202965}
- m_subTextObjects:
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
m_maskType: 0
+ _SortingLayer: 0
+ _SortingLayerID: 0
+ _SortingOrder: 0
diff --git a/Assets/Resources/Prefabs/Facts/Circle.prefab b/Assets/Resources/Prefabs/Facts/Circle.prefab
index 33c93678..6a524bc9 100644
--- a/Assets/Resources/Prefabs/Facts/Circle.prefab
+++ b/Assets/Resources/Prefabs/Facts/Circle.prefab
@@ -219,10 +219,10 @@ MeshCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6262947649539239553}
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
- m_Convex: 0
+ m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &6839596689016440457
diff --git a/Assets/Resources/Prefabs/Facts/Line.prefab b/Assets/Resources/Prefabs/Facts/Line.prefab
index 57ed1b80..70c1c749 100644
--- a/Assets/Resources/Prefabs/Facts/Line.prefab
+++ b/Assets/Resources/Prefabs/Facts/Line.prefab
@@ -408,7 +408,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
- Id: 0
+ URI:
--- !u!65 &6179051021116985022
BoxCollider:
m_ObjectHideFlags: 0
@@ -417,7 +417,7 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6378548342073962023}
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
diff --git a/Assets/Resources/Prefabs/Facts/Ray.prefab b/Assets/Resources/Prefabs/Facts/Ray.prefab
index 308edcdf..91b06cab 100644
--- a/Assets/Resources/Prefabs/Facts/Ray.prefab
+++ b/Assets/Resources/Prefabs/Facts/Ray.prefab
@@ -408,7 +408,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
- Id: 0
+ URI:
--- !u!65 &6179051021116985022
BoxCollider:
m_ObjectHideFlags: 0
@@ -417,7 +417,7 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6378548342073962023}
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
diff --git a/Assets/Resources/Prefabs/Facts/Sphere.prefab b/Assets/Resources/Prefabs/Facts/Sphere.prefab
index 6748d114..fab6756e 100644
--- a/Assets/Resources/Prefabs/Facts/Sphere.prefab
+++ b/Assets/Resources/Prefabs/Facts/Sphere.prefab
@@ -96,7 +96,7 @@ SphereCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 537518992981541273}
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
@@ -113,7 +113,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
- Id: 0
+ URI:
--- !u!114 &6183343481027254878
MonoBehaviour:
m_ObjectHideFlags: 0
--
GitLab