Skip to content

Commit b1228d5

Browse files
committed
Forgot to add a test and some cleanup.
1 parent f14c4f5 commit b1228d5

File tree

2 files changed

+38
-8
lines changed

2 files changed

+38
-8
lines changed

cocos2d-ui-tests/tests/CCRendererTest.m

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,36 @@ - (void)setupProgressNodeTest
340340
[timer repeatOnceWithInterval:interval];
341341
} delay:interval];
342342
}
343+
344+
{
345+
NSString *image = @"Tiles/05.png";
346+
CGPoint position = ccp(0.5, 3.0/8.0);
347+
348+
CCSprite *sprite = [CCSprite spriteWithImageNamed:image];
349+
sprite.positionType = CCPositionTypeNormalized;
350+
sprite.position = position;
351+
sprite.color = [CCColor grayColor];
352+
[self.contentNode addChild:sprite];
353+
354+
CCProgressNode *progress = [CCProgressNode progressWithSprite:[CCSprite spriteWithImageNamed:image]];
355+
progress.type = CCProgressNodeTypeBar;
356+
progress.midpoint = ccp(0.5, 0.5);
357+
progress.barChangeRate = ccp(1, 1);
358+
progress.positionType = CCPositionTypeNormalized;
359+
progress.position = position;
360+
progress.percentage = 50;
361+
[self.contentNode addChild:progress];
362+
363+
[self scheduleBlock:^(CCTimer *timer) {
364+
progress.sprite = [CCSprite spriteWithImageNamed:@"Tiles/06.png"];
365+
[timer repeatOnceWithInterval:1.0];
366+
} delay:0.5];
367+
368+
[self scheduleBlock:^(CCTimer *timer) {
369+
progress.sprite = [CCSprite spriteWithImageNamed:@"Tiles/05.png"];
370+
[timer repeatOnceWithInterval:1.0];
371+
} delay:1.0];
372+
}
343373
}
344374

345375
- (void)setupDrawNodeTest

cocos2d/CCProgressNode.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ -(id)initWithSprite:(CCSprite*) sprite
9393
self.barChangeRate = ccp(1, 1);
9494
self.sprite = sprite;
9595

96-
_dirtyVertexData = NO;
97-
_needsUpdateProgress = YES;
98-
96+
_dirtyVertexData = NO;
97+
_needsUpdateProgress = YES;
98+
9999
// shader program
100100
self.shaderProgram = [[CCShaderCache sharedShaderCache] programForKey:kCCShader_PositionTextureColor];
101101
}
@@ -222,12 +222,12 @@ -(void)updateProgress
222222
if (_dirtyVertexData){
223223
// remove the vertex data if the type, direction, or sprite have changed
224224
if (_vertexData) {
225-
free(_vertexData);
226-
_vertexData = NULL;
227-
_vertexDataCount = 0;
225+
free(_vertexData);
226+
_vertexData = NULL;
227+
_vertexDataCount = 0;
228228
}
229-
_dirtyVertexData = NO;
230-
}
229+
_dirtyVertexData = NO;
230+
}
231231

232232
switch (_type) {
233233
case CCProgressNodeTypeRadial:

0 commit comments

Comments
 (0)