From a28fe324d92ae02b8cd082297f014ffc8ef626ae Mon Sep 17 00:00:00 2001 From: Abbas Jafari Date: Tue, 21 Nov 2023 20:43:54 +0100 Subject: [PATCH] Branch and fork now works and the port directions are fixed --- .../Prefabs/eROBSON/Prefabs/w2_branch.prefab | 103 +++++++++++++----- .../Prefabs/eROBSON/Prefabs/w7_fork.prefab | 25 ++++- 2 files changed, 94 insertions(+), 34 deletions(-) diff --git a/Assets/MirageXR/Player/Prefabs/eROBSON/Prefabs/w2_branch.prefab b/Assets/MirageXR/Player/Prefabs/eROBSON/Prefabs/w2_branch.prefab index b95c73a47..8ab0d6ebd 100644 --- a/Assets/MirageXR/Player/Prefabs/eROBSON/Prefabs/w2_branch.prefab +++ b/Assets/MirageXR/Player/Prefabs/eROBSON/Prefabs/w2_branch.prefab @@ -377,7 +377,7 @@ PrefabInstance: - target: {fileID: 2124229434285276215, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Name - value: PositivePort3 + value: NegartivePort2 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -399,6 +399,16 @@ PrefabInstance: propertyPath: m_Center.z value: -0.87069464 objectReference: {fileID: 0} + - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: pole + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: reverseRay + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_RootOrder @@ -642,22 +652,22 @@ PrefabInstance: - target: {fileID: 2124229434285276215, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Name - value: PositivePort4 + value: NegartivePort3 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Size.x - value: 2.7565742 + value: 2.769018 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Size.z - value: 1.5097544 + value: 1.5432549 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Center.x - value: -0.05051083 + value: 0.04282291 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -667,13 +677,18 @@ PrefabInstance: - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Center.z - value: 0.8248761 + value: -0.826122 objectReference: {fileID: 0} - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} - propertyPath: reverseRay + propertyPath: pole value: 1 objectReference: {fileID: 0} + - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: reverseRay + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_RootOrder @@ -722,7 +737,7 @@ PrefabInstance: - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalRotation.y - value: 0.7071068 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -732,7 +747,12 @@ PrefabInstance: - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -837,12 +857,12 @@ PrefabInstance: - target: {fileID: 2124229434285276215, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Name - value: PositivePort2 + value: NegartivePort1 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Size.z - value: 1.5078888 + value: 1.5766509 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -857,13 +877,18 @@ PrefabInstance: - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Center.z - value: 0.8486134 + value: -0.8311974 objectReference: {fileID: 0} - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} - propertyPath: reverseRay + propertyPath: pole value: 1 objectReference: {fileID: 0} + - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: reverseRay + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_RootOrder @@ -897,22 +922,32 @@ PrefabInstance: - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalPosition.z - value: -0.3509 + value: -0.3487 + objectReference: {fileID: 0} + - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -1017,36 +1052,46 @@ PrefabInstance: - target: {fileID: 2124229434285276215, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Name - value: NegartivePort1 + value: PositivePort objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Size.x - value: 2.761321 + value: 2.7591667 + objectReference: {fileID: 0} + - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: m_Size.y + value: 2.2768738 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Size.z - value: 1.4399502 + value: 1.5719854 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Center.x - value: -0.038309745 + value: -0.027781488 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Center.y - value: -0.34024644 + value: -0.5531579 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Center.z - value: -0.8499747 + value: 0.7494046 objectReference: {fileID: 0} - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: pole + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: reverseRay value: 1 objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, @@ -1072,7 +1117,7 @@ PrefabInstance: - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalPosition.x - value: 0.7819 + value: 0.773 objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -1082,7 +1127,7 @@ PrefabInstance: - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalPosition.z - value: 0.032 + value: 0.048 objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -1097,7 +1142,7 @@ PrefabInstance: - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalRotation.y - value: 0.7071068 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -1107,7 +1152,7 @@ PrefabInstance: - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: -90 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -1132,7 +1177,7 @@ PrefabInstance: - target: {fileID: 3483511425645472839, guid: e6b3ae2545fd90a45bf2b4c4d290e67b, type: 3} propertyPath: m_LocalPosition.x - value: 1.216 + value: 1.204 objectReference: {fileID: 0} - target: {fileID: 3483511425645472839, guid: e6b3ae2545fd90a45bf2b4c4d290e67b, type: 3} @@ -1142,7 +1187,7 @@ PrefabInstance: - target: {fileID: 3483511425645472839, guid: e6b3ae2545fd90a45bf2b4c4d290e67b, type: 3} propertyPath: m_LocalPosition.z - value: 0.69 + value: -0.615 objectReference: {fileID: 0} - target: {fileID: 3483511425645472839, guid: e6b3ae2545fd90a45bf2b4c4d290e67b, type: 3} diff --git a/Assets/MirageXR/Player/Prefabs/eROBSON/Prefabs/w7_fork.prefab b/Assets/MirageXR/Player/Prefabs/eROBSON/Prefabs/w7_fork.prefab index 9ed9439d6..d307a7239 100644 --- a/Assets/MirageXR/Player/Prefabs/eROBSON/Prefabs/w7_fork.prefab +++ b/Assets/MirageXR/Player/Prefabs/eROBSON/Prefabs/w7_fork.prefab @@ -547,7 +547,7 @@ PrefabInstance: - target: {fileID: 2124229434285276215, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Name - value: NegativePort1 + value: PositivePort1 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -572,7 +572,7 @@ PrefabInstance: - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: pole - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -647,7 +647,7 @@ PrefabInstance: - target: {fileID: 2124229434285276215, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Name - value: PositivePort4 + value: NegativePort3 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -669,6 +669,11 @@ PrefabInstance: propertyPath: m_Center.z value: -0.8514456 objectReference: {fileID: 0} + - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: pole + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_RootOrder @@ -827,7 +832,7 @@ PrefabInstance: - target: {fileID: 2124229434285276215, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Name - value: PositivePort3 + value: NegativePort1 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -849,6 +854,11 @@ PrefabInstance: propertyPath: m_Center.z value: -0.8600972 objectReference: {fileID: 0} + - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: pole + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_RootOrder @@ -1101,7 +1111,7 @@ PrefabInstance: - target: {fileID: 2124229434285276215, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_Name - value: PositivePort3 + value: NegativePort2 objectReference: {fileID: 0} - target: {fileID: 4169984385689787876, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} @@ -1123,6 +1133,11 @@ PrefabInstance: propertyPath: m_Center.z value: -0.8434825 objectReference: {fileID: 0} + - target: {fileID: 4325867491917665838, guid: 4fec6e05490aa4146a5ad736fcfd2e96, + type: 3} + propertyPath: pole + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6035337587150862418, guid: 4fec6e05490aa4146a5ad736fcfd2e96, type: 3} propertyPath: m_RootOrder