Compare commits

..

3 commits

6 changed files with 72 additions and 15 deletions

View file

@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012 # Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpritePacker", "SpritePacker\SpritePacker.csproj", "{6EF47B64-1920-4827-BEEF-B262D5A2D214}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpritePacker", "SpritePacker\SpritePacker.csproj", "{6EF47B64-1920-4827-BEEF-B262D5A2D214}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5C9D36DD-3962-45BF-938E-BE1E258053EC}"
ProjectSection(SolutionItems) = preProject
README.md = README.md
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86 Debug|x86 = Debug|x86
@ -14,4 +19,6 @@ Global
{6EF47B64-1920-4827-BEEF-B262D5A2D214}.Release|x86.ActiveCfg = Release|x86 {6EF47B64-1920-4827-BEEF-B262D5A2D214}.Release|x86.ActiveCfg = Release|x86
{6EF47B64-1920-4827-BEEF-B262D5A2D214}.Release|x86.Build.0 = Release|x86 {6EF47B64-1920-4827-BEEF-B262D5A2D214}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
EndGlobal EndGlobal

9
SpritePacker/Help.txt Normal file
View file

@ -0,0 +1,9 @@
SpritePacker, by Starbeamrainbowlabs
Usage:
mono ./SpritePacker.exe [flags] [filenames]
--help Shows this help message.
--version Shows the version information.
More information can be found at https://git.starbeamrainbowlabs.com/sbrl/SpritePacker

View file

@ -39,11 +39,11 @@ namespace SpritePacker
break; break;
// Scan along the X axis // Scan along the X axis
cspr.Area.X = 0; cspr.X = 0;
cspr.Area.Y = scanLines.Y; cspr.Y = scanLines.Y;
bool foundPosition = false; bool foundPosition = false;
while(cspr.Area.X < scanLines.X) while(cspr.X < scanLines.X)
{ {
if (!cspr.IntersectsWith(arrangedSprites)) if (!cspr.IntersectsWith(arrangedSprites))
{ {
@ -56,24 +56,24 @@ namespace SpritePacker
Sprite rightProblem = problems[0]; Sprite rightProblem = problems[0];
foreach (Sprite probSpr in problems) foreach (Sprite probSpr in problems)
{ {
if (probSpr.Area.Right > rightProblem.Area.Right) if (probSpr.Right > rightProblem.Right)
rightProblem = probSpr; rightProblem = probSpr;
if (probSpr.Area.Top < nextScanLines.Y) if (probSpr.Top < nextScanLines.Y)
nextScanLines.Y = probSpr.Area.Top + 1; nextScanLines.Y = probSpr.Top + 1;
} }
// Move up to the position furthest to the right // Move up to the position furthest to the right
// NOTE: We may need to add one here. // NOTE: We may need to add one here.
cspr.Area.X = rightProblem.Area.Right + 1; cspr.X = rightProblem.Right + 1;
} }
if (!foundPosition) if (!foundPosition)
{ {
// We didn't find anything along the x axis - let's scan the y axis next // We didn't find anything along the x axis - let's scan the y axis next
cspr.Area.X = scanLines.X; cspr.X = scanLines.X;
cspr.Area.Y = 0; cspr.Y = 0;
while (cspr.Area.Y < scanLines.Y) while (cspr.Y < scanLines.Y)
{ {
if (!cspr.IntersectsWith(arrangedSprites)) if (!cspr.IntersectsWith(arrangedSprites))
{ {
@ -86,13 +86,13 @@ namespace SpritePacker
Sprite downProblem = problems[0]; Sprite downProblem = problems[0];
foreach (Sprite probSpr in problems) foreach (Sprite probSpr in problems)
{ {
if (probSpr.Area.Bottom > downProblem.Area.Bottom) if (probSpr.Bottom > downProblem.Bottom)
downProblem = probSpr; downProblem = probSpr;
if (probSpr.Area.Left < nextScanLines.X) if (probSpr.Left < nextScanLines.X)
nextScanLines.X = probSpr.Area.Left + 1; nextScanLines.X = probSpr.Left + 1;
} }
// Move up to the position furthest downwards // Move up to the position furthest downwards
cspr.Area.Y = downProblem.Area.Bottom + 1; cspr.Y = downProblem.Bottom + 1;
} }
} }

View file

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows.Markup; using System.Windows.Markup;
using System.IO; using System.IO;
using System.Reflection;
namespace SpritePacker namespace SpritePacker
{ {
@ -15,7 +16,18 @@ namespace SpritePacker
switch(args[i]) switch(args[i])
{ {
case "--help": case "--help":
Console.WriteLine("Help text coming soon!"); /*
string[] resFiles = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceNames();
foreach (string str in resFiles)
Console.WriteLine("[{0}]", str);
*/
Assembly asm = Assembly.GetExecutingAssembly();
Stream stream = asm.GetManifestResourceStream("SpritePacker.Help.txt");
StreamReader source = new StreamReader(stream);
Console.Write(source.ReadToEnd());
source.Dispose();
stream.Dispose();
return; return;
case "--version": case "--version":
Console.WriteLine("Version text coming soon!"); Console.WriteLine("Version text coming soon!");

View file

@ -20,6 +20,31 @@ namespace SpritePacker
set { filename = value; } set { filename = value; }
} }
public int X
{
get { return area.X; }
set { area.X = value; }
}
public int Y
{
get { return area.Y; }
set { area.Y = value; }
}
public int Width
{
get { return area.Width; }
set { area.Width = value; }
}
public int Height
{
get { return area.Height; }
set { area.Height = value; }
}
public int Top { get { return area.Top; } }
public int Bottom { get { return area.Bottom; } }
public int Left { get { return area.Left; } }
public int Right { get { return area.Right; } }
public Sprite(string inFilename) public Sprite(string inFilename)
{ {
Filename = inFilename; Filename = inFilename;
@ -35,6 +60,7 @@ namespace SpritePacker
if (spr.Area.Width > largestSoFar) if (spr.Area.Width > largestSoFar)
largestSoFar = spr.Area.Width; largestSoFar = spr.Area.Width;
} }
return largestSoFar;
} }
public List<Sprite> GetIntersectors(List<Sprite> spriteList) public List<Sprite> GetIntersectors(List<Sprite> spriteList)

View file

@ -40,4 +40,7 @@
<Compile Include="Sprite.cs" /> <Compile Include="Sprite.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<EmbeddedResource Include="Help.txt" />
</ItemGroup>
</Project> </Project>