From 78ccb2369da6a3a187c796d152f3f9fd7ea5f5ab Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 17 Jul 2025 23:11:29 +0200 Subject: [PATCH] License Plate correct model + Color change --- vr-configurator/.gitignore | 5 +- .../Assets/Resources/Material/Universal.mat | 2 +- .../{idErlbachPart88.png => erlLP.png} | Bin ...dErlbachPart88.png.meta => erlLP.png.meta} | 0 .../Assets/Scripts/Models/ModelList.cs | 29 +++-- .../Assets/Scripts/Models/ModelListColors.cs | 109 +++++++++--------- .../Assets/Scripts/Models/PortDef.cs | 1 + 7 files changed, 84 insertions(+), 62 deletions(-) rename vr-configurator/Assets/Resources/sprites/{idErlbachPart88.png => erlLP.png} (100%) rename vr-configurator/Assets/Resources/sprites/{idErlbachPart88.png.meta => erlLP.png.meta} (100%) diff --git a/vr-configurator/.gitignore b/vr-configurator/.gitignore index 3126f57..a6d057d 100644 --- a/vr-configurator/.gitignore +++ b/vr-configurator/.gitignore @@ -79,4 +79,7 @@ crashlytics-build.properties TempAssembly.dll # Max eternal git struggle -export.json \ No newline at end of file +export.json + +/build_apk/ +*.py \ No newline at end of file diff --git a/vr-configurator/Assets/Resources/Material/Universal.mat b/vr-configurator/Assets/Resources/Material/Universal.mat index c658d06..19855c1 100644 --- a/vr-configurator/Assets/Resources/Material/Universal.mat +++ b/vr-configurator/Assets/Resources/Material/Universal.mat @@ -135,7 +135,7 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 0.016976064, b: 0, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _Color: {r: 1, g: 0.016976064, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/vr-configurator/Assets/Resources/sprites/idErlbachPart88.png b/vr-configurator/Assets/Resources/sprites/erlLP.png similarity index 100% rename from vr-configurator/Assets/Resources/sprites/idErlbachPart88.png rename to vr-configurator/Assets/Resources/sprites/erlLP.png diff --git a/vr-configurator/Assets/Resources/sprites/idErlbachPart88.png.meta b/vr-configurator/Assets/Resources/sprites/erlLP.png.meta similarity index 100% rename from vr-configurator/Assets/Resources/sprites/idErlbachPart88.png.meta rename to vr-configurator/Assets/Resources/sprites/erlLP.png.meta diff --git a/vr-configurator/Assets/Scripts/Models/ModelList.cs b/vr-configurator/Assets/Scripts/Models/ModelList.cs index ab77af0..b291d6c 100644 --- a/vr-configurator/Assets/Scripts/Models/ModelList.cs +++ b/vr-configurator/Assets/Scripts/Models/ModelList.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Models; using UnityEngine; /// @@ -131,9 +130,8 @@ public class ModelList Port.Choosable("Rear Bumper", PortDef.ERL_BUMPER_BACK, "idErlbachPart85", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), Port.Choosable("Front Bumper", PortDef.ERL_DRL_OUTLINE, "idErlbachPart86", new Vector3(2.1f, 0f, 0f), Quaternion.identity, 1f, new Vector3(-10f, 0f, 0f)), Port.Hidden(PortDef.ERL_BADGE, "idErlbachPart87", Vector3.zero, Quaternion.identity, 1f, new Vector3(50f, 0f, 0f)), - Port.Choosable("License Plate", PortDef.ERL_LP_BASE, "idErlbachPart88", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), - Port.Hidden(PortDef.ERL_LP_TEXT, "idErlbachPart89", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), - Port.Hidden(PortDef.ERL_LP_COUNTRY, "idErlbachPart90", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), + Port.Hidden(PortDef.ERL_LP_BASE, "idErlbachPart88", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), + Port.Choosable("License Plate", PortDef.ERL_LP_TC, "erlLP", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), Port.Choosable("Grill", PortDef.ERL_GRILL, "erlGrill_1", new Vector3(2.5f, 0f, -0.5f), Quaternion.identity, 1f, new Vector3(-20f, 0f, 0f)), Port.Choosable("Headlight Cover", PortDef.ERL_BUMPER_FRONT, "idErlbachPart92", new Vector3(2.4f, 0f, -5.1f), Quaternion.identity, 1f, new Vector3(-20f, 0f, 0f)), Port.Hidden(PortDef.ERL_DRL_PLATE, "idErlbachPart93", new Vector3(2.1f, 0f, -5.3f), Quaternion.identity, 1f, new Vector3(-20f, 0f, 0f)), @@ -308,7 +306,24 @@ public class ModelList new Vector3(1f, 1f, 1f), // scale null, // no children ModelListColors.ColorAluminiumBrushed // default colors - ) + ), + new ChildModel( + PortDef.ERL_LP_TC, + "License Plate", + "erlLP", + Resources.Load("Material/Universal"), + Vector3.zero, + Quaternion.Euler(0f, 0f, 0f), // no rotation + new Vector3(1f, 1f, 1f), + new List + { + Port.Hidden(PortDef.ERL_LP_TEXT, "idErlbachPart89", Vector3.zero, Quaternion.identity), + Port.Hidden(PortDef.ERL_LP_COUNTRY, "idErlbachPart90", Vector3.zero, Quaternion.identity), + }, + ModelListColors.ColorLicensePlate, + true + ), + }; static ModelList() @@ -440,8 +455,8 @@ public class ModelList 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_LP_TEXT, "License Plate Content", "idErlbachPart89", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(PortDef.ERL_LP_COUNTRY, "Erlbach Part 90", "idErlbachPart90", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), + 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"), Vector3.zero, 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_DRL_PLATE, "Headlight", "idErlbachPart93", Resources.Load($"Material/MetalMesh"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), diff --git a/vr-configurator/Assets/Scripts/Models/ModelListColors.cs b/vr-configurator/Assets/Scripts/Models/ModelListColors.cs index 80d46e6..c514d42 100644 --- a/vr-configurator/Assets/Scripts/Models/ModelListColors.cs +++ b/vr-configurator/Assets/Scripts/Models/ModelListColors.cs @@ -1,59 +1,62 @@ using System.Collections.Generic; using UnityEngine; -namespace Models +public class ModelListColors { - public class ModelListColors + public static readonly List DefaultColors = new List { - public static List DefaultColors = new List() - { - Color.black, - Color.gray, - Color.blue, - Color.red, - Color.yellow, - }; - - public static 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 List ColorAluminiumPolished = new List() - { - Color.black, - Resources.Load($"Material/AluminiumPolished").color, - Color.blue, - Color.red, - Color.yellow, - }; - public static List ColorAluminiumScratched = new List() - { - Color.black, - Resources.Load($"Material/AluminiumScratched").color, - Color.blue, - Color.red, - Color.yellow, - }; - public static List ColorAluminiumBrushed = new List() - { - Color.black, - Resources.Load($"Material/AluminiumBrushed").color, - Color.blue, - Color.red, - Color.yellow, - }; - public static List ColorPVC = new List() - { - Resources.Load($"Material/PVC").color, - Color.blue, - Color.gray, - Color.red, - Color.yellow, - }; - } + 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/PortDef.cs b/vr-configurator/Assets/Scripts/Models/PortDef.cs index 49f05fa..bc2a7c0 100644 --- a/vr-configurator/Assets/Scripts/Models/PortDef.cs +++ b/vr-configurator/Assets/Scripts/Models/PortDef.cs @@ -109,6 +109,7 @@ public class PortDef public const string ERL_BUMPER_FRONT = "erlBumperFront86"; public const string ERL_BADGE = "erlBadge87"; public const string ERL_LP_BASE = "erlLPBase88"; + public const string ERL_LP_TC = "erlLPpickableu"; public const string ERL_LP_TEXT = "erlLPText89"; public const string ERL_LP_COUNTRY = "erlLPCountry90"; public const string ERL_GRILL = "portErlbach91";