diff --git a/.idea/.idea.gimm270_07_photoGallery/.idea/workspace.xml b/.idea/.idea.gimm270_07_photoGallery/.idea/workspace.xml new file mode 100644 index 0000000..b09b15b --- /dev/null +++ b/.idea/.idea.gimm270_07_photoGallery/.idea/workspace.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1663552873780 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Fonts.meta b/Assets/Fonts.meta new file mode 100644 index 0000000..4772021 --- /dev/null +++ b/Assets/Fonts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cafc87e7c309e48e3919e4daa39676d9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Oswald-Light.ttf b/Assets/Fonts/Oswald-Light.ttf new file mode 100644 index 0000000..8055246 Binary files /dev/null and b/Assets/Fonts/Oswald-Light.ttf differ diff --git a/Assets/Fonts/Oswald-Light.ttf.meta b/Assets/Fonts/Oswald-Light.ttf.meta new file mode 100644 index 0000000..c5f1839 --- /dev/null +++ b/Assets/Fonts/Oswald-Light.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 590dad5226b6989b985b090681e2816c +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Oswald + fallbackFontReferences: + - {fileID: 12800000, guid: 2947a88bd6d7982ddb584b39f857889a, type: 3} + - {fileID: 12800000, guid: 63015b5399fb597cf966c4220a4e3252, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Oswald-Medium.ttf b/Assets/Fonts/Oswald-Medium.ttf new file mode 100644 index 0000000..4b77dcc Binary files /dev/null and b/Assets/Fonts/Oswald-Medium.ttf differ diff --git a/Assets/Fonts/Oswald-Medium.ttf.meta b/Assets/Fonts/Oswald-Medium.ttf.meta new file mode 100644 index 0000000..aecd20e --- /dev/null +++ b/Assets/Fonts/Oswald-Medium.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 63015b5399fb597cf966c4220a4e3252 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Oswald + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Oswald-Regular.ttf b/Assets/Fonts/Oswald-Regular.ttf new file mode 100644 index 0000000..053cf26 Binary files /dev/null and b/Assets/Fonts/Oswald-Regular.ttf differ diff --git a/Assets/Fonts/Oswald-Regular.ttf.meta b/Assets/Fonts/Oswald-Regular.ttf.meta new file mode 100644 index 0000000..b1aa5be --- /dev/null +++ b/Assets/Fonts/Oswald-Regular.ttf.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2947a88bd6d7982ddb584b39f857889a +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Oswald + fallbackFontReferences: + - {fileID: 12800000, guid: 63015b5399fb597cf966c4220a4e3252, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/wallMaterial01.mat b/Assets/Materials/wallMaterial01.mat index 57cd53a..14778de 100644 --- a/Assets/Materials/wallMaterial01.mat +++ b/Assets/Materials/wallMaterial01.mat @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.15686275, g: 0.1882353, b: 0.26666668, a: 1} + - _Color: {r: 0.20705882, g: 0.24847056, b: 0.352, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/mainGallery.unity b/Assets/Scenes/mainGallery.unity index 4d67c00..98c7153 100644 --- a/Assets/Scenes/mainGallery.unity +++ b/Assets/Scenes/mainGallery.unity @@ -3901,6 +3901,7 @@ GameObject: - component: {fileID: 291248332} - component: {fileID: 291248331} - component: {fileID: 291248330} + - component: {fileID: 291248334} m_Layer: 0 m_Name: overviewPanorama m_TagString: Untagged @@ -3987,6 +3988,23 @@ Transform: m_Father: {fileID: 246693464} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: -90, z: 90} +--- !u!114 &291248334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 291248329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3} + m_Name: + m_EditorClassIdentifier: + newTitle: Overview + newDesc: This panorama depicts an overview of the area where I captured the images + in this gallery. + minDistance: 4 + maxDistance: 5 --- !u!43 &326199260 Mesh: m_ObjectHideFlags: 0 @@ -16214,7 +16232,7 @@ Light: m_Type: 0 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 2.89 + m_Intensity: 3.48 m_Range: 10 m_SpotAngle: 30.8 m_InnerSpotAngle: 19.3 @@ -22303,6 +22321,108 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1722350007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1722350011} + - component: {fileID: 1722350010} + - component: {fileID: 1722350009} + - component: {fileID: 1722350008} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1722350008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722350007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1722350009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722350007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1722350010 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722350007} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1722350011 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722350007} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1897960196} + - {fileID: 1986132873} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1730356800 GameObject: m_ObjectHideFlags: 0 @@ -23826,6 +23946,86 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1897960195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1897960196} + - component: {fileID: 1897960198} + - component: {fileID: 1897960197} + m_Layer: 5 + m_Name: ArtTitle + m_TagString: ArtTitle + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1897960196 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897960195} + 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: [] + m_Father: {fileID: 1722350011} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 173, y: 55} + m_SizeDelta: {x: 320, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1897960197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897960195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 63015b5399fb597cf966c4220a4e3252, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Testing +--- !u!222 &1897960198 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897960195} + m_CullTransparentMesh: 1 --- !u!1 &1909136987 GameObject: m_ObjectHideFlags: 0 @@ -26144,6 +26344,86 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: +--- !u!1 &1986132872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1986132873} + - component: {fileID: 1986132875} + - component: {fileID: 1986132874} + m_Layer: 5 + m_Name: ArtDescription + m_TagString: Description + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1986132873 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1986132872} + 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: [] + m_Father: {fileID: 1722350011} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -256, y: 55} + m_SizeDelta: {x: 500, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1986132874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1986132872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 63015b5399fb597cf966c4220a4e3252, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 18 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Testing +--- !u!222 &1986132875 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1986132872} + m_CullTransparentMesh: 1 --- !u!1 &2055064493 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/mainGallery/LightingData.asset b/Assets/Scenes/mainGallery/LightingData.asset index de46f5b..20d0bbd 100644 Binary files a/Assets/Scenes/mainGallery/LightingData.asset and b/Assets/Scenes/mainGallery/LightingData.asset differ diff --git a/Assets/Scripts/Proximity.cs b/Assets/Scripts/Proximity.cs index 4d0ea48..cb3ba39 100644 --- a/Assets/Scripts/Proximity.cs +++ b/Assets/Scripts/Proximity.cs @@ -1,23 +1,19 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.UI; - public class Proximity : MonoBehaviour { public string newTitle; - public string newAuthor; public string newDesc; private Transform other; private Text myTitle; - private Text myAuthor; private Text myDesc; private float dist; + public float minDistance = 4.0f; + public float maxDistance = 5.0f; private GameObject player; private GameObject message1; private GameObject message2; - private GameObject message3; private bool check; // Start is called before the first frame update @@ -26,13 +22,10 @@ public class Proximity : MonoBehaviour player = GameObject.FindWithTag("Player"); other = player.GetComponent(); message1 = GameObject.FindWithTag("ArtTitle"); - message2 = GameObject.FindWithTag("Auth"); - message3 = GameObject.FindWithTag("Description"); + message2 = GameObject.FindWithTag("Description"); myTitle = message1.GetComponent(); myTitle.text = ""; - myAuthor = message2.GetComponent(); - myAuthor.text = ""; - myDesc = message3.GetComponent(); + myDesc = message2.GetComponent(); myDesc.text = ""; check = false; } @@ -44,17 +37,23 @@ public class Proximity : MonoBehaviour { dist = Vector3.Distance(transform.position, other.position); print("Distance to player: " + dist); - if (dist < 4) + if (dist < minDistance) { myTitle.text = newTitle; - myAuthor.text = newAuthor; myDesc.text = newDesc; check = true; } - if (dist > 4 && check == true) + if (dist > maxDistance && check) { - Start(); + resetText(); } } } + + private void resetText() + { + myTitle.text = ""; + myDesc.text = ""; + check = false; + } } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..69b0cc9 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,11 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - CinemachineTarget + - ArtTitle + - Auth + - Description layers: - Default - TransparentFX