tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs #43: rename render methods for clarity

Browse Source
This commit is contained in:
Justin R. Miller
2014-02-13 11:27:22 -08:00
parent 1c6e16c0bb
commit 62c79e05cd
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ios/MBXViewController.mm
View File

@@ -128,7 +128,7 @@ class MBXMapView
[self.view addGestureRecognizer:quickZoom];
}
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(startRender:) name:MBXNeedsRenderNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateRender:) name:MBXNeedsRenderNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateNetworkActivity:) name:MBXUpdateActivityNotification object:nil];
mapView = new MBXMapView();
@@ -139,9 +139,9 @@ class MBXMapView
[displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
}
- (void)startRender:(NSNotification *)notification
- (void)updateRender:(NSNotification *)notification
{
[self startRender];
[self updateRender];
}
- (void)updateNetworkActivity:(NSNotification *)notification
@@ -153,16 +153,16 @@ class MBXMapView
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:(self.activityCount > 0)];
}
- (void)startRender
- (void)updateRender
{
[NSObject cancelPreviousPerformRequestsWithTarget:self];
displayLink.paused = NO;
[self performSelector:@selector(stopRender) withObject:nil afterDelay:3.0];
[self performSelector:@selector(pauseRender) withObject:nil afterDelay:3.0];
}
- (void)stopRender
- (void)pauseRender
{
displayLink.paused = YES;
}
@@ -220,7 +220,7 @@ class MBXMapView
mapView->map.moveBy(finalCenter.x - self.center.x, finalCenter.y - self.center.y, duration);
}
[self startRender];
[self updateRender];
}
- (void)handlePinchGesture:(UIPinchGestureRecognizer *)pinch
@@ -264,7 +264,7 @@ class MBXMapView
mapView->map.scaleBy(new_scale / scale, [pinch locationInView:pinch.view].x, [pinch locationInView:pinch.view].y, duration);
}
[self startRender];
[self updateRender];
}
- (void)handleRotateGesture:(UIRotationGestureRecognizer *)rotate
@@ -280,7 +280,7 @@ class MBXMapView
mapView->map.setAngle(self.angle + rotate.rotation, [rotate locationInView:rotate.view].x, [rotate locationInView:rotate.view].y);
}
[self startRender];
[self updateRender];
}
- (void)handleDoubleTapGesture:(UITapGestureRecognizer *)doubleTap
@@ -290,7 +290,7 @@ class MBXMapView
if (doubleTap.state == UIGestureRecognizerStateEnded)
mapView->map.scaleBy(2, [doubleTap locationInView:doubleTap.view].x, [doubleTap locationInView:doubleTap.view].y, 0.5);
[self startRender];
[self updateRender];
}
- (void)handleTwoFingerTapGesture:(UITapGestureRecognizer *)twoFingerTap
@@ -300,7 +300,7 @@ class MBXMapView
if (twoFingerTap.state == UIGestureRecognizerStateEnded)
mapView->map.scaleBy(0.5, [twoFingerTap locationInView:twoFingerTap.view].x, [twoFingerTap locationInView:twoFingerTap.view].y, 0.5);
[self startRender];
[self updateRender];
}
- (void)handleLongPressGesture:(UILongPressGestureRecognizer *)longPress
@@ -310,7 +310,7 @@ class MBXMapView
if (longPress.state == UIGestureRecognizerStateBegan)
mapView->map.resetNorth();
[self startRender];
[self updateRender];
}
- (void)handleTwoFingerLongPressGesture:(UILongPressGestureRecognizer *)twoFingerLongPress
@@ -320,7 +320,7 @@ class MBXMapView
if (twoFingerLongPress.state == UIGestureRecognizerStateBegan)
mapView->map.resetPosition();
[self startRender];
[self updateRender];
}
- (void)handleThreeFingerLongPressGesture:(UILongPressGestureRecognizer *)threeFingerLongPress
@@ -334,7 +334,7 @@ class MBXMapView
self.debug = ! self.debug;
}
[self startRender];
[self updateRender];
}
- (void)handleQuickZoomGesture:(UILongPressGestureRecognizer *)quickZoom
@@ -356,7 +356,7 @@ class MBXMapView
mapView->map.scaleBy(powf(2, newZoom) / mapView->map.getScale(), self.view.bounds.size.width / 2, self.view.bounds.size.height / 2);
}
[self startRender];
[self updateRender];
}
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer