Skip to content

Commit 8d4b714

Browse files
micahpearlmanmicahpearlman
committed
updated simple amr prefab with correct tf
1 parent d3dcafc commit 8d4b714

File tree

2 files changed

+23
-298
lines changed

2 files changed

+23
-298
lines changed

‎Samples~/ZeroSimSamples/Robots/SimpleAMR/SimpleAMR.prefab‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,7 @@ GameObject:
900900
- component: {fileID: 968823325036578812}
901901
- component: {fileID: 968823325036578811}
902902
- component: {fileID: 968823325036578810}
903+
- component: {fileID: 58768617}
903904
m_Layer: 0
904905
m_Name: base_link
905906
m_TagString: Untagged
@@ -1068,6 +1069,26 @@ HingeJoint:
10681069
m_EnablePreprocessing: 1
10691070
m_MassScale: 1
10701071
m_ConnectedMassScale: 1
1072+
--- !u!114 &58768617
1073+
MonoBehaviour:
1074+
m_ObjectHideFlags: 0
1075+
m_CorrespondingSourceObject: {fileID: 0}
1076+
m_PrefabInstance: {fileID: 0}
1077+
m_PrefabAsset: {fileID: 0}
1078+
m_GameObject: {fileID: 968823325036578806}
1079+
m_Enabled: 1
1080+
m_EditorHideFlags: 0
1081+
m_Script: {fileID: 11500000, guid: 6013e0556113f1e9f95189e724e765fc, type: 3}
1082+
m_Name:
1083+
m_EditorClassIdentifier:
1084+
_updateRateHz: 10
1085+
_debug: 0
1086+
_currentUpdateHz: 0
1087+
_currentFixedUpdateHz: 0
1088+
_ROSTopic:
1089+
_name: ros.publisher.transform_base_link
1090+
_frameId: map
1091+
_childFrameId: base_link
10711092
--- !u!1 &968823325051699718
10721093
GameObject:
10731094
m_ObjectHideFlags: 0
@@ -1649,3 +1670,4 @@ MonoBehaviour:
16491670
_ROSTopic: scan
16501671
_name: ros.publisher.scan_lidar_2d
16511672
_lidar2DSensor: {fileID: 2109799646322946625}
1673+
_parentTransformId: base_link

‎Samples~/ZeroSimSamples/Scenes/SimpleRobot_test.unity‎

