diff --git a/data/rastertest.data b/data/rastertest.data index df02eca..fbb0b74 100644 Binary files a/data/rastertest.data and b/data/rastertest.data differ diff --git a/readme.txt b/readme.txt index 5382165..a650793 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ ======================================================= -Welcome to the Jakly Polygon Rasterization Suite v1.0.1 +Welcome to the Jakly Polygon Rasterization Suite v1.0.2 Or uh, polyrastertest as I like to call it. ...Just call it polyrastertest. diff --git a/source/main.cpp b/source/main.cpp index bd65e18..c033f02 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -661,7 +661,7 @@ int main() showresults = (mode >= 2); bool errorfound; - showresults |= errorfound = test((!(Tests[iteration].PolyAttr & Opaque) || (Tests[iteration].ExtendedTestData > 0)), Tests[iteration].ColorMode); + showresults |= errorfound = test(((!(Tests[iteration].PolyAttr & Opaque)) || (Tests[iteration].ExtendedTestData > 0)), Tests[iteration].ColorMode); if (!TestCompletionTracker[iteration]) { @@ -701,7 +701,7 @@ int main() printf("Ver. "); printf(Version); - record(dat, (!(Tests[iteration].PolyAttr & Opaque) || (Tests[iteration].ExtendedTestData > 0)), Tests[iteration].ColorMode); + record(dat, ((!(Tests[iteration].PolyAttr & Opaque)) || (Tests[iteration].ExtendedTestData > 0)), Tests[iteration].ColorMode); iteration++; } } diff --git a/source/main.h b/source/main.h index 013ad57..88624a1 100644 --- a/source/main.h +++ b/source/main.h @@ -4,7 +4,7 @@ // Misc constexpr u8 NumVerts = 4; constexpr u8 NumAxis = 3; -constexpr char Version[] = "1.0.1"; +constexpr char Version[] = "1.0.2"; // Poly Attributes constexpr u32 Opaque = (31 << 16); @@ -30,7 +30,7 @@ constexpr u16 ColorWrongTex = 0b111110000000000; // blue constexpr u16 ColorVoid = 0b000000000000000; // black // only increment if the actual tests change, (only do on releases?) -constexpr u16 DataVersion = 1; +constexpr u16 DataVersion = 2; struct TestData { @@ -182,37 +182,49 @@ constexpr TestData Tests[] = // Sub Cat: The Curse of Edge Marking --------------------- - // Edge Marking + overlapping edges? - I-- what? + // Edge Marking + overlapping edges - I-- what? {.Vertices = {{-32, -32}, {32, -32}, {32, 16}, {-512}}, + .PolyAttr = Opaque | POLY_CULL_NONE | PolyID(1), .Disp3DCnt = GL_OUTLINE, .OutlineColors = {0b000001111100000}, .ColorMode = 2, .ExtendedTestData = 1}, - // Uhhh ok does it still happen with different poly IDs? - Yes. - {.Vertices = {{-32, -32}, {32, -32}, {32, 16}, {-512}}, - .PolyAttr = Opaque | POLY_CULL_NONE | PolyID(1), + // Mirrored horizontally? - + {.Vertices = {{32, -32}, {-32, -32}, {-32, 16}, {-512}}, .Disp3DCnt = GL_OUTLINE, .OutlineColors = {0b000001111100000}, .ColorMode = 2, - .ExtendedTestData = 1}, - // oook, what if the fill rules are swapped? - + .ExtendedTestData = 5}, + // oook, what if the fill rules are swapped? - No {.Vertices = {{-32, 32}, {32, 32}, {32, -16}, {-512}}, .Disp3DCnt = GL_OUTLINE, .OutlineColors = {0b000001111100000}, .ColorMode = 2, .ExtendedTestData = 2}, - // what if they're both supposed to fill? - + // what if they're both supposed to fill? - No {.Vertices = {{-32, 32}, {32, 32}, {32, -16}, {-512}}, .Disp3DCnt = GL_OUTLINE, .OutlineColors = {0b000001111100000}, .ColorMode = 2, .ExtendedTestData = 3}, - // what about neither? - + // what about neither? - No {.Vertices = {{-32, -32}, {32, -32}, {32, 16}, {-512}}, .Disp3DCnt = GL_OUTLINE, .OutlineColors = {0b000001111100000}, .ColorMode = 2, .ExtendedTestData = 4}, + // Bottom? - Yes + {.Vertices = {{-32, -32}, {32, -32}, {32, -64}, {-32, -64}}, + .Disp3DCnt = GL_OUTLINE, + .OutlineColors = {0b000001111100000}, + .ColorMode = 2, + .ExtendedTestData = 6}, + // Top? - No...? + {.Vertices = {{-32, 32}, {32, 32}, {32, 64}, {-32, 64}}, + .Disp3DCnt = GL_OUTLINE, + .OutlineColors = {0b000001111100000}, + .ColorMode = 2, + .ExtendedTestData = 6}, // Category: Vertical Right Edge Shift ======================= @@ -284,6 +296,11 @@ constexpr TestData Tests[] = .Disp3DCnt = GL_OUTLINE, .OutlineColors = {0b000000000011111}, .ColorMode = 2}, + // Basic Triangle + {.Vertices = {{-32, -32}, {32, -32}, {0, 16}, {-512}}, + .Disp3DCnt = GL_OUTLINE, + .OutlineColors = {0b000000000011111}, + .ColorMode = 2}, // Category: Fog ============================================= @@ -381,7 +398,19 @@ constexpr ExtTestData ExtendedTests[] = .VertexColors{ColorMissing, ColorMissing, ColorMissing, ColorMissing}}}}, // ext 4 {.NumPolygons = 1, - .Polygons = {{.Vertices = {{-32, -30, -16}, {-32, -32, -16}, {32, 32, -16}, {32, 34, -16}}, + .Polygons = {{.Vertices = {{-31, -30, -16}, {-31, -32, -16}, {33, 32, -16}, {33, 34, -16}}, + .VertexColors{ColorMissing, ColorMissing, ColorMissing, ColorMissing}}}}, + // ext 5 + {.NumPolygons = 1, + .Polygons = {{.Vertices = {{32, -30, -16}, {32, -32, -16}, {-32, 16, -16}, {-32, 18, -16}}, + .VertexColors{ColorMissing, ColorMissing, ColorMissing, ColorMissing}}}}, + // ext 6 + {.NumPolygons = 1, + .Polygons = {{.Vertices = {{-32, -34, -16}, {32, -32, -16}, {32, 32, -16}, {-32, 34, -16}}, + .VertexColors{ColorMissing, ColorMissing, ColorMissing, ColorMissing}}}}, + // ext 7 + {.NumPolygons = 1, + .Polygons = {{.Vertices = {{-32, -32, -16}, {32, -32, -16}, {32, 32, -16}, {-32, 32, -16}}, .VertexColors{ColorMissing, ColorMissing, ColorMissing, ColorMissing}}}}, };