Use correct resources in ui elements.

spritebuilder · Apr 14, 2015 · e795d1d · e795d1d
1 parent c97cf6a
commit e795d1d
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 59 deletions.
diff --git a/SpriteBuilder/CCButton/CCBPProperties.plist b/SpriteBuilder/CCButton/CCBPProperties.plist
@@ -127,7 +127,7 @@
  <key>default</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonNormal.png</string>
+ <string>Resources/ButtonNormal.png</string>
  </array>
  <key>affectsProperties</key>
  <array>
@@ -222,7 +222,7 @@
  <key>default</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonHighlighted.png</string>
+ <string>Resources/ButtonHighlighted.png</string>
  </array>
  <key>affectsProperties</key>
  <array>
@@ -310,7 +310,7 @@
  <key>default</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonNormal.png</string>
+ <string>Resources/ButtonNormal.png</string>
  </array>
  <key>affectsProperties</key>
  <array>
@@ -403,7 +403,7 @@
  <key>default</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonNormal.png</string>
+ <string>Resources/ButtonNormal.png</string>
  </array>
  <key>affectsProperties</key>
  <array>

diff --git a/SpriteBuilder/CCParticleSystem/CCBPProperties.plist b/SpriteBuilder/CCParticleSystem/CCBPProperties.plist
@@ -367,7 +367,7 @@
  <key>saveInTemplate</key>
  <true/>
  <key>default</key>
- <string>ccbResources/ccbParticleFire.png</string>
+ <string>Resources/ParticleFire.png</string>
  <key>displayName</key>
  <string>Texture</string>
  <key>name</key>

diff --git a/SpriteBuilder/CCSlider/CCBPProperties.plist b/SpriteBuilder/CCSlider/CCBPProperties.plist
@@ -82,7 +82,7 @@
  <key>default</key>
  <array>
  <string></string>
- <string>ccbResources/ccbSliderBgNormal.png</string>
+ <string>Resources/SliderBgNormal.png</string>
  </array>
  <key>affectsProperties</key>
  <array>
@@ -99,7 +99,7 @@
  <key>default</key>
  <array>
  <string></string>
- <string>ccbResources/ccbSliderHandle.png</string>
+ <string>Resources/SliderHandle.png</string>
  </array>
  <key>affectsProperties</key>
  <array>
@@ -126,7 +126,7 @@
  <key>default</key>
  <array>
  <string></string>
- <string>ccbResources/ccbSliderBgHighlighted.png</string>
+ <string>Resources/SliderBgHighlighted.png</string>
  </array>
  <key>affectsProperties</key>
  <array>

diff --git a/SpriteBuilder/CCTextField/CCBPProperties.plist b/SpriteBuilder/CCTextField/CCBPProperties.plist
@@ -82,7 +82,7 @@
  <key>default</key>
  <array>
  <string></string>
- <string>ccbResources/ccbTextField.png</string>
+ <string>Resources/TextField.png</string>
  </array>
  <key>affectsProperties</key>
  <array>

diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m
@@ -200,7 +200,7 @@ - (void)testNodeGraphFromDocumentDict_sprite
  CCSprite *sprite = container.children[0];
  XCTAssertTrue([container.children[0] isKindOfClass:[CCSprite class]]);
 
- XCTAssertEqualObjects([sprite.userObject extraProps][@"spriteFrame"], @"ccbResources/ccbParticleSnow.png");
+ XCTAssertEqualObjects([sprite.userObject extraProps][@"spriteFrame"], @"Resources/ParticleSnow.png");
 
  [self assertColor:[sprite color] red:1.0 green:0.0 blue:0.66666 alpha:0.5];
 
@@ -309,7 +309,7 @@ - (void)testNodeGraphFromDocumentDict_particlesystemGravityMode
 
  XCTAssertEqual(particleSystem.emitterMode, CCParticleSystemModeGravity);
 
- XCTAssertEqualObjects([particleSystem.userObject extraProps][@"texture"], @"ccbResources/ccbParticleFire.png");
+ XCTAssertEqualObjects([particleSystem.userObject extraProps][@"texture"], @"Resources/ParticleFire.png");
 
  [self assertPoint:particleSystem.posVar x:40.0 y:20.0];
 
@@ -398,10 +398,10 @@ - (void)testNodeGraphFromDocumentDict_button
  XCTAssertEqualWithAccuracy([button labelOpacityForState:CCControlStateDisabled], 1.87, 0.001);
  XCTAssertEqualWithAccuracy([button labelOpacityForState:CCControlStateSelected], 0.7, 0.001);
 
- XCTAssertEqualObjects([button.userObject extraProps][@"backgroundSpriteFrame|Normal"], @"ccbResources/ccbButtonNormal.png");
- XCTAssertEqualObjects([button.userObject extraProps][@"backgroundSpriteFrame|Disabled"], @"ccbResources/ccbButtonNormal.png");
- XCTAssertEqualObjects([button.userObject extraProps][@"backgroundSpriteFrame|Selected"], @"ccbResources/ccbButtonNormal.png");
- XCTAssertEqualObjects([button.userObject extraProps][@"backgroundSpriteFrame|Highlighted"], @"ccbResources/ccbButtonHighlighted.png");
+ XCTAssertEqualObjects([button.userObject extraProps][@"backgroundSpriteFrame|Normal"], @"Resources/ButtonNormal.png");
+ XCTAssertEqualObjects([button.userObject extraProps][@"backgroundSpriteFrame|Disabled"], @"Resources/ButtonNormal.png");
+ XCTAssertEqualObjects([button.userObject extraProps][@"backgroundSpriteFrame|Selected"], @"Resources/ButtonNormal.png");
+ XCTAssertEqualObjects([button.userObject extraProps][@"backgroundSpriteFrame|Highlighted"], @"Resources/ButtonHighlighted.png");
 
  XCTAssertEqualObjects([button.userObject extraProps][@"continuous"], @YES);
  XCTAssertEqualObjects([button.userObject extraProps][@"block"], @"doit");
@@ -425,7 +425,7 @@ - (void)testNodeGraphFromDocumentDict_textfield
  XCTAssertEqualObjects([textField.userObject extraProps][@"userInteractionEnabled"], @1);
  XCTAssertEqualObjects([textField.userObject extraProps][@"padding"], @7);
  XCTAssertEqualObjects([textField.userObject extraProps][@"paddingType"], @0);
- XCTAssertEqualObjects([textField.userObject extraProps][@"backgroundSpriteFrame"], @"ccbResources/ccbTextField.png");
+ XCTAssertEqualObjects([textField.userObject extraProps][@"backgroundSpriteFrame"], @"Resources/TextField.png");
 }
 
 // FAILING until blendMode is available in bmfont class
@@ -446,12 +446,12 @@ - (void)testNodeGraphFromDocumentDict_slider
  CCSlider *slider = node.children[0];
  XCTAssertTrue([node.children[0] isKindOfClass:[CCSlider class]]);
 
- XCTAssertEqualObjects([slider.userObject extraProps][@"backgroundSpriteFrame|Disabled"], @"ccbResources/ccbParticleSmoke.png");
- XCTAssertEqualObjects([slider.userObject extraProps][@"backgroundSpriteFrame|Highlighted"], @"ccbResources/ccbParticleStars.png");
- XCTAssertEqualObjects([slider.userObject extraProps][@"backgroundSpriteFrame|Normal"], @"ccbResources/ccbSliderBgNormal.png");
- XCTAssertEqualObjects([slider.userObject extraProps][@"handleSpriteFrame|Disabled"], @"ccbResources/ccbParticleStars.png");
- XCTAssertEqualObjects([slider.userObject extraProps][@"handleSpriteFrame|Highlighted"], @"ccbResources/ccbTextField.png");
- XCTAssertEqualObjects([slider.userObject extraProps][@"handleSpriteFrame|Normal"], @"ccbResources/ccbSliderHandle.png");
+ XCTAssertEqualObjects([slider.userObject extraProps][@"backgroundSpriteFrame|Disabled"], @"Resources/ParticleSmoke.png");
+ XCTAssertEqualObjects([slider.userObject extraProps][@"backgroundSpriteFrame|Highlighted"], @"Resources/ParticleStars.png");
+ XCTAssertEqualObjects([slider.userObject extraProps][@"backgroundSpriteFrame|Normal"], @"Resources/SliderBgNormal.png");
+ XCTAssertEqualObjects([slider.userObject extraProps][@"handleSpriteFrame|Disabled"], @"Resources/ParticleStars.png");
+ XCTAssertEqualObjects([slider.userObject extraProps][@"handleSpriteFrame|Highlighted"], @"Resources/TextField.png");
+ XCTAssertEqualObjects([slider.userObject extraProps][@"handleSpriteFrame|Normal"], @"Resources/SliderHandle.png");
 }
 
 - (void)testNodeGraphFromDocumentDict_scrollview

diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBPublisher_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCBPublisher_Tests.m
@@ -104,8 +104,8 @@ - (void)testPublishingProject
  for (NSNumber *resolution in @[@(1), @(2), @(4)])
  {
  [self assertFilesExistRelativeToDirectory:@"Published-iOS" filesPaths:@[
- [NSString stringWithFormat:@"ccbResources/ccbButtonHighlighted%@.png", [resolution resolutionTag]],
- [NSString stringWithFormat:@"ccbResources/ccbButtonHighlighted2%@.png", [resolution resolutionTag]],
+ [NSString stringWithFormat:@"Resources/ButtonHighlighted%@.png", [resolution resolutionTag]],
+ [NSString stringWithFormat:@"Resources/ButtonHighlighted2%@.png", [resolution resolutionTag]],
  [NSString stringWithFormat:@"photoshop%@.png", [resolution resolutionTag]]
  ]];
  }
@@ -125,12 +125,12 @@ - (void)testPublishingProject
  [self assertRenamingRuleInfFileLookup:@"Published-iOS/fileLookup.plist" originalName:@"blank.wav" renamedName:@"blank.caf"];
  [self assertRenamingRuleInfFileLookup:@"Published-iOS/fileLookup.plist" originalName:@"photoshop.psd" renamedName:@"photoshop.png"];
 
- [self assertPNGAtPath:@"Published-iOS/ccbResources/ccbButtonHighlighted-1x.png" hasWidth:1 hasHeight:3];
- [self assertPNGAtPath:@"Published-iOS/ccbResources/ccbButtonHighlighted2-1x.png" hasWidth:5 hasHeight:2];
- [self assertPNGAtPath:@"Published-iOS/ccbResources/ccbButtonHighlighted-2x.png" hasWidth:2 hasHeight:6];
- [self assertPNGAtPath:@"Published-iOS/ccbResources/ccbButtonHighlighted2-2x.png" hasWidth:10 hasHeight:4];
- [self assertPNGAtPath:@"Published-iOS/ccbResources/ccbButtonHighlighted-4x.png" hasWidth:4 hasHeight:12];
- [self assertPNGAtPath:@"Published-iOS/ccbResources/ccbButtonHighlighted2-4x.png" hasWidth:20 hasHeight:8];
+ [self assertPNGAtPath:@"Published-iOS/Resources/ButtonHighlighted-1x.png" hasWidth:1 hasHeight:3];
+ [self assertPNGAtPath:@"Published-iOS/Resources/ButtonHighlighted2-1x.png" hasWidth:5 hasHeight:2];
+ [self assertPNGAtPath:@"Published-iOS/Resources/ButtonHighlighted-2x.png" hasWidth:2 hasHeight:6];
+ [self assertPNGAtPath:@"Published-iOS/Resources/ButtonHighlighted2-2x.png" hasWidth:10 hasHeight:4];
+ [self assertPNGAtPath:@"Published-iOS/Resources/ButtonHighlighted-4x.png" hasWidth:4 hasHeight:12];
+ [self assertPNGAtPath:@"Published-iOS/Resources/ButtonHighlighted2-4x.png" hasWidth:20 hasHeight:8];
 
  [self assertFileDoesNotExist:@"Published-iOS/Package.plist"];
 }

diff --git a/SpriteBuilder/SpriteBuilder Tests/ProjectSettings_Tests.m b/SpriteBuilder/SpriteBuilder Tests/ProjectSettings_Tests.m
@@ -160,51 +160,51 @@ - (void)testInitWithDictionary
  @"":@{
  @"previewFolderHidden":@(YES)
  },
- @"ccbResources/ccbSliderBgHighlighted.png":@{
+ @"Resources/SliderBgHighlighted.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
- @"ccbResources/ccbButtonHighlighted.png":@{
+ @"Resources/ButtonHighlighted.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
  @"Sprites" : @{},
- @"ccbResources/ccbSliderBgNormal.png":@{
+ @"Resources/SliderBgNormal.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
- @"ccbResources/ccbTextField.png":@{
+ @"Resources/TextField.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
- @"ccbResources/ccbParticleFire.png":@{
+ @"Resources/ParticleFire.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
  @"ccbResources":@{
  @"previewFolderHidden":@(YES)
  },
- @"ccbResources/ccbParticleMagic.png":@{
+ @"Resources/ParticleMagic.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
- @"ccbResources/ccbButtonNormal.png":@{
+ @"Resources/ButtonNormal.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
- @"ccbResources/ccbParticleStars.png":@{
+ @"Resources/ParticleStars.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
- @"ccbResources/ccbSliderHandle.png":@{
+ @"Resources/SliderHandle.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
- @"ccbResources/ccbParticleSmoke.png":@{
+ @"Resources/ParticleSmoke.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  },
- @"ccbResources/ccbParticleSnow.png":@{
+ @"Resources/ParticleSnow.png":@{
  RESOURCE_PROPERTY_IMAGE_SCALE_FROM:@(2),
  RESOURCE_PROPERTY_IMAGE_USEUISCALE:@(YES)
  }
@@ -259,10 +259,10 @@ - (void)testInitWithDictionary
  XCTAssertFalse(project.publishToZipFile);
  XCTAssertEqual(project.publishEnvironment, kCCBPublishEnvironmentDevelop);
 
- NSNumber *scaleFrom = [project propertyForRelPath:@"ccbResources/ccbSliderBgNormal.png" andKey:RESOURCE_PROPERTY_IMAGE_SCALE_FROM];
+ NSNumber *scaleFrom = [project propertyForRelPath:@"Resources/SliderBgNormal.png" andKey:RESOURCE_PROPERTY_IMAGE_SCALE_FROM];
  XCTAssertTrue([scaleFrom isEqualToNumber:@(2)]);
 
- NSNumber *useUIScale = [project propertyForRelPath:@"ccbResources/ccbSliderBgNormal.png" andKey:RESOURCE_PROPERTY_IMAGE_USEUISCALE];
+ NSNumber *useUIScale = [project propertyForRelPath:@"Resources/SliderBgNormal.png" andKey:RESOURCE_PROPERTY_IMAGE_USEUISCALE];
  XCTAssertTrue([useUIScale boolValue]);
 }
 

diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_button.sb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_button.sb
@@ -190,7 +190,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonNormal.png</string>
+ <string>Resources/ButtonNormal.png</string>
  </array>
  </dict>
  <dict>
@@ -243,7 +243,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonHighlighted.png</string>
+ <string>Resources/ButtonHighlighted.png</string>
  </array>
  </dict>
  <dict>
@@ -296,7 +296,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonNormal.png</string>
+ <string>Resources/ButtonNormal.png</string>
  </array>
  </dict>
  <dict>
@@ -349,7 +349,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonNormal.png</string>
+ <string>Resources/ButtonNormal.png</string>
  </array>
  </dict>
  <dict>

diff --git a/...eBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_migration_version_4_to_5.sb b/...eBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_migration_version_4_to_5.sb
@@ -441,7 +441,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonNormal.png</string>
+ <string>Resources/ButtonNormal.png</string>
  </array>
  </dict>
  <dict>

diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_gravity.sb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_gravity.sb
@@ -322,7 +322,7 @@
  <key>type</key>
  <string>Texture</string>
  <key>value</key>
- <string>ccbResources/ccbParticleFire.png</string>
+ <string>Resources/ParticleFire.png</string>
  </dict>
  </array>
  <key>selected</key>

diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_radial.sb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_radial.sb
@@ -311,7 +311,7 @@
  <key>type</key>
  <string>Texture</string>
  <key>value</key>
- <string>ccbResources/ccbParticleFire.png</string>
+ <string>Resources/ParticleFire.png</string>
  </dict>
  </array>
  <key>selected</key>

diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_slider.sb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_slider.sb
@@ -142,7 +142,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbSliderBgNormal.png</string>
+ <string>Resources/SliderBgNormal.png</string>
  </array>
  </dict>
  <dict>
@@ -153,7 +153,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbSliderHandle.png</string>
+ <string>Resources/SliderHandle.png</string>
  </array>
  </dict>
  <dict>
@@ -164,7 +164,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbParticleStars.png</string>
+ <string>Resources/ParticleStars.png</string>
  </array>
  </dict>
  <dict>
@@ -175,7 +175,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbTextField.png</string>
+ <string>Resources/TextField.png</string>
  </array>
  </dict>
  <dict>
@@ -186,7 +186,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbParticleSmoke.png</string>
+ <string>Resources/ParticleSmoke.png</string>
  </array>
  </dict>
  <dict>
@@ -197,7 +197,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbParticleStars.png</string>
+ <string>Resources/ParticleStars.png</string>
  </array>
  </dict>
  </array>

diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite.sb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite.sb
@@ -110,7 +110,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbParticleSnow.png</string>
+ <string>Resources/ParticleSnow.png</string>
  </array>
  </dict>
  <dict>

diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite9slice.sb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite9slice.sb
@@ -123,7 +123,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbButtonNormal.png</string>
+ <string>Resources/ButtonNormal.png</string>
  </array>
  </dict>
  <dict>

diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_textfield.sb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_textfield.sb
@@ -142,7 +142,7 @@
  <key>value</key>
  <array>
  <string></string>
- <string>ccbResources/ccbTextField.png</string>
+ <string>Resources/TextField.png</string>
  </array>
  </dict>
  <dict>