Browse Source

Slight bugfix in new preset mode

master
Starbeamrainbowlabs 1 year ago
parent
commit
f92154b228
Signed by: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com> GPG Key ID: 1BE5172E637709C2
2 changed files with 6 additions and 3 deletions
  1. 5
    2
      SpritePacker-CLI/Program.cs
  2. 1
    1
      SpritePacker/SpritePacker.cs

+ 5
- 2
SpritePacker-CLI/Program.cs View File

@@ -61,8 +61,10 @@ namespace SpritePacker
string presetFilename = args[++i];
if (File.Exists(presetFilename))
rawSourceLocations = File.ReadAllText(presetFilename);
else
else {
Console.Error.WriteLine("Warning: Couldn't find the preset csv file at {0}", presetFilename);
return 1;
}
break;
case "--csv":
outputFormat = OutputFormat.CSV;
@@ -120,7 +122,7 @@ namespace SpritePacker
// Preset some locations if they were specified
if (rawSourceLocations != null) {
foreach (string[] line in parseCSV(rawSourceLocations).Skip(1)) { // Skip the header
// index,filename,x,y,width,height
// index,filename,x,y,width,height
Sprite currentSprite = sprites.Find((Sprite item) => item.Filename == line[1]);
currentSprite.Area = new Rectangle(
int.Parse(line[2]),
@@ -129,6 +131,7 @@ namespace SpritePacker
int.Parse(line[5])
);
currentSprite.Placed = true;
if(Verbose) Console.WriteLine("Pre-placing {0}", currentSprite);
}
}
spritePacker.Add(sprites);

+ 1
- 1
SpritePacker/SpritePacker.cs View File

@@ -155,7 +155,7 @@ namespace SpritePacker
if (probSpr.Bottom > downProblem.Bottom)
downProblem = probSpr;
// If the current problem's right edge is further in than the current next scan line,
// move the enxt scan line up to meet it.
// move the next scan line up to meet it.
// Also make sure that the next scan line and the current scan line don't touch or cross.
if (probSpr.Right < nextScanLines.X && probSpr.Right > scanLines.X)
nextScanLines.X = probSpr.Right; // NOTE: Add one here?

Loading…
Cancel
Save