Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop

Author: jtwigg

Resources/Images/MountainPanorama-License.txt

@@ -0,0 +1,6 @@
+The file MountainPanorama.jpg is a derivative of Helvellyn_Striding_Edge_360_Panorama,_Lake_District_-_June_09.jpg by DAVID ILIFF, used under CC-BY-SA 3.0 (http://creativecommons.org/licenses/by-sa/3.0/deed.en). MountainPanorama.jpg is a crop of the original image.
+
+The original image was downloaded from http://en.wikipedia.org/wiki/File:Helvellyn_Striding_Edge_360_Panorama,_Lake_District_-_June_09.jpg
+
+MountainPanorama.jpg is licensed under CC-BY-SA 3.0.
+

Resources/Images/MountainPanorama.jpg

@@ -1 +1 @@
-3.1.1
+3.2.0

Resources/Images/ShinyTorusNormals.png

@@ -108,12 +108,18 @@
 		926B97F71938606D00E345FB /* CCAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 926B97F21938606D00E345FB /* CCAnimationManager.h */; };
 		9D1C03B81954F636007B6735 /* CCEffectRefraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D1C03B61954F636007B6735 /* CCEffectRefraction.h */; };
 		9D1C03B91954F636007B6735 /* CCEffectRefraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D1C03B71954F636007B6735 /* CCEffectRefraction.m */; };
+		9D473920197841A500314F7D /* CCEffectUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D47391E197841A500314F7D /* CCEffectUtils.h */; };
+		9D473921197841A500314F7D /* CCEffectUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D47391F197841A500314F7D /* CCEffectUtils.m */; };
+		9D6BE2FE1975E18B0082A327 /* CCEffectGlass.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D6BE2FC1975E18B0082A327 /* CCEffectGlass.h */; };
+		9D6BE2FF1975E18B0082A327 /* CCEffectGlass.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D6BE2FD1975E18B0082A327 /* CCEffectGlass.m */; };
 		9D85671D191B018200573093 /* CCEffectBrightness.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D85671B191B018200573093 /* CCEffectBrightness.h */; };
 		9D85671E191B018200573093 /* CCEffectBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D85671C191B018200573093 /* CCEffectBrightness.m */; };
 		9D856721191B019900573093 /* CCEffectContrast.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D85671F191B019900573093 /* CCEffectContrast.h */; };
 		9D856722191B019900573093 /* CCEffectContrast.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D856720191B019900573093 /* CCEffectContrast.m */; };
 		9DB7599A196E09FF00AF3E4A /* CCEffectHue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DB75998196E09FF00AF3E4A /* CCEffectHue.h */; };
 		9DB7599B196E09FF00AF3E4A /* CCEffectHue.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DB75999196E09FF00AF3E4A /* CCEffectHue.m */; };
+		9DE8190D1974733200B1D8C3 /* CCEffectReflection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DE8190B1974733200B1D8C3 /* CCEffectReflection.h */; };
+		9DE8190E1974733200B1D8C3 /* CCEffectReflection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DE8190C1974733200B1D8C3 /* CCEffectReflection.m */; };
 		9DE90429192D630000AEB37A /* CCEffectRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DE90427192D630000AEB37A /* CCEffectRenderer.h */; };
 		9DE9042A192D630000AEB37A /* CCEffectRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DE90428192D630000AEB37A /* CCEffectRenderer.m */; };
 		9DF37621191C594A00C6D27A /* CCEffectPixellate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */; };
@@ -434,6 +440,10 @@
 		92FF6C7318F33A2A005B7139 /* CCActionManager_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCActionManager_Private.h; sourceTree = "<group>"; };
 		9D1C03B61954F636007B6735 /* CCEffectRefraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectRefraction.h; sourceTree = "<group>"; };
 		9D1C03B71954F636007B6735 /* CCEffectRefraction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectRefraction.m; sourceTree = "<group>"; };
+		9D47391E197841A500314F7D /* CCEffectUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectUtils.h; sourceTree = "<group>"; };
+		9D47391F197841A500314F7D /* CCEffectUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectUtils.m; sourceTree = "<group>"; };
+		9D6BE2FC1975E18B0082A327 /* CCEffectGlass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGlass.h; sourceTree = "<group>"; };
+		9D6BE2FD1975E18B0082A327 /* CCEffectGlass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectGlass.m; sourceTree = "<group>"; };
 		9D85671A191AE2CC00573093 /* CCEffectStack_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEffectStack_Private.h; sourceTree = "<group>"; };
 		9D85671B191B018200573093 /* CCEffectBrightness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBrightness.h; sourceTree = "<group>"; };
 		9D85671C191B018200573093 /* CCEffectBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBrightness.m; sourceTree = "<group>"; };
@@ -442,6 +452,8 @@
 		9D85B7DC195396E90039A9DB /* CCEffectStackProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEffectStackProtocol.h; sourceTree = "<group>"; };
 		9DB75998196E09FF00AF3E4A /* CCEffectHue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectHue.h; sourceTree = "<group>"; };
 		9DB75999196E09FF00AF3E4A /* CCEffectHue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectHue.m; sourceTree = "<group>"; };
+		9DE8190B1974733200B1D8C3 /* CCEffectReflection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectReflection.h; sourceTree = "<group>"; };
+		9DE8190C1974733200B1D8C3 /* CCEffectReflection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectReflection.m; sourceTree = "<group>"; };
 		9DE90427192D630000AEB37A /* CCEffectRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectRenderer.h; sourceTree = "<group>"; };
 		9DE90428192D630000AEB37A /* CCEffectRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectRenderer.m; sourceTree = "<group>"; };
 		9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectPixellate.h; sourceTree = "<group>"; };
@@ -1212,6 +1224,8 @@
 				D272031718FC89A000B100FF /* CCEffect_Private.h */,
 				D272031818FC89A000B100FF /* CCEffect.h */,
 				D272031918FC89A000B100FF /* CCEffect.m */,
+				9D47391E197841A500314F7D /* CCEffectUtils.h */,
+				9D47391F197841A500314F7D /* CCEffectUtils.m */,
 				D272032018FC89A000B100FF /* CCEffectStack.h */,
 				9D85671A191AE2CC00573093 /* CCEffectStack_Private.h */,
 				D272032118FC89A000B100FF /* CCEffectStack.m */,
@@ -1222,6 +1236,8 @@
 				9D85671C191B018200573093 /* CCEffectBrightness.m */,
 				9D85671F191B019900573093 /* CCEffectContrast.h */,
 				9D856720191B019900573093 /* CCEffectContrast.m */,
+				9D6BE2FC1975E18B0082A327 /* CCEffectGlass.h */,
+				9D6BE2FD1975E18B0082A327 /* CCEffectGlass.m */,
 				9DB75998196E09FF00AF3E4A /* CCEffectHue.h */,
 				9DB75999196E09FF00AF3E4A /* CCEffectHue.m */,
 				9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */,
@@ -1232,6 +1248,8 @@
 				9DFB1E4F19241AEF008371EF /* CCEffectSaturation.m */,
 				9D1C03B61954F636007B6735 /* CCEffectRefraction.h */,
 				9D1C03B71954F636007B6735 /* CCEffectRefraction.m */,
+				9DE8190B1974733200B1D8C3 /* CCEffectReflection.h */,
+				9DE8190C1974733200B1D8C3 /* CCEffectReflection.m */,
 				9DE90427192D630000AEB37A /* CCEffectRenderer.h */,
 				9DE90428192D630000AEB37A /* CCEffectRenderer.m */,
 			);
@@ -1317,6 +1335,7 @@
 				5018F2730DFDEAFF00C013A5 /* CCLabelTTF.h in Headers */,
 				5018F2750DFDEAFF00C013A5 /* CCNodeColor.h in Headers */,
 				5018F2770DFDEAFF00C013A5 /* CCScene.h in Headers */,
+				9D473920197841A500314F7D /* CCEffectUtils.h in Headers */,
 				5018F27D0DFDEAFF00C013A5 /* CCTextureCache.h in Headers */,
 				B77060051831A07B0043CC67 /* OALNotifications.h in Headers */,
 				D380581A1889AD6000822437 /* CCRenderer.h in Headers */,
@@ -1446,11 +1465,13 @@
 				A0DA0BC315BCDCA200E80A92 /* CCDrawNode.h in Headers */,
 				2B192835163361B10049A044 /* CCClippingNode.h in Headers */,
 				B7EE6A1E181AE34600B983FE /* CCSlider.h in Headers */,
+				9DE8190D1974733200B1D8C3 /* CCEffectReflection.h in Headers */,
 				A003AC8C1657071100C7B792 /* ccFPSImages.h in Headers */,
 				B74C2B9B17BDA63A00A829C0 /* CCSprite9Slice.h in Headers */,
 				B77060CF18341AD50043CC67 /* CCBReader_Private.h in Headers */,
 				B75C2E7C17C5908B002B0E0D /* NSAttributedString+CCAdditions.h in Headers */,
 				A6A0734517C788EB004343C8 /* CCResponderManager.h in Headers */,
+				9D6BE2FE1975E18B0082A327 /* CCEffectGlass.h in Headers */,
 				A6A0734A17C78EF3004343C8 /* CCResponder.h in Headers */,
 				B78AE46217E7AF1C0028BE0B /* CCButton.h in Headers */,
 				9DE90429192D630000AEB37A /* CCEffectRenderer.h in Headers */,
@@ -1654,11 +1675,13 @@
 				B7705FDB1831A07B0043CC67 /* OALAudioTracks.m in Sources */,
 				B7705FEE1831A07B0043CC67 /* ALSoundSourcePool.m in Sources */,
 				B7EE69E11819E75700B983FE /* CCLayout.m in Sources */,
+				9DE8190E1974733200B1D8C3 /* CCEffectReflection.m in Sources */,
 				B7705FD51831A07B0043CC67 /* OALUtilityActions.m in Sources */,
 				2B192836163361B10049A044 /* CCClippingNode.m in Sources */,
 				A003AC8F16572D6000C7B792 /* ccFPSImages.m in Sources */,
 				B79F905B17FE2A2E00908504 /* CCTableView.m in Sources */,
 				B74C2B9C17BDA63A00A829C0 /* CCSprite9Slice.m in Sources */,
+				9D473921197841A500314F7D /* CCEffectUtils.m in Sources */,
 				B75C2E7D17C5908B002B0E0D /* NSAttributedString+CCAdditions.m in Sources */,
 				B7EE69E31819E75700B983FE /* CCLayoutBox.m in Sources */,
 				B7705FF71831A07B0043CC67 /* OALAudioSession.m in Sources */,
@@ -1669,6 +1692,7 @@
 				A6A0734617C788EB004343C8 /* CCResponderManager.m in Sources */,
 				A6A0734B17C78EF3004343C8 /* CCResponder.m in Sources */,
 				B78AE46317E7AF1C0028BE0B /* CCButton.m in Sources */,
+				9D6BE2FF1975E18B0082A327 /* CCEffectGlass.m in Sources */,
 				B78AE46517E7AF1C0028BE0B /* CCControl.m in Sources */,
 				B78AE46717E7AF1C0028BE0B /* CCControlTextureFactory.m in Sources */,
 				D38058211889CE7700822437 /* CCCache.m in Sources */,

Resources/Images/StoneWall.jpg

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0E28FE1A197FCE4500F78989 /* CCCacheTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E28FE19197FCE4500F78989 /* CCCacheTest.m */; };
 		75556A04185636F100ED1B0F /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75556A03185636F100ED1B0F /* XCTest.framework */; };
 		75556A05185636F100ED1B0F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B7E2605717E7D278007067F0 /* Foundation.framework */; };
 		75556A06185636F100ED1B0F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B7E2605517E7D278007067F0 /* UIKit.framework */; };
@@ -107,6 +108,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		0E28FE19197FCE4500F78989 /* CCCacheTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCCacheTest.m; path = "cocos2d-ui-tests/tests/CCCacheTest.m"; sourceTree = SOURCE_ROOT; };
 		755569E31856361100ED1B0F /* CCFileUtilTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCFileUtilTests.m; sourceTree = "<group>"; };
 		755569E41856361100ED1B0F /* CCNodeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCNodeTests.m; sourceTree = "<group>"; };
 		755569E51856361100ED1B0F /* CCPhysicsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPhysicsTests.m; sourceTree = "<group>"; };
@@ -354,6 +356,7 @@
 		B71B087F17EA5B500082EBC0 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				0E28FE19197FCE4500F78989 /* CCCacheTest.m */,
 				D2B4894B1917EE6700C3443A /* CCEffectsTest.m */,
 				D3D6CF5E18BD5F0500A51531 /* CCRendererTest.m */,
 				D3870C5F18B440150033D885 /* SpritePerformanceTest.m */,
@@ -656,6 +659,7 @@
 				B7EE697918186D5200B983FE /* CCTextFieldTest.m in Sources */,
 				D29698121926DF7500BBB097 /* CCEffectPongTest.m in Sources */,
 				B7E2620017E7D321007067F0 /* AppDelegate.m in Sources */,
+				0E28FE1A197FCE4500F78989 /* CCCacheTest.m in Sources */,
 				B77060AB1832E3310043CC67 /* CCTextureCacheTest.m in Sources */,
 				A664A4EF18A3D9B8006184B8 /* PositioningTest.m in Sources */,
 				B7E2621C17E7D370007067F0 /* main.m in Sources */,

VERSION

@@ -0,0 +1,143 @@
+#import "TestBase.h"
+#import "CCCache.h"
+
+// -----------------------------------------------------------------
+// Simple demo cache, holding an allocated array
+// -----------------------------------------------------------------
+
+@interface DemoCache : CCCache @end
+
+@implementation DemoCache
+
+- (id)createSharedDataForKey:(id<NSCopying>)key
+{
+    unsigned char* rawData = malloc(255);
+    CCLOG(@"Data created for key: %@", key);
+    return([NSValue valueWithPointer:rawData]);
+}
+
+- (id)createPublicObjectForSharedData:(id)data
+{
+    return([NSValue valueWithNonretainedObject:data]);
+}
+
+- (void)disposeOfSharedData:(id)data
+{
+    free([((NSValue *)data) pointerValue]);
+}
+
+- (void)logCache
+{
+    for (unsigned char letter = 'A'; letter < 'X'; letter ++)
+    {
+        NSString *key = [NSString stringWithFormat:@"object%c", letter];
+        if ([self keyExists:key])
+        {
+            NSValue *value = [self rawObjectForKey:key];
+            if (value) CCLOG(@"%@", key); else CCLOG(@"%@ (unused)", key);
+        }
+    }
+}
+
+@end
+
+// -----------------------------------------------------------------
+// Cache test
+// -----------------------------------------------------------------
+
+@interface CCCacheTest : TestBase @end
+
+// -----------------------------------------------------------------
+
+@implementation CCCacheTest
+{
+    DemoCache *_cache;
+    int _testStep;
+    NSValue *_valueA;
+    NSValue *_valueB;
+}
+
+- (NSArray*) testConstructors
+{
+    return [NSArray arrayWithObjects:
+            @"cacheTest",
+            nil];
+}
+
+- (void)cacheTest
+{
+    self.subTitle = @"Cache Test";
+    
+    CCButton *button = [CCButton buttonWithTitle:@"[ Step test]" fontName:@"Arial" fontSize:18];
+    button.positionType = CCPositionTypeNormalized;
+    button.position = ccp(0.5, 0.5);
+    [button setTarget:self selector:@selector(stepClicked:)];
+    [self.contentNode addChild:button];
+    
+    _testStep = 0;
+    
+    _cache = [DemoCache cache];
+    
+    [_cache preload:@"objectA"];
+    [_cache preload:@"objectA"]; // same object as above
+    [_cache preload:@"objectB"];
+    [_cache preload:@"objectC"];
+}
+
+- (void)stepClicked:(id)sender
+{
+    CCLOG(@"---------------------------------------------------");
+    switch (_testStep) {
+        case 0:
+            CCLOG(@"-- All cached objects should be unused");
+            break;
+            
+        case 1:
+            CCLOG(@"-- objectA in use");
+            _valueA = [_cache objectForKey:@"objectA"];
+            break;
+            
+        case 2:
+            CCLOG(@"-- objectB in use");
+            _valueB = [_cache objectForKey:@"objectB"];
+            break;
+            
+        case 3:
+            CCLOG(@"-- Flush, and thus remove objectC");
+            [_cache flush];
+            break;
+            
+        case 4:
+            CCLOG(@"-- objectA not in use anymore");
+            _valueA = nil;
+            break;
+            
+        case 5:
+            CCLOG(@"-- Flush, and thus only leaving objectB");
+            [_cache flush];
+            break;
+            
+        case 6:
+            CCLOG(@"-- New objectA should be created");
+            _valueA = [_cache objectForKey:@"objectA"];
+            break;
+            
+        case 7:
+            CCLOG(@"-- No new objectB should be created");
+            [_cache flush];
+            _valueB = [_cache objectForKey:@"objectB"];
+            break;
+            
+        default:
+            CCLOG(@"End of test!");
+            _testStep = -1;
+            break;
+    }
+    [_cache logCache];
+    _testStep ++;
+}
+
+
+// -----------------------------------------------------------------
+
+@end

cocos2d-ios.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 #import "CCEffectNode.h"
 #import "CCEffectGaussianBlur.h"
 
-#if CC_ENABLE_EXPERIMENTAL_EFFECTS
 
 #define PADDLE_SCALE 0.5f
 #define PADDLE_X_OFFSET 10.0f
@@ -377,7 +376,3 @@ - (void)decreasePixellate:(CCTime)interval
 
 @end
 
-#endif
-
-
-