WORK IN PROGRESS: Reorganize repository

FuffrDots/FuffrDots/AppViewController.m → Examples/FuffrDots/FuffrDots/AppViewController.m

@@ -262,6 +262,8 @@ - (void) fuffrConnected
 
 - (void) touchesBegan: (NSSet*)touches
 {
+	//NSLog(@"@@@ touchesBegan: %i", (int)touches.count);
+
 	for (FFRTouch* touch in touches)
 	{
 		[self.touches addObject: touch];
@@ -272,11 +274,15 @@ - (void) touchesBegan: (NSSet*)touches
 
 - (void) touchesMoved: (NSSet*)touches
 {
+	//NSLog(@"@@@ touchesMoved: %i", (int)touches.count);
+
 	[self redrawView];
 }
 
 - (void) touchesEnded: (NSSet*)touches
 {
+	//NSLog(@"@@@ touchesEnded: %i", (int)touches.count);
+
 	for (FFRTouch* touch in touches)
 	{
 		[self.touches removeObject: touch];
@@ -306,10 +312,21 @@ - (void)drawImageView
 	{
 		self.glView.clearsContextBeforeDrawing = NO;
 	}
-
-	[self.glView drawViewWithTouches:self.touches paintMode:self.paintModeOn dotColors:self.dotColors];
 
-	NSString* message = [NSString stringWithFormat: @"Number of touches: %lu", self.touches.count];
+	// Copying set to prevent exception:
+	//   *** Terminating app due to uncaught exception 'NSGenericException',
+	//   reason: '*** Collection <__NSSetM: 0x178054460> was mutated while
+	//   being enumerated.'
+	// from occuring in EAGLView in method drawViewWithTouches in the for-loop.
+	[self.glView
+		drawViewWithTouches:[NSSet setWithSet:self.touches]
+		paintMode:self.paintModeOn
+		dotColors:self.dotColors];
+
+	NSString* message = [NSString
+		stringWithFormat: @"Number of touches: %lu FPS: %i",
+		self.touches.count,
+		self.glView.framesPerSecond];
 	[self showMessage: message];
 }
 

FuffrDots/FuffrDots/EAGLView.h → Examples/FuffrDots/FuffrDots/EAGLView.h

@@ -39,6 +39,8 @@ Note that setting the view non-opaque will only work if the EAGL surface has an
     GLuint depthRenderbuffer;
 }
 
+@property (nonatomic, assign) int framesPerSecond;
+
 - (void)drawView;
 - (void)drawViewWithTouches:(NSSet*)touches paintMode:(BOOL)paintMode dotColors:(NSMutableDictionary*)dotColors;
 

FuffrDots/FuffrDots/EAGLView.m → Examples/FuffrDots/FuffrDots/EAGLView.m

@@ -58,6 +58,8 @@ - (id)initWithFrame:(CGRect)frame
 {
 	if (self = [super initWithFrame:frame])
 	{
+		self.framesPerSecond = 0;
+
 		CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer;
 
 		self.contentScaleFactor = [UIScreen mainScreen].scale;
@@ -189,6 +191,7 @@ - (void)drawViewWithTouches:(NSSet*)touches paintMode:(BOOL)paintModeOn dotColor
 		sFrameCountLastSecond = sFrameCount;
 		sFPS = fps;
 		NSLog(@"FPS: %i", fps);
+		self.framesPerSecond = fps;
 	}
 	fps = sFPS;