sigonasr2/SigRenderer2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix missing rendered face with plane clipping.

Browse Source
This commit is contained in:
Joshua Sigona 2021-11-03 08:53:32 +09:00
parent 2e86db49f2
commit c016c613aa
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sig/Panel.java
View File

@ -129,13 +129,16 @@ public class Panel extends JPanel implements Runnable {
triViewed.A = Matrix.MultiplyVector(matView,triTransformed.A); triViewed.A = Matrix.MultiplyVector(matView,triTransformed.A);
triViewed.B = Matrix.MultiplyVector(matView,triTransformed.B); triViewed.B = Matrix.MultiplyVector(matView,triTransformed.B);
triViewed.C = Matrix.MultiplyVector(matView,triTransformed.C); triViewed.C = Matrix.MultiplyVector(matView,triTransformed.C);
triProjected.setColor(new Color(dp,dp,dp)); triViewed.setColor(new Color(dp,dp,dp));
int clippedTriangles = 0; int clippedTriangles = 0;
Triangle[] clipped = new Triangle[]{new Triangle(),new Triangle()}; Triangle[] clipped = new Triangle[]{new Triangle(),new Triangle()};
clippedTriangles = Triangle.ClipAgainstPlane(new Vector(0,0,1),new Vector(0,0,1), triViewed, clipped); clippedTriangles = Triangle.ClipAgainstPlane(new Vector(0,0,1),new Vector(0,0,1), triViewed, clipped);
for (int i=0;i<clippedTriangles;i++) { for (int i=0;i<clippedTriangles;i++) {
if (i>0) {
triProjected = new Triangle();
}
triProjected.A = Matrix.MultiplyVector(SigRenderer.matProj,clipped[i].A); triProjected.A = Matrix.MultiplyVector(SigRenderer.matProj,clipped[i].A);
triProjected.B = Matrix.MultiplyVector(SigRenderer.matProj,clipped[i].B); triProjected.B = Matrix.MultiplyVector(SigRenderer.matProj,clipped[i].B);
triProjected.C = Matrix.MultiplyVector(SigRenderer.matProj,clipped[i].C); triProjected.C = Matrix.MultiplyVector(SigRenderer.matProj,clipped[i].C);

14
src/sig/SigRenderer.java
View File

@ -14,7 +14,7 @@ import java.awt.BorderLayout;
public class SigRenderer implements KeyListener,MouseListener,MouseMotionListener{ public class SigRenderer implements KeyListener,MouseListener,MouseMotionListener{
public static boolean WIREFRAME = true; public static boolean WIREFRAME = false;
public static Mesh cube; public static Mesh cube;
public static int SCREEN_WIDTH=1280; public static int SCREEN_WIDTH=1280;
@ -45,16 +45,16 @@ public class SigRenderer implements KeyListener,MouseListener,MouseMotionListene
public void runGameLoop() { public void runGameLoop() {
if (upHeld) { if (upHeld) {
vCamera.y-=MOVESPEED;
}
if (downHeld) {
vCamera.y+=MOVESPEED; vCamera.y+=MOVESPEED;
} }
if (downHeld) {
vCamera.y-=MOVESPEED;
}
if (rightHeld) { if (rightHeld) {
vCamera.x+=MOVESPEED; vCamera.x-=MOVESPEED;
} }
if (leftHeld) { if (leftHeld) {
vCamera.x-=MOVESPEED; vCamera.x+=MOVESPEED;
} }
if (wHeld||sHeld) { if (wHeld||sHeld) {
Vector forward = Vector.multiply(vLookDir,MOVESPEED); Vector forward = Vector.multiply(vLookDir,MOVESPEED);
@ -74,7 +74,7 @@ public class SigRenderer implements KeyListener,MouseListener,MouseMotionListene
} }
SigRenderer(JFrame f) { SigRenderer(JFrame f) {
cube = new Mesh(OBJReader.ReadOBJFile("axis.obj")); cube = new Mesh(OBJReader.ReadOBJFile("teapot.obj"));
Panel p = new Panel(); Panel p = new Panel();

5
src/sig/Triangle.java
View File

@ -68,15 +68,14 @@ public class Triangle {
return 1; return 1;
} else } else
if (insidePointCount==1&&outsidePointCount==2) { if (insidePointCount==1&&outsidePointCount==2) {
out_tri[0].col = Color.BLUE; out_tri[0].col = in.col;
out_tri[0].A = inside_points[0]; out_tri[0].A = inside_points[0];
out_tri[0].B = Vector.IntersectPlane(plane_p, plane_n, inside_points[0], outside_points[0]); out_tri[0].B = Vector.IntersectPlane(plane_p, plane_n, inside_points[0], outside_points[0]);
out_tri[0].C = Vector.IntersectPlane(plane_p, plane_n, inside_points[0], outside_points[1]); out_tri[0].C = Vector.IntersectPlane(plane_p, plane_n, inside_points[0], outside_points[1]);
return 1; return 1;
} else } else
if (insidePointCount==2&&outsidePointCount==1) { if (insidePointCount==2&&outsidePointCount==1) {
out_tri[0].col=Color.RED; out_tri[0].col=out_tri[1].col=in.col;
out_tri[1].col=Color.GREEN;
out_tri[0].A = inside_points[0]; out_tri[0].A = inside_points[0];
out_tri[0].B = inside_points[1]; out_tri[0].B = inside_points[1];
out_tri[0].C = Vector.IntersectPlane(plane_p, plane_n, inside_points[0], outside_points[0]); out_tri[0].C = Vector.IntersectPlane(plane_p, plane_n, inside_points[0], outside_points[0]);