Slight bugfix in new preset mode
This commit is contained in:
parent
494e8c09fa
commit
f92154b228
2 changed files with 6 additions and 3 deletions
|
@ -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;
|
||||
|
@ -129,6 +131,7 @@ namespace SpritePacker
|
|||
int.Parse(line[5])
|
||||
);
|
||||
currentSprite.Placed = true;
|
||||
if(Verbose) Console.WriteLine("Pre-placing {0}", currentSprite);
|
||||
}
|
||||
}
|
||||
spritePacker.Add(sprites);
|
||||
|
|
|
@ -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…
Reference in a new issue