From 2f3d960c7294a7b6a4eb4580261a8e5ba3434aa7 Mon Sep 17 00:00:00 2001
From: Richard Pajersky <xpajersk@fi.muni.cz>
Date: Tue, 11 May 2021 20:48:37 +0200
Subject: [PATCH] Wireframe removed
---
.../gui/canvas/MouseRotationListener.java | 2 --
.../analyst/gui/scene/SceneRenderer.java | 18 ++----------------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/canvas/MouseRotationListener.java b/GUI/src/main/java/cz/fidentis/analyst/gui/canvas/MouseRotationListener.java
index 162bd0d9..a92a5099 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/canvas/MouseRotationListener.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/canvas/MouseRotationListener.java
@@ -41,8 +41,6 @@ public class MouseRotationListener extends MouseAdapter {
*/
@Override
public void mouseDragged(MouseEvent evt) {
- //JOptionPane.showMessageDialog(null, evt.getButton());
-
if (SwingUtilities.isLeftMouseButton(evt)) {
double rotateX = -(lastY - evt.getY()) * rotationSpeed;
double rotateY = +(lastX - evt.getX()) * rotationSpeed;
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/scene/SceneRenderer.java b/GUI/src/main/java/cz/fidentis/analyst/gui/scene/SceneRenderer.java
index 8ef41c2d..b6298b9c 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/scene/SceneRenderer.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/scene/SceneRenderer.java
@@ -29,7 +29,6 @@ public class SceneRenderer {
private GL2 gl;
private boolean brightBackground = false;
- private boolean wireframe = false;
/**
* Constructor.
@@ -120,6 +119,7 @@ public class SceneRenderer {
gl.glShadeModel(GL2.GL_SMOOTH);
+ // set up transparent object to render later
if (((DrawableMesh)drawables.toArray()[0]).getTransparency() != 1) {
Collections.reverse((ArrayList)drawables);
}
@@ -141,7 +141,7 @@ public class SceneRenderer {
}
/**
- * Sets up material based on info from DrawableMesh
+ * Sets up material
*/
private void setMaterial(DrawableMesh obj) {
// set color
@@ -207,20 +207,6 @@ public class SceneRenderer {
gl.glLoadIdentity();
}
- /**
- * Sets the wire-frame rendering mode
- */
- protected void setWireframeMode() {
- this.wireframe = true;
- }
-
- /**
- * Sets the "shaded" rendering mode (filled triangles)
- */
- protected void setFillMode() {
- this.wireframe = false;
- }
-
/**
* Loops through the facet and render all the vertices as they are stored in corner table
*
--
GitLab