From 27a739da224df8adfd3a9418e05e0a95ec0668dc Mon Sep 17 00:00:00 2001
From: Richard Pajersky <xpajersk@fi.muni.cz>
Date: Wed, 5 May 2021 12:07:08 +0200
Subject: [PATCH] All adjustment previews work
---
.../gui/RegistrationCPEventListener.java | 15 +++-----
.../analyst/gui/scene/DrawableMesh.java | 36 -------------------
.../analyst/gui/scene/SceneRenderer.java | 4 +--
.../analyst/gui/tab/PostRegistrationCP.java | 9 +++--
4 files changed, 13 insertions(+), 51 deletions(-)
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java b/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java
index 3b4350b2..3696b145 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java
@@ -153,15 +153,10 @@ public class RegistrationCPEventListener {
canvas.renderScene();
}
- public void setXScale() {
-
- }
-
- public void setYScale() {
-
- }
-
- public void setZScale() {
-
+ public void setScale(float value) {
+ secondaryFace.getScale().x = value;
+ secondaryFace.getScale().y = value;
+ secondaryFace.getScale().z = value;
+ canvas.renderScene();
}
}
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java b/GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java
index 9faa2a24..4688116e 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java
@@ -110,42 +110,6 @@ public class DrawableMesh {
this.scale = scale;
}
- /*public void increaseXTranslation(float value) {
- this.translation.x = this.translation.x + value;
- }
-
- public void increaseYTranslation(float value) {
- this.translation.y = this.translation.y + value;
- }
-
- public void increaseZTranslation(float value) {
- this.translation.z = this.translation.z + value;
- }
-
- public void increaseXRotation(float value) {
- this.rotation.x = this.rotation.x + value;
- }
-
- public void increaseYRotation(float value) {
- this.rotation.y = this.rotation.y + value;
- }
-
- public void increaseZRotation(float value) {
- this.rotation.z = this.rotation.z + value;
- }
-
- public void increaseXScale(float value) {
- this.scale.x = this.scale.x + value;
- }
-
- public void increaseYScale(float value) {
- this.scale.y = this.scale.y + value;
- }
-
- public void increaseZScale(float value) {
- this.scale.z = this.scale.z + value;
- }*/
-
public void resetTranslation() {
this.translation = new Vector3f(0, 0, 0);
}
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 076aa371..fb73a96a 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
@@ -147,10 +147,10 @@ public class SceneRenderer {
gl.glRotatef(obj.getRotation().x, 1f, 0f, 0f);
gl.glRotatef(obj.getRotation().y, 0f, 1f, 0f);
gl.glRotatef(obj.getRotation().z, 0f, 0f, 1f);
- /*// move
+ // move
gl.glTranslatef(obj.getTranslation().x, obj.getTranslation().y, obj.getTranslation().z);
// scale
- gl.glScalef(obj.getScale().x, obj.getScale().y, obj.getScale().z);*/
+ gl.glScalef(1 + obj.getScale().x, 1 + obj.getScale().y, 1 + obj.getScale().z);
renderFacet(facet);
gl.glPopMatrix();
}
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java b/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java
index e3b69d33..f6f77f19 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java
@@ -861,11 +861,13 @@ public class PostRegistrationCP extends javax.swing.JPanel {
}//GEN-LAST:event_translationXFTFPropertyChange
private void translationYFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_translationYFTFPropertyChange
- // TODO add your handling code here:
+ float value = ((Number)translationYFTF.getValue()).floatValue();
+ listener.setYTranslation(value);
}//GEN-LAST:event_translationYFTFPropertyChange
private void translationZFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_translationZFTFPropertyChange
- // TODO add your handling code here:
+ float value = ((Number)translationZFTF.getValue()).floatValue();
+ listener.setZTranslation(value);
}//GEN-LAST:event_translationZFTFPropertyChange
private void rotationXFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_rotationXFTFPropertyChange
@@ -884,7 +886,8 @@ public class PostRegistrationCP extends javax.swing.JPanel {
}//GEN-LAST:event_rotationZFTFPropertyChange
private void scaleFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_scaleFTFPropertyChange
- // TODO add your handling code here:
+ float value = ((Number)scaleFTF.getValue()).floatValue();
+ listener.setScale(value);
}//GEN-LAST:event_scaleFTFPropertyChange
--
GitLab