From b6c487db2a0309a852aa025a83dd78195902f5c3 Mon Sep 17 00:00:00 2001 From: Leo Qu Date: Tue, 3 Mar 2026 16:28:20 -0500 Subject: [PATCH] UI material and environment Made-with: Cursor --- Assets/Flatbuffers_generated/ModuleType.cs | 1 + Assets/LiveViewModulePanel.cs | 2 +- Assets/Module/DCMotorModule.prefab | 260 +++++++++++++++++ Assets/Module/DCMotorModule.prefab.meta | 7 + Assets/Module/DCMotorModuleFinal.prefab | 71 +++++ Assets/Module/DCMotorModuleFinal.prefab.meta | 7 + Assets/Module/DCMotorOld.prefab | 292 +++++++++++++++++++ Assets/Module/DCMotorOld.prefab.meta | 7 + Assets/Module/DCNEWSOCKET.prefab | 79 +++++ Assets/Module/DCNEWSOCKET.prefab.meta | 7 + Assets/Module/TopologyBuilder.cs | 1 + Assets/ModuleSpawner.cs | 3 + Assets/Resources/mockData.json | 2 +- Assets/Resources/mockDataSimple.json | 2 +- Assets/Scenes/SampleScene.unity | 117 +++++++- Assets/dc_module_unity.fbx | 3 + Assets/dc_module_unity.fbx.meta | 109 +++++++ 17 files changed, 955 insertions(+), 15 deletions(-) create mode 100644 Assets/Module/DCMotorModule.prefab create mode 100644 Assets/Module/DCMotorModule.prefab.meta create mode 100644 Assets/Module/DCMotorModuleFinal.prefab create mode 100644 Assets/Module/DCMotorModuleFinal.prefab.meta create mode 100644 Assets/Module/DCMotorOld.prefab create mode 100644 Assets/Module/DCMotorOld.prefab.meta create mode 100644 Assets/Module/DCNEWSOCKET.prefab create mode 100644 Assets/Module/DCNEWSOCKET.prefab.meta create mode 100644 Assets/dc_module_unity.fbx create mode 100644 Assets/dc_module_unity.fbx.meta diff --git a/Assets/Flatbuffers_generated/ModuleType.cs b/Assets/Flatbuffers_generated/ModuleType.cs index 5f491a7..a41a0b2 100644 --- a/Assets/Flatbuffers_generated/ModuleType.cs +++ b/Assets/Flatbuffers_generated/ModuleType.cs @@ -21,5 +21,6 @@ public enum ModuleType : sbyte SPLITTER_6 = 14, SPLITTER_7 = 15, SPLITTER_8 = 16, + POWER = 17, }; diff --git a/Assets/LiveViewModulePanel.cs b/Assets/LiveViewModulePanel.cs index 57fdca2..51b0b17 100644 --- a/Assets/LiveViewModulePanel.cs +++ b/Assets/LiveViewModulePanel.cs @@ -323,7 +323,7 @@ public class LiveViewModulePanel : MonoBehaviour if (m is DCMotorModule) return "DC"; if (m is DisplayModule) return "Display"; if (m is HubModule) return "Hub"; - if (m is PowerModule) return "Battery"; + if (m is PowerModule) return "Power"; if (m is GripperModule) return "Gripper"; if (m is DisplayModule) return "Display"; if (m is DistanceSensorModule) return "Distance Sensor"; diff --git a/Assets/Module/DCMotorModule.prefab b/Assets/Module/DCMotorModule.prefab new file mode 100644 index 0000000..8f9805c --- /dev/null +++ b/Assets/Module/DCMotorModule.prefab @@ -0,0 +1,260 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2019457865491779920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2205902824370289416} + - component: {fileID: 5170167143947308326} + - component: {fileID: 1549954897902023943} + - component: {fileID: 4911314022991483531} + m_Layer: 0 + m_Name: MotorShaft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2205902824370289416 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019457865491779920} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.005, z: 0} + m_LocalScale: {x: 0.0025, y: 0.02, z: 0.0025} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5278868739616043210} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5170167143947308326 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019457865491779920} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1549954897902023943 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019457865491779920} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5a9603aa200ca0c45bf4ce1b20e1a39a, 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!65 &4911314022991483531 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019457865491779920} + 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.0807759, y: 0.747985, z: 1} + m_Center: {x: 0.04038785, y: 0.12600818, z: 0} +--- !u!1 &2958901227120055125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3506715766167772924} + - component: {fileID: 6489369990435455088} + - component: {fileID: 2697430761330675283} + - component: {fileID: 8326399252751671744} + m_Layer: 0 + m_Name: DCMotorBody + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3506715766167772924 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2958901227120055125} + serializedVersion: 2 + m_LocalRotation: {x: 0.71791947, y: -0, z: -0, w: 0.69612616} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5278868739616043210} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6489369990435455088 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2958901227120055125} + m_Mesh: {fileID: 8604045607132181640, guid: 02370d6fa17f742f393ad699c6e30f40, type: 3} +--- !u!23 &2697430761330675283 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2958901227120055125} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 7397659539795428015, guid: 02370d6fa17f742f393ad699c6e30f40, type: 3} + 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!65 &8326399252751671744 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2958901227120055125} + 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: 0.002819935, y: 0.0036000002, z: 0.0050528883} + m_Center: {x: 0.000009967983, y: 7.777669e-12, z: 0.0024735613} +--- !u!1 &3563533490444010952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5278868739616043210} + - component: {fileID: 8712259243222680207} + m_Layer: 0 + m_Name: DCMotorModule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5278868739616043210 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3563533490444010952} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.907, y: 0.304, z: -1.862} + m_LocalScale: {x: 20, y: 20, z: 20} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2205902824370289416} + - {fileID: 3506715766167772924} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8712259243222680207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3563533490444010952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 010a1e64e11ea4ea48068fa4ba025b46, type: 3} + m_Name: + m_EditorClassIdentifier: + motorShaft: {fileID: 2205902824370289416} + rotationSpeed: 90 diff --git a/Assets/Module/DCMotorModule.prefab.meta b/Assets/Module/DCMotorModule.prefab.meta new file mode 100644 index 0000000..71dd2cd --- /dev/null +++ b/Assets/Module/DCMotorModule.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7731927cf621844b6aad08f3b4f9e278 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Module/DCMotorModuleFinal.prefab b/Assets/Module/DCMotorModuleFinal.prefab new file mode 100644 index 0000000..0d4b904 --- /dev/null +++ b/Assets/Module/DCMotorModuleFinal.prefab @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2755166691943480011 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3144005682151899204, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_Name + value: DCMotorModuleFinal Variant + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.25829834 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalPosition.y + value: 0.3040734 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalPosition.z + value: -1.3519248 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.009781737 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7069807 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7070592 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalRotation.z + value: -0.012243745 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180.2 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.7850037 + objectReference: {fileID: 0} + - target: {fileID: 6627662761486256073, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90.003 + objectReference: {fileID: 0} + - target: {fileID: 7425357433547079646, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalPosition.x + value: 0.000031 + objectReference: {fileID: 0} + - target: {fileID: 7425357433547079646, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalPosition.y + value: 0.000012 + objectReference: {fileID: 0} + - target: {fileID: 7425357433547079646, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.005003 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a5fae2277d0014f04abc97a6662ec89b, type: 3} diff --git a/Assets/Module/DCMotorModuleFinal.prefab.meta b/Assets/Module/DCMotorModuleFinal.prefab.meta new file mode 100644 index 0000000..22bdfb6 --- /dev/null +++ b/Assets/Module/DCMotorModuleFinal.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 697a2b8a9a497421e82b9fed7afa4798 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Module/DCMotorOld.prefab b/Assets/Module/DCMotorOld.prefab new file mode 100644 index 0000000..ffa929e --- /dev/null +++ b/Assets/Module/DCMotorOld.prefab @@ -0,0 +1,292 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1467126261888459679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3232951914591476731} + - component: {fileID: 6571457672642416589} + - component: {fileID: 7550244084283555613} + - component: {fileID: 3226239165173753503} + m_Layer: 0 + m_Name: DCMotorBody + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3232951914591476731 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467126261888459679} + serializedVersion: 2 + m_LocalRotation: {x: 0.71791947, y: -0, z: -0, w: 0.69612616} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7425357433547079646} + m_Father: {fileID: 6627662761486256073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6571457672642416589 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467126261888459679} + m_Mesh: {fileID: 8604045607132181640, guid: 02370d6fa17f742f393ad699c6e30f40, type: 3} +--- !u!23 &7550244084283555613 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467126261888459679} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 7397659539795428015, guid: 02370d6fa17f742f393ad699c6e30f40, type: 3} + 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!65 &3226239165173753503 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467126261888459679} + 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: 0.002819935, y: 0.0036000002, z: 0.0050528883} + m_Center: {x: 0.000009967983, y: 7.777669e-12, z: 0.0024735613} +--- !u!1 &3144005682151899204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6627662761486256073} + - component: {fileID: 610632699172388127} + m_Layer: 0 + m_Name: DCMotorOld + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6627662761486256073 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144005682151899204} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0.7071068, z: 0, w: 0} + m_LocalPosition: {x: -0.258, y: 0.304, z: -1.272} + m_LocalScale: {x: 20, y: 20, z: 20} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5636511985024230804} + - {fileID: 3232951914591476731} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 90} +--- !u!114 &610632699172388127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3144005682151899204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 010a1e64e11ea4ea48068fa4ba025b46, type: 3} + m_Name: + m_EditorClassIdentifier: + motorShaft: {fileID: 5636511985024230804} + rotationSpeed: 90 +--- !u!1 &4495798888270218818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7425357433547079646} + m_Layer: 0 + m_Name: BodySocket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7425357433547079646 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4495798888270218818} + serializedVersion: 2 + m_LocalRotation: {x: -0.49223533, y: 0.49223533, z: 0.50764596, w: 0.50764596} + m_LocalPosition: {x: 0.00008, y: 0.00009, z: 0.00507} + m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3232951914591476731} + m_LocalEulerAnglesHint: {x: -91.766, y: 180, z: -90} +--- !u!1 &7537172105070870413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5636511985024230804} + - component: {fileID: 5508900516591227585} + - component: {fileID: 1413293439546090567} + - component: {fileID: 7166894695426940597} + m_Layer: 0 + m_Name: MotorShaft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5636511985024230804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7537172105070870413} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.005, z: 0} + m_LocalScale: {x: 0.0025, y: 0.02, z: 0.0025} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6627662761486256073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5508900516591227585 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7537172105070870413} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1413293439546090567 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7537172105070870413} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5a9603aa200ca0c45bf4ce1b20e1a39a, 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!65 &7166894695426940597 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7537172105070870413} + 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.0807759, y: 0.747985, z: 1} + m_Center: {x: 0.04038785, y: 0.12600818, z: 0} diff --git a/Assets/Module/DCMotorOld.prefab.meta b/Assets/Module/DCMotorOld.prefab.meta new file mode 100644 index 0000000..4d1cd6f --- /dev/null +++ b/Assets/Module/DCMotorOld.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a5fae2277d0014f04abc97a6662ec89b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Module/DCNEWSOCKET.prefab b/Assets/Module/DCNEWSOCKET.prefab new file mode 100644 index 0000000..896bda3 --- /dev/null +++ b/Assets/Module/DCNEWSOCKET.prefab @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7704966891293510062 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 981099726818392719, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_Name + value: DCNEWSOCKET + objectReference: {fileID: 0} + - target: {fileID: 4697389362955306261, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4697389362955306261, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4697389362955306261, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4697389362955306261, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4697389362955306261, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalPosition.x + value: -0.25829834 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalPosition.y + value: 0.3040734 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalPosition.z + value: -1.3519248 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalRotation.w + value: 0.009781737 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7069807 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7070592 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalRotation.z + value: -0.012243745 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180.2 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.7850037 + objectReference: {fileID: 0} + - target: {fileID: 9063038678325951746, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90.003 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 697a2b8a9a497421e82b9fed7afa4798, type: 3} diff --git a/Assets/Module/DCNEWSOCKET.prefab.meta b/Assets/Module/DCNEWSOCKET.prefab.meta new file mode 100644 index 0000000..a8c340e --- /dev/null +++ b/Assets/Module/DCNEWSOCKET.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8f54eee4d6fe643ba98e080c86deb5d1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Module/TopologyBuilder.cs b/Assets/Module/TopologyBuilder.cs index c65e151..8d577fd 100644 --- a/Assets/Module/TopologyBuilder.cs +++ b/Assets/Module/TopologyBuilder.cs @@ -114,6 +114,7 @@ public class TopologyBuilder : MonoBehaviour case "DC": return ModuleType.DC_MOTOR; case "Hub": return ModuleType.SPLITTER; case "Battery": return ModuleType.BATTERY; + case "Power": return ModuleType.POWER; case "Gripper": return ModuleType.GRIPPER; case "Display": return ModuleType.DISPLAY; case "Distance": return ModuleType.DISTANCE_SENSOR; diff --git a/Assets/ModuleSpawner.cs b/Assets/ModuleSpawner.cs index 1184c3a..c0aa3d9 100644 --- a/Assets/ModuleSpawner.cs +++ b/Assets/ModuleSpawner.cs @@ -14,6 +14,7 @@ public class ModuleSpawner : MonoBehaviour public GameObject distanceSensorModulePrefab; public GameObject imuSensorModulePrefab; public GameObject speakerModulePrefab; + public GameObject powerModulePrefab; public GameObject GetPrefabForType(ModuleType type) { @@ -22,6 +23,8 @@ public class ModuleSpawner : MonoBehaviour { case ModuleType.BATTERY: return batteryModulePrefab; + case ModuleType.POWER: + return powerModulePrefab; case ModuleType.SPLITTER: return hubModulePrefab; case ModuleType.DC_MOTOR: diff --git a/Assets/Resources/mockData.json b/Assets/Resources/mockData.json index c6a6397..9e9c565 100644 --- a/Assets/Resources/mockData.json +++ b/Assets/Resources/mockData.json @@ -1 +1 @@ -{"Modules":[{"Id":"battery1","Type":"Battery","Degree":null},{"Id":"servo1","Type":"Servo1","Degree":45},{"Id":"servo2","Type":"Servo2","Degree":60},{"Id":"servo3","Type":"Servo1","Degree":90},{"Id":"servo4","Type":"Servo2","Degree":45},{"Id":"servo5","Type":"Servo1","Degree":120},{"Id":"servo6","Type":"Servo2","Degree":30},{"Id":"endModule","Type":"Gripper","Degree":90}],"Connections":[{"FromModuleId":"battery1","ToModuleId":"servo1","FromSocket":"MaleSocket","ToSocket":"BodySocket","Orientation":0},{"FromModuleId":"servo1","ToModuleId":"servo2","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo2","ToModuleId":"servo3","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0},{"FromModuleId":"servo3","ToModuleId":"servo4","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo4","ToModuleId":"servo5","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0},{"FromModuleId":"servo5","ToModuleId":"servo6","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo6","ToModuleId":"endModule","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0}]} +{"Modules":[{"Id":"power1","Type":"Power","Degree":null},{"Id":"hub1","Type":"Hub","Degree":null},{"Id":"servo1","Type":"Servo1","Degree":45},{"Id":"servo2","Type":"Servo2","Degree":60},{"Id":"servo3","Type":"Servo1","Degree":90},{"Id":"servo4","Type":"Servo2","Degree":45},{"Id":"servo5","Type":"Servo1","Degree":120},{"Id":"servo6","Type":"Servo2","Degree":30},{"Id":"speaker1","Type":"Speaker","Degree":null},{"Id":"endModule","Type":"Gripper","Degree":90}],"Connections":[{"FromModuleId":"power1","ToModuleId":"hub1","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0},{"FromModuleId":"hub1","ToModuleId":"servo1","FromSocket":"MaleSocket1","ToSocket":"BodySocket","Orientation":0},{"FromModuleId":"hub1","ToModuleId":"speaker1","FromSocket":"MaleSocket2","ToSocket":"FemaleSocket","Orientation":0},{"FromModuleId":"servo1","ToModuleId":"servo2","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo2","ToModuleId":"servo3","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0},{"FromModuleId":"servo3","ToModuleId":"servo4","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo4","ToModuleId":"servo5","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0},{"FromModuleId":"servo5","ToModuleId":"servo6","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo6","ToModuleId":"endModule","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0}]} diff --git a/Assets/Resources/mockDataSimple.json b/Assets/Resources/mockDataSimple.json index f23f8b7..f8a7a8f 100644 --- a/Assets/Resources/mockDataSimple.json +++ b/Assets/Resources/mockDataSimple.json @@ -1 +1 @@ -{"Modules":[{"Id":"battery1","Type":"Battery","Degree":null},{"Id":"servo1","Type":"Servo1","Degree":45},{"Id":"servo2","Type":"Servo2","Degree":60},{"Id":"servo3","Type":"Servo1","Degree":90},{"Id":"servo4","Type":"Servo2","Degree":0},{"Id":"endModule","Type":"Speaker","Degree":null}],"Connections":[{"FromModuleId":"battery1","ToModuleId":"servo1","FromSocket":"MaleSocket","ToSocket":"BodySocket","Orientation":0},{"FromModuleId":"servo1","ToModuleId":"servo2","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo2","ToModuleId":"servo3","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0},{"FromModuleId":"servo3","ToModuleId":"servo4","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo4","ToModuleId":"endModule","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0}]} +{"Modules":[{"Id":"power1","Type":"Power","Degree":null},{"Id":"servo1","Type":"Servo1","Degree":45},{"Id":"servo2","Type":"Servo2","Degree":60},{"Id":"servo3","Type":"Servo1","Degree":90},{"Id":"servo4","Type":"Servo2","Degree":0},{"Id":"endModule","Type":"Speaker","Degree":null}],"Connections":[{"FromModuleId":"power1","ToModuleId":"servo1","FromSocket":"MaleSocket","ToSocket":"BodySocket","Orientation":0},{"FromModuleId":"servo1","ToModuleId":"servo2","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo2","ToModuleId":"servo3","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0},{"FromModuleId":"servo3","ToModuleId":"servo4","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":90},{"FromModuleId":"servo4","ToModuleId":"endModule","FromSocket":"MaleSocket","ToSocket":"FemaleSocket","Orientation":0}]} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 1d676a8..446beae 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -756,6 +756,103 @@ Transform: m_CorrespondingSourceObject: {fileID: 1669686713939424428, guid: 8f54eee4d6fe643ba98e080c86deb5d1, type: 3} m_PrefabInstance: {fileID: 715658897} m_PrefabAsset: {fileID: 0} +--- !u!1 &193441043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 193441044} + - component: {fileID: 193441045} + m_Layer: 0 + m_Name: Point Light (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &193441044 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 193441043} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.46, y: -16.21, z: -4.913} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1319424261} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &193441045 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 193441043} + m_Enabled: 1 + serializedVersion: 12 + m_Type: 2 + m_Color: {r: 0.7735849, g: 0.64003205, b: 0.5509968, a: 1} + m_Intensity: 2 + m_Range: 20 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!1 &263702966 GameObject: m_ObjectHideFlags: 0 @@ -1124,8 +1221,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: spawner: {fileID: 2021810911} - useJsonFile: 1 - skipControlLibraryCalls: 1 + useJsonFile: 0 + skipControlLibraryCalls: 0 jsonFileName: mockData --- !u!4 &387671720 Transform: @@ -4567,10 +4664,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 4077927847297772526, guid: 46058ab5ebab64d548b4008f54df1f6d, type: 3} - insertIndex: -1 - addedObject: {fileID: 1130031670} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46058ab5ebab64d548b4008f54df1f6d, type: 3} --- !u!1 &943453643 @@ -5859,11 +5953,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1118554157} m_CullTransparentMesh: 1 ---- !u!4 &1130031670 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5278868739616043210, guid: 7731927cf621844b6aad08f3b4f9e278, type: 3} - m_PrefabInstance: {fileID: 1309657867} - m_PrefabAsset: {fileID: 0} --- !u!1 &1135363928 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2070925442191277755, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} @@ -6706,6 +6795,7 @@ Transform: - {fileID: 1188016939} - {fileID: 2122590370} - {fileID: 2131696472} + - {fileID: 193441044} - {fileID: 1001677316} - {fileID: 1658889055} - {fileID: 558155751} @@ -9442,6 +9532,8 @@ MonoBehaviour: displayModulePrefab: {fileID: 9087040773434933035, guid: 1d13960332e6840458c2d63f616e2774, type: 3} distanceSensorModulePrefab: {fileID: 4820635649742989172, guid: 71a1ec0b30283422eafea6e72a83d947, type: 3} imuSensorModulePrefab: {fileID: 7670757311786442011, guid: 78f1dcd3d1ad14720bec24368d935b13, type: 3} + speakerModulePrefab: {fileID: 0} + powerModulePrefab: {fileID: 0} --- !u!4 &2021810912 Transform: m_ObjectHideFlags: 0 @@ -9952,7 +10044,7 @@ Transform: m_GameObject: {fileID: 2131696470} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.21305, y: 6.04, z: -11.672999} + m_LocalPosition: {x: -7.74, y: 5.95, z: -11.672999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10320,3 +10412,4 @@ SceneRoots: - {fileID: 2031445727} - {fileID: 859822641} - {fileID: 1319424261} + - {fileID: 1309657867} diff --git a/Assets/dc_module_unity.fbx b/Assets/dc_module_unity.fbx new file mode 100644 index 0000000..6052e65 --- /dev/null +++ b/Assets/dc_module_unity.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5376122b414105a1a5b496d8b155bd797b8907f12ba468265987477a6a4d989d +size 62944 diff --git a/Assets/dc_module_unity.fbx.meta b/Assets/dc_module_unity.fbx.meta new file mode 100644 index 0000000..1c77a4f --- /dev/null +++ b/Assets/dc_module_unity.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 02370d6fa17f742f393ad699c6e30f40 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: