From 223fbde73afa828309617303380e5a60955a38c0 Mon Sep 17 00:00:00 2001 From: Abdul Mukheem Shaik <mukheemuddin@gmail.com> Date: Mon, 27 May 2024 23:37:59 +0200 Subject: [PATCH] added transform classic component --- Assets/Plugins/ParrelSync.meta | 8 +++ .../Plugins/ParrelSync/ScriptableObjects.meta | 8 +++ .../ParrelSyncProjectSettings.asset | 15 ++++ .../ParrelSyncProjectSettings.asset.meta | 8 +++ .../Resources/Wind_Turbine_withMap.prefab | 70 +++++++++++++++++++ Assets/SharedSpatialAnchors/Scripts/API.cs | 1 - Packages/manifest.json | 1 + Packages/packages-lock.json | 7 ++ 8 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 Assets/Plugins/ParrelSync.meta create mode 100644 Assets/Plugins/ParrelSync/ScriptableObjects.meta create mode 100644 Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset create mode 100644 Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta diff --git a/Assets/Plugins/ParrelSync.meta b/Assets/Plugins/ParrelSync.meta new file mode 100644 index 0000000..d0092ed --- /dev/null +++ b/Assets/Plugins/ParrelSync.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64dcfe5f95badbf46b7e8db9110b25be +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ParrelSync/ScriptableObjects.meta b/Assets/Plugins/ParrelSync/ScriptableObjects.meta new file mode 100644 index 0000000..e18cb0e --- /dev/null +++ b/Assets/Plugins/ParrelSync/ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f0d7d3363842e2479df33beb60d2fa7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset b/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset new file mode 100644 index 0000000..0ec926c --- /dev/null +++ b/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0011418c9d75434988a06b6df93b283, type: 3} + m_Name: ParrelSyncProjectSettings + m_EditorClassIdentifier: + m_OptionalSymbolicLinkFolders: [] diff --git a/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta b/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta new file mode 100644 index 0000000..c314c91 --- /dev/null +++ b/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8e33279de3786345a88ee8cb21917e0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab index a7387f7..84f4056 100644 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind_Turbine_withMap.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2369382148363411835} - component: {fileID: 5762830989053361383} - component: {fileID: 6073354290617709007} + - component: {fileID: 5326010102002042226} m_Layer: 0 m_Name: wind_turbine_0001_rotor m_TagString: WindTurbine @@ -122,6 +123,7 @@ MonoBehaviour: observableSearch: 2 ObservedComponents: - {fileID: 5762830989053361383} + - {fileID: 5326010102002042226} sceneViewId: 0 InstantiationId: 0 isRuntimeInstantiated: 0 @@ -157,6 +159,39 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &5326010102002042226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382264866490105688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8efc6b1d64977384eb3405357896c656, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PositionModel: + SynchronizeEnabled: 1 + TeleportEnabled: 1 + TeleportIfDistanceGreaterThan: 3 + InterpolateOption: 2 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 1 + ExtrapolateOption: 0 + ExtrapolateSpeed: 1 + ExtrapolateIncludingRoundTripTime: 1 + ExtrapolateNumberOfStoredPositions: 1 + m_RotationModel: + SynchronizeEnabled: 0 + InterpolateOption: 2 + InterpolateRotateTowardsSpeed: 180 + InterpolateLerpSpeed: 5 + m_ScaleModel: + SynchronizeEnabled: 0 + InterpolateOption: 0 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 0 --- !u!1 &382264866490105690 GameObject: m_ObjectHideFlags: 0 @@ -177,6 +212,7 @@ GameObject: - component: {fileID: 6433795997240961375} - component: {fileID: 7309076934599776581} - component: {fileID: 2935496554514557820} + - component: {fileID: 5643319099722428757} m_Layer: 0 m_Name: Wind_Turbine_withMap m_TagString: Wind_Turbine_withMap @@ -381,6 +417,7 @@ MonoBehaviour: ObservedComponents: - {fileID: 6433795997240961375} - {fileID: 7309076934599776581} + - {fileID: 5643319099722428757} sceneViewId: 0 InstantiationId: 0 isRuntimeInstantiated: 0 @@ -428,6 +465,39 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 118420a922675d145ade2a28e327d7a5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5643319099722428757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382264866490105690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8efc6b1d64977384eb3405357896c656, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PositionModel: + SynchronizeEnabled: 1 + TeleportEnabled: 1 + TeleportIfDistanceGreaterThan: 3 + InterpolateOption: 2 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 1 + ExtrapolateOption: 0 + ExtrapolateSpeed: 1 + ExtrapolateIncludingRoundTripTime: 1 + ExtrapolateNumberOfStoredPositions: 1 + m_RotationModel: + SynchronizeEnabled: 1 + InterpolateOption: 1 + InterpolateRotateTowardsSpeed: 180 + InterpolateLerpSpeed: 5 + m_ScaleModel: + SynchronizeEnabled: 1 + InterpolateOption: 0 + InterpolateMoveTowardsSpeed: 1 + InterpolateLerpSpeed: 0 --- !u!1001 &5204658001146585073 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/SharedSpatialAnchors/Scripts/API.cs b/Assets/SharedSpatialAnchors/Scripts/API.cs index 54fc310..087e1f8 100644 --- a/Assets/SharedSpatialAnchors/Scripts/API.cs +++ b/Assets/SharedSpatialAnchors/Scripts/API.cs @@ -56,7 +56,6 @@ public class API : MonoBehaviourPunCallbacks, IPunObservable PhotonView photonView; private GameObject avatar; private AudioController audioControllerScript; - [PunRPC] public bool turn_WT_on_Y_Axis = false; public GameObject windTurbineWithMap; diff --git a/Packages/manifest.json b/Packages/manifest.json index 2c07da0..08d3a6c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -20,6 +20,7 @@ "com.unity.xr.management": "4.4.0", "com.unity.xr.mock-hmd": "1.3.0-preview.1", "com.unity.xr.oculus": "3.4.0", + "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8ff4399..7e56266 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -264,6 +264,13 @@ }, "url": "https://packages.unity.com" }, + "com.veriorpies.parrelsync": { + "version": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "d1ef610e9fe3ad0b490cce91594449fc0af809a6" + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0,