From a53e9e3d857e399f899a2218ef630f5881ca65b3 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 9 Jul 2025 11:37:25 +0200 Subject: [PATCH] remove slop --- .../Scripts/Models/ChildModelBehaviour.cs | 2 -- .../Assets/Scripts/Models/ModelManager.cs | 33 ++----------------- .../Assets/Scripts/Transform/ExplodeModel.cs | 1 - 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/vr-configurator/Assets/Scripts/Models/ChildModelBehaviour.cs b/vr-configurator/Assets/Scripts/Models/ChildModelBehaviour.cs index b766f38..e2fbd22 100644 --- a/vr-configurator/Assets/Scripts/Models/ChildModelBehaviour.cs +++ b/vr-configurator/Assets/Scripts/Models/ChildModelBehaviour.cs @@ -26,12 +26,10 @@ public class ChildModelBehaviour : ModelBehaviour public Port GetParentPort() { - Debug.Log($"Searching port for {name} with PortID {ChildModel.ParentPort} with parent {Parent}"); foreach (Port parentPort in Parent.Model.Ports) { if (parentPort.PortID == ChildModel.ParentPort) { - Debug.Log($"Found port for {name} with PortID {parentPort.PortID} {parentPort.PortName} for {ChildModel.ParentPort}"); return parentPort; } } diff --git a/vr-configurator/Assets/Scripts/Models/ModelManager.cs b/vr-configurator/Assets/Scripts/Models/ModelManager.cs index d3ad94f..9704938 100644 --- a/vr-configurator/Assets/Scripts/Models/ModelManager.cs +++ b/vr-configurator/Assets/Scripts/Models/ModelManager.cs @@ -5,8 +5,8 @@ using UnityEngine.Serialization; public class ModelManager : MonoBehaviour, IResettable { - private Dictionary> _portDict; //port mapped on - private Dictionary _childModelDict; //childModels by their ID + Dictionary> _portDict; //port mapped on + Dictionary _childModelDict; //childModels by their ID public List BaseModelList; //available BaseModels @@ -19,6 +19,7 @@ public class ModelManager : MonoBehaviour, IResettable { get { return baseModelGO.GetComponent(); } } + public BaseModelSelector baseModelSelector; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() @@ -27,7 +28,6 @@ public class ModelManager : MonoBehaviour, IResettable _portDict = new Dictionary>(); _childModelDict = new Dictionary(); BaseModelList = new List(); - //baseModelSelector = FindFirstObjectByType(); foreach (var baseModel in ModelList.BaseModels) { @@ -40,35 +40,8 @@ public class ModelManager : MonoBehaviour, IResettable } if (baseModelGO == null) //set in the editor { - //TODO: send into model selection Debug.LogError("baseModel is null, fix the configuration"); } - /* - var originalGlasMat = Resources.Load("Material/Glas"); - if (originalGlasMat != null) - { - var glasMatInstance = new Material(originalGlasMat); // Kopie erzeugen - var urpLit = Shader.Find("URP/UI/Prerendered"); - if (urpLit != null) - { - glasMatInstance.shader = urpLit; - glasMatInstance.SetFloat("_Smoothness", 0.9f); - glasMatInstance.SetFloat("_Metallic", 0.0f); - glasMatInstance.SetFloat("_Surface", 1); - glasMatInstance.SetFloat("_Blend", 0); - glasMatInstance.SetColor("_BaseColor", new Color(0.2f, 0.2f, 0.2f, 0.45f)); - } - var fensterGO = GameObject.Find("portErlbachWindow"); // Name des Fenster-Objekts - if (fensterGO != null) - { - var renderer = fensterGO.GetComponent(); - if (renderer != null) - { - renderer.material = glasMatInstance; - } - } - } - */ } void RegisterChildModel(ChildModel model) diff --git a/vr-configurator/Assets/Scripts/Transform/ExplodeModel.cs b/vr-configurator/Assets/Scripts/Transform/ExplodeModel.cs index ba03793..5b628bb 100644 --- a/vr-configurator/Assets/Scripts/Transform/ExplodeModel.cs +++ b/vr-configurator/Assets/Scripts/Transform/ExplodeModel.cs @@ -67,7 +67,6 @@ public class ExplodeModel : MonoBehaviour, IResettable, IPointerDownHandler initialPos.Add(child.localPosition); goalPos.Add(child.localPosition + port.ExplodeDirection); transforms.Add(child); - Debug.LogWarning($"moving: {cmb.name} - {port.PortID} InitPos: {child.localPosition} -> goal {child.localPosition + port.ExplodeDirection}"); } } text.text = explode ? "Explode" : "Unexplode";