From 40cc5fd4485010b4382d52471ff46c6b06bfab0b Mon Sep 17 00:00:00 2001
From: Richard Pajersky <xpajersk@fi.muni.cz>
Date: Mon, 10 May 2021 09:14:11 +0200
Subject: [PATCH] Changed transparency to float
---
.../analyst/gui/RegistrationCPEventListener.java | 16 ++++++++--------
.../fidentis/analyst/gui/scene/DrawableMesh.java | 6 +++---
2 files changed, 11 insertions(+), 11 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 d89022d8..da67bddd 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java
@@ -82,25 +82,25 @@ public class RegistrationCPEventListener {
public void setTransparency(int value) {
if (value == transparencyRange) {
- setPrimaryTransparency(1d);
- setSecondaryTransparency(1d);
+ setPrimaryTransparency(1);
+ setSecondaryTransparency(1);
}
if (value < transparencyRange) {
- setPrimaryTransparency(value / 10d);
- setSecondaryTransparency(1d);
+ setPrimaryTransparency(value / 10f);
+ setSecondaryTransparency(1);
}
if (value > transparencyRange) {
- setSecondaryTransparency((2 * transparencyRange - value) / 10d);
- setPrimaryTransparency(1d);
+ setSecondaryTransparency((2 * transparencyRange - value) / 10f);
+ setPrimaryTransparency(1);
}
canvas.renderScene();
}
- public void setPrimaryTransparency(double transparency) {
+ public void setPrimaryTransparency(float transparency) {
primaryFace.setTransparency(transparency);
}
- public void setSecondaryTransparency(double transparency) {
+ public void setSecondaryTransparency(float transparency) {
secondaryFace.setTransparency(transparency);
}
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 11c518ed..74b8988c 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
@@ -21,7 +21,7 @@ public class DrawableMesh {
// TO DO - R. Pajersky: add transformation attributes and methods
private Color color = new Color(255, 255, 255);
- private double transparency = 1f;
+ private float transparency = 1;
private Vector3d translation = new Vector3d(0, 0, 0);
private Vector3d rotation = new Vector3d(0, 0, 0);
private Vector3d scale = new Vector3d(0, 0, 0);
@@ -78,11 +78,11 @@ public class DrawableMesh {
return color;
}
- public double getTransparency() {
+ public float getTransparency() {
return transparency;
}
- public void setTransparency(double transparency) {
+ public void setTransparency(float transparency) {
this.transparency = transparency;
}
--
GitLab