Corrected struct property issue.
This commit is contained in:
parent
7467dd88a4
commit
d90b2b3744
3 changed files with 43 additions and 14 deletions
|
@ -39,11 +39,11 @@ namespace SpritePacker
|
|||
break;
|
||||
|
||||
// Scan along the X axis
|
||||
cspr.Area.X = 0;
|
||||
cspr.Area.Y = scanLines.Y;
|
||||
cspr.X = 0;
|
||||
cspr.Y = scanLines.Y;
|
||||
|
||||
bool foundPosition = false;
|
||||
while(cspr.Area.X < scanLines.X)
|
||||
while(cspr.X < scanLines.X)
|
||||
{
|
||||
if (!cspr.IntersectsWith(arrangedSprites))
|
||||
{
|
||||
|
@ -56,24 +56,24 @@ namespace SpritePacker
|
|||
Sprite rightProblem = problems[0];
|
||||
foreach (Sprite probSpr in problems)
|
||||
{
|
||||
if (probSpr.Area.Right > rightProblem.Area.Right)
|
||||
if (probSpr.Right > rightProblem.Right)
|
||||
rightProblem = probSpr;
|
||||
if (probSpr.Area.Top < nextScanLines.Y)
|
||||
nextScanLines.Y = probSpr.Area.Top + 1;
|
||||
if (probSpr.Top < nextScanLines.Y)
|
||||
nextScanLines.Y = probSpr.Top + 1;
|
||||
}
|
||||
|
||||
// Move up to the position furthest to the right
|
||||
// NOTE: We may need to add one here.
|
||||
cspr.Area.X = rightProblem.Area.Right + 1;
|
||||
cspr.X = rightProblem.Right + 1;
|
||||
|
||||
}
|
||||
|
||||
if (!foundPosition)
|
||||
{
|
||||
// We didn't find anything along the x axis - let's scan the y axis next
|
||||
cspr.Area.X = scanLines.X;
|
||||
cspr.Area.Y = 0;
|
||||
while (cspr.Area.Y < scanLines.Y)
|
||||
cspr.X = scanLines.X;
|
||||
cspr.Y = 0;
|
||||
while (cspr.Y < scanLines.Y)
|
||||
{
|
||||
if (!cspr.IntersectsWith(arrangedSprites))
|
||||
{
|
||||
|
@ -86,13 +86,13 @@ namespace SpritePacker
|
|||
Sprite downProblem = problems[0];
|
||||
foreach (Sprite probSpr in problems)
|
||||
{
|
||||
if (probSpr.Area.Bottom > downProblem.Area.Bottom)
|
||||
if (probSpr.Bottom > downProblem.Bottom)
|
||||
downProblem = probSpr;
|
||||
if (probSpr.Area.Left < nextScanLines.X)
|
||||
nextScanLines.X = probSpr.Area.Left + 1;
|
||||
if (probSpr.Left < nextScanLines.X)
|
||||
nextScanLines.X = probSpr.Left + 1;
|
||||
}
|
||||
// Move up to the position furthest downwards
|
||||
cspr.Area.Y = downProblem.Area.Bottom + 1;
|
||||
cspr.Y = downProblem.Bottom + 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -20,6 +20,31 @@ namespace SpritePacker
|
|||
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)
|
||||
{
|
||||
Filename = inFilename;
|
||||
|
@ -35,6 +60,7 @@ namespace SpritePacker
|
|||
if (spr.Area.Width > largestSoFar)
|
||||
largestSoFar = spr.Area.Width;
|
||||
}
|
||||
return largestSoFar;
|
||||
}
|
||||
|
||||
public List<Sprite> GetIntersectors(List<Sprite> spriteList)
|
||||
|
|
|
@ -40,4 +40,7 @@
|
|||
<Compile Include="Sprite.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Help.txt" />
|
||||
</ItemGroup>
|
||||
</Project>
|
Loading…
Reference in a new issue