Final scale factor tweaks

musictheory · Jan 8, 2012 · 303f91c · 303f91c
1 parent d449347
commit 303f91c
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 24 deletions.
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/iccir.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/iccir.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Source/SwiffLayer.h b/Source/SwiffLayer.h
@@ -46,6 +46,7 @@
     NSUInteger             m_sublayerCount;
     SwiffSparseArray       m_sublayers;
 
+    CGFloat              m_scaleFactor;
     CGAffineTransform    m_baseAffineTransform;
     CGAffineTransform    m_scaledAffineTransform;
 

diff --git a/Source/SwiffLayer.m b/Source/SwiffLayer.m
@@ -144,7 +144,7 @@ - (void) _calculateGeometryForPlacedObject: (SwiffPlacedObject *) placedObject
     transform = CGAffineTransformConcat(transform, m_scaledAffineTransform);
 
     CGAffineTransform scaleFactorTransform = CGAffineTransformMakeScale(scaleFactor, scaleFactor);
-    
+
     CGRect bounds = [definition renderBounds];
     bounds = sExpandRect(CGRectApplyAffineTransform(bounds, scaleFactorTransform));
     transform = CGAffineTransformConcat(CGAffineTransformInvert(scaleFactorTransform), transform);
@@ -190,7 +190,6 @@ - (CGFloat) _scaleFactorForPlacedObject:(SwiffPlacedObject *)placedObject hairli
 {
     CGAffineTransform t = CGAffineTransformIdentity;
     t = CGAffineTransformConcat(t, [placedObject affineTransform]);
-    t = CGAffineTransformConcat(t, m_scaledAffineTransform);
 
     // Take a 1x1 square at (0,0) and apply the transform to it.
     //
@@ -212,7 +211,8 @@ - (CGFloat) _scaleFactorForPlacedObject:(SwiffPlacedObject *)placedObject hairli
     CGFloat max2 = MAX(leftLineLength, rightLineLength);
     CGFloat max3 = MAX(max1, max2);
 
-    return SwiffScaleCeil(max3, hairlineWidth);
+    CGFloat contentsScale = [self contentsScale];
+    return SwiffScaleCeil(max3, 1) * (contentsScale * m_scaleFactor);
 }
 
 
@@ -362,14 +362,16 @@ - (void) _addSublayersForPlacedObjects:(NSArray *)placedObjects
 
         [sublayer setBounds:bounds];
         [sublayer setAnchorPoint:CGPointMake((-bounds.origin.x / bounds.size.width), (-bounds.origin.y / bounds.size.height))];
-        [sublayer setContentsScale:[self contentsScale]];
+        [sublayer setContentsScale:1];
         [sublayer setDelegate:self];
         [sublayer setZPosition:depth];
         [sublayer setNeedsDisplay];
 
         // Toggle geometry flipped flag until [self addSublayer:sublayer] in _updateGeometryForSublayer:withPlacedObject:
-        [sublayer setGeometryFlipped:YES];
-
+        if ([sublayer contentsAreFlipped] != [self contentsAreFlipped]) {
+            [sublayer setGeometryFlipped:YES];
+        }
+
         SwiffLog(@"View", @"adding sublayer at depth %d", (int)depth);
 
         CALayer *existing = SwiffSparseArrayGetValueAtIndex(&self->m_sublayers, depth);
@@ -410,7 +412,6 @@ - (void) _updateSublayersForPlacedObjects:(NSArray *)placedObjects
         CALayer *sublayer = SwiffSparseArrayGetValueAtIndex(&m_sublayers, depth);
 
         if (!sublayer) {
-            NSLog(@"nothing to update!");
             continue;
         }
 
@@ -525,7 +526,7 @@ - (void) _transitionToFrame:(SwiffFrame *)newFrame fromFrame:(SwiffFrame *)oldFr
     [self _addSublayersForPlacedObjects:sublayerAdds];
     [self _invalidatePlacedObjects:rectInvalidates];
 
-    // Do updates last, as it calls +[CATransaction flush]
+    // Do updates last
     [sublayerUpdates addObjectsFromArray:sublayerAdds];
     [self _updateSublayersForPlacedObjects:sublayerUpdates];
 
@@ -554,7 +555,11 @@ - (void) setBounds:(CGRect)bounds
 
     CGSize movieSize = [m_movie stageRect].size;
 
-    m_scaledAffineTransform = CGAffineTransformMakeScale(bounds.size.width /  movieSize.width, bounds.size.height / movieSize.height);
+    CGFloat sx = bounds.size.width /  movieSize.width;
+    CGFloat sy = bounds.size.height / movieSize.height;
+
+    m_scaleFactor = sx > sy ? sx : sy;
+    m_scaledAffineTransform = CGAffineTransformMakeScale(sx, sy);
 
     [m_contentLayer setContentsScale:[self contentsScale]];
     [m_contentLayer setFrame:bounds];
@@ -610,6 +615,7 @@ - (void) drawLayer:(CALayer *)layer inContext:(CGContextRef)context
             CGContextFillRect(context, [layer bounds]);
         }
 
+        SwiffRendererSetScaleFactorHint(m_renderer, [self contentsScale]);
         SwiffRendererSetBaseAffineTransform(m_renderer, &m_scaledAffineTransform);
         SwiffRendererSetPlacedObjects(m_renderer, filteredObjects ? filteredObjects : placedObjects);
         SwiffRendererRender(m_renderer, context);
@@ -666,9 +672,6 @@ - (void) drawLayer:(CALayer *)layer inContext:(CGContextRef)context
 //      CGContextSetCTM() is private, so immitate it with concatenation
         CGContextConcatCTM(context, CGAffineTransformInvert(base)); // CGContextSetCTM(context, CGAffineTransformIdentity)
 
-        // Refactor in contentScale
-        CGFloat contentsScale = [layer contentsScale];
-
         CGFloat renderTranslationX = [[layer valueForKey:SwiffRenderTranslationXKey] doubleValue];
         CGFloat renderTranslationY = [[layer valueForKey:SwiffRenderTranslationYKey] doubleValue];
         CGFloat renderScaleFactor  = [[layer valueForKey:SwiffRenderScaleFactorKey]  doubleValue];
@@ -689,9 +692,11 @@ - (void) drawLayer:(CALayer *)layer inContext:(CGContextRef)context
         CGFloat hairlineWidth     = SwiffRendererGetHairlineWidth(m_renderer);
         CGFloat fillHairlineWidth = SwiffRendererGetFillHairlineWidth(m_renderer);
 
+        CGFloat contentsScale = [self contentsScale];
         SwiffRendererSetHairlineWidth(m_renderer, hairlineWidth * contentsScale);
         SwiffRendererSetFillHairlineWidth(m_renderer, fillHairlineWidth * contentsScale);
 
+        SwiffRendererSetScaleFactorHint(m_renderer, 1.0);
         SwiffRendererSetBaseAffineTransform(m_renderer, &base);
         SwiffRendererSetPlacedObjects(m_renderer, placedObjects);
         SwiffRendererRender(m_renderer, context);

diff --git a/Source/SwiffRenderer.m b/Source/SwiffRenderer.m
@@ -150,12 +150,12 @@ static void sTracePathStrokeAdvanced(
     CGContextRef context = state->context;
 
     CGFloat scale  = state->scaleFactorHint;
-    CGFloat offset = (lround(width) % 2) ? (scale / 2) : 0;
+    CGFloat offset = (lround(width * state->scaleFactorHint) % 2) ? ((1.0 / state->scaleFactorHint) / 2) : 0;
 
     CGFloat x = NAN, y = NAN, controlX = NAN, controlY = NAN, moveX = NAN, moveY = NAN;
 
     SwiffPathOperation prevOp = SwiffPathOperationMove;
-    SwiffPathOperation op;
+    SwiffPathOperation op     = SwiffPathOperationMove;
     SwiffPathOperation nextOp = *operations++;
 
 nextOperation:

diff --git a/Source/SwiffSoundDefinition.h b/Source/SwiffSoundDefinition.h
@@ -33,9 +33,9 @@
 @class SwiffMovie, SwiffSoundDefinition;
 
 // C-based API, for audio callbacks
-extern CFDataRef  SwiffSoundDefinitionGetData(SwiffSoundDefinition *definition);
-extern NSUInteger SwiffSoundDefinitionGetOffsetForFrame(SwiffSoundDefinition *definition, CFIndex frame);
-extern NSUInteger SwiffSoundDefinitionGetLengthForFrame(SwiffSoundDefinition *definition, CFIndex frame);
+extern CFDataRef SwiffSoundDefinitionGetData(SwiffSoundDefinition *definition);
+extern CFIndex   SwiffSoundDefinitionGetOffsetForFrame(SwiffSoundDefinition *definition, CFIndex frame);
+extern CFIndex   SwiffSoundDefinitionGetLengthForFrame(SwiffSoundDefinition *definition, CFIndex frame);
 
 @class SwiffSoundStreamBlock;
 

diff --git a/Source/SwiffSoundDefinition.m b/Source/SwiffSoundDefinition.m
@@ -152,23 +152,23 @@ CFDataRef SwiffSoundDefinitionGetData(SwiffSoundDefinition *self)
 }
 
 
-extern NSUInteger SwiffSoundDefinitionGetOffsetForFrame(SwiffSoundDefinition *self, CFIndex frame)
+extern CFIndex SwiffSoundDefinitionGetOffsetForFrame(SwiffSoundDefinition *self, CFIndex frame)
 {
     if ((frame >= 0) && (frame < self->m_framesCount)) {
         return self->m_frames[frame];
     }
 
-    return NSNotFound;
+    return kCFNotFound;
 }
 
 
-extern NSUInteger SwiffSoundDefinitionGetLengthForFrame(SwiffSoundDefinition *self, CFIndex frame)
+extern CFIndex SwiffSoundDefinitionGetLengthForFrame(SwiffSoundDefinition *self, CFIndex frame)
 {
-    NSUInteger offset1 = SwiffSoundDefinitionGetOffsetForFrame(self, frame);
-    if (offset1 == NSNotFound) return 0;
+    CFIndex offset1 = SwiffSoundDefinitionGetOffsetForFrame(self, frame);
+    if (offset1 == kCFNotFound) return 0;
 
-    NSUInteger offset2 = SwiffSoundDefinitionGetOffsetForFrame(self, frame + 1);
-    if (offset2 == NSNotFound) {
+    CFIndex offset2 = SwiffSoundDefinitionGetOffsetForFrame(self, frame + 1);
+    if (offset2 == kCFNotFound) {
         offset2 = CFDataGetLength(SwiffSoundDefinitionGetData(self));
     }
 

diff --git a/Source/SwiffView.m b/Source/SwiffView.m
@@ -72,6 +72,7 @@ - (id) initWithFrame:(CGRect)frame movie:(SwiffMovie *)movie
 
     if ((self = [super initWithFrame:frame])) {
         m_layer = [[SwiffLayer alloc] initWithMovie:movie];
+        [m_layer setContentsScale:[[UIScreen mainScreen] scale]];
         [[self layer] addSublayer:m_layer];
         [self _layoutMovieLayer];
     }