Get rid of observer

Preparation for turning this into a Swift class
cochrane · May 5, 2024 · 00ab769 · 00ab769
1 parent 8898648
commit 00ab769
Showing 1 changed file with 3 additions and 66 deletions.
diff --git a/GLLara/GLLCameraTarget.m b/GLLara/GLLCameraTarget.m
@@ -12,94 +12,31 @@
 #import "GLLItem.h"
 #import "simd_functions.h"
 
-static void *contextMarker = (void *) 0xdeadbeef;
-
-@interface GLLCameraTarget ()
-{
-    BOOL didRegister;
-}
-
-@property (nonatomic, assign, readwrite) vec_float4 position;
-- (void)_updatePosition;
-- (void)_registerObserver;
-
-@end
-
 @implementation GLLCameraTarget
 
 + (NSSet *)keyPathsForValuesAffectingDisplayName
 {
     return [NSSet setWithObjects:@"name", nil];
 }
 
-@synthesize position;
+@dynamic position;
 
 @dynamic name;
 @dynamic bones;
 @dynamic cameras;
 
-- (void)awakeFromFetch
-{
-    [super awakeFromFetch];
-    [self _registerObserver];
-}
-- (void)awakeFromInsert
-{
-    [super awakeFromInsert];
-    [self _registerObserver];
-}
-- (void)awakeFromSnapshotEvents:(NSSnapshotEventType)flags
-{
-    [super awakeFromSnapshotEvents:flags];
-    [self _registerObserver];
-}
-- (void)willTurnIntoFault
-{
-    if (didRegister)
-        [self removeObserver:self forKeyPath:@"bones"];
-    didRegister = NO;
-}
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
-    if (context == contextMarker && [keyPath isEqual:@"bones"])
-    {
-        if (![change[NSKeyValueChangeOldKey] isKindOfClass:[NSNull class]])
-            for (GLLItemBone *transform in change[NSKeyValueChangeOldKey])
-                [transform removeObserver:self forKeyPath:@"globalTransformValue"];
-
-        if (![change[NSKeyValueChangeNewKey] isKindOfClass:[NSNull class]])
-            for (GLLItemBone *transform in change[NSKeyValueChangeNewKey])
-                [transform addObserver:self forKeyPath:@"globalTransformValue" options: NSKeyValueObservingOptionInitial context:contextMarker];
-    }
-    else if (context == contextMarker && [keyPath isEqual:@"globalTransformValue"])
-    {
-        [self _updatePosition];
-    }
-    else
-        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-}
-
 - (NSString *)displayName
 {
     return [NSString stringWithFormat:NSLocalizedString(@"%@ — %@", @"camera target name format"), self.name, [[self.bones.anyObject item] displayName]];
 }
 
-- (void)_updatePosition
+- (vec_float4)position
 {
     vec_float4 newPosition = 0.0f;
     for (GLLItemBone *bone in self.bones) {
         newPosition += bone.globalPosition;
     }
-
-    [self willChangeValueForKey:@"position"];
-    self.position = newPosition / self.bones.count;
-    [self didChangeValueForKey:@"position"];
-}
-
-- (void)_registerObserver {
-    if (!didRegister)
-        [self addObserver:self forKeyPath:@"bones" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:contextMarker];
-    didRegister = YES;
+    return newPosition / self.bones.count;
 }
 
 @end