m-vz/modular-vr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

desert portal

Browse Source
This commit is contained in:
milan
2022-11-27 12:12:02 +01:00
parent bc61d04541
commit 15f3857302
65 changed files with 3412 additions and 1127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

286
Assets/Portal/Assets/Prefabs/Portal.prefab
View File

@@ -1,5 +1,88 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5366957160841664999
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4697416823958963037}
- component: {fileID: 8547629936759508216}
- component: {fileID: 5871497001431693362}
m_Layer: 0
m_Name: Portal Screen
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4697416823958963037
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5366957160841664999}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2246995198243242195}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8547629936759508216
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5366957160841664999}
m_Mesh: {fileID: -1875780437015597444, guid: 45a0860e0db749d4881818b0d8d3d0b4, type: 3}
--- !u!23 &5871497001431693362
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5366957160841664999}
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: 603cda73335499d4980d9b171eaffe0d, 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 &5635962022185625128
GameObject:
m_ObjectHideFlags: 0
@@ -48,8 +131,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ae59cddbf8fa37549bb38b1039feeb34, type: 3}
m_Name:
m_EditorClassIdentifier:
size: {x: 1, y: 1}
linkedPortal: {fileID: 0}
portalCamera: {fileID: 17691322601746172}
portalTransform: {fileID: 2246995198243242195}
--- !u!65 &7604291350124895408
BoxCollider:
m_ObjectHideFlags: 0
@@ -180,7 +265,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7398326895463990628}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ad60e3973ab83f3468637a06970d7f1f, type: 3}
m_Name:
@@ -188,129 +273,86 @@ MonoBehaviour:
minNearClipPlane: 0.0001
portal: {fileID: 1249363658}
screen: {fileID: 5871497001431693362}
--- !u!1001 &5096432983393035446
PrefabInstance:
--- !u!1 &8470391359842711396
GameObject:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2246995198243242195}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 45a0860e0db749d4881818b0d8d3d0b4,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 45a0860e0db749d4881818b0d8d3d0b4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 45a0860e0db749d4881818b0d8d3d0b4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 45a0860e0db749d4881818b0d8d3d0b4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 45a0860e0db749d4881818b0d8d3d0b4,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 603cda73335499d4980d9b171eaffe0d, type: 2}
- target: {fileID: 919132149155446097, guid: 45a0860e0db749d4881818b0d8d3d0b4,
type: 3}
propertyPath: m_Name
value: Portal Screen
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 45a0860e0db749d4881818b0d8d3d0b4, type: 3}
--- !u!4 &4697416823958963037 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 45a0860e0db749d4881818b0d8d3d0b4,
type: 3}
m_PrefabInstance: {fileID: 5096432983393035446}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
--- !u!23 &5871497001431693362 stripped
serializedVersion: 6
m_Component:
- component: {fileID: 9135323956734471646}
- component: {fileID: 5289736326143877755}
- component: {fileID: 7965773041589933745}
m_Layer: 0
m_Name: Portal Frame
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9135323956734471646
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8470391359842711396}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2246995198243242195}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5289736326143877755
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8470391359842711396}
m_Mesh: {fileID: -6360558719573625917, guid: a2052daf99b37934fb434aaffa9e75f2, type: 3}
--- !u!23 &7965773041589933745
MeshRenderer:
m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 45a0860e0db749d4881818b0d8d3d0b4,
type: 3}
m_PrefabInstance: {fileID: 5096432983393035446}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8740793916703066677
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2246995198243242195}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
propertyPath: m_Name
value: Portal Frame
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a2052daf99b37934fb434aaffa9e75f2, type: 3}
--- !u!4 &9135323956734471646 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a2052daf99b37934fb434aaffa9e75f2,
type: 3}
m_PrefabInstance: {fileID: 8740793916703066677}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8470391359842711396}
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: 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}

4
Assets/Portal/Runtime/Portal.asmdef
View File

