@@ -1,3 +1,6 @@ +version 0.7.2 - xxx + . TextureAtlas: fixed colorarray memory leak (issue #272) + version 0.7.1 - 20-Mar-2009 . Actions: added tags to actions (issue #222) . Actions: Spawns can be Speeded (issue #257) CHANGELOG @@ -10,21 +10,21 @@ design: Main features * Scene management (workflow) * Transitions between scenes - * Sprites and Sprite Sheets - * Effects: Lens, Ripple, Waves, Liquid, etc. + * Sprites and Sprite Sheets + * Effects: Lens, Ripple, Waves, Liquid, etc. * Actions (behaviours): - * Trasformation Actions: Move, Rotate, Scale, Jump, etc. - * Composable actions: Sequence, Spawn, Repeat, Reverse - * Ease Actions: Exp, Sin, Cubic, etc. - * Misc actions: CallFunc, OrbitCamera + * Trasformation Actions: Move, Rotate, Scale, Jump, etc. + * Composable actions: Sequence, Spawn, Repeat, Reverse + * Ease Actions: Exp, Sin, Cubic, etc. + * Misc actions: CallFunc, OrbitCamera * Basic menus and buttons * Integrated Chipmunk 2d physics engine * Particle system * Text rendering support * Texture Atlas support * Tile Map support - * Parallax scrolling support - * High Score server + * Parallax scrolling support + * High Score server * Touch/Accelerometer support * Portrait and Landscape mode * Integrated Pause/Resume @@ -35,7 +35,7 @@ Main features Experimental features: * Motion Streak / Ribbon support - * Sound Engine support + * Sound Engine support This library does not work with the toolchain, but it should be easy to port it to it. README @@ -1343,7 +1343,7 @@ 8EDF3E9D0F6BD8E600F54643 /* waterfall.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = waterfall.wav; sourceTree = "<group>"; }; 8EDF3EA50F6BD90B00F54643 /* SoundEngineTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundEngineTest.h; sourceTree = "<group>"; }; 8EDF3EA60F6BD90B00F54643 /* SoundEngineTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SoundEngineTest.m; sourceTree = "<group>"; }; - 8EDF3ED80F6BDA0000F54643 /* StreakTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StreakTest.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8EDF3ED80F6BDA0000F54643 /* SoundEngineTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SoundEngineTest.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8EDF3F7F0F6BDEB400F54643 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 8EDF3F850F6BDEDA00F54643 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 8EDF3FD90F6BE3F400F54643 /* listener-marker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "listener-marker.png"; path = "experimental/sound-engine/sound-engine-sample/listener-marker.png"; sourceTree = SOURCE_ROOT; }; @@ -1732,7 +1732,7 @@ 50D56FD20F3FABEC007CD6B9 /* EffectsAdvancedDemo.app */, 504828800F45AED700A30CEF /* AttachDemo.app */, 505CC1590F62BB03000EDF26 /* PerformanceTest.app */, - 8EDF3ED80F6BDA0000F54643 /* StreakTest.app */, + 8EDF3ED80F6BDA0000F54643 /* SoundEngineTest.app */, ); name = Products; sourceTree = "<group>"; @@ -2962,7 +2962,7 @@ ); name = "SoundEngineTest (experimental)"; productName = playground; - productReference = 8EDF3ED80F6BDA0000F54643 /* StreakTest.app */; + productReference = 8EDF3ED80F6BDA0000F54643 /* SoundEngineTest.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ cocos2d-iphone.xcodeproj/project.pbxproj @@ -77,11 +77,6 @@ free(vertices); return nil; } - - if( _withColorArray && ! colors ) { - NSLog(@"TextureAtlas: not enough memory"); - return nil; - } [self initIndices]; @@ -100,6 +95,8 @@ free(vertices); free(texCoordinates); free(indices); + if(_withColorArray) + free(colors); [texture release]; cocos2d/TextureAtlas.m @@ -363,7 +363,7 @@ Class restartAction() AtlasSpriteManager *mgr = (AtlasSpriteManager*) [self getChildByTag:kTagSpriteManager]; int idx = CCRANDOM_0_1() * 1400 / 100; - int x = (idx%5) * 81; + int x = (idx%5) * 85; int y = (idx/5) * 121; tests/TestAtlas.m d394115812662fb549bd0806500fc01cc5917563 ricardoquesada ricardoquesada@79afc9a6-2f50-0410-804d-6f1bdedaafc9 http://github.com/nullstyle/cocos2d-iphone/commit/40c52692c94648da2fb6368ed5ecd793ff9ff469 40c52692c94648da2fb6368ed5ecd793ff9ff469 2009-03-21T07:31:22-07:00 2009-03-21T07:31:22-07:00 fixed issue #272 git-svn-id: http://cocos2d-iphone.googlecode.com/svn/trunk@720 79afc9a6-2f50-0410-804d-6f1bdedaafc9 572d8d47c4c8ce7eaef600f98be880fa68f45b21 ricardoquesada ricardoquesada@79afc9a6-2f50-0410-804d-6f1bdedaafc9