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 3b4350b289370d356e4a7e4edb3021dad4dc5c04..3696b145a232a22f3e3186a9c1652e59bd04b293 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 9faa2a24fdcc795cca20beae2b08dd8f6ac87ef0..4688116e912a929fae56ab5d301a1016b1725348 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 076aa3716dfd854043fc111d9d5a8d4649289dcf..fb73a96aee6bfce0379ebc0f333253389d1385cd 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 e3b69d331ca4fa74667a3bfe072dafb814fb90e7..f6f77f19832db9bdd4ae0987739ab7f934f6fd1e 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