From 5d03586c8bc6e21729d2b144982920ba5b1485dc Mon Sep 17 00:00:00 2001 From: raccoon Date: Tue, 17 Dec 2024 06:24:54 +0500 Subject: [PATCH] Some fixes and better code --- .../scene/measuregeneric-world.unity | 121 +++++++++++++++++- Assets/measuregeneric/scripts/Areaportal.cs | 29 +++-- 2 files changed, 133 insertions(+), 17 deletions(-) diff --git a/Assets/measuregeneric/scene/measuregeneric-world.unity b/Assets/measuregeneric/scene/measuregeneric-world.unity index 6a48a91..df9b89f 100644 --- a/Assets/measuregeneric/scene/measuregeneric-world.unity +++ b/Assets/measuregeneric/scene/measuregeneric-world.unity @@ -351,7 +351,7 @@ ReflectionProbe: m_Mode: 0 m_RefreshMode: 0 m_TimeSlicingMode: 0 - m_Resolution: 512 + m_Resolution: 1024 m_UpdateFrequency: 0 m_BoxSize: {x: 9.6, y: 6.4, z: 9.6} m_BoxOffset: {x: -0.8, y: 0, z: 0.8} @@ -2066,6 +2066,120 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1401659686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1401659691} + - component: {fileID: 1401659690} + - component: {fileID: 1401659689} + - component: {fileID: 1401659688} + - component: {fileID: 1401659687} + m_Layer: 0 + m_Name: Areaportal (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1401659687 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401659686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 1 + serializedProgramAsset: {fileID: 11400000, guid: 340ef0f1c2c5a914793cbdc4fc1b2e02, + type: 2} + programSource: {fileID: 11400000, guid: 3d4aec674dbe4a04197c830e83c7daef, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1401659688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401659686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38ff975e564aed544838406328257bd9, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1401659687} +--- !u!65 &1401659689 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401659686} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3.2, y: 3.2, z: 3.2} + m_Center: {x: 0, y: 0, z: 0} +--- !u!41 &1401659690 +OcclusionPortal: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401659686} + m_Open: 0 + m_Center: {x: -0.1, y: 0, z: 0} + m_Size: {x: 0.2, y: 3.2, z: 3.2} +--- !u!4 &1401659691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401659686} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.6, z: -20.800001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1716360668 GameObject: m_ObjectHideFlags: 0 @@ -4519,7 +4633,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 + m_DynamicOccludee: 0 m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 @@ -4602,7 +4716,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 + m_DynamicOccludee: 0 m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 @@ -4894,3 +5008,4 @@ SceneRoots: - {fileID: 2031782866} - {fileID: 229322142} - {fileID: 1909056249} + - {fileID: 1401659691} diff --git a/Assets/measuregeneric/scripts/Areaportal.cs b/Assets/measuregeneric/scripts/Areaportal.cs index 3ef8759..b98092d 100644 --- a/Assets/measuregeneric/scripts/Areaportal.cs +++ b/Assets/measuregeneric/scripts/Areaportal.cs @@ -21,32 +21,33 @@ public class Areaportal : UdonSharpBehaviour foreach(Transform child in this.transform) { this.imposters[i++] = child.gameObject; + child.gameObject.SetActive(!this.portal.open); + } + } + + public void SetPortalOpenState(bool state) + { + this.portal.open = state; + + foreach(GameObject imposter in this.imposters) + { + imposter.SetActive(!state); } } public override void OnPlayerTriggerEnter(VRCPlayerApi player) { - if (!(player.IsValid() && player.isLocal)) - return; - - this.portal.open = true; - - foreach(GameObject imposter in this.imposters) + if (player.IsValid() && player.isLocal) { - imposter.SetActive(false); + this.SetPortalOpenState(true); } } public override void OnPlayerTriggerExit(VRCPlayerApi player) { - if (!(player.IsValid() && player.isLocal)) - return; - - this.portal.open = false; - - foreach(GameObject imposter in this.imposters) + if (player.IsValid() && player.isLocal) { - imposter.SetActive(true); + this.SetPortalOpenState(false); } } }