From 1bcbcd1e78cf2a5dc933a2ea133b34b24b1e616c Mon Sep 17 00:00:00 2001 From: FlorianSpeicher Date: Tue, 1 Jul 2025 00:06:21 +0200 Subject: [PATCH] Fix Explode Bike --- .../Assets/Scenes/SampleScene.unity | 44 ++-- .../Assets/Scripts/Models/Definitions.cs | 4 +- .../Assets/Scripts/Models/ModelList.cs | 208 +++++++++--------- .../Assets/Scripts/Transform/ExplodeModel.cs | 15 +- .../ProjectSettings/QualitySettings.asset | 2 +- 5 files changed, 141 insertions(+), 132 deletions(-) diff --git a/vr-configurator/Assets/Scenes/SampleScene.unity b/vr-configurator/Assets/Scenes/SampleScene.unity index 212eb06..c7cf2e1 100644 --- a/vr-configurator/Assets/Scenes/SampleScene.unity +++ b/vr-configurator/Assets/Scenes/SampleScene.unity @@ -1066,9 +1066,9 @@ RectTransform: - {fileID: 2141376354} m_Father: {fileID: 1976633620} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 431.6, y: -246.65} m_SizeDelta: {x: 624, y: 493.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &89481405 @@ -1342,7 +1342,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -0.00078187487} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -16, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &103570489 MonoBehaviour: @@ -12907,8 +12907,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 786401573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.55339396} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -20580,9 +20580,9 @@ RectTransform: - {fileID: 1541654562} m_Father: {fileID: 1976633620} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -194.7} m_SizeDelta: {x: 40, y: 389.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1494770816 @@ -20864,7 +20864,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!222 &1509914125 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23158,9 +23158,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1976633620} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.8, y: -8} m_SizeDelta: {x: 12, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1643928004 @@ -24510,7 +24510,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 2.793, y: -1.917} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 779.60004, y: 541.3} m_Pivot: {x: 1, y: 0} --- !u!114 &1748687178 MonoBehaviour: @@ -28304,10 +28304,10 @@ RectTransform: - {fileID: 89481404} m_Father: {fileID: 1748687177} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 395.80002, y: -270.65} + m_SizeDelta: {x: 743.60004, y: 493.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1976633621 MonoBehaviour: @@ -31437,10 +31437,10 @@ RectTransform: - {fileID: 1883583715} m_Father: {fileID: 89481404} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 312, y: -246.65} + m_SizeDelta: {x: 624, y: 493.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2141376355 MonoBehaviour: diff --git a/vr-configurator/Assets/Scripts/Models/Definitions.cs b/vr-configurator/Assets/Scripts/Models/Definitions.cs index 9b04f94..217e634 100644 --- a/vr-configurator/Assets/Scripts/Models/Definitions.cs +++ b/vr-configurator/Assets/Scripts/Models/Definitions.cs @@ -11,10 +11,10 @@ public class Definitions public const string PORT_BIKE_PEDAL_L = "bikePedalL"; public const string PORT_BIKE_PEDAL_R = "bikePedalR"; public const string PORT_BIKE_STEER = "bikeSteer"; - public const string PORT_BIKE_TIRE_FRONT = "bikeTireFront"; - public const string PORT_BIKE_DRIVER = "bikeDriver"; public const string PORT_BIKE_RIM = "bikeRim"; + public const string PORT_BIKE_RIM_FRONT = "bikeRimFront"; public const string PORT_BIKE_TIRE = "bikeTire"; + public const string PORT_BIKE_TIRE_FRONT = "bikeTireFront"; // ERLCAR PORTS public const string PORT_ERLBACH_1 = "portErlbach1"; diff --git a/vr-configurator/Assets/Scripts/Models/ModelList.cs b/vr-configurator/Assets/Scripts/Models/ModelList.cs index c9ff3d0..26b4947 100644 --- a/vr-configurator/Assets/Scripts/Models/ModelList.cs +++ b/vr-configurator/Assets/Scripts/Models/ModelList.cs @@ -28,16 +28,16 @@ public class ModelList Vector3.one, new List { - Port.Choosable("Attachments", Definitions.PORT_BIKE_FRAME, "idBikeAttachments", new Vector3(0, 0, 0)), - Port.Choosable("Frame", Definitions.PORT_BIKE_FRAME2, "idBikeFrame", new Vector3(0, 0, 0)), - Port.Hidden(Definitions.PORT_BIKE_SPROCKET, "idBikeSprocket", new Vector3(0.007933f, 0.444f, -0.1614f)), - Port.Hidden(Definitions.PORT_BIKE_PEDAL_L, "idBikePedalL", new Vector3(-0.1252177f, 0.5490288f, -0.312027f)), - Port.Hidden(Definitions.PORT_BIKE_PEDAL_R, "idBikePedalR", new Vector3(0.1410843f, 0.3393247f, -0.01154391f)), - Port.Choosable("Handlebars", Definitions.PORT_BIKE_STEER, "idBikeHandlebars", new Vector3(0.002989591f, 1.214713f, 0.4860705f), Quaternion.Euler(-30f, 0f, 0f)), - Port.Choosable("Back Rim", Definitions.PORT_BIKE_RIM, "idBikeRim_Back", new Vector3(-0.01431298f, 0.4673222f, -0.7874681f)), - Port.Hidden(Definitions.PORT_BIKE_TIRE, "idBikeTire_Back", new Vector3(-0.01431298f, 0.4673222f, -0.7874681f)), - Port.Choosable("Front Rim", Definitions.PORT_BIKE_RIM, "idBikeRim_Front", new Vector3(0.01984263f, 0.4673225f, 0.9462124f)), - Port.Hidden( Definitions.PORT_BIKE_TIRE_FRONT, "idBikeTire_Front", new Vector3(0.01984263f, 0.4673225f, 0.9462124f)), + Port.Choosable("Attachments", Definitions.PORT_BIKE_FRAME, "idBikeAttachments", Vector3.zero), + Port.Choosable("Frame", Definitions.PORT_BIKE_FRAME2, "idBikeFrame", Vector3.zero), + Port.Hidden(Definitions.PORT_BIKE_SPROCKET, "idBikeSprocket", new Vector3(0.007933f, 0.444f, -0.1614f), Quaternion.identity, 1f, new Vector3(0.5f, 0f, 0f)), + Port.Hidden(Definitions.PORT_BIKE_PEDAL_L, "idBikePedalL", new Vector3(-0.1252177f, 0.5490288f, -0.312027f), Quaternion.identity, 1f, new Vector3(-0.5f, 0f, 0f)), + Port.Hidden(Definitions.PORT_BIKE_PEDAL_R, "idBikePedalR", new Vector3(0.1410843f, 0.3393247f, -0.01154391f), Quaternion.identity, 1f, new Vector3(0.5f, 0f, 0f)), + Port.Choosable("Handlebars", Definitions.PORT_BIKE_STEER, "idBikeHandlebars", new Vector3(0.002989591f, 1.214713f, 0.4860705f), Quaternion.Euler(-30f, 0f, 0f), 1f, new Vector3(0f, 0.5f, 1f)), + Port.Choosable("Back Rim", Definitions.PORT_BIKE_RIM, "idBikeRim_Back", new Vector3(-0.01431298f, 0.4673222f, -0.7874681f), Quaternion.identity, 1f, new Vector3(0f, 0f, -0.6f)), + Port.Hidden(Definitions.PORT_BIKE_TIRE, "idBikeTire_Back", new Vector3(-0.01431298f, 0.4673222f, -0.7874681f), Quaternion.identity, 1f, new Vector3(0f, 0f, -0.6f)), + Port.Choosable("Front Rim", Definitions.PORT_BIKE_RIM_FRONT, "idBikeRim_Front", new Vector3(0.01984263f, 0.4673225f, 0.9462124f), Quaternion.identity, 1f, new Vector3(0f, 0f, 0.6f)), + Port.Hidden( Definitions.PORT_BIKE_TIRE_FRONT, "idBikeTire_Front", new Vector3(0.01984263f, 0.4673225f, 0.9462124f), Quaternion.identity, 1f, new Vector3(0f, 0f, 0.6f)), } ), new BaseModel( @@ -50,103 +50,103 @@ public class ModelList new Vector3(0.03f, 0.03f, 0.03f), //because model is too big in space new List { - Port.Hidden(Definitions.PORT_ERLBACH_1, "idErlbachPart1", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_2, "idErlbachPart2", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_3, "idErlbachPart3", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_4, "idErlbachPart4", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_5, "idErlbachPart5", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_6, "idErlbachPart6", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_7, "idErlbachPart7", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_8, "idErlbachPart8", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_9, "idErlbachPart9", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_10, "idErlbachPart10", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_11, "idErlbachPart11", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_12, "idErlbachPart12", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_13, "idErlbachPart13", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_14, "idErlbachPart14", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_15, "idErlbachPart15", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_16, "idErlbachPart16", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_17, "idErlbachPart17", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_18, "idErlbachPart18", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_19, "idErlbachPart19", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_20, "idErlbachPart20", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_21, "idErlbachPart21", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_22, "idErlbachPart22", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_23, "idErlbachPart23", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_24, "idErlbachPart24", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_25, "idErlbachPart25", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_26, "idErlbachPart26", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_27, "idErlbachPart27", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_28, "idErlbachPart28", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_29, "idErlbachPart29", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_30, "idErlbachPart30", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_31, "idErlbachPart31", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_32, "idErlbachPart32", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_33, "idErlbachPart33", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_34, "idErlbachPart34", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_35, "idErlbachPart35", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_36, "idErlbachPart36", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_37, "idErlbachPart37", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_38, "idErlbachPart38", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_39, "idErlbachPart39", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_40, "idErlbachPart40", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_41, "idErlbachPart41", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_42, "idErlbachPart42", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_43, "idErlbachPart43", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_44, "idErlbachPart44", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_45, "idErlbachPart45", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_46, "idErlbachPart46", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_47, "idErlbachPart47", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_48, "idErlbachPart48", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_49, "idErlbachPart49", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_50, "idErlbachPart50", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_51, "idErlbachPart51", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_52, "idErlbachPart52", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_53, "idErlbachPart53", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_54, "idErlbachPart54", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_55, "idErlbachPart55", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_56, "idErlbachPart56", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_57, "idErlbachPart57", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_58, "idErlbachPart58", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_59, "idErlbachPart59", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_60, "idErlbachPart60", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_61, "idErlbachPart61", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_62, "idErlbachPart62", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_63, "idErlbachPart63", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_64, "idErlbachPart64", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_65, "idErlbachPart65", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_66, "idErlbachPart66", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_67, "idErlbachPart67", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_68, "idErlbachPart68", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_69, "idErlbachPart69", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_70, "idErlbachPart70", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_71, "idErlbachPart71", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_72, "idErlbachPart72", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_73, "idErlbachPart73", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_BasePlate, "idErlbachBody_BasePlate", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_FrontAxe, "idErlbachPart75", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_BatteriePack, "idErlbachBatBox_Big", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(0f, 0f, 1f)), - Port.Hidden(Definitions.PORT_ERLBACH_77, "idErlbachPart77", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_78, "idErlbachPart78", new Vector3(0f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_79, "idErlbachPart79", new Vector3(0f, 0f, 0f)), + Port.Hidden(Definitions.PORT_ERLBACH_1, "idErlbachPart1", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_2, "idErlbachPart2", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_3, "idErlbachPart3", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_4, "idErlbachPart4", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_5, "idErlbachPart5", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_6, "idErlbachPart6", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_7, "idErlbachPart7", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_8, "idErlbachPart8", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_9, "idErlbachPart9", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_10, "idErlbachPart10", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_11, "idErlbachPart11", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_12, "idErlbachPart12", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_13, "idErlbachPart13", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_14, "idErlbachPart14", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_15, "idErlbachPart15", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_16, "idErlbachPart16", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_17, "idErlbachPart17", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_18, "idErlbachPart18", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_19, "idErlbachPart19", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_20, "idErlbachPart20", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_21, "idErlbachPart21", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_22, "idErlbachPart22", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_23, "idErlbachPart23", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_24, "idErlbachPart24", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_25, "idErlbachPart25", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_26, "idErlbachPart26", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_27, "idErlbachPart27", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_28, "idErlbachPart28", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_29, "idErlbachPart29", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_30, "idErlbachPart30", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_31, "idErlbachPart31", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_32, "idErlbachPart32", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_33, "idErlbachPart33", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_34, "idErlbachPart34", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_35, "idErlbachPart35", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_36, "idErlbachPart36", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_37, "idErlbachPart37", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_38, "idErlbachPart38", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_39, "idErlbachPart39", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_40, "idErlbachPart40", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_41, "idErlbachPart41", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_42, "idErlbachPart42", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_43, "idErlbachPart43", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_44, "idErlbachPart44", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_45, "idErlbachPart45", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_46, "idErlbachPart46", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_47, "idErlbachPart47", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_48, "idErlbachPart48", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_49, "idErlbachPart49", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_50, "idErlbachPart50", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_51, "idErlbachPart51", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_52, "idErlbachPart52", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_53, "idErlbachPart53", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_54, "idErlbachPart54", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_55, "idErlbachPart55", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_56, "idErlbachPart56", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_57, "idErlbachPart57", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_58, "idErlbachPart58", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_59, "idErlbachPart59", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_60, "idErlbachPart60", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_61, "idErlbachPart61", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_62, "idErlbachPart62", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_63, "idErlbachPart63", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_64, "idErlbachPart64", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_65, "idErlbachPart65", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_66, "idErlbachPart66", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_67, "idErlbachPart67", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_68, "idErlbachPart68", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_69, "idErlbachPart69", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_70, "idErlbachPart70", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_71, "idErlbachPart71", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_72, "idErlbachPart72", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_73, "idErlbachPart73", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_BasePlate, "idErlbachBody_BasePlate", Vector3.zero, Quaternion.identity, 1f, Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_FrontAxe, "idErlbachPart75", Vector3.zero, Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), + Port.Hidden(Definitions.PORT_ERLBACH_BatteriePack, "idErlbachBatBox_Big", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 1f)), + Port.Hidden(Definitions.PORT_ERLBACH_77, "idErlbachPart77", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_78, "idErlbachPart78", Vector3.zero), + Port.Hidden(Definitions.PORT_ERLBACH_79, "idErlbachPart79", Vector3.zero), Port.Hidden(Definitions.PORT_ERL_TIRE_LH, "LH", new Vector3(0f,0f,0f), Quaternion.identity, 1f, new Vector3(0f, -1f, 0f)), - Port.Choosable("Wheel Back Right", Definitions.PORT_ERL_RIM_LH, "idErlbachWheel_LH", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(0f, -1f, 0f)), + Port.Choosable("Wheel Back Right", Definitions.PORT_ERL_RIM_LH, "idErlbachWheel_LH", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, -1f, 0f)), Port.Hidden(Definitions.PORT_ERL_TIRE_LV, "LV", new Vector3(0f,0f,0f), Quaternion.identity, 1f, new Vector3(0f, -1f, 0f)), - Port.Choosable("Wheel Front Right", Definitions.PORT_ERL_RIM_LV, "idErlbachWheel_LV", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(0f, -1f, 0f)), + Port.Choosable("Wheel Front Right", Definitions.PORT_ERL_RIM_LV, "idErlbachWheel_LV", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, -1f, 0f)), Port.Hidden(Definitions.PORT_ERL_TIRE_RH, "RH", new Vector3(0f,0f,0f), Quaternion.identity, 1f, new Vector3(0f, 1f, 0f)), - Port.Choosable("Wheel Back Left", Definitions.PORT_ERL_RIM_RH, "idErlbachWheel_RH", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(0f, 1f, 0f)), + Port.Choosable("Wheel Back Left", Definitions.PORT_ERL_RIM_RH, "idErlbachWheel_RH", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 1f, 0f)), Port.Hidden(Definitions.PORT_ERL_TIRE_RV, "RV", new Vector3(0f,0f,0f), Quaternion.identity, 1f, new Vector3(0f, 1f, 0f)), - Port.Choosable("Wheel Front Left", Definitions.PORT_ERL_RIM_RV, "idErlbachWheel_RV", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(0f, 1f, 0f)), - Port.Choosable("Body", Definitions.PORT_ERLBACH_Body, "idErlbachPart84", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(0f, 0f, 1f)), - Port.Choosable("Bumper", Definitions.PORT_ERLBACH_Bumper, "idErlbachPart85", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), - Port.Choosable("Front Bumper", Definitions.PORT_ERLBACH_FrontBumper, "idErlbachPart86", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(-1f, 0f, 0f)), - Port.Choosable("Number", Definitions.PORT_ERLBACH_Number, "idErlbachPart87", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), - Port.Choosable("License Plate", Definitions.PORT_ERLBACH_LicensePlate, "idErlbachPart88", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_LicensePlateContent, "idErlbachPart89", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), - Port.Choosable("Grill", Definitions.PORT_ERLBACH_Grill, "idErlbachPart90", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(-1f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_Refelctor_H, "idErlbachPart91", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_Headlight_V_Cover, "idErlbachPart92", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(-1f, 0f, 0f)), - Port.Hidden(Definitions.PORT_ERLBACH_Headlight_V, "idErlbachPart93", new Vector3(0f, 0f, 0f), Quaternion.identity, 1f, new Vector3(-1f, 0f, 0f)), + Port.Choosable("Wheel Front Left", Definitions.PORT_ERL_RIM_RV, "idErlbachWheel_RV", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 1f, 0f)), + Port.Choosable("Body", Definitions.PORT_ERLBACH_Body, "idErlbachPart84", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 1f)), + Port.Choosable("Bumper", Definitions.PORT_ERLBACH_Bumper, "idErlbachPart85", Vector3.zero, Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), + Port.Choosable("Front Bumper", Definitions.PORT_ERLBACH_FrontBumper, "idErlbachPart86", Vector3.zero, Quaternion.identity, 1f, new Vector3(-1f, 0f, 0f)), + Port.Choosable("Number", Definitions.PORT_ERLBACH_Number, "idErlbachPart87", Vector3.zero, Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), + Port.Choosable("License Plate", Definitions.PORT_ERLBACH_LicensePlate, "idErlbachPart88", Vector3.zero, Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), + Port.Hidden(Definitions.PORT_ERLBACH_LicensePlateContent, "idErlbachPart89", Vector3.zero, Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), + Port.Choosable("Grill", Definitions.PORT_ERLBACH_Grill, "idErlbachPart90", Vector3.zero, Quaternion.identity, 1f, new Vector3(-1f, 0f, 0f)), + Port.Hidden(Definitions.PORT_ERLBACH_Refelctor_H, "idErlbachPart91", Vector3.zero, Quaternion.identity, 1f, new Vector3(1f, 0f, 0f)), + Port.Hidden(Definitions.PORT_ERLBACH_Headlight_V_Cover, "idErlbachPart92", Vector3.zero, Quaternion.identity, 1f, new Vector3(-1f, 0f, 0f)), + Port.Hidden(Definitions.PORT_ERLBACH_Headlight_V, "idErlbachPart93", Vector3.zero, Quaternion.identity, 1f, new Vector3(-1f, 0f, 0f)), } ) }; @@ -333,7 +333,7 @@ public class ModelList new ModelElement(Definitions.PORT_BIKE_STEER, "Handlebars", "idBikeHandlebars", Resources.Load($"Material/AluminiumScratched"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors), new ModelElement(Definitions.PORT_BIKE_RIM, "Back Wheel", "idBikeRim_Back", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors), new ModelElement(Definitions.PORT_BIKE_TIRE, "Back Wheel2", "idBikeTire_Back", Resources.Load($"Material/PlasticCable"), Vector3.zero, Quaternion.identity, Vector3.one, null, null), - new ModelElement(Definitions.PORT_BIKE_RIM, "Front Wheel", "idBikeRim_Front", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors), + new ModelElement(Definitions.PORT_BIKE_RIM_FRONT, "Front Wheel", "idBikeRim_Front", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors), new ModelElement(Definitions.PORT_BIKE_TIRE_FRONT, "Front Wheel2", "idBikeTire_Front", Resources.Load($"Material/PlasticCable"), Vector3.zero, Quaternion.identity, Vector3.one, null, null) }, Resources.LoadAll($"Model/Bicycle/Models/Low-Poly Bicycle"), diff --git a/vr-configurator/Assets/Scripts/Transform/ExplodeModel.cs b/vr-configurator/Assets/Scripts/Transform/ExplodeModel.cs index ad3dd6a..41c7938 100644 --- a/vr-configurator/Assets/Scripts/Transform/ExplodeModel.cs +++ b/vr-configurator/Assets/Scripts/Transform/ExplodeModel.cs @@ -30,13 +30,22 @@ public class ExplodeModel : MonoBehaviour { if (tick <= finalTick) { - if(explode) for (int i = 0; i < baseModel.transform.childCount; i++) - baseModel.transform.GetChild(i).transform.localPosition = MathUtil.EaseBoth(initialPos[i], goalPos[i], (tick + 0f)/finalTick); //0f for floating point div + { + Debug.Log($"Child {baseModel.transform.GetChild(i).transform.name} : {baseModel.transform.GetChild(i).transform.localPosition} : {goalPos[i]} : {initialPos[i]}"); + baseModel.transform.GetChild(i).transform.localPosition = + MathUtil.EaseBoth(initialPos[i], goalPos[i], + (tick + 0f) / finalTick); //0f for floating point div + } else for (int i = 0; i < baseModel.transform.childCount; i++) - baseModel.transform.GetChild(i).transform.localPosition = MathUtil.EaseBoth(goalPos[i], initialPos[i], (tick + 0f)/finalTick); //0f for floating point div + { + baseModel.transform.GetChild(i).transform.localPosition = + MathUtil.EaseBoth(goalPos[i], initialPos[i], + (tick + 0f) / finalTick); //0f for floating point div + } + tick++; } } diff --git a/vr-configurator/ProjectSettings/QualitySettings.asset b/vr-configurator/ProjectSettings/QualitySettings.asset index f746b82..26d0422 100644 --- a/vr-configurator/ProjectSettings/QualitySettings.asset +++ b/vr-configurator/ProjectSettings/QualitySettings.asset @@ -75,7 +75,7 @@ QualitySettings: globalTextureMipmapLimit: 0 textureMipmapLimitSettings: [] anisotropicTextures: 1 - antiAliasing: 4 + antiAliasing: 2 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 0