zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-08-16 02:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rotate and G element font settings.

Browse Source
This commit is contained in:
Mikael Sand
2017-08-25 13:46:03 +03:00
parent 95736f2f69
commit c6028e825d
4 changed files with 101 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/Text/GlyphContext.m
+66 -63
View File
@@ -39,17 +39,17 @@
NSArray *mDXs_;
NSArray *mDYs_;
NSArray *mRs_;
int mXsIndex_;
int mYsIndex_;
int mDXsIndex_;
int mDYsIndex_;
int mRsIndex_;
int mXIndex_;
int mYIndex_;
int mDXIndex_;
int mDYIndex_;
int mRIndex_;
int mTop_;
long mXsIndex_;
long mYsIndex_;
long mDXsIndex_;
long mDYsIndex_;
long mRsIndex_;
long mXIndex_;
long mYIndex_;
long mDXIndex_;
long mDYIndex_;
long mRIndex_;
long mTop_;
float mScale_;
float mWidth_;
float mHeight_;
@@ -65,7 +65,7 @@
withNSDictionary:(NSDictionary *)font;
+ (void)incrementIndicesWithNSArray:(NSArray *)indices
withInt:(int)topIndex;
withLong:(long)topIndex;
- (void)pushContextwithRNSVGText:(RNSVGText *)node
reset:(bool)reset
@@ -89,10 +89,10 @@
NSNumber * fontSize = [NSNumber numberWithDouble:topFont_->fontSize];
NSString * fontWeight = topFont_->fontWeight_;
NSString * fontStyle = topFont_->fontStyle_;
BOOL fontFamilyFound = NO;
NSArray *supportedFontFamilyNames = [UIFont familyNames];
if ([supportedFontFamilyNames containsObject:fontFamily]) {
fontFamilyFound = YES;
} else {
@@ -104,7 +104,7 @@
}
}
fontFamily = fontFamilyFound ? fontFamily : nil;
return (__bridge CTFontRef)[RCTFont updateFont:nil
withFamily:fontFamily
size:fontSize
@@ -163,36 +163,36 @@
if (x != nil && [x count] != 0) {
mXsIndex_++;
mXIndex_ = -1;
[mXIndices_ addObject:[NSNumber numberWithInteger:mXIndex_]];
[mXIndices_ addObject:[NSNumber numberWithLong:mXIndex_]];
mXs_ = x;
[mXsContext_ addObject:mXs_];
}
if (y != nil && [y count] != 0) {
mYsIndex_++;
mYIndex_ = -1;
[mYIndices_ addObject:[NSNumber numberWithInteger:mYIndex_]];
[mYIndices_ addObject:[NSNumber numberWithLong:mYIndex_]];
mYs_ = y;
[mYsContext_ addObject:mYs_];
}
if (deltaX != nil && [deltaX count] != 0) {
mDXsIndex_++;
mDXIndex_ = -1;
[mDXIndices_ addObject:[NSNumber numberWithInteger:mDXIndex_]];
[mDXIndices_ addObject:[NSNumber numberWithLong:mDXIndex_]];
mDXs_ = deltaX;
[mDXsContext_ addObject:mDXs_];
}
if (deltaY != nil && [deltaY count] != 0) {
mDYsIndex_++;
mDYIndex_ = -1;
[mDYIndices_ addObject:[NSNumber numberWithInteger:mDYIndex_]];
[mDYIndices_ addObject:[NSNumber numberWithLong:mDYIndex_]];
mDYs_ = deltaY;
[mDYsContext_ addObject:mDYs_];
}
if (rotate != nil && [rotate count] != 0) {
mRsIndex_++;
mRIndex_ = -1;
[mRIndices_ addObject:[NSNumber numberWithInteger:mRIndex_]];
mRs_ = rotate;
[mRIndices_ addObject:[NSNumber numberWithLong:mRIndex_]];
mRs_ = [rotate valueForKeyPath:@"self.doubleValue"];
[mRsContext_ addObject:mRs_];
}
GlyphContext_pushIndices(self);
@@ -206,47 +206,47 @@
[mDYsIndices_ removeLastObject];
[mRsIndices_ removeLastObject];
mTop_--;
int x = mXsIndex_;
int y = mYsIndex_;
int dx = mDXsIndex_;
int dy = mDYsIndex_;
int r = mRsIndex_;
long x = mXsIndex_;
long y = mYsIndex_;
long dx = mDXsIndex_;
long dy = mDYsIndex_;
long r = mRsIndex_;
topFont_ = [mFontContext_ lastObject];
mXsIndex_ = [[mXsIndices_ lastObject] intValue];
mYsIndex_ = [[mYsIndices_ lastObject] intValue];
mDXsIndex_ = [[mDXsIndices_ lastObject] intValue];
mDYsIndex_ = [[mDYsIndices_ lastObject] intValue];
mRsIndex_ = [[mRsIndices_ lastObject] intValue];
mXsIndex_ = [[mXsIndices_ lastObject] longValue];
mYsIndex_ = [[mYsIndices_ lastObject] longValue];
mDXsIndex_ = [[mDXsIndices_ lastObject] longValue];
mDYsIndex_ = [[mDYsIndices_ lastObject] longValue];
mRsIndex_ = [[mRsIndices_ lastObject] longValue];
if (x != mXsIndex_) {
[mXsContext_ removeObjectAtIndex:x];
mXs_ = [mXsContext_ objectAtIndex:mXsIndex_];
mXIndex_ = [[mXIndices_ objectAtIndex:mXsIndex_] intValue];
mXIndex_ = [[mXIndices_ objectAtIndex:mXsIndex_] longValue];
}
if (y != mYsIndex_) {
[mYsContext_ removeObjectAtIndex:y];
mYs_ = [mYsContext_ objectAtIndex:mYsIndex_];
mYIndex_ = [[mYIndices_ objectAtIndex:mYsIndex_] intValue];
mYIndex_ = [[mYIndices_ objectAtIndex:mYsIndex_] longValue];
}
if (dx != mDXsIndex_) {
[mDXsContext_ removeObjectAtIndex:dx];
mDXs_ = [mDXsContext_ objectAtIndex:mDXsIndex_];
mDXIndex_ = [[mDXIndices_ objectAtIndex:mDXsIndex_] intValue];
mDXIndex_ = [[mDXIndices_ objectAtIndex:mDXsIndex_] longValue];
}
if (dy != mDYsIndex_) {
[mDYsContext_ removeObjectAtIndex:dy];
mDYs_ = [mDYsContext_ objectAtIndex:mDYsIndex_];
mDYIndex_ = [[mDYIndices_ objectAtIndex:mDYsIndex_] intValue];
mDYIndex_ = [[mDYIndices_ objectAtIndex:mDYsIndex_] longValue];
}
if (r != mRsIndex_) {
[mRsContext_ removeObjectAtIndex:r];
mRs_ = [mRsContext_ objectAtIndex:mRsIndex_];
mRIndex_ = [[mRIndices_ objectAtIndex:mRsIndex_] intValue];
mRIndex_ = [[mRIndices_ objectAtIndex:mRsIndex_] longValue];
}
}
+ (void)incrementIndicesWithNSArray:(NSMutableArray *)indices
withInt:(int)topIndex {
GlyphContext_incrementIndicesWithNSArray_withInt_(indices, topIndex);
withLong:(long)topIndex {
GlyphContext_incrementIndicesWithNSArray_withLong_(indices, topIndex);
}
- (double)getFontSize {
@@ -254,8 +254,8 @@
}
- (double)nextXWithDouble:(double)advance {
GlyphContext_incrementIndicesWithNSArray_withInt_(mXIndices_, mXsIndex_);
int nextIndex = mXIndex_ + 1;
GlyphContext_incrementIndicesWithNSArray_withLong_(mXIndices_, mXsIndex_);
long nextIndex = mXIndex_ + 1;
if (nextIndex < [mXs_ count]) {
mDX_ = 0;
mXIndex_ = nextIndex;
@@ -271,8 +271,8 @@
}
- (double)nextY {
GlyphContext_incrementIndicesWithNSArray_withInt_(mYIndices_, mYsIndex_);
int nextIndex = mYIndex_ + 1;
GlyphContext_incrementIndicesWithNSArray_withLong_(mYIndices_, mYsIndex_);
long nextIndex = mYIndex_ + 1;
if (nextIndex < [mYs_ count]) {
mDY_ = 0;
mYIndex_ = nextIndex;
@@ -287,8 +287,8 @@
}
- (double)nextDeltaX {
GlyphContext_incrementIndicesWithNSArray_withInt_(mDXIndices_, mDXsIndex_);
int nextIndex = mDXIndex_ + 1;
GlyphContext_incrementIndicesWithNSArray_withLong_(mDXIndices_, mDXsIndex_);
long nextIndex = mDXIndex_ + 1;
if (nextIndex < [mDXs_ count]) {
mDXIndex_ = nextIndex;
NSString *string = [mDXs_ objectAtIndex:nextIndex];
@@ -303,8 +303,8 @@
}
- (double)nextDeltaY {
GlyphContext_incrementIndicesWithNSArray_withInt_(mDYIndices_, mDYsIndex_);
int nextIndex = mDYIndex_ + 1;
GlyphContext_incrementIndicesWithNSArray_withLong_(mDYIndices_, mDYsIndex_);
long nextIndex = mDYIndex_ + 1;
if (nextIndex < [mDYs_ count]) {
mDYIndex_ = nextIndex;
NSString *string = [mDYs_ objectAtIndex:nextIndex];
@@ -319,10 +319,13 @@
}
- (NSNumber*)nextRotation {
GlyphContext_incrementIndicesWithNSArray_withInt_(mRIndices_, mRsIndex_);
int nextIndex = mRIndex_ + 1;
if (nextIndex < [mRs_ count]) {
GlyphContext_incrementIndicesWithNSArray_withLong_(mRIndices_, mRsIndex_);
long nextIndex = mRIndex_ + 1;
long count = [mRs_ count];
if (nextIndex < count) {
mRIndex_ = nextIndex;
} else {
mRIndex_ = count - 1;
}
return mRs_[mRIndex_];
}
@@ -336,11 +339,11 @@
}
void GlyphContext_pushIndices(GlyphContext *self) {
[self->mXsIndices_ addObject:[NSNumber numberWithInteger:self->mXsIndex_]];
[self->mYsIndices_ addObject:[NSNumber numberWithInteger:self->mYsIndex_]];
[self->mDXsIndices_ addObject:[NSNumber numberWithInteger:self->mDXsIndex_]];
[self->mDYsIndices_ addObject:[NSNumber numberWithInteger:self->mDYsIndex_]];
[self->mRsIndices_ addObject:[NSNumber numberWithInteger:self->mRsIndex_]];
[self->mXsIndices_ addObject:[NSNumber numberWithLong:self->mXsIndex_]];
[self->mYsIndices_ addObject:[NSNumber numberWithLong:self->mYsIndex_]];
[self->mDXsIndices_ addObject:[NSNumber numberWithLong:self->mDXsIndex_]];
[self->mDYsIndices_ addObject:[NSNumber numberWithLong:self->mDYsIndex_]];
[self->mRsIndices_ addObject:[NSNumber numberWithLong:self->mRsIndex_]];
}
void GlyphContext_initWithFloat_withFloat_withFloat_(GlyphContext *self, float scale_, float width, float height) {
@@ -380,11 +383,11 @@ void GlyphContext_initWithFloat_withFloat_withFloat_(GlyphContext *self, float s
[self->mDXsContext_ addObject:self->mDXs_];
[self->mDYsContext_ addObject:self->mDYs_];
[self->mRsContext_ addObject:self->mRs_];
[self->mXIndices_ addObject:[NSNumber numberWithInteger:self->mXIndex_]];
[self->mYIndices_ addObject:[NSNumber numberWithInteger:self->mYIndex_]];
[self->mDXIndices_ addObject:[NSNumber numberWithInteger:self->mDXIndex_]];
[self->mDYIndices_ addObject:[NSNumber numberWithInteger:self->mDYIndex_]];
[self->mRIndices_ addObject:[NSNumber numberWithInteger:self->mRIndex_]];
[self->mXIndices_ addObject:[NSNumber numberWithLong:self->mXIndex_]];
[self->mYIndices_ addObject:[NSNumber numberWithLong:self->mYIndex_]];
[self->mDXIndices_ addObject:[NSNumber numberWithLong:self->mDXIndex_]];
[self->mDYIndices_ addObject:[NSNumber numberWithLong:self->mDYIndex_]];
[self->mRIndices_ addObject:[NSNumber numberWithLong:self->mRIndex_]];
[self->mFontContext_ addObject:self->topFont_];
GlyphContext_pushIndices(self);
}
@@ -428,10 +431,10 @@ void GlyphContext_pushNodeAndFontWithRNSVGGroup_withNSDictionary_(GlyphContext *
self->topFont_ = data;
}
void GlyphContext_incrementIndicesWithNSArray_withInt_(NSMutableArray *indices, int topIndex) {
for (int index = topIndex; index >= 0; index--) {
int xIndex = [[indices objectAtIndex:index] intValue];
[indices setObject:[NSNumber numberWithInteger:xIndex + 1] atIndexedSubscript:index];
void GlyphContext_incrementIndicesWithNSArray_withLong_(NSMutableArray *indices, long topIndex) {
for (long index = topIndex; index >= 0; index--) {
long xIndex = [[indices objectAtIndex:index] longValue];
[indices setObject:[NSNumber numberWithLong:xIndex + 1] atIndexedSubscript:index];
}
}
@end
ios/Text/RNSVGTSpan.m
+33 -45
View File
@@ -67,59 +67,42 @@
[self setupTextPath:context];
CGMutablePathRef path = CGPathCreateMutable();
[self pushGlyphContext];
CTFontRef font = [self getFontFromContext];
// Create a dictionary for this font
CFDictionaryRef attributes;
if (font != nil) {
attributes = (__bridge CFDictionaryRef)@{
(NSString *)kCTFontAttributeName: (__bridge id)font,
(NSString *)kCTForegroundColorFromContextAttributeName: @YES,
(NSString *)NSLigatureAttributeName: @0
};
} else {
attributes = (__bridge CFDictionaryRef)@{
(NSString *)kCTForegroundColorFromContextAttributeName: @YES,
(NSString *)NSLigatureAttributeName: @0
};
}
CFStringRef string = (__bridge CFStringRef)text;
CFAttributedStringRef attrString = CFAttributedStringCreate(kCFAllocatorDefault, string, attributes);
CTLineRef line = CTLineCreateWithAttributedString(attrString);
CGMutablePathRef linePath = [self getLinePath:line text:text font:font];
CGAffineTransform offset = CGAffineTransformIdentity;
CGPathAddPath(path, &offset, linePath);
CGPathRelease(linePath);
CGMutablePathRef path = [self getLinePath:text];
_cache = CGPathRetain(CFAutorelease(CGPathCreateCopy(path)));
[self popGlyphContext];
// clean up
CFRelease(attrString);
CFRelease(line);
[self popGlyphContext];
return (CGPathRef)CFAutorelease(path);
}
- (CGMutablePathRef)getLinePath:(CTLineRef)line text:(NSString *)str font:(CTFontRef)fontRef
- (CGMutablePathRef)getLinePath:(NSString *)str
{
// Create a dictionary for this font
CTFontRef fontRef = [self getFontFromContext];
CFDictionaryRef attributes;
if (fontRef != nil) {
attributes = (__bridge CFDictionaryRef)@{
(NSString *)kCTFontAttributeName: (__bridge id)fontRef,
(NSString *)kCTForegroundColorFromContextAttributeName: @YES,
(NSString *)NSLigatureAttributeName: @0 };
} else {
attributes = (__bridge CFDictionaryRef)@{
(NSString *)kCTForegroundColorFromContextAttributeName: @YES,
(NSString *)NSLigatureAttributeName: @0 };
}
CFStringRef string = (__bridge CFStringRef)str;
CFAttributedStringRef attrString = CFAttributedStringCreate(kCFAllocatorDefault, string, attributes);
CTLineRef line = CTLineCreateWithAttributedString(attrString);
CGMutablePathRef path = CGPathCreateMutable();
CFArrayRef runs = CTLineGetGlyphRuns(line);
GlyphContext* gc = [[self getTextRoot] getGlyphContext];
FontData* font = [gc getFont];
NSUInteger n = str.length;
CGSize glyph_advances[n];
unichar characters[n];
CGGlyph glyphs[n];
CFStringGetCharacters((__bridge CFStringRef) str, CFRangeMake(0, n), characters);
CTFontGetGlyphsForCharacters(fontRef, characters, glyphs, n);
CTFontGetAdvancesForGlyphs(fontRef, kCTFontOrientationHorizontal, glyphs, glyph_advances, n);
/*
*
* Three properties affect the space between characters and words:
@@ -682,18 +665,22 @@
}
}
double tau = 2 * M_PI;
double radToDeg = 360 / tau;
CFIndex runEnd = CFArrayGetCount(runs);
for (CFIndex r = 0; r < runEnd; r++) {
CTRunRef run = CFArrayGetValueAtIndex(runs, r);
CFIndex runGlyphCount = CTRunGetGlyphCount(run);
CGPoint positions[runGlyphCount];
CGSize glyph_advances[runGlyphCount];
//CGPoint positions[runGlyphCount];
CGGlyph glyphs[runGlyphCount];
// Grab the glyphs, positions, and font
CTRunGetPositions(run, CFRangeMake(0, 0), positions);
CTRunGetGlyphs(run, CFRangeMake(0, 0), glyphs);
//CTRunGetPositions(run, CFRangeMake(0, 0), positions);
CTFontRef runFont = CFDictionaryGetValue(CTRunGetAttributes(run), kCTFontAttributeName);
CTFontGetAdvancesForGlyphs(runFont, kCTFontOrientationHorizontal, glyphs, glyph_advances, runGlyphCount);
for(CFIndex g = 0; g < runGlyphCount; g++) {
CGPathRef letter = CTFontCreatePathForGlyph(runFont, glyphs[g], nil);
@@ -728,7 +715,7 @@
double y = [gc nextY];
double dx = [gc nextDeltaX];
double dy = [gc nextDeltaY];
NSNumber* r = [gc nextRotation];
double r = [[gc nextRotation] doubleValue] / radToDeg;
advance *= side;
charWidth *= side;
@@ -764,17 +751,16 @@
CGFloat percentConsumed = midPoint / pathLength;
CGPoint mid = [_path pointAtPercent:percentConsumed withSlope:&slope];
// Calculate the rotation
double angle = atan(slope.y / slope.x); // + M_PI;
if (slope.x < 0) angle += M_PI; // going left, update the angle
double angle = atan2(slope.y, slope.x);
transform = CGAffineTransformConcat(CGAffineTransformMakeTranslation(mid.x, mid.y), transform);
transform = CGAffineTransformConcat(CGAffineTransformMakeRotation(angle + [r doubleValue]), transform);
transform = CGAffineTransformConcat(CGAffineTransformMakeRotation(angle + r), transform);
transform = CGAffineTransformScale(transform, scaledDirection, side);
transform = CGAffineTransformConcat(CGAffineTransformMakeTranslation(-halfWay, dy + baselineShift), transform);
transform = CGAffineTransformConcat(CGAffineTransformMakeTranslation(0, y), transform);
} else {
transform = CGAffineTransformConcat(CGAffineTransformMakeRotation([r doubleValue]), transform);
transform = CGAffineTransformMakeTranslation(startPoint, y + dy);
transform = CGAffineTransformConcat(CGAffineTransformMakeRotation(r), transform);
}
transform = CGAffineTransformScale(transform, 1.0, -1.0);
@@ -783,6 +769,8 @@
}
}
CFRelease(attrString);
CFRelease(line);
return path;
}
ios/ViewManagers/RNSVGRenderableManager.m
+1
View File
@@ -32,5 +32,6 @@ RCT_EXPORT_VIEW_PROPERTY(strokeDasharray, NSArray<NSString *>)
RCT_EXPORT_VIEW_PROPERTY(strokeDashoffset, CGFloat)
RCT_EXPORT_VIEW_PROPERTY(strokeMiterlimit, CGFloat)
RCT_EXPORT_VIEW_PROPERTY(propList, NSArray<NSString *>)
RCT_EXPORT_VIEW_PROPERTY(font, NSDictionary)
@end
ios/ViewManagers/RNSVGTextManager.m
+1
View File
@@ -25,6 +25,7 @@ RCT_EXPORT_VIEW_PROPERTY(deltaX, NSArray<NSString *>)
RCT_EXPORT_VIEW_PROPERTY(deltaY, NSArray<NSString *>)
RCT_EXPORT_VIEW_PROPERTY(positionX, NSArray<NSString *>)
RCT_EXPORT_VIEW_PROPERTY(positionY, NSArray<NSString *>)
RCT_EXPORT_VIEW_PROPERTY(rotate, NSArray<NSString *>)
RCT_EXPORT_VIEW_PROPERTY(font, NSDictionary)
@end