From 975f44c8e4599610a52d2f6f991a29a9babf81d3 Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 20 Jul 2025 23:16:12 +0200 Subject: [PATCH] Metal Cables --- .../Assets/Scripts/Models/ModelBehaviour.cs | 5 + .../Assets/Scripts/Models/ModelList.cs | 145 +++++++----------- .../Assets/Scripts/Models/ModelListColors.cs | 62 -------- .../Assets/Scripts/Models/ModelListHelper.cs | 124 +++++++++++++++ ...Colors.cs.meta => ModelListHelper.cs.meta} | 0 .../Assets/Scripts/Models/PortDef.cs | 1 + 6 files changed, 187 insertions(+), 150 deletions(-) delete mode 100644 vr-configurator/Assets/Scripts/Models/ModelListColors.cs create mode 100644 vr-configurator/Assets/Scripts/Models/ModelListHelper.cs rename vr-configurator/Assets/Scripts/Models/{ModelListColors.cs.meta => ModelListHelper.cs.meta} (100%) diff --git a/vr-configurator/Assets/Scripts/Models/ModelBehaviour.cs b/vr-configurator/Assets/Scripts/Models/ModelBehaviour.cs index 62ba4aa..6951d35 100644 --- a/vr-configurator/Assets/Scripts/Models/ModelBehaviour.cs +++ b/vr-configurator/Assets/Scripts/Models/ModelBehaviour.cs @@ -196,6 +196,11 @@ public class ModelBehaviour : MonoBehaviour, IResettable //Debug.Log($"POS {child.transform.gameObject.name} pos {child.transform.localPosition} {child.transform.rotation} {child.transform.localScale}"); cmb.Parent = this; cmb.ChildModel = childModel; + if (newModel.Passthrough) + { + cmb.meshRenderer.material = newModel.Material; + cmb.meshRenderer.sharedMaterial = newModel.Material; + } port.Apply(child.transform); // move to correct position portDict[i] = cmb.ChildModel; } diff --git a/vr-configurator/Assets/Scripts/Models/ModelList.cs b/vr-configurator/Assets/Scripts/Models/ModelList.cs index a5ced0f..e57a305 100644 --- a/vr-configurator/Assets/Scripts/Models/ModelList.cs +++ b/vr-configurator/Assets/Scripts/Models/ModelList.cs @@ -42,8 +42,6 @@ public class ModelList new Vector3(0.03f, 0.03f, 0.03f), //because model is too big in space new List { - Port.Hidden(PortDef.ERL_CABLE_1, "idErlbachPart1", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_2, "idErlbachPart2", Vector3.zero), Port.Hidden(PortDef.ERL_CAP_3, "idErlbachPart3", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 20f)), Port.Hidden(PortDef.ERL_CAP_4, "idErlbachPart4", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 20f)), Port.Hidden(PortDef.ERL_CAP_5, "idErlbachPart5", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 20f)), @@ -59,62 +57,9 @@ public class ModelList Port.Hidden(PortDef.ERL_CAP_15, "idErlbachPart15", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 20f)), Port.Hidden(PortDef.ERL_CAP_16, "idErlbachPart16", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 20f)), Port.Hidden(PortDef.ERL_CAP_17, "idErlbachPart17", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 20f)), - Port.Hidden(PortDef.ERL_CABLE_18, "idErlbachPart18", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_19, "idErlbachPart19", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_20, "idErlbachPart20", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_21, "idErlbachPart21", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_22, "idErlbachPart22", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_23, "idErlbachPart23", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_24, "idErlbachPart24", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_25, "idErlbachPart25", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_26, "idErlbachPart26", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_27, "idErlbachPart27", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_28, "idErlbachPart28", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_29, "idErlbachPart29", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_30, "idErlbachPart30", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_31, "idErlbachPart31", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_32, "idErlbachPart32", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_33, "idErlbachPart33", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_34, "idErlbachPart34", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_35, "idErlbachPart35", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_36, "idErlbachPart36", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_37, "idErlbachPart37", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_38, "idErlbachPart38", Vector3.zero), + Port.Choosable("Cables", PortDef.ERL_CABLES, "erlCables_1", Vector3.zero, Quaternion.identity), Port.Hidden(PortDef.ERL_CAP_39, "idErlbachPart39", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 20f)), Port.Hidden(PortDef.ERL_CAP_40, "idErlbachPart40", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 20f)), - Port.Hidden(PortDef.ERL_CABLE_41, "idErlbachPart41", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_42, "idErlbachPart42", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_43, "idErlbachPart43", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_44, "idErlbachPart44", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_45, "idErlbachPart45", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_46, "idErlbachPart46", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_47, "idErlbachPart47", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_48, "idErlbachPart48", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_49, "idErlbachPart49", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_50, "idErlbachPart50", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_51, "idErlbachPart51", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_52, "idErlbachPart52", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_53, "idErlbachPart53", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_54, "idErlbachPart54", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_55, "idErlbachPart55", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_56, "idErlbachPart56", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_57, "idErlbachPart57", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_58, "idErlbachPart58", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_59, "idErlbachPart59", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_60, "idErlbachPart60", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_61, "idErlbachPart61", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_62, "idErlbachPart62", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_63, "idErlbachPart63", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_64, "idErlbachPart64", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_65, "idErlbachPart65", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_66, "idErlbachPart66", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_67, "idErlbachPart67", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_68, "idErlbachPart68", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_69, "idErlbachPart69", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_70, "idErlbachPart70", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_71, "idErlbachPart71", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_72, "idErlbachPart72", Vector3.zero), - Port.Hidden(PortDef.ERL_CABLE_73, "idErlbachPart73", Vector3.zero), Port.Hidden(PortDef.ERL_BASEPLATE, "idErlbachBody_BasePlate", Vector3.zero, Quaternion.identity, 1f, Vector3.zero), Port.Hidden(PortDef.ERL_BASEPLATE_FRONT, "idErlbachPart75", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 0f)), Port.Hidden(PortDef.ERL_BATBOX, "idErlbachBatBox_Big", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 50f)), @@ -157,7 +102,7 @@ public class ModelList Port.Hidden(PortDef.ERL_RIM_RH, "erlRim1_RH", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 30f, 0f)), Port.Hidden(PortDef.ERL_RIM_RV, "erlRim1_RV", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 30f, 0f)), }, - ModelListColors.ColorAluminiumScratched, + ModelListHelper.ColorAluminiumScratched, true ), new ChildModel( @@ -175,7 +120,7 @@ public class ModelList Port.Hidden(PortDef.ERL_RIM_RH, "erlRim2_RH", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 30f, 0f)), Port.Hidden(PortDef.ERL_RIM_RV, "erlRim2_RV", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 30f, 0f)), }, - ModelListColors.ColorAluminiumScratched, + ModelListHelper.ColorAluminiumScratched, true ), new ChildModel( @@ -193,7 +138,7 @@ public class ModelList Port.Hidden(PortDef.ERL_RIM_RH, "erlRim3_RH", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 30f, 0f)), Port.Hidden(PortDef.ERL_RIM_RV, "erlRim3_RV", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 30f, 0f)), }, - ModelListColors.ColorAluminiumScratched, + ModelListHelper.ColorAluminiumScratched, true ), // Sport @@ -207,7 +152,7 @@ public class ModelList Quaternion.Euler(-180, 0, 0), new Vector3(1f, 1f, 1f), null, - ModelListColors.ColorAluminiumScratched + ModelListHelper.ColorAluminiumScratched ), new ChildModel( PortDef.ERL_RIM_RV, @@ -219,7 +164,7 @@ public class ModelList Quaternion.Euler(-180, 0, 0), new Vector3(1f, 1f, 1f), null, - ModelListColors.ColorAluminiumScratched + ModelListHelper.ColorAluminiumScratched ), new ChildModel( PortDef.ERL_RIM_LV, @@ -231,7 +176,7 @@ public class ModelList Quaternion.Euler(0, 0, 0), new Vector3(1f, 1f, 1f), null, - ModelListColors.ColorAluminiumScratched + ModelListHelper.ColorAluminiumScratched ), new ChildModel( PortDef.ERL_RIM_LH, @@ -243,7 +188,7 @@ public class ModelList Quaternion.Euler(0, 0, 0), new Vector3(1f, 1f, 1f), null, - ModelListColors.ColorAluminiumScratched + ModelListHelper.ColorAluminiumScratched ), // Elegance new ChildModel( @@ -256,7 +201,7 @@ public class ModelList Quaternion.Euler(-180, 0, 0), new Vector3(1f, 1f, 1f), null, - ModelListColors.ColorAluminiumScratched + ModelListHelper.ColorAluminiumScratched ), new ChildModel( PortDef.ERL_RIM_RV, @@ -268,7 +213,7 @@ public class ModelList Quaternion.Euler(-180, 0, 0), new Vector3(1f, 1f, 1f), null, - ModelListColors.ColorAluminiumScratched + ModelListHelper.ColorAluminiumScratched ), new ChildModel( PortDef.ERL_RIM_LV, @@ -280,7 +225,7 @@ public class ModelList Quaternion.Euler(0, 0, 0), new Vector3(1f, 1f, 1f), null, - ModelListColors.ColorAluminiumScratched + ModelListHelper.ColorAluminiumScratched ), new ChildModel( PortDef.ERL_RIM_LH, @@ -292,7 +237,7 @@ public class ModelList Quaternion.Euler(-180, 0, 0), new Vector3(1f, 1f, 1f), null, - ModelListColors.ColorAluminiumScratched + ModelListHelper.ColorAluminiumScratched ), // GRILL new ChildModel( @@ -305,7 +250,7 @@ public class ModelList Quaternion.Euler(0f, 180f, -90f), // no rotation new Vector3(1f, 1f, 1f), // scale null, // no children - ModelListColors.ColorAluminiumBrushed // default colors + ModelListHelper.ColorAluminiumBrushed // default colors ), new ChildModel( PortDef.ERL_LP_TC, @@ -320,7 +265,31 @@ public class ModelList Port.Hidden(PortDef.ERL_LP_TEXT, "idErlbachPart89", Vector3.zero, Quaternion.identity), Port.Hidden(PortDef.ERL_LP_COUNTRY, "idErlbachPart90", Vector3.zero, Quaternion.identity), }, - ModelListColors.ColorLicensePlate, + ModelListHelper.ColorLicensePlate, + true + ), + new ChildModel( + PortDef.ERL_CABLES, + "Plastic Cables", + "erlCables_1", + Resources.Load("Material/PlasticCable"), + Vector3.zero, + Quaternion.Euler(0f, 0f, 0f), // no rotation + new Vector3(1f, 1f, 1f), + ModelListHelper.PortsErlCables, + null, //no color + true + ), + new ChildModel( + PortDef.ERL_CABLES, + "Metal Cables", + "erlCables_2", + Resources.Load("Material/AluminiumBrushed"), + Vector3.zero, + Quaternion.Euler(0f, 0f, 0f), // no rotation + new Vector3(1f, 1f, 1f), + ModelListHelper.PortsErlCables, + null, //no color true ), @@ -338,15 +307,15 @@ public class ModelList ModelLoader.LoadChildFromPackedModel(ChildModels, new List { - new ModelElement(PortDef.BIKE_FRAME, "Back Frame", "idBikeAttachments", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumPolished), - new ModelElement(PortDef.BIKE_FRAME2, "Frame", "idBikeFrame", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumPolished), + new ModelElement(PortDef.BIKE_FRAME, "Back Frame", "idBikeAttachments", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumPolished), + new ModelElement(PortDef.BIKE_FRAME2, "Frame", "idBikeFrame", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumPolished), new ModelElement(PortDef.BIKE_SPROCKET, "Sprocket", "idBikeSprocket", Resources.Load($"Material/AluminiumBrushed"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.BIKE_PEDAL_L, "Left Pedal", "idBikePedalL", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorPVC), - new ModelElement(PortDef.BIKE_PEDAL_R, "Right Pedal", "idBikePedalR", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorPVC), - new ModelElement(PortDef.BIKE_STEER, "Handlebars", "idBikeHandlebars", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumScratched), - new ModelElement(PortDef.BIKE_RIM, "Back Rim", "idBikeRim_Back", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumPolished), + new ModelElement(PortDef.BIKE_PEDAL_L, "Left Pedal", "idBikePedalL", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorPVC), + new ModelElement(PortDef.BIKE_PEDAL_R, "Right Pedal", "idBikePedalR", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorPVC), + new ModelElement(PortDef.BIKE_STEER, "Handlebars", "idBikeHandlebars", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumScratched), + new ModelElement(PortDef.BIKE_RIM, "Back Rim", "idBikeRim_Back", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumPolished), new ModelElement(PortDef.BIKE_TIRE, "Back Tire", "idBikeTire_Back", Resources.Load($"Material/PlasticCable"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.BIKE_RIM_FRONT, "Front Rim", "idBikeRim_Front", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumPolished), + new ModelElement(PortDef.BIKE_RIM_FRONT, "Front Rim", "idBikeRim_Front", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumPolished), new ModelElement(PortDef.BIKE_TIRE_FRONT, "Front Tire", "idBikeTire_Front", Resources.Load($"Material/PlasticCable"), Vector3.zero, Quaternion.identity, Vector3.one, null, null) }, Resources.LoadAll($"Model/Bicycle/Models/Low-Poly Bicycle"), @@ -443,24 +412,24 @@ public class ModelList new ModelElement(PortDef.ERL_ROD_78, "Erlbach Part 78", "idErlbachPart78", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), new ModelElement(PortDef.ERL_ROD_79, "Erlbach Part 79", "idErlbachPart79", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), new ModelElement(PortDef.ERL_TIRE_LH, "Tire LH", "erlTire1_LH", Resources.Load($"Material/CarTire"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.ERL_RIM_LH, "Standard Rim", "erlRim1_LH", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumScratched), + new ModelElement(PortDef.ERL_RIM_LH, "Standard Rim", "erlRim1_LH", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumScratched), new ModelElement(PortDef.ERL_TIRE_LV, "Tire LV", "erlTire1_LV", Resources.Load($"Material/CarTire"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.ERL_RIM_LV, "Standard Rim", "erlRim1_LV", Resources.Load($"Material/AluminiumScratched"), new Vector3(0f, -0.25f, 0f), Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumScratched), + new ModelElement(PortDef.ERL_RIM_LV, "Standard Rim", "erlRim1_LV", Resources.Load($"Material/AluminiumScratched"), new Vector3(0f, -0.25f, 0f), Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumScratched), new ModelElement(PortDef.ERL_TIRE_RH, "Tire RH", "erlTire1_RH", Resources.Load($"Material/CarTire"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.ERL_RIM_RH, "Standard Rim", "erlRim1_RH", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumScratched), + new ModelElement(PortDef.ERL_RIM_RH, "Standard Rim", "erlRim1_RH", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumScratched), new ModelElement(PortDef.ERL_TIRE_RV, "Tire RV", "erlTire1_RV", Resources.Load($"Material/CarTire"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.ERL_RIM_RV, "Standard Rim", "erlRim1_RV", Resources.Load($"Material/AluminiumScratched"), new Vector3(0f, 0.25f, 0f), Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumScratched), - new ModelElement(PortDef.ERL_BODY, "Body", "idErlbachPart84", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumPolished), - new ModelElement(PortDef.ERL_BUMPER_BACK, "Rear Bumper", "idErlbachPart85", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumPolished), - new ModelElement(PortDef.ERL_DRL_OUTLINE, "Front Bumper", "idErlbachPart86", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumPolished), - new ModelElement(PortDef.ERL_BADGE, "Number", "idErlbachPart87", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumScratched), - new ModelElement(PortDef.ERL_LP_BASE, "License Plate", "idErlbachPart88", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumPolished), + new ModelElement(PortDef.ERL_RIM_RV, "Standard Rim", "erlRim1_RV", Resources.Load($"Material/AluminiumScratched"), new Vector3(0f, 0.25f, 0f), Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumScratched), + new ModelElement(PortDef.ERL_BODY, "Body", "idErlbachPart84", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumPolished), + new ModelElement(PortDef.ERL_BUMPER_BACK, "Rear Bumper", "idErlbachPart85", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumPolished), + new ModelElement(PortDef.ERL_DRL_OUTLINE, "Front Bumper", "idErlbachPart86", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumPolished), + new ModelElement(PortDef.ERL_BADGE, "Number", "idErlbachPart87", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumScratched), + new ModelElement(PortDef.ERL_LP_BASE, "License Plate", "idErlbachPart88", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumPolished), new ModelElement(PortDef.ERL_LP_TEXT, "License Plate Content", "idErlbachPart89", Resources.Load($"Material/Universal"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), new ModelElement(PortDef.ERL_LP_COUNTRY, "Erlbach Part 90", "idErlbachPart90", Resources.Load($"Material/Universal"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.ERL_GRILL, "Standard Grill", "erlGrill_1", Resources.Load($"Material/AluminiumBrushed"), new Vector3(2.5f, 0f, -0.5f), Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumBrushed), - new ModelElement(PortDef.ERL_BUMPER_FRONT, "Headlight Cover", "idErlbachPart92", Resources.Load($"Material/AluminiumBrushed"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorAluminiumBrushed), + new ModelElement(PortDef.ERL_GRILL, "Standard Grill", "erlGrill_1", Resources.Load($"Material/AluminiumBrushed"), new Vector3(2.5f, 0f, -0.5f), Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumBrushed), + new ModelElement(PortDef.ERL_BUMPER_FRONT, "Headlight Cover", "idErlbachPart92", Resources.Load($"Material/AluminiumBrushed"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorAluminiumBrushed), new ModelElement(PortDef.ERL_DRL_PLATE, "Headlight", "idErlbachPart93", Resources.Load($"Material/MetalMesh"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.ERL_WINDOW, "Window", "idErlbachWindow", Resources.Load($"Material/Glas"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListColors.ColorGlass), + new ModelElement(PortDef.ERL_WINDOW, "Window", "idErlbachWindow", Resources.Load($"Material/Glas"), Vector3.zero, Quaternion.identity, Vector3.one, null, ModelListHelper.ColorGlass), }, Resources.LoadAll($"Model/ERLbach/ERLBach_mit_Fenster"), 1 //skip basemodel diff --git a/vr-configurator/Assets/Scripts/Models/ModelListColors.cs b/vr-configurator/Assets/Scripts/Models/ModelListColors.cs deleted file mode 100644 index c514d42..0000000 --- a/vr-configurator/Assets/Scripts/Models/ModelListColors.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -public class ModelListColors -{ - public static readonly List DefaultColors = new List - { - Color.black, - Color.gray, - Color.blue, - Color.red, - Color.yellow, - }; - public static readonly List ColorGlass = new List - { - Resources.Load("Material/Glas").color, - new Color(0f, 0f, 0f, 0f), - new Color(0.2f, 0.2f, 0.2f, 0.45f), - new Color(0.1f, 0.1f, 0.1f, 0.65f), - new Color(0.05f, 0.05f, 0.05f, 0.80f), - }; - public static readonly List ColorAluminiumPolished = new List - { - Color.black, - Resources.Load("Material/AluminiumPolished").color, - Color.blue, - Color.red, - Color.yellow, - }; - public static readonly List ColorAluminiumScratched = new List - { - Color.black, - Resources.Load("Material/AluminiumScratched").color, - Color.blue, - Color.red, - Color.yellow, - }; - public static readonly List ColorAluminiumBrushed = new List - { - Color.black, - Resources.Load("Material/AluminiumBrushed").color, - Color.blue, - Color.red, - Color.yellow, - }; - public static readonly List ColorPVC = new List - { - Resources.Load("Material/PVC").color, - Color.blue, - Color.gray, - Color.red, - Color.yellow, - }; - public static readonly List ColorLicensePlate = new List - { - Color.black, - Color.blue, - Color.red, - Color.yellow, - Color.green, - }; -} diff --git a/vr-configurator/Assets/Scripts/Models/ModelListHelper.cs b/vr-configurator/Assets/Scripts/Models/ModelListHelper.cs new file mode 100644 index 0000000..db3b43a --- /dev/null +++ b/vr-configurator/Assets/Scripts/Models/ModelListHelper.cs @@ -0,0 +1,124 @@ +using System.Collections.Generic; +using UnityEngine; + +public class ModelListHelper +{ + public static readonly List DefaultColors = new List + { + Color.black, + Color.gray, + Color.blue, + Color.red, + Color.yellow, + }; + public static readonly List ColorGlass = new List + { + Resources.Load("Material/Glas").color, + new Color(0f, 0f, 0f, 0f), + new Color(0.2f, 0.2f, 0.2f, 0.45f), + new Color(0.1f, 0.1f, 0.1f, 0.65f), + new Color(0.05f, 0.05f, 0.05f, 0.80f), + }; + public static readonly List ColorAluminiumPolished = new List + { + Color.black, + Resources.Load("Material/AluminiumPolished").color, + Color.blue, + Color.red, + Color.yellow, + }; + public static readonly List ColorAluminiumScratched = new List + { + Color.black, + Resources.Load("Material/AluminiumScratched").color, + Color.blue, + Color.red, + Color.yellow, + }; + public static readonly List ColorAluminiumBrushed = new List + { + Color.black, + Resources.Load("Material/AluminiumBrushed").color, + Color.blue, + Color.red, + Color.yellow, + }; + public static readonly List ColorPVC = new List + { + Resources.Load("Material/PVC").color, + Color.blue, + Color.gray, + Color.red, + Color.yellow, + }; + public static readonly List ColorLicensePlate = new List + { + Color.black, + Color.blue, + Color.red, + Color.yellow, + Color.green, + }; + + public static readonly List PortsErlCables = new List() + { + Port.Hidden(PortDef.ERL_CABLE_1, "idErlbachPart1", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_2, "idErlbachPart2", Vector3.zero), + + Port.Hidden(PortDef.ERL_CABLE_18, "idErlbachPart18", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_19, "idErlbachPart19", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_20, "idErlbachPart20", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_21, "idErlbachPart21", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_22, "idErlbachPart22", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_23, "idErlbachPart23", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_24, "idErlbachPart24", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_25, "idErlbachPart25", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_26, "idErlbachPart26", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_27, "idErlbachPart27", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_28, "idErlbachPart28", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_29, "idErlbachPart29", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_30, "idErlbachPart30", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_31, "idErlbachPart31", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_32, "idErlbachPart32", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_33, "idErlbachPart33", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_34, "idErlbachPart34", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_35, "idErlbachPart35", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_36, "idErlbachPart36", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_37, "idErlbachPart37", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_38, "idErlbachPart38", Vector3.zero), + + Port.Hidden(PortDef.ERL_CABLE_41, "idErlbachPart41", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_42, "idErlbachPart42", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_43, "idErlbachPart43", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_44, "idErlbachPart44", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_45, "idErlbachPart45", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_46, "idErlbachPart46", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_47, "idErlbachPart47", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_48, "idErlbachPart48", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_49, "idErlbachPart49", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_50, "idErlbachPart50", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_51, "idErlbachPart51", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_52, "idErlbachPart52", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_53, "idErlbachPart53", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_54, "idErlbachPart54", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_55, "idErlbachPart55", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_56, "idErlbachPart56", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_57, "idErlbachPart57", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_58, "idErlbachPart58", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_59, "idErlbachPart59", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_60, "idErlbachPart60", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_61, "idErlbachPart61", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_62, "idErlbachPart62", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_63, "idErlbachPart63", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_64, "idErlbachPart64", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_65, "idErlbachPart65", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_66, "idErlbachPart66", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_67, "idErlbachPart67", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_68, "idErlbachPart68", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_69, "idErlbachPart69", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_70, "idErlbachPart70", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_71, "idErlbachPart71", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_72, "idErlbachPart72", Vector3.zero), + Port.Hidden(PortDef.ERL_CABLE_73, "idErlbachPart73", Vector3.zero), + }; +} diff --git a/vr-configurator/Assets/Scripts/Models/ModelListColors.cs.meta b/vr-configurator/Assets/Scripts/Models/ModelListHelper.cs.meta similarity index 100% rename from vr-configurator/Assets/Scripts/Models/ModelListColors.cs.meta rename to vr-configurator/Assets/Scripts/Models/ModelListHelper.cs.meta diff --git a/vr-configurator/Assets/Scripts/Models/PortDef.cs b/vr-configurator/Assets/Scripts/Models/PortDef.cs index c61d512..e38b08e 100644 --- a/vr-configurator/Assets/Scripts/Models/PortDef.cs +++ b/vr-configurator/Assets/Scripts/Models/PortDef.cs @@ -16,6 +16,7 @@ public class PortDef public const string BIKE_TIRE_FRONT = "bikeTireFront"; // ERLbach + public const string ERL_CABLES = "erlCables"; public const string ERL_CABLE_1 = "erlCable1"; public const string ERL_CABLE_2 = "erlCable2"; public const string ERL_CAP_3 = "erlCap3";