elias/OSCADSharpDotnet7
1
0
Fork 0
mirror of https://github.com/eliasstepanik/OSCADSharpDotnet7.git synced 2026-01-27 12:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple of off by one errors on CubistImageProcessor

Browse Source
This commit is contained in:
Michael Smith 2016-05-15 21:10:54 -07:00
parent ff27687980
commit 79c7828817
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OSCADSharp/OSCADSharp/Solids/Imported/CubistImageProcessor.cs
View File

@ -35,7 +35,7 @@ namespace OSCADSharp.Solids.Imported
public OSCADObject ProcessImage() public OSCADObject ProcessImage()
{ {
this.cubes = this.processImage(); this.cubes = this.processImage();
OSCADObject obj = new OSCADObject.MultiStatementObject("union()", cubes); OSCADObject obj = new OSCADObject.MultiStatementObject("union()", cubes);
return obj.Scale(1, -1, 1).Translate(0, ImageBounds.Width, 0); return obj.Scale(1, -1, 1).Translate(0, ImageBounds.Width, 0);
} }
@ -45,7 +45,7 @@ namespace OSCADSharp.Solids.Imported
Bitmap img = new Bitmap(Image.FromFile(this.imagePath)); Bitmap img = new Bitmap(Image.FromFile(this.imagePath));
this.setPixelArray(img); this.setPixelArray(img);
this.setHeightMappings(img); this.setHeightMappings(img);
this.ImageBounds = new Bounds(new Vector3(), new Vector3(img.Width, img.Height, 1)); this.ImageBounds = new Bounds(new Vector3(), new Vector3(img.Width, img.Height, 1));
List<OSCADObject> cubes = new List<OSCADObject>(); List<OSCADObject> cubes = new List<OSCADObject>();
bool[,] visited = new bool[img.Width, img.Height]; bool[,] visited = new bool[img.Width, img.Height];
@ -66,7 +66,7 @@ namespace OSCADSharp.Solids.Imported
{ {
cube.Size.Z = heightMappings[color]; cube.Size.Z = heightMappings[color];
} }
string cubeColor = String.Format("[{0}, {1}, {2}]", color.R == 0 ? 0 : color.R / 255.0, color.G == 0 ? 0 : color.G / 255.0, color.B == 0 ? 0 : color.B / 255.0); string cubeColor = String.Format("[{0}, {1}, {2}]", color.R == 0 ? 0 : color.R / 255.0, color.G == 0 ? 0 : color.G / 255.0, color.B == 0 ? 0 : color.B / 255.0);
cubes.Add(cube.Translate(((Point)start).X, ((Point)start).Y, 0) cubes.Add(cube.Translate(((Point)start).X, ((Point)start).Y, 0)
.Color(cubeColor, color.A)); .Color(cubeColor, color.A));
@ -113,11 +113,11 @@ namespace OSCADSharp.Solids.Imported
private void markVisited(ref bool[,] visited, Cube cube, Point start, Bitmap img) private void markVisited(ref bool[,] visited, Cube cube, Point start, Bitmap img)
{ {
var bounds = cube.Bounds(); var bounds = cube.Bounds();
for (int column = start.X; column < start.X + bounds.Width; column++) for (int x = start.X; x < start.X + bounds.Width && x < img.Width; x++)
{ {
for (int row = start.Y; row < start.Y + bounds.Length; row++) for (int y = start.Y; y < start.Y + bounds.Length && y < img.Height; y++)
{ {
visited[column, row] = true; visited[x, y] = true;
} }
} }
} }
@ -136,15 +136,11 @@ namespace OSCADSharp.Solids.Imported
pixelCanBeTraversed(img, ref visited, new Point(start.X, start.Y + 1), color); pixelCanBeTraversed(img, ref visited, new Point(start.X, start.Y + 1), color);
} }
if (canTraverse) if (canTraverse)
{ {
if (cube == null) if (cube == null)
{ {
cube = new Cube(); cube = new Cube();
cube.Size.X += 1;
cube.Size.Y += 1;
return traverseNext(img, start, ref visited, color, cube); return traverseNext(img, start, ref visited, color, cube);
} }
else else
@ -172,17 +168,17 @@ namespace OSCADSharp.Solids.Imported
private void canContinueTraversal(Bitmap img, ref Point start, ref bool[,] visited, Color color, Cube cube, ref bool canTraverse) private void canContinueTraversal(Bitmap img, ref Point start, ref bool[,] visited, Color color, Cube cube, ref bool canTraverse)
{ {
var bounds = cube.Bounds(); var bounds = cube.Bounds();
for (int column = start.X; column < start.X + bounds.Width && canTraverse; column++) for (int x = start.X; x < start.X + bounds.Width+1 && canTraverse; x++)
{ {
for (int row = start.Y; row < start.Y + bounds.Length && canTraverse; row++) for (int y = start.Y; y < start.Y + bounds.Length+1 && canTraverse; y++)
{ {
if (start.X + column >= img.Width || start.Y + row >= img.Height) if (x >= img.Width || y >= img.Height)
{ {
canTraverse = false; canTraverse = false;
} }
else else
{ {
canTraverse = canTraverse && pixelCanBeTraversed(img, ref visited, new Point(column, row), color); canTraverse = canTraverse && pixelCanBeTraversed(img, ref visited, new Point(x, y), color);
} }
} }
} }
@ -198,9 +194,9 @@ namespace OSCADSharp.Solids.Imported
private Point? getNextPoint(Bitmap img, ref bool[,] visited, int width, int height) private Point? getNextPoint(Bitmap img, ref bool[,] visited, int width, int height)
{ {
int rowStart = this.scannedRows; int rowStart = this.scannedRows;
for (int row = rowStart; row < height; row++) for (int row = rowStart; row <= height; row++)
{ {
for (int column = 0; column < width; column++) for (int column = 0; column <= width; column++)
{ {
if (visited[column, row] == false) if (visited[column, row] == false)
{ {
@ -217,3 +213,4 @@ namespace OSCADSharp.Solids.Imported
#endregion #endregion
} }
} }