@@ -5,7 +5,9 @@
"GUID:75469ad4d38634e559750d17036d5f7c",
"GUID:15fc0a57446b3144c949da3e2b9737a9",
"GUID:fe685ec1767f73d42b749ea8045bfe43",
"GUID:8804073475ba36c47830e8e19dc699ce"
"GUID:776d03a35f1b52c4a9aed9f56d7b4229",
"GUID:8804073475ba36c47830e8e19dc699ce",
"GUID:2d68e204354e44f2a2ecf3cfa9213c5f"
],
"includePlatforms": [],
"excludePlatforms": [],

76
Assets/Portal/Runtime/Portal.cs
View File

@@ -1,11 +1,14 @@
using System;
using System.Collections.Generic;
using EscapeRoomEngine.Engine.Runtime.Modules;
using EscapeRoomEngine.Engine.Runtime.Utilities;
using NaughtyAttributes;
using UnityEngine;
namespace EscapeRoomEngine.Portal.Runtime
{
[RequireComponent(typeof(Collider))]
public class Portal : MonoBehaviour
public class Portal : DoorState
{
public static readonly Matrix4x4 HalfRotation = Matrix4x4.Rotate(Quaternion.Euler(0, 180, 0));
@@ -16,30 +19,46 @@ namespace EscapeRoomEngine.Portal.Runtime
/// <summary>
/// The camera that will draw the view for this portal.
/// </summary>
public PortalCamera portalCamera;
[BoxGroup("Internal")] public PortalCamera portalCamera;
/// <summary>
/// The transform marking the edge of the portal plane.
/// </summary>
[BoxGroup("Internal")] public Transform portalTransform;
private bool Connected => linkedPortal != null;
private readonly List<PortalDriver> _closePortalDrivers = new();
private void Awake()
{
// check whether the other portal is set up
if (!linkedPortal || linkedPortal.linkedPortal != this) throw new Exception("Other portal not set up correctly.");
// check whether the collider is set up correctly
if (!GetComponent<Collider>().isTrigger) throw new Exception("Collider must be a trigger.");
DoorEvent += (_, type) =>
{
if (type == DoorEventType.Connected)
{
linkedPortal = FromDoorState(Module.ConnectedDoorState);
portalCamera.screen.gameObject.SetActive(true);
portalCamera.enabled = true;
}
};
}
private void FixedUpdate()
{
for (var i = 0; i < _closePortalDrivers.Count; i++)
if (Connected)
{
var portalDriver = _closePortalDrivers[i];
if (portalDriver.entrySide < 0 && CalculateSide(portalDriver.transform) >= 0) // must have entered from the front and exited the back
for (var i = 0; i < _closePortalDrivers.Count; i++)
{
StopTrackingDriver(portalDriver);
linkedPortal.StartTrackingDriver(portalDriver, -1);
portalDriver.Teleport(this, linkedPortal);
i--; // decrease the loop counter because the list is one element smaller now
var portalDriver = _closePortalDrivers[i];
if (portalDriver.entrySide < 0 && CalculateSide(portalDriver.transform) >= 0) // must have entered from the front and exited the back
{
StopTrackingDriver(portalDriver);
linkedPortal.StartTrackingDriver(portalDriver, -1);
portalDriver.Teleport(this, linkedPortal);
i--; // decrease the loop counter because the list is one element smaller now
}
}
}
}
@@ -59,24 +78,41 @@ namespace EscapeRoomEngine.Portal.Runtime
private void OnTriggerEnter(Collider other)
{
var portalDriver = other.GetComponent<PortalDriver>();
if (portalDriver && !_closePortalDrivers.Contains(portalDriver))
if (Connected)
{
StartTrackingDriver(portalDriver, CalculateSide(portalDriver.transform));
var portalDriver = other.GetComponent<PortalDriver>();
if (portalDriver && !_closePortalDrivers.Contains(portalDriver))
{
StartTrackingDriver(portalDriver, CalculateSide(portalDriver.transform));
}
}
}
private void OnTriggerExit(Collider other)
{
var portalDriver = other.GetComponent<PortalDriver>();
if (portalDriver)
StopTrackingDriver(portalDriver);
if (Connected)
{
var portalDriver = other.GetComponent<PortalDriver>();
if (portalDriver)
{
StopTrackingDriver(portalDriver);
}
}
}
private int CalculateSide(Transform portalDriverTransform)
{
var t = transform;
return Math.Sign(Vector3.Dot(t.forward, portalDriverTransform.position - t.position));
return Math.Sign(Vector3.Dot(portalTransform.forward, portalDriverTransform.position - portalTransform.position));
}
private static Portal FromDoorState(DoorState state)
{
if (state is Portal portal)
{
return portal;
}
throw new WrongTypeException(typeof(Portal), state.GetType(), typeof(DoorState));
}
}
}

