diff --git a/Assets/Resources/Prefabs/Facts/Triangle.prefab b/Assets/Resources/Prefabs/Facts/Triangle.prefab index 4b7d809f3a8362bfe5c143ef7eff697ccab8d48d..dd00b4c22742f2165838556f9e75e90fc290e656 100644 --- a/Assets/Resources/Prefabs/Facts/Triangle.prefab +++ b/Assets/Resources/Prefabs/Facts/Triangle.prefab @@ -1,5 +1,193 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2688299870578515406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 29302832430599646} + - component: {fileID: 503893222331825355} + - component: {fileID: 661528896933927744} + - component: {fileID: 3021905677247651873} + m_Layer: 10 + m_Name: LabelText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &29302832430599646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2688299870578515406} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3390467403729316765} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 2, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &503893222331825355 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2688299870578515406} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &661528896933927744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2688299870578515406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + 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: + m_Calls: [] + m_text: Test + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + 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_fontSize: 4 + m_fontSizeBase: 4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 503893222331825355} + m_maskType: 0 +--- !u!114 &3021905677247651873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2688299870578515406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3} + m_Name: + m_EditorClassIdentifier: + Cam1: {fileID: 0} + Cam2: {fileID: 0} + BackUPCam: {fileID: 0} --- !u!1 &3319392661904935552 GameObject: m_ObjectHideFlags: 0 @@ -134,7 +322,7 @@ GameObject: - component: {fileID: 6626359674163989219} - component: {fileID: 4818731436791451552} m_Layer: 21 - m_Name: CircleHighlight + m_Name: TriangleHighlight m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -217,7 +405,7 @@ GameObject: - component: {fileID: 3164742056485930267} - component: {fileID: 1460740696286669547} m_Layer: 21 - m_Name: CircleHighlight + m_Name: TriangleHighlight m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -442,6 +630,7 @@ Transform: m_Children: - {fileID: 142224692930156368} - {fileID: 7541265271928914416} + - {fileID: 29302832430599646} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -458,7 +647,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _URI: - FactText: [] + FactText: + - {fileID: 0} StringLabelFormats: [] Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} @@ -487,4 +677,4 @@ MonoBehaviour: AlternateNormals: 0 ab: 1 height: 1 - c: 0.5 + _c: 0.5 diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity index 7ea9575cd452cb8cce12bad48eaecb59d2a9efee..b98f94b9d0851f903e4a8aa7a53cf5ff212f12d6 100644 --- a/Assets/Scenes/Worlds/RiverWorld.unity +++ b/Assets/Scenes/Worlds/RiverWorld.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44084534, g: 0.48955458, b: 0.56959116, a: 1} + m_IndirectSpecularColor: {r: 0.44100717, g: 0.4898312, b: 0.5698877, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -2205,7 +2205,6 @@ Transform: - {fileID: 778909919} - {fileID: 1840687079} - {fileID: 387397068} - - {fileID: 176084180} m_Father: {fileID: 642235746} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3191,101 +3190,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 174119663} m_PrefabAsset: {fileID: 0} ---- !u!1001 &176084179 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 117995034} - m_Modifications: - - target: {fileID: 3992787084245164670, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_Name - value: Cake - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalScale.z - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalPosition.x - value: 69.2062 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalPosition.y - value: 7.4 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalPosition.z - value: 53.6 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0ea7d7beb330a245bd999e7c4cab227, type: 3} ---- !u!4 &176084180 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5820827822255915852, guid: b0ea7d7beb330a245bd999e7c4cab227, - type: 3} - m_PrefabInstance: {fileID: 176084179} - m_PrefabAsset: {fileID: 0} --- !u!1001 &180392428 PrefabInstance: m_ObjectHideFlags: 0 @@ -5880,7 +5784,7 @@ PrefabInstance: - target: {fileID: 8728653376014859777, guid: d52eb204fee04a9469db562163356fe6, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8728653376014859777, guid: d52eb204fee04a9469db562163356fe6, type: 3} @@ -14198,6 +14102,91 @@ Transform: type: 3} m_PrefabInstance: {fileID: 544167770} m_PrefabAsset: {fileID: 0} +--- !u!1001 &544246698 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 642235746} + m_Modifications: + - target: {fileID: 3992787084245164670, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_Name + value: Cake + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalPosition.x + value: 31.500832 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.3042488 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalPosition.z + value: 19.507496 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, type: 3} +--- !u!4 &544246699 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5820827822255915852, guid: 00c8824bbfc9a4c47ac6b0ccb51c333c, + type: 3} + m_PrefabInstance: {fileID: 544246698} + m_PrefabAsset: {fileID: 0} --- !u!1001 &544431158 PrefabInstance: m_ObjectHideFlags: 0 @@ -15932,8 +15921,9 @@ Transform: m_Children: - {fileID: 117995034} - {fileID: 312391688} + - {fileID: 544246699} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &645585536 PrefabInstance: @@ -26505,7 +26495,7 @@ PrefabInstance: - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e, type: 3} @@ -60518,6 +60508,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2258042202925325658, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: factLayerMask.m_Bits + value: 2161664 + objectReference: {fileID: 0} - target: {fileID: 2267088185126138740, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -62056,6 +62051,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4705772093382662422, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: factLayerMask.m_Bits + value: 2161664 + objectReference: {fileID: 0} - target: {fileID: 4781424044739630211, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs index 035c21017c9f7ce231aff4d5a0b81fcd54ef5418..70584ecf68cabbe8be31c7a1a6939f291d1a41cc 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs @@ -131,11 +131,13 @@ public void SpawnTriangle(TriangleFact2 fact) triangle.transform.SetPositionAndRotation(fact.Position, fact.Rotation); // triangle.transform.localScale = Vector3.Scale(triangle.transform.localScale, fact.LocalScale); - // triangle.GetComponentInChildren<TextMeshPro>().text = fact.GetLabel(StageStatic.stage.factState) + " = " + System.Math.Round(fact.Area, 2) + "m²"; + triangle.GetComponentInChildren<TextMeshPro>().text = fact.GetLabel(StageStatic.stage.factState) + " = " + System.Math.Round(fact.Area, 2) + "m²"; TriangleGenerator[] triangelGenerators = triangle.GetComponentsInChildren<TriangleGenerator>(); foreach (var gen in triangelGenerators) { + gen.ab = Vector3.Distance(fact.A, fact.B); + gen.height = Vector3.Distance(fact.c, fact.C); gen.c = fact.cPosition; } } diff --git a/Assets/Scripts/MeshGenerator/TriangleGenerator.cs b/Assets/Scripts/MeshGenerator/TriangleGenerator.cs index 3666065447dbe68942d0513e8240b04075dfc178..b8ed7c36fe45829b4936c8cc6550fe0065b22a2d 100644 --- a/Assets/Scripts/MeshGenerator/TriangleGenerator.cs +++ b/Assets/Scripts/MeshGenerator/TriangleGenerator.cs @@ -6,9 +6,17 @@ public class TriangleGenerator : ShapeGenerator { #region InspectorVariables [Header("Triangle values")] - [Range(0, 100)] public float ab = 1f; - [Range(0, 100)] public float height = 1f; - [Range(0, 1)] public float c = 0.5f; + public float ab = 1f; + public float height = 1f; + [SerializeField] protected float _c = 0.5f; + public float c + { + get { return _c; } + set { + _c = value; + GenerateShapeForAll(); + } + } #endregion InspectorVariables #region Implementation