xcasset support for texture cache + refactoring

Author: s1ddok

cocos2d/CCTextureCache.m

@@ -290,58 +290,53 @@ -(CCTexture*) addImage: (NSString*) path
 
 		CGFloat contentScale;
 		NSString *fullpath = [fileUtils fullPathForFilename:path contentScale:&contentScale];
-		if( ! fullpath ) {
-			CCLOG(@"cocos2d: Couldn't find file:%@", path);
-			return nil;
-		}
-
-		NSString *lowerCase = [fullpath lowercaseString];
-
+        
 		// all images are handled by UIKit/AppKit except PVR extension that is handled by cocos2d's handler
+        // main bundle loading is priotirized for backwards compatibility reasons
+        if( fullpath ) {
+            NSString *lowerCase = [fullpath lowercaseString];
 
-		if ( [lowerCase hasSuffix:@".pvr"] || [lowerCase hasSuffix:@".pvr.gz"] || [lowerCase hasSuffix:@".pvr.ccz"] )
-			tex = [self addPVRImage:path];
-
+            if ( [lowerCase hasSuffix:@".pvr"] || [lowerCase hasSuffix:@".pvr.gz"] || [lowerCase hasSuffix:@".pvr.ccz"] )
+                tex = [self addPVRImage:path];
 #if __CC_PLATFORM_IOS
-
-		else {
-            UIImage *image = [[UIImage alloc] initWithContentsOfFile:fullpath];
-			tex = [[CCTexture alloc] initWithCGImage:image.CGImage contentScale:contentScale];
-            
-			CCLOGINFO(@"Texture loaded: %@", path);
-            
-			if( tex ){
-				dispatch_sync(_dictQueue, ^{
-					[_textures setObject: tex forKey:path];
-					CCLOGINFO(@"Texture %@ cached: %p", path, tex);
-				});
-			}else{
-				CCLOG(@"cocos2d: Couldn't create texture for file:%@ in CCTextureCache", path);
-			}
-		}
-
-
+            else {
+                UIImage *image = [[UIImage alloc] initWithContentsOfFile:fullpath];
+                tex = [[CCTexture alloc] initWithCGImage:image.CGImage contentScale:contentScale];
+            }
 #elif __CC_PLATFORM_MAC
-		else {
-
-			NSData *data = [[NSData alloc] initWithContentsOfFile:fullpath];
-			NSBitmapImageRep *image = [[NSBitmapImageRep alloc] initWithData:data];
-			tex = [ [CCTexture alloc] initWithCGImage:[image CGImage] contentScale:contentScale];
-
-
-			if( tex ){
-				dispatch_sync(_dictQueue, ^{
-					[_textures setObject: tex forKey:path];
-				});
-			}else{
-				CCLOG(@"cocos2d: Couldn't create texture for file:%@ in CCTextureCache", path);
-			}
-
-			// autorelease prevents possible crash in multithreaded environments
-			//[tex autorelease];
-		}
+            else {
+                NSData *data = [[NSData alloc] initWithContentsOfFile:fullpath];
+                NSBitmapImageRep *image = [[NSBitmapImageRep alloc] initWithData:data];
+                tex = [ [CCTexture alloc] initWithCGImage:[image CGImage] contentScale:contentScale];
+                
+                // autorelease prevents possible crash in multithreaded environments
+                //[tex autorelease];
+            }
 #endif // __CC_PLATFORM_MAC
-
+        // if we cant find a file in the main bundle then we trying to load it from xcassets
+        } else {
+#if __CC_PLATFORM_IOS
+            UIImage *image = [UIImage imageNamed:path];
+            
+            if (image)
+                tex = [[CCTexture alloc] initWithCGImage:image.CGImage contentScale:image.scale];
+#elif __CC_PLATFORM_MAC
+            NSImage *image = [NSImage imageNamed:path];
+        
+            if (image)
+                tex = [[CCTexture alloc] initWithCGImage:[image CGImageForProposedRect:nil context:nil hints:nil] contentScale:contentScale];
+#endif
+        }
+		
+        //if we could load a tex from anywhere we add it to the cache
+        if( tex ){
+            dispatch_sync(_dictQueue, ^{
+                [_textures setObject: tex forKey:path];
+            });
+        }else{
+            CCLOG(@"cocos2d: Couldn't create texture for file:%@ in CCTextureCache", path);
+            return nil;
+        }
 	}
 
 	return((id)tex.proxy);