stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-30 07:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed blockmap problems with straight lines along the edges of the 128 mp blocks

Browse source
This commit is contained in:
codeimp 2009-01-21 09:16:26 +00:00
parent 4bf63e93e7
commit d2265287b4
1 changed files with 82 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
Source/VisualModes/VisualBlockMap.cs
View file

@ -329,66 +329,101 @@ namespace CodeImp.DoomBuilder.VisualModes
pos = GetBlockCoordinates(v1); pos = GetBlockCoordinates(v1);
end = GetBlockCoordinates(v2); end = GetBlockCoordinates(v2);
// Add lines to this block // Horizontal straight line?
GetBlock(pos).Lines.Add(line); if(pos.Y == end.Y)
// Moving outside the block?
if(pos != end)
{ {
// Calculate current block edges // Simple loop
float cl = pos.X * BLOCK_SIZE;
float cr = (pos.X + 1) * BLOCK_SIZE;
float ct = pos.Y * BLOCK_SIZE;
float cb = (pos.Y + 1) * BLOCK_SIZE;
// Line directions
dirx = Math.Sign(v2.x - v1.x); dirx = Math.Sign(v2.x - v1.x);
for(int x = pos.X; x != end.X; x += dirx)
{
GetBlock(new Point(x, pos.Y)).Lines.Add(line);
}
GetBlock(end).Lines.Add(line);
}
// Vertical straight line?
else if(pos.X == end.X)
{
// Simple loop
diry = Math.Sign(v2.y - v1.y); diry = Math.Sign(v2.y - v1.y);
for(int y = pos.Y; y != end.Y; y += diry)
// Calculate offset and delta movement over x
if(dirx >= 0)
{ {
posx = (cr - v1.x) / (v2.x - v1.x); GetBlock(new Point(pos.X, y)).Lines.Add(line);
deltax = BLOCK_SIZE / (v2.x - v1.x);
} }
else GetBlock(end).Lines.Add(line);
}
else
{
// Add lines to this block
GetBlock(pos).Lines.Add(line);
// Moving outside the block?
if(pos != end)
{ {
// Calculate current block edges
float cl = pos.X * BLOCK_SIZE;
float cr = (pos.X + 1) * BLOCK_SIZE;
float ct = pos.Y * BLOCK_SIZE;
float cb = (pos.Y + 1) * BLOCK_SIZE;
// Line directions
dirx = Math.Sign(v2.x - v1.x);
diry = Math.Sign(v2.y - v1.y);
// Calculate offset and delta movement over x // Calculate offset and delta movement over x
posx = (v1.x - cl) / (v1.x - v2.x); if(dirx == 0)
deltax = BLOCK_SIZE / (v1.x - v2.x);
}
// Calculate offset and delta movement over y
if(diry >= 0)
{
posy = (cb - v1.y) / (v2.y - v1.y);
deltay = BLOCK_SIZE / (v2.y - v1.y);
}
else
{
posy = (v1.y - ct) / (v1.y - v2.y);
deltay = BLOCK_SIZE / (v1.y - v2.y);
}
// Continue while not reached the end
while(pos != end)
{
// Check in which direction to move
if(posx < posy)
{ {
// Move horizontally posx = float.MaxValue;
posx += deltax; deltax = float.MaxValue;
if(pos.X != end.X) pos.X += dirx; }
else if(dirx > 0)
{
posx = (cr - v1.x) / (v2.x - v1.x);
deltax = BLOCK_SIZE / (v2.x - v1.x);
} }
else else
{ {
// Move vertically // Calculate offset and delta movement over x
posy += deltay; posx = (v1.x - cl) / (v1.x - v2.x);
if(pos.Y != end.Y) pos.Y += diry; deltax = BLOCK_SIZE / (v1.x - v2.x);
} }
// Add lines to this block // Calculate offset and delta movement over y
GetBlock(pos).Lines.Add(line); if(diry == 0)
{
posy = float.MaxValue;
deltay = float.MaxValue;
}
else if(diry > 0)
{
posy = (cb - v1.y) / (v2.y - v1.y);
deltay = BLOCK_SIZE / (v2.y - v1.y);
}
else
{
posy = (v1.y - ct) / (v1.y - v2.y);
deltay = BLOCK_SIZE / (v1.y - v2.y);
}
// Continue while not reached the end
while(pos != end)
{
// Check in which direction to move
if(posx < posy)
{
// Move horizontally
posx += deltax;
if(pos.X != end.X) pos.X += dirx;
}
else
{
// Move vertically
posy += deltay;
if(pos.Y != end.Y) pos.Y += diry;
}
// Add lines to this block
GetBlock(pos).Lines.Add(line);
}
} }
} }
} }