From 8916822925f835f89d22b7a15ee5faa28e5422c1 Mon Sep 17 00:00:00 2001 From: Darius Wiles Date: Sat, 19 Jun 2021 16:37:40 -0700 Subject: [PATCH] Fix bad texture coordinates in raster-12 The Cube Model defines the triangle vertexes forming its top face in a different way to its other faces. It makes no difference for the demos where the cube faces are solid colors, but it is a problem in raster-12.html, when textures are introduced. It results in one of the top face triangles displaying the wrong part of the texture. Fix the problem by reordering the triangle vertexes on the top cube face. Although the problem is only visible on raster-12.html, make similar changes to raster-06.html to raster-12.html so the definition of cube vertexes remains consistent. --- demos/raster-06.html | 4 ++-- demos/raster-07.html | 4 ++-- demos/raster-08.html | 4 ++-- demos/raster-09.html | 4 ++-- demos/raster-10.html | 12 ++++++------ demos/raster-11.html | 2 +- demos/raster-12.html | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/demos/raster-06.html b/demos/raster-06.html index 060041c..485160c 100644 --- a/demos/raster-06.html +++ b/demos/raster-06.html @@ -196,8 +196,8 @@ Triangle(5, 7, 6, BLUE), Triangle(1, 5, 6, YELLOW), Triangle(1, 6, 2, YELLOW), - Triangle(4, 5, 1, PURPLE), - Triangle(4, 1, 0, PURPLE), + Triangle(5, 1, 0, PURPLE), + Triangle(5, 0, 4, PURPLE), Triangle(2, 6, 7, CYAN), Triangle(2, 7, 3, CYAN) ]; diff --git a/demos/raster-07.html b/demos/raster-07.html index e4f5f4f..c9def6f 100644 --- a/demos/raster-07.html +++ b/demos/raster-07.html @@ -233,8 +233,8 @@ Triangle(5, 7, 6, BLUE), Triangle(1, 5, 6, YELLOW), Triangle(1, 6, 2, YELLOW), - Triangle(4, 5, 1, PURPLE), - Triangle(4, 1, 0, PURPLE), + Triangle(5, 1, 0, PURPLE), + Triangle(5, 0, 4, PURPLE), Triangle(2, 6, 7, CYAN), Triangle(2, 7, 3, CYAN) ]; diff --git a/demos/raster-08.html b/demos/raster-08.html index a676422..d5b2795 100644 --- a/demos/raster-08.html +++ b/demos/raster-08.html @@ -349,8 +349,8 @@ Triangle(5, 7, 6, BLUE), Triangle(1, 5, 6, YELLOW), Triangle(1, 6, 2, YELLOW), - Triangle(4, 5, 1, PURPLE), - Triangle(4, 1, 0, PURPLE), + Triangle(5, 1, 0, PURPLE), + Triangle(5, 0, 4, PURPLE), Triangle(2, 6, 7, CYAN), Triangle(2, 7, 3, CYAN) ]; diff --git a/demos/raster-09.html b/demos/raster-09.html index b0b8750..a362dda 100644 --- a/demos/raster-09.html +++ b/demos/raster-09.html @@ -434,8 +434,8 @@ Triangle(5, 7, 6, BLUE), Triangle(1, 5, 6, YELLOW), Triangle(1, 6, 2, YELLOW), - Triangle(4, 5, 1, PURPLE), - Triangle(4, 1, 0, PURPLE), + Triangle(5, 1, 0, PURPLE), + Triangle(5, 0, 4, PURPLE), Triangle(2, 6, 7, CYAN), Triangle(2, 7, 3, CYAN) ]; diff --git a/demos/raster-10.html b/demos/raster-10.html index 74603c9..48ad829 100644 --- a/demos/raster-10.html +++ b/demos/raster-10.html @@ -589,16 +589,16 @@ var triangles = [ Triangle([0, 1, 2], RED), Triangle([0, 2, 3], RED), - Triangle([1, 5, 6], YELLOW), - Triangle([1, 6, 2], YELLOW), - Triangle([2, 6, 7], CYAN), - Triangle([2, 7, 3], CYAN), Triangle([4, 0, 3], GREEN), - Triangle([4, 1, 0], PURPLE), Triangle([4, 3, 7], GREEN), - Triangle([4, 5, 1], PURPLE), Triangle([5, 4, 7], BLUE), Triangle([5, 7, 6], BLUE), + Triangle([1, 5, 6], YELLOW), + Triangle([1, 6, 2], YELLOW), + Triangle([5, 1, 0], PURPLE), + Triangle([5, 0, 4], PURPLE), + Triangle([2, 6, 7], CYAN), + Triangle([2, 7, 3], CYAN), ]; Shuffle(triangles); diff --git a/demos/raster-11.html b/demos/raster-11.html index f81a11d..4e4b640 100644 --- a/demos/raster-11.html +++ b/demos/raster-11.html @@ -786,7 +786,7 @@ Triangle([5, 7, 6], BLUE, [Vertex(0, 0, -1), Vertex(0, 0, -1), Vertex(0, 0, -1)]), Triangle([1, 5, 6], YELLOW, [Vertex(-1, 0, 0), Vertex(-1, 0, 0), Vertex(-1, 0, 0)]), Triangle([1, 6, 2], YELLOW, [Vertex(-1, 0, 0), Vertex(-1, 0, 0), Vertex(-1, 0, 0)]), - Triangle([1, 0, 5], PURPLE, [Vertex(0, 1, 0), Vertex(0, 1, 0), Vertex(0, 1, 0)]), + Triangle([5, 1, 0], PURPLE, [Vertex(0, 1, 0), Vertex(0, 1, 0), Vertex(0, 1, 0)]), Triangle([5, 0, 4], PURPLE, [Vertex(0, 1, 0), Vertex(0, 1, 0), Vertex(0, 1, 0)]), Triangle([2, 6, 7], CYAN, [Vertex(0, -1, 0), Vertex(0, -1, 0), Vertex(0, -1, 0)]), Triangle([2, 7, 3], CYAN, [Vertex(0, -1, 0), Vertex(0, -1, 0), Vertex(0, -1, 0)]) diff --git a/demos/raster-12.html b/demos/raster-12.html index fcd0f03..1818d49 100644 --- a/demos/raster-12.html +++ b/demos/raster-12.html @@ -840,8 +840,8 @@ Triangle([5, 7, 6], BLUE, [Vertex( 0, 0, -1), Vertex( 0, 0, -1), Vertex( 0, 0, -1)], wood_texture, [Pt(0, 0), Pt(1, 1), Pt(0, 1)]), Triangle([1, 5, 6], YELLOW, [Vertex(-1, 0, 0), Vertex(-1, 0, 0), Vertex(-1, 0, 0)], wood_texture, [Pt(0, 0), Pt(1, 0), Pt(1, 1)]), Triangle([1, 6, 2], YELLOW, [Vertex(-1, 0, 0), Vertex(-1, 0, 0), Vertex(-1, 0, 0)], wood_texture, [Pt(0, 0), Pt(1, 1), Pt(0, 1)]), - Triangle([1, 0, 5], PURPLE, [Vertex( 0, 1, 0), Vertex( 0, 1, 0), Vertex( 0, 1, 0)], wood_texture, [Pt(0, 0), Pt(1, 0), Pt(1, 1)]), - Triangle([5, 0, 4], PURPLE, [Vertex( 0, 1, 0), Vertex( 0, 1, 0), Vertex( 0, 1, 0)], wood_texture, [Pt(0, 1), Pt(1, 1), Pt(0, 0)]), + Triangle([5, 1, 0], PURPLE, [Vertex( 0, 1, 0), Vertex( 0, 1, 0), Vertex( 0, 1, 0)], wood_texture, [Pt(0, 0), Pt(1, 0), Pt(1, 1)]), + Triangle([5, 0, 4], PURPLE, [Vertex( 0, 1, 0), Vertex( 0, 1, 0), Vertex( 0, 1, 0)], wood_texture, [Pt(0, 0), Pt(1, 1), Pt(0, 1)]), Triangle([2, 6, 7], CYAN, [Vertex( 0, -1, 0), Vertex( 0, -1, 0), Vertex( 0, -1, 0)], wood_texture, [Pt(0, 0), Pt(1, 0), Pt(1, 1)]), Triangle([2, 7, 3], CYAN, [Vertex( 0, -1, 0), Vertex( 0, -1, 0), Vertex( 0, -1, 0)], wood_texture, [Pt(0, 0), Pt(1, 1), Pt(0, 1)]), ];