From 48836237400a741cf3fd659784c293eedfce07ab Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Thu, 11 Mar 2021 13:31:35 +0000 Subject: [PATCH] made artefact preview work --- .../Physical/Physical Artefact.asset | 1 + .../ArtefactObjects/Power/PA_Blink.asset | 1 + .../ArtefactObjects/Power/PA_Boost.asset | 1 + .../ArtefactObjects/Written/WA_Widget.asset | 1 + .../Prefabs/Artefacts/RotatableModels.meta | 8 + .../RotatableModels/TestArtefact.prefab | 83 ++++++++ .../RotatableModels/TestArtefact.prefab.meta | 7 + game/Assets/Prefabs/UI/ArtefactUI.prefab | 75 ++++++- game/Assets/Scenes/Main.unity | 186 +++++++++++++++++- game/Assets/Scripts/Artefacts/Artefact.cs | 3 + .../Scripts/Artefacts/ArtefactPreview.cs | 16 ++ .../Scripts/Artefacts/ArtefactPreview.cs.meta | 11 ++ .../Assets/Scripts/Artefacts/PickUpDisplay.cs | 8 +- .../Textures/PreviewImage.renderTexture | 38 ++++ .../Textures/PreviewImage.renderTexture.meta | 8 + 15 files changed, 432 insertions(+), 15 deletions(-) create mode 100644 game/Assets/Prefabs/Artefacts/RotatableModels.meta create mode 100644 game/Assets/Prefabs/Artefacts/RotatableModels/TestArtefact.prefab create mode 100644 game/Assets/Prefabs/Artefacts/RotatableModels/TestArtefact.prefab.meta create mode 100644 game/Assets/Scripts/Artefacts/ArtefactPreview.cs create mode 100644 game/Assets/Scripts/Artefacts/ArtefactPreview.cs.meta create mode 100644 game/Assets/Textures/PreviewImage.renderTexture create mode 100644 game/Assets/Textures/PreviewImage.renderTexture.meta diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset index 4acb507..39391f0 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset @@ -15,3 +15,4 @@ MonoBehaviour: _artefactID: 0 _dialogueKey: _name: + _prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3} diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset index 03f4cb0..9f940fc 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset @@ -15,4 +15,5 @@ MonoBehaviour: _artefactID: 10 _dialogueKey: PA_DASH _name: Blink + _prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3} _power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2} diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Boost.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Boost.asset index 2800466..bb5344f 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Boost.asset +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Boost.asset @@ -15,4 +15,5 @@ MonoBehaviour: _artefactID: 11 _dialogueKey: PA_BOOST _name: Boost + _prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3} _power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2} diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Written/WA_Widget.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Written/WA_Widget.asset index 62f10cb..1c88ee0 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Written/WA_Widget.asset +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Written/WA_Widget.asset @@ -15,3 +15,4 @@ MonoBehaviour: _artefactID: 20 _dialogueKey: WA_0 _name: Widget + _prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3} diff --git a/game/Assets/Prefabs/Artefacts/RotatableModels.meta b/game/Assets/Prefabs/Artefacts/RotatableModels.meta new file mode 100644 index 0000000..8785410 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/RotatableModels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e261fff7e0dfd7f47b136d01ed657ca9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Artefacts/RotatableModels/TestArtefact.prefab b/game/Assets/Prefabs/Artefacts/RotatableModels/TestArtefact.prefab new file mode 100644 index 0000000..1ecb242 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/RotatableModels/TestArtefact.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3799998566341120319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3799998566341123779} + - component: {fileID: 3799998566341123778} + - component: {fileID: 3799998566341123777} + m_Layer: 0 + m_Name: TestArtefact + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3799998566341123779 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3799998566341120319} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3799998566341123778 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3799998566341120319} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3799998566341123777 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3799998566341120319} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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: 1 + 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} diff --git a/game/Assets/Prefabs/Artefacts/RotatableModels/TestArtefact.prefab.meta b/game/Assets/Prefabs/Artefacts/RotatableModels/TestArtefact.prefab.meta new file mode 100644 index 0000000..bb087f0 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/RotatableModels/TestArtefact.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e48f46564bce92e4aa707fd447afd68e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/UI/ArtefactUI.prefab b/game/Assets/Prefabs/UI/ArtefactUI.prefab index e90f1d8..7a94d08 100644 --- a/game/Assets/Prefabs/UI/ArtefactUI.prefab +++ b/game/Assets/Prefabs/UI/ArtefactUI.prefab @@ -272,6 +272,78 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1255585289902994548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1804033037041769558} + - component: {fileID: 6559757184916034406} + - component: {fileID: 4888347001989026482} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1804033037041769558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255585289902994548} + 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_Children: [] + m_Father: {fileID: 7371638682713914365} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6559757184916034406 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255585289902994548} + m_CullTransparentMesh: 1 +--- !u!114 &4888347001989026482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255585289902994548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 8400000, guid: 0fc273c76f186624c8278e4fc863187c, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &1847473709807652412 GameObject: m_ObjectHideFlags: 0 @@ -532,7 +604,8 @@ RectTransform: 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_Children: [] + m_Children: + - {fileID: 1804033037041769558} m_Father: {fileID: 6133269047523877030} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 88f61fb..e55e30b 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -2455,15 +2455,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000029802322 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.040505223 + value: -0.040505264 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.022064082 + value: 0.022064105 objectReference: {fileID: 0} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.m_InvertInput @@ -3458,6 +3458,122 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} m_PrefabInstance: {fileID: 3060674078099949809} m_PrefabAsset: {fileID: 0} +--- !u!1 &1075378750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1075378751} + - component: {fileID: 1075378754} + - component: {fileID: 1075378753} + - component: {fileID: 1075378752} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1075378751 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075378750} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -2.261} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1971608067} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1075378752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075378750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: 0 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &1075378753 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075378750} + m_Enabled: 1 +--- !u!20 &1075378754 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075378750} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 0fc273c76f186624c8278e4fc863187c, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &1083470527 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} @@ -4162,11 +4278,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 985763be016f1d6408a7112ccc290bea, type: 3} m_PrefabInstance: {fileID: 3060674077815803899} m_PrefabAsset: {fileID: 0} ---- !u!1 &1239556274 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4676633831945762664, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - m_PrefabInstance: {fileID: 782933553} - m_PrefabAsset: {fileID: 0} --- !u!1 &1241011629 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3} @@ -6623,6 +6734,50 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674079330468791} m_PrefabAsset: {fileID: 0} +--- !u!1 &1971608066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1971608067} + - component: {fileID: 1971608068} + m_Layer: 0 + m_Name: Preview + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1971608067 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971608066} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1337, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1075378751} + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1971608068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971608066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d5a3b7abfa891b45a3fee95bb3f212d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1976976714 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2784d88b6334dc143a910f3d252aa5df, type: 3} @@ -6968,11 +7123,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: artefactUI: {fileID: 483749937} - Player: {fileID: 1239556274} artefactText: {fileID: 59318657} - inputSettings: {fileID: 11400000, guid: 87faf39b6f22e524984c1680a88045ac, type: 2} dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} artefacts: {fileID: 11400000, guid: f523ac0d77530064b8b41c627b13fae0, type: 2} + _preview: {fileID: 1971608068} _uiOpen: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2} _uiClose: {fileID: 11400000, guid: d8c4272694282b64e9cd1d4a42477262, type: 2} --- !u!114 &2070784759 @@ -58540,6 +58694,18 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} --- !u!1001 &8182946074183196472 diff --git a/game/Assets/Scripts/Artefacts/Artefact.cs b/game/Assets/Scripts/Artefacts/Artefact.cs index 47617ae..f179176 100644 --- a/game/Assets/Scripts/Artefacts/Artefact.cs +++ b/game/Assets/Scripts/Artefacts/Artefact.cs @@ -12,6 +12,9 @@ public class Artefact : ScriptableObject public string Name => _name; [SerializeField] private string _name; + + public GameObject Prefab => _prefab; + [SerializeField] private GameObject _prefab; public bool show => _show; private bool _show = false; diff --git a/game/Assets/Scripts/Artefacts/ArtefactPreview.cs b/game/Assets/Scripts/Artefacts/ArtefactPreview.cs new file mode 100644 index 0000000..1ec9a1b --- /dev/null +++ b/game/Assets/Scripts/Artefacts/ArtefactPreview.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using System.Security.Cryptography; +using UnityEngine; + +public class ArtefactPreview : MonoBehaviour +{ + private GameObject _artefactInstance; + public void Preview( GameObject artefact ) + { + if ( _artefactInstance ) + Destroy( _artefactInstance ); + + _artefactInstance = Instantiate( artefact, transform ); + } +} diff --git a/game/Assets/Scripts/Artefacts/ArtefactPreview.cs.meta b/game/Assets/Scripts/Artefacts/ArtefactPreview.cs.meta new file mode 100644 index 0000000..6ee90a4 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/ArtefactPreview.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5d5a3b7abfa891b45a3fee95bb3f212d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/PickUpDisplay.cs b/game/Assets/Scripts/Artefacts/PickUpDisplay.cs index c5f119a..4242dbf 100644 --- a/game/Assets/Scripts/Artefacts/PickUpDisplay.cs +++ b/game/Assets/Scripts/Artefacts/PickUpDisplay.cs @@ -11,11 +11,10 @@ public class PickUpDisplay : MonoBehaviour [SerializeField] private static bool _paused; [SerializeField] private GameObject artefactUI; - [SerializeField] private GameObject Player; [SerializeField] private Text artefactText; - [SerializeField] private InputSettings inputSettings; [SerializeField] private DialogueSystem dialogue; [SerializeField] private ArtefactSystem artefacts; + [SerializeField] private ArtefactPreview _preview; [SerializeField] private GameEvent _uiOpen; @@ -44,7 +43,8 @@ public class PickUpDisplay : MonoBehaviour artefactUI.SetActive(true); artefactText.text = chosenArtefact.Name; // inputSettings.updateMode = (InputSettings.UpdateMode)1; - dialogue.PlayLine(chosenArtefact.dialogueKey); + dialogue.PlayLine( chosenArtefact.dialogueKey ); + _preview.Preview( chosenArtefact.Prefab ); _uiOpen.Raise(); } @@ -52,7 +52,7 @@ public class PickUpDisplay : MonoBehaviour public void PopUpOff() { _paused = false; - artefactUI.SetActive(false); + artefactUI.SetActive( false ); // inputSettings.updateMode = (InputSettings.UpdateMode)2; chosenArtefact = null; diff --git a/game/Assets/Textures/PreviewImage.renderTexture b/game/Assets/Textures/PreviewImage.renderTexture new file mode 100644 index 0000000..469b01d --- /dev/null +++ b/game/Assets/Textures/PreviewImage.renderTexture @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PreviewImage + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1280 + m_Height: 720 + m_AntiAliasing: 2 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/game/Assets/Textures/PreviewImage.renderTexture.meta b/game/Assets/Textures/PreviewImage.renderTexture.meta new file mode 100644 index 0000000..24dcfc5 --- /dev/null +++ b/game/Assets/Textures/PreviewImage.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0fc273c76f186624c8278e4fc863187c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: