Add support for packing spritesheets to a common divisor.

spritebuilder · Apr 20, 2015 · c180299 · c180299
1 parent 99b900a
commit c180299
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/SpriteBuilder/libs/Tupac/Tupac.h b/SpriteBuilder/libs/Tupac/Tupac.h
@@ -41,6 +41,7 @@
 @property(nonatomic,copy) NSString* directoryPrefix;
 @property(nonatomic,assign) int maxTextureSize;
 @property(nonatomic,assign) int padding;
+@property(nonatomic,assign) int divisor;
 @property(nonatomic,assign) BOOL dither;
 @property(nonatomic,assign) BOOL compress;
 @property(nonatomic,assign) BOOL trim;

diff --git a/SpriteBuilder/libs/Tupac/Tupac.mm b/SpriteBuilder/libs/Tupac/Tupac.mm
@@ -92,6 +92,7 @@ - (id)init
  self.outputFormat = TupacOutputFormatCocos2D;
  self.maxTextureSize = 2048;
  self.padding = 1;
+ self.divisor = 1;
  self.trim = YES;
  }
  return self;
@@ -210,6 +211,13 @@ + (NSRect) trimmedRectForImage:(CGImageRef)image
  return [basename stringByAppendingPathExtension:ext];
 }
 
+// Pad a size and round the result up to a multiple of the divisor
+static int
+PadSize(int size, int padding, int divisor)
+{
+ return (size + padding + divisor - 1)/divisor*divisor;
+}
+
 - (NSArray *)createTextureAtlasTrimSuffix:(NSString *)suffix
 {
  // Reset the error message
@@ -322,7 +330,7 @@ - (NSArray *)createTextureAtlasTrimSuffix:(NSString *)suffix
  BOOL packingError = NO;
  while (!packingError && !allFitted)
  {
- MaxRectsBinPack bin(outW, outH);
+ MaxRectsBinPack bin(outW - self.padding, outH - self.padding);
 
  std::vector<TPRectSize> inRects;
 
@@ -332,8 +340,8 @@ - (NSArray *)createTextureAtlasTrimSuffix:(NSString *)suffix
  NSRect trimRect = [imageInfo[@"trimRect"] rectValue];
 
  inRects.push_back(TPRectSize());
- inRects[numImages].width = (int) (trimRect.size.width + self.padding * 2);
- inRects[numImages].height = (int) (trimRect.size.height + self.padding * 2);
+ inRects[numImages].width = PadSize(trimRect.size.width, self.padding, self.divisor);
+ inRects[numImages].height = PadSize(trimRect.size.height, self.padding, self.divisor);
  inRects[numImages].idx = numImages;
 
  numImages++;