Skip to content

Commit 6721797

Browse files
author
Jared Bienz
committed
Better tracking with TagAlong. Correctly dismissing the controller now.
1 parent 223e178 commit 6721797

File tree

2 files changed

+46
-28
lines changed

2 files changed

+46
-28
lines changed

SpatialAlignment-Unity/Assets/SpatialAlignment/Refinement/Prefabs/NudgeController.prefab

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ GameObject:
7979
- component: {fileID: 1848810891968837930}
8080
- component: {fileID: 6313569961156761970}
8181
- component: {fileID: 1476431697951561922}
82+
- component: {fileID: 2567561747529452442}
8283
m_Layer: 0
8384
m_Name: NudgeController
8485
m_TagString: Untagged
@@ -141,8 +142,8 @@ BoxCollider:
141142
m_IsTrigger: 0
142143
m_Enabled: 1
143144
serializedVersion: 2
144-
m_Size: {x: 0.5, y: 0.38, z: 0.32}
145-
m_Center: {x: 0, y: 0, z: 0}
145+
m_Size: {x: 0.5, y: 0.38, z: 0.02}
146+
m_Center: {x: 0, y: 0, z: 0.17}
146147
--- !u!114 &6313569961156761970
147148
MonoBehaviour:
148149
m_ObjectHideFlags: 0
@@ -176,7 +177,7 @@ MonoBehaviour:
176177
m_Script: {fileID: 11500000, guid: 1c655338633f4544180b3d90a593ac17, type: 3}
177178
m_Name:
178179
m_EditorClassIdentifier:
179-
TagalongDistance: 2
180+
TagalongDistance: 2.5
180181
EnforceDistance: 1
181182
PositionUpdateSpeed: 9.8
182183
SmoothMotion: 1
@@ -192,6 +193,20 @@ MonoBehaviour:
192193
DepthUpdateSpeed: 4
193194
DebugDrawLines: 0
194195
DebugPointLight: {fileID: 0}
196+
--- !u!114 &2567561747529452442
197+
MonoBehaviour:
198+
m_ObjectHideFlags: 0
199+
m_CorrespondingSourceObject: {fileID: 0}
200+
m_PrefabInstance: {fileID: 0}
201+
m_PrefabAsset: {fileID: 0}
202+
m_GameObject: {fileID: 4553076131041205133}
203+
m_Enabled: 1
204+
m_EditorHideFlags: 0
205+
m_Script: {fileID: 11500000, guid: ac8d5b128a1d8204fb76c86f47b75912, type: 3}
206+
m_Name:
207+
m_EditorClassIdentifier:
208+
pivotAxis: 1
209+
targetTransform: {fileID: 0}
195210
--- !u!1 &4553076131385493597
196211
GameObject:
197212
m_ObjectHideFlags: 0
@@ -330,18 +345,18 @@ PrefabInstance:
330345
objectReference: {fileID: 0}
331346
m_RemovedComponents: []
332347
m_SourcePrefab: {fileID: 100100000, guid: c681308707466d445a4fd8f48e052e44, type: 3}
333-
--- !u!4 &4553076131893444543 stripped
334-
Transform:
335-
m_CorrespondingSourceObject: {fileID: 1407939468874378217, guid: c681308707466d445a4fd8f48e052e44,
336-
type: 3}
337-
m_PrefabInstance: {fileID: 3217197285109863510}
338-
m_PrefabAsset: {fileID: 0}
339348
--- !u!1 &4553076131893797789 stripped
340349
GameObject:
341350
m_CorrespondingSourceObject: {fileID: 1407939468874610635, guid: c681308707466d445a4fd8f48e052e44,
342351
type: 3}
343352
m_PrefabInstance: {fileID: 3217197285109863510}
344353
m_PrefabAsset: {fileID: 0}
354+
--- !u!4 &4553076131893444543 stripped
355+
Transform:
356+
m_CorrespondingSourceObject: {fileID: 1407939468874378217, guid: c681308707466d445a4fd8f48e052e44,
357+
type: 3}
358+
m_PrefabInstance: {fileID: 3217197285109863510}
359+
m_PrefabAsset: {fileID: 0}
345360
--- !u!1001 &4553076130370156034
346361
PrefabInstance:
347362
m_ObjectHideFlags: 0
@@ -416,18 +431,18 @@ PrefabInstance:
416431
objectReference: {fileID: 0}
417432
m_RemovedComponents: []
418433
m_SourcePrefab: {fileID: 100100000, guid: 8afc416d88cbd0f4eb92a8fcdf7246cc, type: 3}
419-
--- !u!1 &4898222032203157418 stripped
420-
GameObject:
421-
m_CorrespondingSourceObject: {fileID: 8995443699713571240, guid: 8afc416d88cbd0f4eb92a8fcdf7246cc,
422-
type: 3}
423-
m_PrefabInstance: {fileID: 4553076130370156034}
424-
m_PrefabAsset: {fileID: 0}
425434
--- !u!4 &4898222032202863496 stripped
426435
Transform:
427436
m_CorrespondingSourceObject: {fileID: 8995443699713598858, guid: 8afc416d88cbd0f4eb92a8fcdf7246cc,
428437
type: 3}
429438
m_PrefabInstance: {fileID: 4553076130370156034}
430439
m_PrefabAsset: {fileID: 0}
440+
--- !u!1 &4898222032203157418 stripped
441+
GameObject:
442+
m_CorrespondingSourceObject: {fileID: 8995443699713571240, guid: 8afc416d88cbd0f4eb92a8fcdf7246cc,
443+
type: 3}
444+
m_PrefabInstance: {fileID: 4553076130370156034}
445+
m_PrefabAsset: {fileID: 0}
431446
--- !u!1001 &4553076130525926237
432447
PrefabInstance:
433448
m_ObjectHideFlags: 0
@@ -760,18 +775,18 @@ PrefabInstance:
760775
objectReference: {fileID: 0}
761776
m_RemovedComponents: []
762777
m_SourcePrefab: {fileID: 100100000, guid: 2196d091fcb740b4795862a1085338ef, type: 3}
763-
--- !u!4 &7951677388108589795 stripped
764-
Transform:
765-
m_CorrespondingSourceObject: {fileID: 5869825194047654272, guid: 2196d091fcb740b4795862a1085338ef,
766-
type: 3}
767-
m_PrefabInstance: {fileID: 4553076132188955491}
768-
m_PrefabAsset: {fileID: 0}
769778
--- !u!1 &6134566480534239251 stripped
770779
GameObject:
771780
m_CorrespondingSourceObject: {fileID: 7641936939002387312, guid: 2196d091fcb740b4795862a1085338ef,
772781
type: 3}
773782
m_PrefabInstance: {fileID: 4553076132188955491}
774783
m_PrefabAsset: {fileID: 0}
784+
--- !u!4 &7951677388108589795 stripped
785+
Transform:
786+
m_CorrespondingSourceObject: {fileID: 5869825194047654272, guid: 2196d091fcb740b4795862a1085338ef,
787+
type: 3}
788+
m_PrefabInstance: {fileID: 4553076132188955491}
789+
m_PrefabAsset: {fileID: 0}
775790
--- !u!1001 &4898222032551075613
776791
PrefabInstance:
777792
m_ObjectHideFlags: 0
@@ -1018,18 +1033,18 @@ PrefabInstance:
10181033
objectReference: {fileID: 0}
10191034
m_RemovedComponents: []
10201035
m_SourcePrefab: {fileID: 100100000, guid: 55619865647756b42be699c0af371afd, type: 3}
1021-
--- !u!1 &4910424392673456455 stripped
1022-
GameObject:
1023-
m_CorrespondingSourceObject: {fileID: 1619031061983936934, guid: 55619865647756b42be699c0af371afd,
1024-
type: 3}
1025-
m_PrefabInstance: {fileID: 5931980524684226785}
1026-
m_PrefabAsset: {fileID: 0}
10271036
--- !u!4 &1419241669885618073 stripped
10281037
Transform:
10291038
m_CorrespondingSourceObject: {fileID: 4746943664505247608, guid: 55619865647756b42be699c0af371afd,
10301039
type: 3}
10311040
m_PrefabInstance: {fileID: 5931980524684226785}
10321041
m_PrefabAsset: {fileID: 0}
1042+
--- !u!1 &4910424392673456455 stripped
1043+
GameObject:
1044+
m_CorrespondingSourceObject: {fileID: 1619031061983936934, guid: 55619865647756b42be699c0af371afd,
1045+
type: 3}
1046+
m_PrefabInstance: {fileID: 5931980524684226785}
1047+
m_PrefabAsset: {fileID: 0}
10331048
--- !u!1001 &8581454803380732203
10341049
PrefabInstance:
10351050
m_ObjectHideFlags: 0

SpatialAlignment-Unity/Assets/SpatialAlignment/Refinement/Scripts/NudgeRefinement.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,14 @@ protected virtual void CreateController()
117117
/// <summary>
118118
/// Destroys the controller instance.
119119
/// </summary>
120+
/// <remarks>
121+
/// The default implementation destroys the prefabs GameObject.
122+
/// </remarks>
120123
protected virtual void DestroyController()
121124
{
122125
if (controller != null)
123126
{
124-
Destroy(controller);
127+
Destroy(controller.gameObject);
125128
controller = null;
126129
}
127130
}

0 commit comments

Comments
 (0)