Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/TimeShift/libs/cocos2d/CCConfiguration.h b/TimeShift/libs/cocos2d/CCConfiguration.h
- index 5ca15c0..f5526ae 100644
- --- a/TimeShift/libs/cocos2d/CCConfiguration.h
- +++ b/TimeShift/libs/cocos2d/CCConfiguration.h
- @@ -56,6 +56,7 @@ enum {
- kCCDeviceiPhoneRetinaDisplay,
- kCCDeviceiPhone5,
- kCCDeviceiPhone5RetinaDisplay,
- + kCCDeviceiPhoneRetinaHDDisplay,
- kCCDeviceiPad,
- kCCDeviceiPadRetinaDisplay,
- diff --git a/TimeShift/libs/cocos2d/CCConfiguration.m b/TimeShift/libs/cocos2d/CCConfiguration.m
- index d3a985c..4769d20 100644
- --- a/TimeShift/libs/cocos2d/CCConfiguration.m
- +++ b/TimeShift/libs/cocos2d/CCConfiguration.m
- @@ -143,6 +143,8 @@ static char * glExtensions;
- if( CC_CONTENT_SCALE_FACTOR() == 2 ) {
- ret = isiPhone5 ? kCCDeviceiPhone5RetinaDisplay : kCCDeviceiPhoneRetinaDisplay;
- + } else if ( CC_CONTENT_SCALE_FACTOR() == 3) {
- + ret = kCCDeviceiPhoneRetinaHDDisplay;
- } else
- ret = isiPhone5 ? kCCDeviceiPhone5 : kCCDeviceiPhone;
- }
- diff --git a/TimeShift/libs/cocos2d/Platforms/iOS/CCDirectorIOS.m b/TimeShift/libs/cocos2d/Platforms/iOS/CCDirectorIOS.m
- index 7eed357..f710064 100644
- --- a/TimeShift/libs/cocos2d/Platforms/iOS/CCDirectorIOS.m
- +++ b/TimeShift/libs/cocos2d/Platforms/iOS/CCDirectorIOS.m
- @@ -305,7 +305,7 @@ CGFloat __ccContentScaleFactor = 1;
- -(BOOL) enableRetinaDisplay:(BOOL)enabled
- {
- // Already enabled ?
- - if( enabled && __ccContentScaleFactor == 2 )
- + if( enabled && (__ccContentScaleFactor == 2 || __ccContentScaleFactor == 3) )
- return YES;
- // Already disabled
- @@ -320,9 +320,9 @@ CGFloat __ccContentScaleFactor = 1;
- if ([[UIScreen mainScreen] scale] == 1.0)
- return NO;
- - float newScale = enabled ? 2 : 1;
- + float newScale = enabled ? [[UIScreen mainScreen] scale] : 1;
- [self setContentScaleFactor:newScale];
- -
- +
- // Load Hi-Res FPS label
- [[CCFileUtils sharedFileUtils] buildSearchResolutionsOrder];
- [self createStatsLabel];
- diff --git a/TimeShift/libs/cocos2d/Support/CCFileUtils.h b/TimeShift/libs/cocos2d/Support/CCFileUtils.h
- index 3a51413..0458c3d 100644
- --- a/TimeShift/libs/cocos2d/Support/CCFileUtils.h
- +++ b/TimeShift/libs/cocos2d/Support/CCFileUtils.h
- @@ -36,6 +36,7 @@ extern NSString const *kCCFileUtilsiPhone;
- extern NSString const *kCCFileUtilsiPhoneHD;
- extern NSString const *kCCFileUtilsiPhone5;
- extern NSString const *kCCFileUtilsiPhone5HD;
- +extern NSString const *kCCFileUtilsiPhoneRetinaHD;
- extern NSString const *kCCFileUtilsMac;
- extern NSString const *kCCFileUtilsMacHD;
- @@ -197,6 +198,8 @@ enum {
- */
- -(void)setiPadRetinaDisplaySuffix:(NSString*)iPadRetinaDisplaySuffix;
- +-(void) setiPhoneRetinaHDDisplaySuffix:(NSString *)suffix;
- +
- #endif // __CC_PLATFORM_IOS
- diff --git a/TimeShift/libs/cocos2d/Support/CCFileUtils.m b/TimeShift/libs/cocos2d/Support/CCFileUtils.m
- index e369a31..9c318ca 100644
- --- a/TimeShift/libs/cocos2d/Support/CCFileUtils.m
- +++ b/TimeShift/libs/cocos2d/Support/CCFileUtils.m
- @@ -39,6 +39,7 @@ NSString *kCCFileUtilsiPhone = @"iphone";
- NSString *kCCFileUtilsiPhoneHD = @"iphonehd";
- NSString *kCCFileUtilsiPhone5 = @"iphone5";
- NSString *kCCFileUtilsiPhone5HD = @"iphone5hd";
- +NSString *kCCFileUtilsiPhoneRetinaHD = @"iphoneretinahd";
- NSString *kCCFileUtilsMac = @"mac";
- NSString *kCCFileUtilsMacHD = @"machd";
- @@ -163,6 +164,7 @@ NSInteger ccLoadFileIntoMemory(const char *filename, unsigned char **out)
- @"-hd", kCCFileUtilsiPhoneHD,
- @"-iphone5", kCCFileUtilsiPhone5,
- @"-iphone5hd", kCCFileUtilsiPhone5HD,
- + @"-iphoneretinahd", kCCFileUtilsiPhoneRetinaHD,
- @"", kCCFileUtilsDefault,
- nil];
- @@ -173,6 +175,7 @@ NSInteger ccLoadFileIntoMemory(const char *filename, unsigned char **out)
- @"resources-iphonehd", kCCFileUtilsiPhoneHD,
- @"resources-iphone5", kCCFileUtilsiPhone5,
- @"resources-iphone5hd", kCCFileUtilsiPhone5HD,
- + @"resources-iphoneretinahd", kCCFileUtilsiPhoneRetinaHD,
- @"", kCCFileUtilsDefault,
- nil];
- @@ -265,6 +268,12 @@ NSInteger ccLoadFileIntoMemory(const char *filename, unsigned char **out)
- [_searchResolutionsOrder addObject:kCCFileUtilsiPhone5];
- [_searchResolutionsOrder addObject:kCCFileUtilsiPhone];
- }
- + else if (device == kCCDeviceiPhoneRetinaHDDisplay) {
- + [_searchResolutionsOrder addObject:kCCFileUtilsiPhoneRetinaHD];
- + [_searchResolutionsOrder addObject:kCCFileUtilsiPhone5HD];
- + [_searchResolutionsOrder addObject:kCCFileUtilsiPhoneHD];
- + [_searchResolutionsOrder addObject:kCCFileUtilsiPhone];
- + }
- else if (device == kCCDeviceiPhone)
- {
- [_searchResolutionsOrder addObject:kCCFileUtilsiPhone];
- @@ -412,6 +421,8 @@ NSInteger ccLoadFileIntoMemory(const char *filename, unsigned char **out)
- return kCCResolutioniPhone5RetinaDisplay;
- if( [key isEqualToString:kCCFileUtilsiPhone5] )
- return kCCResolutioniPhone5;
- + if( [key isEqualToString:kCCFileUtilsiPhoneRetinaHD] )
- + return kCCResolutioniPhoneRetinaHDDisplay;
- if( [key isEqualToString:kCCFileUtilsDefault] )
- return kCCResolutionUnknown;
- #elif defined(__CC_PLATFORM_MAC)
- @@ -634,6 +645,11 @@ NSInteger ccLoadFileIntoMemory(const char *filename, unsigned char **out)
- [_suffixesDict setObject:suffix forKey:kCCFileUtilsiPhoneHD];
- }
- +-(void) setiPhoneRetinaHDDisplaySuffix:(NSString *)suffix
- +{
- + [_suffixesDict setObject:suffix forKey:kCCFileUtilsiPhoneRetinaHD];
- +}
- +
- #endif // __CC_PLATFORM_IOS
- diff --git a/TimeShift/libs/cocos2d/ccTypes.h b/TimeShift/libs/cocos2d/ccTypes.h
- index fa5ac77..c3a9fd1 100644
- --- a/TimeShift/libs/cocos2d/ccTypes.h
- +++ b/TimeShift/libs/cocos2d/ccTypes.h
- @@ -335,6 +335,8 @@ typedef enum
- kCCResolutioniPhone5,
- //! iPhone 5 RetinaDisplay resolution type
- kCCResolutioniPhone5RetinaDisplay,
- + //! iPhone 6 Plus RetinaDisplay resolution type
- + kCCResolutioniPhoneRetinaHDDisplay,
- //! iPad resolution type
- kCCResolutioniPad,
- //! iPad Retina Display resolution type
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement