Merge pull request #756 from jtwigg/develop

Support new compression algo for Int's.

Author: vlidholt

UnitTests/CCPhysicsTests.m

@@ -942,7 +942,7 @@ -(void)testKineticNodeActionsBasic1
     for(int i = 0; i < 100; i++)
 	{
 		float desired  = (float)i * 0.1f * 100.0f/10.0f + (float)i * 0.1f * 200.0f/10.0f;
-		NSLog(@"node1.position.x=  %0.2f   desired = %0.2f",body1.absolutePosition.x, desired);
+		//NSLog(@"node1.position.x=  %0.2f   desired = %0.2f",body1.absolutePosition.x, desired);
 		XCTAssertEqualWithAccuracy(body1.absolutePosition.x, desired , accuracy, @"Not in the write position");
 		[scheduler update:0.10f];
 	}

UnitTests/CCReaderTest.m

@@ -7,6 +7,10 @@
 //
 
 #import <XCTest/XCTest.h>
+#import "cocos2d.h"
+#import "CCBReader.h"
+#include <mach/mach.h>
+#include <mach/mach_time.h>
 
 @interface CCReaderTest : XCTestCase
 
@@ -20,6 +24,53 @@ - (void)setUp
     // Put setup code here; it will be run once, before the first test case.
 }
 
+double machGetClockS()
+{
+    static bool init = 0 ;
+    static mach_timebase_info_data_t tbInfo ;
+    static double conversionFactor ;
+    if(!init)
+    {
+        init = 1 ;
+        // get the time base
+        mach_timebase_info( &tbInfo ) ;
+        conversionFactor = tbInfo.numer / (1e9*tbInfo.denom) ; // ns->s
+    }
+    
+    return mach_absolute_time() * conversionFactor ; // seconds
+}
+
+double machGetClockDiffS()
+{
+    static double lastTime = 0;
+    
+    double currentTime = machGetClockS() ;
+    
+    double diff = currentTime - lastTime ;
+    
+    lastTime = currentTime ; // update for next call
+    
+    return diff ; // that's your answer
+}
+
+-(void)testReaderPerformance
+{
+    NSString *filePath =[[NSBundle mainBundle] pathsForResourcesOfType:@"ccbi" inDirectory:@"Resources-shared/Tests"][0];
+    XCTAssertNotNil(filePath);
+    
+    NSData * fileData = [[NSData alloc] initWithContentsOfFile:filePath];
+    
+    CCBReader  * ccbReader = [[CCBReader alloc] init];
+    
+    machGetClockDiffS();
+    for (int i = 0; i < 100; i++)
+    {
+            [ccbReader loadWithData:fileData owner:self];
+    }
+
+    NSLog(@"TimeToRun: %0.8f", machGetClockDiffS());
+}
+
 - (void)tearDown
 {
     // Put teardown code here; it will be run once, after the last test case.

cocos2d-tests-ios.xcodeproj/project.pbxproj

@@ -27,6 +27,7 @@
 		758A6C80184410EE00D1A8D2 /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 758A6C7F184410EE00D1A8D2 /* Particles */; };
 		75F76497185A831B00E2FAFE /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = 75F76496185A831B00E2FAFE /* Sounds */; };
 		92324E2A18EB635500D78D3F /* CCReaderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 92324E2918EB635500D78D3F /* CCReaderTest.m */; };
+		9269312A1923D8A700CE6285 /* Resources-shared in Resources */ = {isa = PBXBuildFile; fileRef = B7C6237517EA695100928F91 /* Resources-shared */; };
 		92FE241118F5F06F00647961 /* CCAnimationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FE241018F5F06F00647961 /* CCAnimationTest.m */; };
 		A6167B93189A7D4D0044D391 /* VertexZTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A6167B92189A7D4D0044D391 /* VertexZTest.m */; };
 		A664A4EF18A3D9B8006184B8 /* PositioningTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A664A4EE18A3D9B8006184B8 /* PositioningTest.m */; };
@@ -594,6 +595,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9269312A1923D8A700CE6285 /* Resources-shared in Resources */,
 				75556A1B1856374700ED1B0F /* InfoPlist.strings in Resources */,
 				75556A15185636FB00ED1B0F /* powered.png in Resources */,
 			);

cocos2d-ui-tests/Resources-shared/Tests/PerfTest1.ccbi

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CCSetupScreenMode</key>
+	<string>CCScreenModeFlexible</string>
+	<key>CCSetupScreenOrientation</key>
+	<string>CCScreenOrientationLandscape</string>
+	<key>CCSetupTabletScale2X</key>
+	<true/>
+</dict>
+</plist>