NativeTouchHandler improvement, general coding improvements.

Limelight/Input/NativeTouchPointer.m

@@ -15,12 +15,7 @@
 // pointer instance with coordinate manipulation.
 
 
-// Use a Dictionary to store UITouch object's memory address as key, and pointerId as value,字典存放UITouch对象地址和pointerId映射关系
-// pointerId will be generated from electronic noise, by arc4_random, pointerId,由随机噪声生成
-// Use a NSSet store pointerId, for quick repeition inquiry, NSSet存放活跃的pointerId合集,用于快速查找,以防重复.
-static NSMutableDictionary *pointerIdDict; //pointerId Dict for native touch.
-static NSMutableSet<NSNumber *> *pointerIdSet; //pointerIdSet for native touch.
-static NSMutableDictionary *pointerDict;
+static NSMutableDictionary *pointerObjDict;
 
 static CGFloat pointerVelocityFactor;
 static CGFloat pointerVelocityDivider;
@@ -34,8 +29,6 @@ StreamView *streamView;
     CGPoint previousPoint;
     CGPoint latestRelativePoint;
     CGPoint previousRelativePoint;
-    // CGFloat velocityX;
-    // CGFloat velocityY;
 }
 
 + (void)setPointerVelocityDivider:(CGFloat)dividerLocation{
@@ -47,54 +40,50 @@ StreamView *streamView;
 }
 
 
-- (instancetype)initWith:(UITouch *)touch{
-        self = [self init];
-        self->initialPoint = [touch locationInView:streamView];
-        self->latestPoint = self->initialPoint;
-        self->latestRelativePoint = self->initialPoint;
-        return self;
-    }
+- (instancetype)initWithTouch:(UITouch *)touch{
+    self = [super init];
+    self->initialPoint = [touch locationInView:streamView];
+    self->latestPoint = self->initialPoint;
+    self->latestRelativePoint = self->initialPoint;
+    return self;
+}
 
 - (void)updatePointerCoords:(UITouch *)touch{
     previousPoint = latestPoint;
     latestPoint = [touch locationInView:streamView];
-    // velocityX = latestPoint.x - previousPoint.x;
-    // velocityY = latestPoint.y - previousPoint.y;
     previousRelativePoint = latestRelativePoint;
     latestRelativePoint.x = previousRelativePoint.x + pointerVelocityFactor * (latestPoint.x - previousPoint.x);
     latestRelativePoint.y = previousRelativePoint.y + pointerVelocityFactor * (latestPoint.y - previousPoint.y);
 }
 
-+ (void)initContextWith:(StreamView *)view{
++ (void)initContextWithView:(StreamView *)view{
     streamView = view;
-    pointerIdDict = [NSMutableDictionary dictionary];
-    pointerIdSet = [NSMutableSet set];
-    pointerDict = [NSMutableDictionary dictionary];
+    pointerObjDict = [NSMutableDictionary dictionary];
     pointerVelocityDividerLocationByPoints = CGRectGetWidth([[UIScreen mainScreen] bounds]) * pointerVelocityDivider;
     NSLog(@"pointerVelocityDivider:  %.2f", pointerVelocityDivider);
     NSLog(@"pointerVelocityDividerLocationByPoints:  %.2f", pointerVelocityDividerLocationByPoints);
 }
 
 + (void)populatePointerObjIntoDict:(UITouch*)touch{
-    [pointerDict setObject:[[NativeTouchPointer alloc] initWith:touch] forKey:@((uint64_t)touch)];
+    [pointerObjDict setObject:[[NativeTouchPointer alloc] initWithTouch:touch] forKey:@((uintptr_t)touch)];
 }
 
 + (void)removePointerObjFromDict:(UITouch*)touch{
-    uint64_t eventAddrValue = (uint64_t)touch;
-    NativeTouchPointer* pointer = [pointerDict objectForKey:@(eventAddrValue)];
+    uintptr_t memAddrValue = (uintptr_t)touch;
+    NativeTouchPointer* pointer = [pointerObjDict objectForKey:@(memAddrValue)];
     if(pointer != nil){
-        [pointerDict removeObjectForKey:@(eventAddrValue)];
+        [pointerObjDict removeObjectForKey:@(memAddrValue)];
     }
 
 }
 
 + (void)updatePointerObjInDict:(UITouch *)touch{
-    [[pointerDict objectForKey:@((uint64_t)touch)] updatePointerCoords:touch];
+    [[pointerObjDict objectForKey:@((uintptr_t)touch)] updatePointerCoords:touch];
 }
 
 
 + (CGPoint)selectCoordsFor:(UITouch *)touch{
-    NativeTouchPointer *pointer = [pointerDict objectForKey:@((uint64_t)touch)];
+    NativeTouchPointer *pointer = [pointerObjDict objectForKey:@((uintptr_t)touch)];
     if((pointer -> initialPoint).x > pointerVelocityDividerLocationByPoints){  //if first contact coords locates on the right side of divider.
         return pointer->latestRelativePoint;
     }
@@ -103,39 +92,5 @@ StreamView *streamView;
 
 
 
-// 随机生成pointerId并填入NSDict和NSSet
-// generate & populate pointerId into NSDict & NSSet, called in UITouchPhaseBegan
-+ (void)populatePointerId:(UITouch*)touch{
-    uint64_t eventAddrValue = (uint64_t)touch;
-    uint32_t randomPointerId = arc4random_uniform(UINT32_MAX); // generate pointerId from eletronic noise.
-    for(;;){
-        if([pointerIdSet containsObject:@(randomPointerId)]) randomPointerId = arc4random_uniform(UINT32_MAX); // in case of new pointerId collides with existing ones, generate again.
-        else{ // populate pointerId into NSDict & NSSet.
-            [pointerIdDict setObject:@(randomPointerId) forKey:@(eventAddrValue)];
-            [pointerIdSet addObject:@(randomPointerId)];
-            return;
-        }
-    }
-}
-
-
-
-// remove pointerId in UITouchPhaseEnded condition
-+ (void)removePointerId:(UITouch*)touch{
-    uint64_t eventAddrValue = (uint64_t)touch;
-    NSNumber* pointerIdObj = [pointerIdDict objectForKey:@(eventAddrValue)];
-    if(pointerIdObj != nil){
-        [pointerIdSet removeObject:pointerIdObj];
-        [pointerIdDict removeObjectForKey:@(eventAddrValue)];
-    }
-}
-
-// 从字典中获取UITouch事件对应的pointerId
-// call this only when NSDcit & NSSet is up-to-date.
-+ (uint32_t) retrievePointerIdFromDict:(UITouch*)touch{
-    return [[pointerIdDict objectForKey:@((uint64_t)touch)] unsignedIntValue];
-}
-
-
 
 @end