Permalink
Browse files

last minute changes

fixed armv6 version of CCParticleExamples, uses quad system so particle batchnode can be used.
deleted log from particleSystem
changed version number on various places 
changed incorrect message in sprite test
  • Loading branch information...
araker committed Mar 12, 2012
1 parent 7125e92 commit c784e1275e255db6e91116069b518c5e048b3db6
View
@@ -24,6 +24,7 @@ version 1.1-beta2 12-Mar-2012
. [FIX] Node: orderOfArrival is @synthezied correctly (issue #1273)
. [FIX] Node & Sprite: Scale before Skew to prevent issues with negatives scales.
. [FIX] ParticleSystem: prevent bursts of particles due to too high emitCounter (issue #1201)
+. [FIX] ParticleSystem: CCParticleExamples on armv6 uses quad particle system by default, so CCParticleBatchNode can be used
. [FIX] ParticleBatchNode: removeChild error and 'freezing' particles (issue #1316)
. [FIX] ParticleBatchNode: memoryleak (issue #1306)
. [FIX] Sprite: fixed possible setColor and opacity
View
@@ -2,4 +2,4 @@
Please, see the online document:
-http://www.cocos2d-iphone.org/wiki/doku.php/release_notes:1_1_beta2
+http://www.cocos2d-iphone.org/wiki/doku.php/release_notes:1_1_0
@@ -39,12 +39,13 @@
</MacroExpansion>
</TestAction>
<LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
debugDocumentVersioning = "YES"
+ enablesOpenGLESFrameCapture = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
@@ -30,82 +30,68 @@
#import "CCParticleSystemPoint.h"
#import "CCParticleSystemQuad.h"
-// build each architecture with the optimal particle system
-
-// ARMv7, Mac or Simulator use "Quad" particle
-#if defined(__ARM_NEON__) || defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || TARGET_IPHONE_SIMULATOR
- #define ARCH_OPTIMAL_PARTICLE_SYSTEM CCParticleSystemQuad
-
-// ARMv6 use "Point" particle
-#elif __arm__
- #define ARCH_OPTIMAL_PARTICLE_SYSTEM CCParticleSystemPoint
-#else
- #error(unknown architecture)
-#endif
-
-
//! A fire particle system
-@interface CCParticleFire: ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleFire: CCParticleSystemQuad
{
}
@end
//! A fireworks particle system
-@interface CCParticleFireworks : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleFireworks : CCParticleSystemQuad
{
}
@end
//! A sun particle system
-@interface CCParticleSun : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleSun : CCParticleSystemQuad
{
}
@end
//! A galaxy particle system
-@interface CCParticleGalaxy : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleGalaxy : CCParticleSystemQuad
{
}
@end
//! A flower particle system
-@interface CCParticleFlower : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleFlower : CCParticleSystemQuad
{
}
@end
//! A meteor particle system
-@interface CCParticleMeteor : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleMeteor : CCParticleSystemQuad
{
}
@end
//! An spiral particle system
-@interface CCParticleSpiral : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleSpiral : CCParticleSystemQuad
{
}
@end
//! An explosion particle system
-@interface CCParticleExplosion : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleExplosion : CCParticleSystemQuad
{
}
@end
//! An smoke particle system
-@interface CCParticleSmoke : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleSmoke : CCParticleSystemQuad
{
}
@end
//! An snow particle system
-@interface CCParticleSnow : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleSnow : CCParticleSystemQuad
{
}
@end
//! A rain particle system
-@interface CCParticleRain : ARCH_OPTIMAL_PARTICLE_SYSTEM
+@interface CCParticleRain : CCParticleSystemQuad
{
}
@end
@@ -555,7 +555,7 @@ -(void) update: (ccTime) dt
[self addParticle];
emitCounter -= rate;
}
- CCLOG(@"emitCounter %f",emitCounter);
+
elapsed += dt;
if(duration != -1 && duration < elapsed)
[self stopSystem];
View
@@ -26,7 +26,7 @@
#import <Foundation/Foundation.h>
#import "cocos2d.h"
-static NSString *version = @"cocos2d v1.1.0-pre";
+static NSString *version = @"cocos2d v1.1.0-beta2";
NSString *cocos2dVersion()
{
@@ -2093,10 +2093,11 @@ - (void) applicationDidFinishLaunching:(UIApplication*)application
// You can change anytime.
[CCTexture2D setDefaultAlphaPixelFormat:kCCTexture2DPixelFormat_RGBA8888];
- // When in iPad / RetinaDisplay mode, CCFileUtils will append the "-ipad" / "-hd" to all loaded files
- // If the -ipad / -hdfile is not found, it will load the non-suffixed version
- [CCFileUtils setiPadSuffix:@"-ipad"]; // Default on iPad is "" (empty string)
- [CCFileUtils setRetinaDisplaySuffix:@"-hd"]; // Default on RetinaDisplay is "-hd"
+ // When in iPhone RetinaDisplay, iPad, iPad RetinaDisplay mode, CCFileUtils will append the "-hd", "-ipad", "-ipadhd" to all loaded files
+ // If the -hd, -ipad, -ipadhd files are not found, it will load the non-suffixed version
+ [CCFileUtils setiPhoneRetinaDisplaySuffix:@"-hd"]; // Default on iPhone RetinaDisplay is "-hd"
+ [CCFileUtils setiPadSuffix:@"-ipad"]; // Default on iPad is "" (empty string)
+ [CCFileUtils setiPadRetinaDisplaySuffix:@"-ipadhd"]; // Default on iPad RetinaDisplay is "-ipadhd"
CCScene *scene = [CCScene node];
[scene addChild: [nextAction() node]];
View
@@ -811,7 +811,7 @@ -(NSString *) title
-(NSString *) subtitle
{
- return @"tag order in console should be 2,1,3,4,5";
+ return @"tag order in console should be 2,3,4,5,1";
}
@end

0 comments on commit c784e12

Please sign in to comment.