Lines changed: 1 addition & 298 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,6 @@ NavMeshSettings:
123123
debug:
124124
m_Flags: 0
125125
m_NavMeshData: {fileID: 0}
126-
--- !u!134 &29090693
127-
PhysicMaterial:
128-
m_ObjectHideFlags: 0
129-
m_CorrespondingSourceObject: {fileID: 0}
130-
m_PrefabInstance: {fileID: 0}
131-
m_PrefabAsset: {fileID: 0}
132-
m_Name: DynamicMaterial
133-
dynamicFriction: 0
134-
staticFriction: 0
135-
bounciness: 0
136-
frictionCombine: 0
137-
bounceCombine: 0
138126
--- !u!1 &58768610 stripped
139127
GameObject:
140128
m_CorrespondingSourceObject: {fileID: 968823325036578806, guid: e40f2c3c7691c519a99f10bf56f8b75f,
@@ -257,18 +245,6 @@ Transform:
257245
m_Father: {fileID: 0}
258246
m_RootOrder: 2
259247
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
260-
--- !u!134 &207220753
261-
PhysicMaterial:
262-
m_ObjectHideFlags: 0
263-
m_CorrespondingSourceObject: {fileID: 0}
264-
m_PrefabInstance: {fileID: 0}
265-
m_PrefabAsset: {fileID: 0}
266-
m_Name: DynamicMaterial
267-
dynamicFriction: 0
268-
staticFriction: 0
269-
bounciness: 0
270-
frictionCombine: 0
271-
bounceCombine: 0
272248
--- !u!1 &310625171
273249
GameObject:
274250
m_ObjectHideFlags: 0
@@ -624,18 +600,6 @@ MonoBehaviour:
624600
_name: ros.publisher.transform_ROSUnityManager
625601
_frameId: map
626602
_childFrameId: ros.publisher.transform_ROSUnityManager
627-
--- !u!134 &837473547
628-
PhysicMaterial:
629-
m_ObjectHideFlags: 0
630-
m_CorrespondingSourceObject: {fileID: 0}
631-
m_PrefabInstance: {fileID: 0}
632-
m_PrefabAsset: {fileID: 0}
633-
m_Name: DynamicMaterial
634-
dynamicFriction: 0.6
635-
staticFriction: 0.6
636-
bounciness: 0
637-
frictionCombine: 0
638-
bounceCombine: 0
639603
--- !u!1 &1189395066
640604
GameObject:
641605
m_ObjectHideFlags: 0
@@ -731,42 +695,6 @@ Transform:
731695
m_Father: {fileID: 0}
732696
m_RootOrder: 3
733697
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
734-
--- !u!84 &1296479716
735-
RenderTexture:
736-
m_ObjectHideFlags: 0
737-
m_CorrespondingSourceObject: {fileID: 0}
738-
m_PrefabInstance: {fileID: 0}
739-
m_PrefabAsset: {fileID: 0}
740-
m_Name:
741-
m_ImageContentsHash:
742-
serializedVersion: 2
743-
Hash: 00000000000000000000000000000000
744-
m_ForcedFallbackFormat: 4
745-
m_DownscaleFallback: 0
746-
m_IsAlphaChannelOptional: 0
747-
serializedVersion: 3
748-
m_Width: 640
749-
m_Height: 480
750-
m_AntiAliasing: 1
751-
m_MipCount: -1
752-
m_DepthFormat: 1
753-
m_ColorFormat: 8
754-
m_MipMap: 0
755-
m_GenerateMips: 1
756-
m_SRGB: 0
757-
m_UseDynamicScale: 0
758-
m_BindMS: 0
759-
m_EnableCompatibleFormat: 1
760-
m_TextureSettings:
761-
serializedVersion: 2
762-
m_FilterMode: 1
763-
m_Aniso: 1
764-
m_MipBias: 0
765-
m_WrapU: 1
766-
m_WrapV: 1
767-
m_WrapW: 1
768-
m_Dimension: 2
769-
m_VolumeDepth: 1
770698
--- !u!1 &1298881059
771699
GameObject:
772700
m_ObjectHideFlags: 0
@@ -871,115 +799,6 @@ MonoBehaviour:
871799
_yMaxLimit: 80
872800
_distanceMin: 0.5
873801
_distanceMax: 15
874-
--- !u!1001 &1425474414
875-
PrefabInstance:
876-
m_ObjectHideFlags: 0
877-
serializedVersion: 2
878-
m_Modification:
879-
m_TransformParent: {fileID: 0}
880-
m_Modifications:
881-
- target: {fileID: 4241044037577918920, guid: f46c135214725cdb2885ac935c86e08e,
882-
type: 3}
883-
propertyPath: m_ConnectedAnchor.x
884-
value: 0.065
885-
objectReference: {fileID: 0}
886-
- target: {fileID: 4241044037577918920, guid: f46c135214725cdb2885ac935c86e08e,
887-
type: 3}
888-
propertyPath: m_ConnectedAnchor.y
889-
value: 0.134
890-
objectReference: {fileID: 0}
891-
- target: {fileID: 4241044037577918920, guid: f46c135214725cdb2885ac935c86e08e,
892-
type: 3}
893-
propertyPath: m_ConnectedAnchor.z
894-
value: 0.018000003
895-
objectReference: {fileID: 0}
896-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
897-
type: 3}
898-
propertyPath: m_RootOrder
899-
value: 8
900-
objectReference: {fileID: 0}
901-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
902-
type: 3}
903-
propertyPath: m_LocalPosition.x
904-
value: 0
905-
objectReference: {fileID: 0}
906-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
907-
type: 3}
908-
propertyPath: m_LocalPosition.y
909-
value: 0.0502
910-
objectReference: {fileID: 0}
911-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
912-
type: 3}
913-
propertyPath: m_LocalPosition.z
914-
value: -0
915-
objectReference: {fileID: 0}
916-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
917-
type: 3}
918-
propertyPath: m_LocalRotation.w
919-
value: 1
920-
objectReference: {fileID: 0}
921-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
922-
type: 3}
923-
propertyPath: m_LocalRotation.x
924-
value: 0
925-
objectReference: {fileID: 0}
926-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
927-
type: 3}
928-
propertyPath: m_LocalRotation.y
929-
value: 0
930-
objectReference: {fileID: 0}
931-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
932-
type: 3}
933-
propertyPath: m_LocalRotation.z
934-
value: 0
935-
objectReference: {fileID: 0}
936-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
937-
type: 3}
938-
propertyPath: m_LocalEulerAnglesHint.x
939-
value: 0
940-
objectReference: {fileID: 0}
941-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
942-
type: 3}
943-
propertyPath: m_LocalEulerAnglesHint.y
944-
value: 0
945-
objectReference: {fileID: 0}
946-
- target: {fileID: 7790923370650357424, guid: f46c135214725cdb2885ac935c86e08e,
947-
type: 3}
948-
propertyPath: m_LocalEulerAnglesHint.z
949-
value: 0
950-
objectReference: {fileID: 0}
951-
- target: {fileID: 7790923370650357429, guid: f46c135214725cdb2885ac935c86e08e,
952-
type: 3}
953-
propertyPath: m_Name
954-
value: turtlebot3_waffle_simplified_v3_rigged
955-
objectReference: {fileID: 0}
956-
- target: {fileID: 7790923370650357429, guid: f46c135214725cdb2885ac935c86e08e,
957-
type: 3}
958-
propertyPath: m_IsActive
959-
value: 1
960-
objectReference: {fileID: 0}
961-
- target: {fileID: 7790923371113811723, guid: f46c135214725cdb2885ac935c86e08e,
962-
type: 3}
963-
propertyPath: m_IsActive
964-
value: 0
965-
objectReference: {fileID: 0}
966-
- target: {fileID: 8491759256346210500, guid: f46c135214725cdb2885ac935c86e08e,
967-
type: 3}
968-
propertyPath: m_ConnectedAnchor.x
969-
value: 0.065
970-
objectReference: {fileID: 0}
971-
- target: {fileID: 8491759256346210500, guid: f46c135214725cdb2885ac935c86e08e,
972-
type: 3}
973-
propertyPath: m_ConnectedAnchor.y
974-
value: -0.134
975-
objectReference: {fileID: 0}
976-
- target: {fileID: 8491759256346210500, guid: f46c135214725cdb2885ac935c86e08e,
977-
type: 3}
978-
propertyPath: m_ConnectedAnchor.z
979-
value: 0.018000003
980-
objectReference: {fileID: 0}
981-
m_RemovedComponents: []
982-
m_SourcePrefab: {fileID: 100100000, guid: f46c135214725cdb2885ac935c86e08e, type: 3}
983802
--- !u!1 &1719666800
984803
GameObject:
985804
m_ObjectHideFlags: 0
@@ -1136,7 +955,7 @@ PrefabInstance:
1136955
- target: {fileID: 968823323656958414, guid: e40f2c3c7691c519a99f10bf56f8b75f,
1137956
type: 3}
1138957
propertyPath: m_RootOrder
1139-
value: 7
958+
value: 6
1140959
objectReference: {fileID: 0}
1141960
- target: {fileID: 968823323656958414, guid: e40f2c3c7691c519a99f10bf56f8b75f,
1142961
type: 3}
@@ -1195,18 +1014,6 @@ PrefabInstance:
11951014
objectReference: {fileID: 0}
11961015
m_RemovedComponents: []
11971016
m_SourcePrefab: {fileID: 100100000, guid: e40f2c3c7691c519a99f10bf56f8b75f, type: 3}
1198-
--- !u!134 &1884966545
1199-
PhysicMaterial:
1200-
m_ObjectHideFlags: 0
1201-
m_CorrespondingSourceObject: {fileID: 0}
1202-
m_PrefabInstance: {fileID: 0}
1203-
m_PrefabAsset: {fileID: 0}
1204-
m_Name: DynamicMaterial
1205-
dynamicFriction: 1
1206-
staticFriction: 1
1207-
bounciness: 0
1208-
frictionCombine: 0
1209-
bounceCombine: 0
12101017
--- !u!1001 &2007358011
12111018
PrefabInstance:
12121019
m_ObjectHideFlags: 0
@@ -1397,107 +1204,3 @@ MeshCollider:
13971204
m_Convex: 0
13981205
m_CookingOptions: 30
13991206
m_Mesh: {fileID: 6192547391499243942, guid: 17be92f99b8fb14eaa65adc226ac3fd4, type: 3}
1400-
--- !u!1001 &1933133041389252522
1401-
PrefabInstance:
1402-
m_ObjectHideFlags: 0
1403-
serializedVersion: 2
1404-
m_Modification:
1405-
m_TransformParent: {fileID: 0}
1406-
m_Modifications:
1407-
- target: {fileID: 1933133040376761006, guid: 72ef474c4d4d897df96a2872360de7ef,
1408-
type: 3}
1409-
propertyPath: m_Material
1410-
value:
1411-
objectReference: {fileID: 207220753}
1412-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1413-
type: 3}
1414-
propertyPath: m_RootOrder
1415-
value: 6
1416-
objectReference: {fileID: 0}
1417-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1418-
type: 3}
1419-
propertyPath: m_LocalPosition.x
1420-
value: 0
1421-
objectReference: {fileID: 0}
1422-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1423-
type: 3}
1424-
propertyPath: m_LocalPosition.y
1425-
value: 0.05
1426-
objectReference: {fileID: 0}
1427-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1428-
type: 3}
1429-
propertyPath: m_LocalPosition.z
1430-
value: 0
1431-
objectReference: {fileID: 0}
1432-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1433-
type: 3}
1434-
propertyPath: m_LocalRotation.w
1435-
value: 1
1436-
objectReference: {fileID: 0}
1437-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1438-
type: 3}
1439-
propertyPath: m_LocalRotation.x
1440-
value: 0
1441-
objectReference: {fileID: 0}
1442-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1443-
type: 3}
1444-
propertyPath: m_LocalRotation.y
1445-
value: 0
1446-
objectReference: {fileID: 0}
1447-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1448-
type: 3}
1449-
propertyPath: m_LocalRotation.z
1450-
value: 0
1451-
objectReference: {fileID: 0}
1452-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1453-
type: 3}
1454-
propertyPath: m_LocalEulerAnglesHint.x
1455-
value: 0
1456-
objectReference: {fileID: 0}
1457-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1458-
type: 3}
1459-
propertyPath: m_LocalEulerAnglesHint.y
1460-
value: 0
1461-
objectReference: {fileID: 0}
1462-
- target: {fileID: 1933133040623375824, guid: 72ef474c4d4d897df96a2872360de7ef,
1463-
type: 3}
1464-
propertyPath: m_LocalEulerAnglesHint.z
1465-
value: 0
1466-
objectReference: {fileID: 0}
1467-
- target: {fileID: 1933133040623375826, guid: 72ef474c4d4d897df96a2872360de7ef,
1468-
type: 3}
1469-
propertyPath: m_Name
1470-
value: SimpleBot
1471-
objectReference: {fileID: 0}
1472-
- target: {fileID: 1933133040623375826, guid: 72ef474c4d4d897df96a2872360de7ef,
1473-
type: 3}
1474-
propertyPath: m_IsActive
1475-
value: 0
1476-
objectReference: {fileID: 0}
1477-
- target: {fileID: 1933133040999397960, guid: 72ef474c4d4d897df96a2872360de7ef,
1478-
type: 3}
1479-
propertyPath: m_TargetTexture
1480-
value:
1481-
objectReference: {fileID: 1296479716}
1482-
- target: {fileID: 1933133041438289403, guid: 72ef474c4d4d897df96a2872360de7ef,
1483-
type: 3}
1484-
propertyPath: m_Material
1485-
value:
1486-
objectReference: {fileID: 1884966545}
1487-
- target: {fileID: 1933133041985982427, guid: 72ef474c4d4d897df96a2872360de7ef,
1488-
type: 3}
1489-
propertyPath: m_Material
1490-
value:
1491-
objectReference: {fileID: 837473547}
1492-
- target: {fileID: 1933133042009654637, guid: 72ef474c4d4d897df96a2872360de7ef,
1493-
type: 3}
1494-
propertyPath: m_Material
1495-
value:
1496-
objectReference: {fileID: 29090693}
1497-
- target: {fileID: 1933133042079727081, guid: 72ef474c4d4d897df96a2872360de7ef,
1498-
type: 3}
1499-
propertyPath: m_Material
1500-
value:
1501-
objectReference: {fileID: 1884966545}
1502-
m_RemovedComponents: []
1503-
m_SourcePrefab: {fileID: 100100000, guid: 72ef474c4d4d897df96a2872360de7ef, type: 3}

0 commit comments

Comments
 (0)