Skip to content
This repository was archived by the owner on Nov 16, 2024. It is now read-only.

Commit 08343b0

Browse files
Handle main camera without parent (#206)
* Clean up some gratuitous logging. * Fix handling of unexpected case with no parent to scene's main camera. * Up patch version.
1 parent 3777fd9 commit 08343b0

4 files changed

Lines changed: 23 additions & 14 deletions

File tree

Assets/WorldLocking.Core/Scripts/AlignSubtree.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ private void CheckInternalWiring()
292292
if (orienter == null)
293293
{
294294
orienter = GetComponentInChildren<Orienter>();
295-
Debug.Log($"No Orienter found on {name}, implicit Orienter found in subtree is {(orienter == null ? "null" : orienter.name)}");
295+
Debug.LogWarning($"No Orienter found on {name}, implicit Orienter found in subtree is {(orienter == null ? "null" : orienter.name)}");
296296
}
297297
if (Orienter != null)
298298
{

Assets/WorldLocking.Core/Scripts/Fragment.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void AdjustAll(IPlugin plugin)
168168
}
169169
else
170170
{
171-
Debug.Log($"No adjustment during refreeze for {attach.AnchorId.FormatStr()}");
171+
Debug.LogWarning($"No adjustment during refreeze for {attach.AnchorId.FormatStr()}");
172172
}
173173

174174
}

Assets/WorldLocking.Core/Scripts/SpacePin.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

44
//#define WLT_LOG_SAVE_LOAD
5+
//#define WLT_EXTRA_LOGGING
56

67
using System;
78
using System.Collections;
@@ -200,6 +201,14 @@ private void DebugLogSaveLoad(string message)
200201
Debug.Log($"F={Time.frameCount} {message}");
201202
#endif // WLT_LOG_SAVE_LOAD
202203
}
204+
205+
private void DebugLogExtra(string message)
206+
{
207+
#if WLT_EXTRA_LOGGING
208+
Debug.Log(msg);
209+
#endif // WLT_EXTRA_LOGGING
210+
}
211+
203212
private void CheckDependencies()
204213
{
205214
/// Cache the WorldLockingManager as a dependency.
@@ -314,19 +323,19 @@ protected Pose ExtractModelPose()
314323
case ModelPositionSourceEnum.Transform:
315324
{
316325
modelPose = ExtractModelPoseFromTransform();
317-
Debug.Log($"Extracted pose from transform on {name}");
326+
DebugLogExtra($"Extracted pose from transform on {name}");
318327
}
319328
break;
320329
case ModelPositionSourceEnum.RendererBounds:
321330
{
322331
modelPose = ExtractModelPoseFromRenderer();
323-
Debug.Log($"Extracted pose from renderer on {name}");
332+
DebugLogExtra($"Extracted pose from renderer on {name}");
324333
}
325334
break;
326335
case ModelPositionSourceEnum.ColliderBounds:
327336
{
328337
modelPose = ExtractModelPoseFromCollider();
329-
Debug.Log($"Extracted pose from collider on {name}");
338+
DebugLogExtra($"Extracted pose from collider on {name}");
330339
}
331340
break;
332341
default:

Assets/WorldLocking.Core/Scripts/WorldLockingManager.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class WorldLockingManager
2929
/// allowing quick visual verification of the version of World Locking Tools for Unity currently installed.
3030
/// It has no effect in code, but serves only as a label.
3131
/// </summary>
32-
public static string Version => "1.5.0";
32+
public static string Version => "1.5.1";
3333

3434
/// <summary>
3535
/// The configuration settings may only be set as a block.
@@ -506,10 +506,10 @@ private void ApplyNewSettings()
506506
if (Camera.main != null)
507507
{
508508
string parentName = Camera.main.transform.parent != null ? Camera.main.transform.parent.name : "null";
509-
Debug.Log($"No camera parent set on WorldLockingManager, using parent {parentName} of scene's main camera.");
509+
Debug.LogWarning($"No camera parent set on WorldLockingManager, using parent {parentName} of scene's main camera.");
510510
CameraParent = Camera.main.transform.parent;
511511
}
512-
else
512+
else if (ApplyAdjustment)
513513
{
514514
Debug.LogError("No CameraParent set on WorldLockingManager, and no main camera to infer parent from.");
515515
}
@@ -519,15 +519,15 @@ private void ApplyNewSettings()
519519
{
520520
if (CameraParent != null && CameraParent.parent != null)
521521
{
522-
Debug.Log($"No Adjustment Frame set on WorldLockingManager, using Transform {CameraParent.parent.gameObject.name} from scene's main camera hierarchy.");
522+
Debug.LogWarning($"No Adjustment Frame set on WorldLockingManager, using Transform {CameraParent.parent.gameObject.name} from scene's main camera hierarchy.");
523523
AdjustmentFrame = CameraParent.parent;
524524
}
525-
else if (Camera.main != null)
525+
else if (CameraParent != null)
526526
{
527-
Debug.Log($"No Adjustment Frame set on WorldLockingManager, using root Transform {Camera.main.transform.root.gameObject.name} from scene's main camera.");
528-
AdjustmentFrame = Camera.main.transform.root;
527+
Debug.LogWarning($"No Adjustment Frame set on WorldLockingManager, using root Transform {CameraParent.transform.root.gameObject.name} from scene's main camera.");
528+
AdjustmentFrame = CameraParent.transform.root;
529529
}
530-
else
530+
else if (ApplyAdjustment)
531531
{
532532
Debug.LogError("No Adjustment Frame set and no main camera to infer node from.");
533533
}
@@ -561,7 +561,7 @@ private void Update()
561561
}
562562
if (ApplyAdjustment && (AdjustmentFrame == null))
563563
{
564-
Debug.Log("No WLM update because no adjustment frame set");
564+
Debug.LogWarning($"F={Time.frameCount}: No WLM update because no adjustment frame set");
565565
ErrorStatus = "no adjustment frame";
566566
return;
567567
}

0 commit comments

Comments
 (0)