diff --git a/Assets/AWSIM/Prefabs/Sensors/PerceptionResult.prefab b/Assets/AWSIM/Prefabs/Sensors/PerceptionResult.prefab deleted file mode 100644 index fb84f0625..000000000 --- a/Assets/AWSIM/Prefabs/Sensors/PerceptionResult.prefab +++ /dev/null @@ -1,68 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &9018196562765666343 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9018196562765666340} - - component: {fileID: 9018196562765666341} - - component: {fileID: 9018196562765666342} - m_Layer: 0 - m_Name: PerceptionResult - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9018196562765666340 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9018196562765666343} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9018196562765666341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9018196562765666343} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a01699b62cf01f97185f27e73f715f1d, type: 3} - m_Name: - m_EditorClassIdentifier: - OutputHz: 10 - cachedObjectsWithClassification: [] ---- !u!114 &9018196562765666342 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9018196562765666343} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b268261a3d68d09b1ab995099f84af28, type: 3} - m_Name: - m_EditorClassIdentifier: - objectTopic: /awsim/ground_truth/perception/object_recognition/detection/objects - frameId: base_link - maxDistance: 200 - qosSettings: - ReliabilityPolicy: 2 - DurabilityPolicy: 2 - HistoryPolicy: 1 - Depth: 1 diff --git a/Assets/AWSIM/Prefabs/Sensors/PerceptionResult.prefab.meta b/Assets/AWSIM/Prefabs/Sensors/PerceptionResult.prefab.meta deleted file mode 100644 index 0e76c783b..000000000 --- a/Assets/AWSIM/Prefabs/Sensors/PerceptionResult.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 028fcafdcae418f07807ac3a1d1a8660 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/CoRE/OutdoorsScene.unity b/Assets/CoRE/OutdoorsScene.unity index a3bd047af..54bcf8de9 100644 --- a/Assets/CoRE/OutdoorsScene.unity +++ b/Assets/CoRE/OutdoorsScene.unity @@ -1085,85 +1085,6 @@ Transform: m_Father: {fileID: 1568566513} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &664482253 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 664482254} - - component: {fileID: 664482256} - - component: {fileID: 664482255} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &664482254 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 664482253} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 10} - m_Children: [] - m_Father: {fileID: 1386871786} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &664482255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 664482253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: New Text ---- !u!222 &664482256 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 664482253} - m_CullTransparentMesh: 1 --- !u!1001 &744440314 PrefabInstance: m_ObjectHideFlags: 0 @@ -2184,6 +2105,10 @@ PrefabInstance: propertyPath: m_Name value: TargetRobot objectReference: {fileID: 0} + - target: {fileID: 4317307418933297255, guid: c3f86e03becf38fb793653161cd34174, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3f86e03becf38fb793653161cd34174, type: 3} --- !u!1 &921720821 stripped @@ -2270,72 +2195,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6759902930094879305, guid: 90935f9c2f9bf8faa882cc705282e305, type: 3} m_PrefabInstance: {fileID: 930528486} m_PrefabAsset: {fileID: 0} ---- !u!1 &944507135 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 944507138} - - component: {fileID: 944507137} - - component: {fileID: 944507136} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &944507136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 944507135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &944507137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 944507135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &944507138 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 944507135} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &949236183 GameObject: m_ObjectHideFlags: 0 @@ -3933,106 +3792,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 641953663604812303, guid: 50b399be373994d18a4966e3617a0f81, type: 3} m_PrefabInstance: {fileID: 1382359936} m_PrefabAsset: {fileID: 0} ---- !u!1 &1386871782 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1386871786} - - component: {fileID: 1386871785} - - component: {fileID: 1386871784} - - component: {fileID: 1386871783} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1386871783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386871782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1386871784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386871782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1386871785 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386871782} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1386871786 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386871782} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 664482254} - m_Father: {fileID: 0} - m_RootOrder: 14 - 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_Pivot: {x: 0, y: 0} --- !u!1 &1389532000 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/CoRE/OutdoorsScene/ReflectionProbe-0.exr b/Assets/CoRE/OutdoorsScene/ReflectionProbe-0.exr index 3bda9d7f4..2d73d3208 100644 Binary files a/Assets/CoRE/OutdoorsScene/ReflectionProbe-0.exr and b/Assets/CoRE/OutdoorsScene/ReflectionProbe-0.exr differ diff --git a/Assets/CoRE/OutdoorsScene/ReflectionProbe-1.exr b/Assets/CoRE/OutdoorsScene/ReflectionProbe-1.exr index 1413318b3..df7021850 100644 Binary files a/Assets/CoRE/OutdoorsScene/ReflectionProbe-1.exr and b/Assets/CoRE/OutdoorsScene/ReflectionProbe-1.exr differ diff --git a/Assets/CoRE/OutdoorsScene/ReflectionProbe-2.exr b/Assets/CoRE/OutdoorsScene/ReflectionProbe-2.exr index 7ae206259..d1c2a8dc2 100644 Binary files a/Assets/CoRE/OutdoorsScene/ReflectionProbe-2.exr and b/Assets/CoRE/OutdoorsScene/ReflectionProbe-2.exr differ diff --git a/Assets/CoRE/OutdoorsScene/ReflectionProbe-3.exr b/Assets/CoRE/OutdoorsScene/ReflectionProbe-3.exr index 57f216b83..c611ce804 100644 Binary files a/Assets/CoRE/OutdoorsScene/ReflectionProbe-3.exr and b/Assets/CoRE/OutdoorsScene/ReflectionProbe-3.exr differ diff --git a/Assets/CoRE/OutdoorsScene/ReflectionProbe-4.exr b/Assets/CoRE/OutdoorsScene/ReflectionProbe-4.exr index e78768933..da8fc9a45 100644 Binary files a/Assets/CoRE/OutdoorsScene/ReflectionProbe-4.exr and b/Assets/CoRE/OutdoorsScene/ReflectionProbe-4.exr differ diff --git a/Assets/CoRE/Prefab/ColorBall-Green.prefab b/Assets/CoRE/Prefab/ColorBall-Green.prefab index fabc6815f..27ceec366 100644 --- a/Assets/CoRE/Prefab/ColorBall-Green.prefab +++ b/Assets/CoRE/Prefab/ColorBall-Green.prefab @@ -16,6 +16,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 3 +--- !u!114 &2354751084669716679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7535681071301648070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61cf0f5dedacb9df99847911afe8a965, type: 3} + m_Name: + m_EditorClassIdentifier: + lifetime: 5 --- !u!135 &6970124227543991574 SphereCollider: m_ObjectHideFlags: 0 diff --git a/Assets/CoRE/Prefab/ColorBall-Orange.prefab b/Assets/CoRE/Prefab/ColorBall-Orange.prefab index d596404fd..b485a60c9 100644 --- a/Assets/CoRE/Prefab/ColorBall-Orange.prefab +++ b/Assets/CoRE/Prefab/ColorBall-Orange.prefab @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!135 &7042287213409363265 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3848065056687729657} + m_Material: {fileID: 13400000, guid: 3c021dbe03fa021099a375d2d196d4d6, type: 2} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.0035 + m_Center: {x: 0, y: 0, z: 0} --- !u!54 &4991118693400327232 Rigidbody: m_ObjectHideFlags: 0 @@ -16,19 +29,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 3 ---- !u!135 &7042287213409363265 -SphereCollider: +--- !u!114 &6486826707893129627 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3848065056687729657} - m_Material: {fileID: 13400000, guid: 3c021dbe03fa021099a375d2d196d4d6, type: 2} - m_IsTrigger: 0 + m_GameObject: {fileID: 7535681071301648070} m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.0035 - m_Center: {x: 0, y: 0, z: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61cf0f5dedacb9df99847911afe8a965, type: 3} + m_Name: + m_EditorClassIdentifier: + lifetime: 5 --- !u!1001 &7229816528552387479 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/CoRE/Prefab/disk.prefab b/Assets/CoRE/Prefab/disk.prefab index 9b547f205..91cdea028 100644 --- a/Assets/CoRE/Prefab/disk.prefab +++ b/Assets/CoRE/Prefab/disk.prefab @@ -106,6 +106,7 @@ GameObject: m_Component: - component: {fileID: 7681853084804847554} - component: {fileID: 3296411475198232087} + - component: {fileID: 825979496092862452} m_Layer: 0 m_Name: disk m_TagString: Untagged @@ -144,3 +145,16 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 3 +--- !u!114 &825979496092862452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7048340136466599288} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61cf0f5dedacb9df99847911afe8a965, type: 3} + m_Name: + m_EditorClassIdentifier: + lifetime: 5 diff --git a/Assets/CoRE/Scrips/AutoBot.cs b/Assets/CoRE/Scrips/AutoBot.cs index 4eb30c4d7..fdd501fe0 100644 --- a/Assets/CoRE/Scrips/AutoBot.cs +++ b/Assets/CoRE/Scrips/AutoBot.cs @@ -100,21 +100,26 @@ void FixedUpdate() // Robot State Pub geometry_msgs.msg.Pose msg_pose = new geometry_msgs.msg.Pose(); msg_pose.Position.X = (float)(this.transform.position.x); - msg_pose.Position.Y = (float)(this.transform.position.y); - msg_pose.Position.Z = (float)(this.transform.position.z); - msg_pose.Orientation.X = (float)(this.transform.rotation.x); - msg_pose.Orientation.Y = (float)(this.transform.rotation.y); - msg_pose.Orientation.W = (float)(this.transform.rotation.w); - msg_pose.Orientation.Z = (float)(this.transform.rotation.z); + msg_pose.Position.Y = (float)(this.transform.position.z); + msg_pose.Position.Z = (float)(this.transform.position.y); + + Quaternion unityQuat = new Quaternion(this.transform.rotation.x, this.transform.rotation.y, this.transform.rotation.z, this.transform.rotation.w); + Quaternion rosQuat = Quaternion.Euler(-90, 0, 0) * unityQuat; + msg_pose.Orientation.X = (float)(rosQuat.x); + msg_pose.Orientation.Y = (float)(rosQuat.z); + msg_pose.Orientation.W = (float)(rosQuat.w); + msg_pose.Orientation.Z = (float)(rosQuat.y); robo_pose_pub.Publish(msg_pose); msg_pose.Position.X = (float)(gun_gameobj.transform.localPosition.x); - msg_pose.Position.Y = (float)(gun_gameobj.transform.localPosition.y); - msg_pose.Position.Z = (float)(gun_gameobj.transform.localPosition.z); - msg_pose.Orientation.X = (float)(gun_gameobj.transform.localRotation.x); - msg_pose.Orientation.Y = (float)(gun_gameobj.transform.localRotation.y); - msg_pose.Orientation.W = (float)(gun_gameobj.transform.localRotation.w); - msg_pose.Orientation.Z = (float)(gun_gameobj.transform.localRotation.z); + msg_pose.Position.Y = (float)(gun_gameobj.transform.localPosition.z); + msg_pose.Position.Z = (float)(gun_gameobj.transform.localPosition.y); + unityQuat = new Quaternion(gun_gameobj.transform.localRotation.x, gun_gameobj.transform.localRotation.y, gun_gameobj.transform.localRotation.z, gun_gameobj.transform.localRotation.w); + rosQuat = Quaternion.Euler(-90, 0, 0) * unityQuat; + msg_pose.Orientation.X = (float)(rosQuat.x); + msg_pose.Orientation.Y = (float)(rosQuat.z); + msg_pose.Orientation.W = (float)(rosQuat.w); + msg_pose.Orientation.Z = (float)(rosQuat.y); gun_pose_pub.Publish(msg_pose); } } diff --git a/Assets/CoRE/Scrips/GameObjDestryer.cs b/Assets/CoRE/Scrips/GameObjDestryer.cs new file mode 100644 index 000000000..0a4a7a51d --- /dev/null +++ b/Assets/CoRE/Scrips/GameObjDestryer.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using JetBrains.Annotations; +using UnityEngine; + +public class GameObjDestryer : MonoBehaviour +{ + public float lifetime = 10f; + // Start is called before the first frame update + void Start() + { + Destroy(this.gameObject, lifetime); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/CoRE/Scrips/GameObjDestryer.cs.meta b/Assets/CoRE/Scrips/GameObjDestryer.cs.meta new file mode 100644 index 000000000..eda5c27ea --- /dev/null +++ b/Assets/CoRE/Scrips/GameObjDestryer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61cf0f5dedacb9df99847911afe8a965 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 9f01edcb9..5e8789f77 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.test-framework": "1.1.24", "com.unity.textmeshpro": "3.0.4", "com.unity.timeline": "1.5.4", + "com.unity.toolchain.linux-x86_64": "2.0.6", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.2", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.6.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d3e6464b4..64dc75f69 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -101,18 +101,18 @@ } }, "com.unity.sysroot": { - "version": "2.0.3", + "version": "2.0.7", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.sysroot.linux-x86_64": { - "version": "2.0.2", + "version": "2.0.6", "depth": 1, "source": "registry", "dependencies": { - "com.unity.sysroot": "2.0.3" + "com.unity.sysroot": "2.0.7" }, "url": "https://packages.unity.com" }, @@ -148,6 +148,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.linux-x86_64": { + "version": "2.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.7", + "com.unity.sysroot.linux-x86_64": "2.0.6" + }, + "url": "https://packages.unity.com" + }, "com.unity.toolchain.win-x86_64-linux-x86_64": { "version": "2.0.2", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1441b459d..6c5fe67cd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: TIERIV - productName: AWSIM + companyName: StrayedCats + productName: CoRE.SIM defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} @@ -39,13 +39,11 @@ PlayerSettings: y: 0 width: 1 height: 1 - m_SplashScreenLogos: - - logo: {fileID: 21300000, guid: 4da817fbe135e6c48829478700b369be, type: 3} - duration: 2 + m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 + defaultScreenWidth: 1920 + defaultScreenHeight: 1080 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 @@ -148,7 +146,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Standalone: com.TIERIV.AWSIM + Standalone: com.StrayedCats.CoRE.SIM buildNumber: Standalone: 0 iPhone: 0 diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/UserSettings/Search.settings @@ -0,0 +1 @@ +{} \ No newline at end of file