diff --git a/Assets/Prefabs/Portal.prefab b/Assets/Prefabs/Portal.prefab index e64dd08..ec10938 100644 --- a/Assets/Prefabs/Portal.prefab +++ b/Assets/Prefabs/Portal.prefab @@ -49,7 +49,9 @@ MonoBehaviour: m_AngleDif: 0 m_CamDif: 0 m_CameraPrefab: {fileID: 1179287573507601862, guid: 1a28b9e152b1d3d419d1881ea498fcbf, type: 3} - m_PortalRenderer: {fileID: 4162196787169641245} + m_Renderers: + - {fileID: 4162196787169641245} + - {fileID: 4134581380583201958} m_PlayerPoint: {fileID: 6158405577604730568} --- !u!65 &5568742943214540714 BoxCollider: @@ -103,6 +105,89 @@ Transform: m_Children: [] m_Father: {fileID: 3117384245817137028} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3792217788487949262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8495484525370355397} + - component: {fileID: 6225447176941520143} + - component: {fileID: 4134581380583201958} + m_Layer: 12 + m_Name: BackRender + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8495484525370355397 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792217788487949262} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -2, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2772991262862259612} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6225447176941520143 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792217788487949262} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4134581380583201958 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3792217788487949262} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 2100000, guid: b8370180ee45f7948b513305ba938a27, 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} --- !u!1 &4525855263416128436 GameObject: m_ObjectHideFlags: 0 @@ -130,10 +215,11 @@ Transform: m_GameObject: {fileID: 4525855263416128436} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalPosition: {x: 0, y: 5, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8495484525370355397} m_Father: {fileID: 3117384245817137028} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &5956259521933674024 @@ -246,7 +332,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7967144210440699741} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -269,7 +355,7 @@ BoxCollider: m_Bits: 0 m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 + m_ProvidesContacts: 1 m_Enabled: 1 serializedVersion: 3 m_Size: {x: 10, y: 10, z: 5} diff --git a/Assets/Scripts/Portals/PortalCamera.cs b/Assets/Scripts/Portals/PortalCamera.cs index a643983..8c5d7a2 100644 --- a/Assets/Scripts/Portals/PortalCamera.cs +++ b/Assets/Scripts/Portals/PortalCamera.cs @@ -19,7 +19,7 @@ public class PortalCamera : MonoBehaviour Vector3 m_Rot; // Initialistion function for the camera - public void InitCamera(MeshRenderer renderer, PortalManager creator, Vector3 rot) + public void InitCamera(MeshRenderer[] renderers, PortalManager creator, Vector3 rot) { // Transfers the passed rotation to be stored within the class m_Rot = rot; @@ -42,7 +42,11 @@ public class PortalCamera : MonoBehaviour // Links the camera to the mesh renderer m_Camera.targetTexture = m_RenderTexture; // Sets it's camera to display to the render texture instead of the screen m_RenderMaterial.mainTexture = m_RenderTexture; // Sets the material to use the render texture as it's texture - renderer.material = m_RenderMaterial; // Set's the renderer to use the material + + foreach (Renderer renderer in renderers) + { + renderer.material = m_RenderMaterial; + } } // Update is called every frame diff --git a/Assets/Scripts/Portals/PortalManager.cs b/Assets/Scripts/Portals/PortalManager.cs index 347d55b..d4ba54a 100644 --- a/Assets/Scripts/Portals/PortalManager.cs +++ b/Assets/Scripts/Portals/PortalManager.cs @@ -9,7 +9,7 @@ public class PortalManager : MonoBehaviour [Header("Set References")] [SerializeField] GameObject m_CameraPrefab; - [SerializeField] MeshRenderer m_PortalRenderer; + [SerializeField] MeshRenderer[] m_Renderers; [Header("Points")] [SerializeField] Transform m_PlayerPoint; @@ -45,7 +45,7 @@ public class PortalManager : MonoBehaviour m_PortalCamera = cam.GetComponentInChildren(); // Initialises the camera so it renders to the portal and not the screen - m_PortalCamera.InitCamera(m_PortalRenderer, this, transform.parent.localEulerAngles * 2.0f); + m_PortalCamera.InitCamera(m_Renderers, this, transform.parent.localEulerAngles * 2.0f); } // Updates is called every frame