From 9f71b56c94ad4b5d4625bdb88b45ad500992b1fd Mon Sep 17 00:00:00 2001 From: sebastianhampel1 Date: Mon, 3 Apr 2023 19:39:16 -0400 Subject: [PATCH] updatesx --- .../Materials/PBR/rusted-steel-unity/rusted-steel.mat | 4 ++-- Assets/Scripts/Player/PlayerInteractionHandler.cs | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/Materials/PBR/rusted-steel-unity/rusted-steel.mat b/Assets/Materials/PBR/rusted-steel-unity/rusted-steel.mat index 26c6736..3e71c01 100644 --- a/Assets/Materials/PBR/rusted-steel-unity/rusted-steel.mat +++ b/Assets/Materials/PBR/rusted-steel-unity/rusted-steel.mat @@ -195,7 +195,7 @@ Material: - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BASE_COLOR_WEIGHT: 1 - - _BUMP_MAP_STRENGTH: 4.67 + - _BUMP_MAP_STRENGTH: 1.08 - _BlendMode: 0 - _COAT_IOR: 1.4 - _COAT_ROUGHNESS: 0 @@ -255,7 +255,7 @@ Material: - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - - _REFLECTIONS_IOR: 1.52 + - _REFLECTIONS_IOR: 1 - _REFLECTIONS_ROUGHNESS: 0.601 - _REFLECTIONS_WEIGHT: 1 - _RayTracing: 0 diff --git a/Assets/Scripts/Player/PlayerInteractionHandler.cs b/Assets/Scripts/Player/PlayerInteractionHandler.cs index bd4a36e..49d569e 100644 --- a/Assets/Scripts/Player/PlayerInteractionHandler.cs +++ b/Assets/Scripts/Player/PlayerInteractionHandler.cs @@ -214,10 +214,11 @@ public class PlayerInteractionHandler : MonoBehaviour this.flashlightEnabled = false; } - + + private void OnTriggerEnter(Collider other) { - if(other.gameObject.GetComponent() != null) + /* if(other.gameObject.GetComponent() != null) { InteractableItem item = other.gameObject.GetComponent(); if(item is InteractableItem && item is not HeavyInteractableItem) @@ -230,11 +231,11 @@ public class PlayerInteractionHandler : MonoBehaviour heavyItemsInRange.Add((HeavyInteractableItem)item); } - } + }*/ } private void OnTriggerExit(Collider other) { - if (other.gameObject.GetComponent() != null) + /*if (other.gameObject.GetComponent() != null) { InteractableItem item = other.gameObject.GetComponent(); if (item is InteractableItem && item is not HeavyInteractableItem) @@ -249,6 +250,6 @@ public class PlayerInteractionHandler : MonoBehaviour //itemsInRange.Remove((HeavyInteractableItem)(item)); heavyItemsInRange.Remove((HeavyInteractableItem)item); } - } + }*/ } }