diff --git a/vr-configurator/Assets/Scenes/SampleScene.unity b/vr-configurator/Assets/Scenes/SampleScene.unity index 9ecc13e..aadc17a 100644 --- a/vr-configurator/Assets/Scenes/SampleScene.unity +++ b/vr-configurator/Assets/Scenes/SampleScene.unity @@ -534,37 +534,6 @@ Transform: - {fileID: 1227652227} m_Father: {fileID: 434687814} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &16201380 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 16201381} - m_Layer: 0 - m_Name: Capsule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &16201381 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 16201380} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &17435610 GameObject: m_ObjectHideFlags: 0 @@ -3593,37 +3562,6 @@ Transform: m_Children: [] m_Father: {fileID: 1002657906} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &212180280 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 212180281} - m_Layer: 0 - m_Name: 9-Sliced - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &212180281 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 212180280} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &213124148 GameObject: m_ObjectHideFlags: 0 @@ -21925,114 +21863,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1272917964} m_Mesh: {fileID: 0} ---- !u!1 &1275794565 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1275794569} - - component: {fileID: 1275794568} - - component: {fileID: 1275794567} - - component: {fileID: 1275794566} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!65 &1275794566 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1275794565} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1275794567 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1275794565} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 409ec6bbb2d1a7f44ae19a6f2abb4f58, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1275794568 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1275794565} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1275794569 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1275794565} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.973, y: -0.099, z: 11.232718} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1279562653 GameObject: m_ObjectHideFlags: 0 @@ -181236,7 +181066,4 @@ SceneRoots: - {fileID: 1591058974} - {fileID: 548570670} - {fileID: 540709790} - - {fileID: 1275794569} - {fileID: 317678350} - - {fileID: 212180281} - - {fileID: 16201381} diff --git a/vr-configurator/Assets/Scripts/Models/ModelList.cs b/vr-configurator/Assets/Scripts/Models/ModelList.cs index cc0a33e..0e215a8 100644 --- a/vr-configurator/Assets/Scripts/Models/ModelList.cs +++ b/vr-configurator/Assets/Scripts/Models/ModelList.cs @@ -149,10 +149,10 @@ public class ModelList Port.Choosable("License Plate", Definitions.PORT_ERLBACH_LicensePlate, "idErlbachPart88", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), Port.Hidden(Definitions.PORT_ERLBACH_LicensePlateContent, "idErlbachPart89", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), Port.Hidden(Definitions.PORT_ERLBACH_90, "idErlbachPart90", Vector3.zero, Quaternion.identity, 1f, new Vector3(20f, 0f, 0f)), - Port.Choosable("Grille", Definitions.PORT_ERLBACH_GRILL, "idErlbachPart91", new Vector3(2.5f, 0f, -0.5f), Quaternion.identity, 1f, new Vector3(-20f, 0f, 0f)), + Port.Choosable("Grill", Definitions.PORT_ERLBACH_GRILL, "erlGrill_1", new Vector3(2.5f, 0f, -0.5f), Quaternion.identity, 1f, new Vector3(-20f, 0f, 0f)), Port.Choosable("Front Bumper", Definitions.PORT_ERLBACH_FrontBumper, "idErlbachPart92", new Vector3(2.4f, 0f, -5.1f), Quaternion.identity, 1f, new Vector3(-20f, 0f, 0f)), Port.Hidden(Definitions.PORT_ERLBACH_Headlight_V, "idErlbachPart93", new Vector3(2.1f, 0f, -5.3f), Quaternion.identity, 1f, new Vector3(-20f, 0f, 0f)), - Port.Choosable("Glas", Definitions.PORT_ERLBACH_Windows, "idErlbachGlas", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 100f)), + Port.Choosable("Fenster", Definitions.PORT_ERLBACH_Windows, "idErlbachGlas", Vector3.zero, Quaternion.identity, 1f, new Vector3(0f, 0f, 100f)), } ) }; @@ -314,8 +314,8 @@ public class ModelList // GRILL new ChildModel( Definitions.PORT_ERLBACH_GRILL, - "Grille Elegance", - "idErlbachGrill", + "Elegance Grill", + "erlGrill_2", Resources.Load("Model/ERLbach/Grill1"), Resources.Load("Material/AluminiumBrushed"), new Vector3(-145f, -34.3f, 24.5f), // offset to the port @@ -457,8 +457,8 @@ public class ModelList new ModelElement( Definitions.PORT_ERLBACH_LicensePlate, "License Plate", "idErlbachPart88", Resources.Load($"Material/AluminiumPolished"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors ), new ModelElement( Definitions.PORT_ERLBACH_LicensePlateContent, "License Plate Content", "idErlbachPart89", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, null ), new ModelElement( Definitions.PORT_ERLBACH_90, "Erlbach Part 90", "idErlbachPart90", Resources.Load($"Material/PVC"), Vector3.zero, Quaternion.identity, Vector3.one, null, null ), - new ModelElement( Definitions.PORT_ERLBACH_GRILL, "Standard Grille", "idErlbachPart91", Resources.Load($"Material/AluminiumBrushed"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors ), - new ModelElement( Definitions.PORT_ERLBACH_FrontBumper, "FrontBumper", "idErlbachPart92", Resources.Load($"Material/AluminiumBrushed"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors ), + new ModelElement( Definitions.PORT_ERLBACH_GRILL, "Standard Grill", "erlGrill_1", Resources.Load($"Material/AluminiumBrushed"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors ), + new ModelElement( Definitions.PORT_ERLBACH_FrontBumper, "Front Bumper", "idErlbachPart92", Resources.Load($"Material/AluminiumBrushed"), Vector3.zero, Quaternion.identity, Vector3.one, null, DefaultColors ), new ModelElement( Definitions.PORT_ERLBACH_Headlight_V, "Headlight", "idErlbachPart93", Resources.Load($"Material/MetalMesh"), Vector3.zero, Quaternion.identity, Vector3.one, null, null ), new ModelElement( Definitions.PORT_ERLBACH_Windows, "Fenster", "idErlbachGlas", Resources.Load($"Material/Glas"), Vector3.zero, Quaternion.identity, Vector3.one, null, WindowColor), },