13
Assets/Portal/Runtime/PortalCamera.cs
View File

@@ -29,7 +29,7 @@ namespace EscapeRoomEngine.Portal.Runtime
/// <summary>
/// The mesh where the rendered texture will be drawn on.
/// </summary>
[SerializeField] private MeshRenderer screen;
[SerializeField] public MeshRenderer screen;
private PlayerCamera _playerCamera;
private Camera _camera;
@@ -47,12 +47,14 @@ namespace EscapeRoomEngine.Portal.Runtime
private void OnEnable()
{
_camera.enabled = true;
RenderPipelineManager.beginCameraRendering += Render;
}
private void OnDisable()
{
RenderPipelineManager.beginCameraRendering -= Render;
_camera.enabled = false;
}
private void Render(ScriptableRenderContext scriptableRenderContext, Camera _)
@@ -63,8 +65,6 @@ namespace EscapeRoomEngine.Portal.Runtime
// don't render this portal if it is not visible
return;
var t = portal.transform;
screen.enabled = false;
foreach (var eye in Eyes)
@@ -83,15 +83,16 @@ namespace EscapeRoomEngine.Portal.Runtime
}
// position portal camera
var m = t.localToWorldMatrix * Portal.HalfRotation * portal.linkedPortal.transform.worldToLocalMatrix *
var m = portal.portalTransform.localToWorldMatrix * Portal.HalfRotation *
portal.linkedPortal.portalTransform.worldToLocalMatrix *
_playerCamera.GetEyeTransform(eye).localToWorldMatrix;
transform.SetPositionAndRotation(m.GetPosition(), m.rotation);
_camera.projectionMatrix = _playerCamera.camera.GetStereoProjectionMatrix(eye);
// set camera clip plane to portal (otherwise the wall behind the portal would be rendered)
// calculating the clip plane: https://computergraphics.stackexchange.com/a/1506
var n = -t.forward; // clip plane normal
var portalPlane = new Plane(n, t.position); // clip plane in world space
var n = -portal.portalTransform.forward; // clip plane normal
var portalPlane = new Plane(n, portal.portalTransform.position); // clip plane in world space
var clipPlane = _camera.worldToCameraMatrix.inverse.transpose *
new Vector4(n.x, n.y, n.z, portalPlane.distance); // vector format clip plane in camera space
if (-portalPlane.GetDistanceToPoint(transform.position) >= minNearClipPlane)

10
Assets/Portal/Runtime/PortalDriver.cs
View File

@@ -73,13 +73,13 @@ namespace EscapeRoomEngine.Portal.Runtime
public void Teleport(Portal from, Portal to)
{
var m = to.transform.localToWorldMatrix * Portal.HalfRotation * from.transform.worldToLocalMatrix *
traveller.localToWorldMatrix;
var m = to.portalTransform.localToWorldMatrix * Portal.HalfRotation *
from.portalTransform.worldToLocalMatrix * traveller.localToWorldMatrix;
traveller.SetPositionAndRotation(m.GetPosition(), m.rotation);
if (_rigidbody)
if (_rigidbody && !_rigidbody.isKinematic)
{
_rigidbody.velocity = to.transform.TransformDirection(
Portal.HalfRotation.rotation * from.transform.InverseTransformDirection(_rigidbody.velocity));
_rigidbody.velocity = to.portalTransform.TransformDirection(
Portal.HalfRotation.rotation * from.portalTransform.InverseTransformDirection(_rigidbody.velocity));
}
}
}