restructure project

palasjir · Dec 27, 2017 · 01da9e9 · 01da9e9
1 parent 6089398
commit 01da9e9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/src/main/java/palasjir/viewer/Main.java b/src/main/java/palasjir/viewer/Main.java
@@ -3,6 +3,7 @@
 
 import com.jogamp.opengl.awt.GLCanvas;
 import com.jogamp.opengl.util.FPSAnimator;
+import palasjir.viewer.ui.VisualizationPanel;
 
 import java.awt.Dimension;
 import java.awt.event.WindowAdapter;
@@ -25,7 +26,7 @@ public static void main(String[] args) {
             final Dimension dimension = new Dimension(CANVAS_WIDTH, CANVAS_HEIGHT);
             final GLCanvas canvas = new VisualizationPanel(dimension);
 
-            // Create a animator that drives canvas' display() at the specified FPS.
+            // Create a animator that drives canvas' render() at the specified FPS.
             final FPSAnimator animator = new FPSAnimator(canvas, FPS, true);
 
             // Create the top-level container

diff --git a/...ava/palasjir/viewer/TransferFunction.java → ...asjir/viewer/render/TransferFunction.java b/...ava/palasjir/viewer/TransferFunction.java → ...asjir/viewer/render/TransferFunction.java
@@ -1,4 +1,4 @@
-package palasjir.viewer;
+package palasjir.viewer.render;
 
 import java.nio.ByteBuffer;
 

diff --git a/src/main/java/palasjir/viewer/UnitCube.java → ...java/palasjir/viewer/render/UnitCube.java b/src/main/java/palasjir/viewer/UnitCube.java → ...java/palasjir/viewer/render/UnitCube.java
@@ -1,4 +1,4 @@
-package palasjir.viewer;
+package palasjir.viewer.render;
 
 public class UnitCube {
 

diff --git a/...iewer/VisualisationMouseInputAdapter.java → ...er/ui/VisualisationMouseInputAdapter.java b/...iewer/VisualisationMouseInputAdapter.java → ...er/ui/VisualisationMouseInputAdapter.java
@@ -1,4 +1,4 @@
-package palasjir.viewer;
+package palasjir.viewer.ui;
 
 import palasjir.viewer.coordinates.Camera;
 

diff --git a/...a/palasjir/viewer/VisualizationPanel.java → ...alasjir/viewer/ui/VisualizationPanel.java b/...a/palasjir/viewer/VisualizationPanel.java → ...alasjir/viewer/ui/VisualizationPanel.java
@@ -1,4 +1,4 @@
-package palasjir.viewer;
+package palasjir.viewer.ui;
 
 import com.hackoeur.jglm.Mat4;
 import com.hackoeur.jglm.Matrices;
@@ -7,7 +7,11 @@
 import com.jogamp.opengl.*;
 import com.jogamp.opengl.awt.GLCanvas;
 import com.jogamp.opengl.util.glsl.ShaderState;
+import palasjir.viewer.utils.ShaderProgramHelper;
+import palasjir.viewer.render.TransferFunction;
+import palasjir.viewer.utils.VolumeData;
 import palasjir.viewer.coordinates.Camera;
+import palasjir.viewer.render.UnitCube;
 
 import java.awt.Dimension;
 import java.nio.ByteBuffer;
@@ -17,7 +21,7 @@
 import static com.jogamp.opengl.GL.*;
 import static com.jogamp.opengl.GL2ES2.*;
 import static com.jogamp.opengl.GL2GL3.*;
-import static palasjir.viewer.Utils.*;
+import static palasjir.viewer.utils.Utils.*;
 
 public class VisualizationPanel extends GLCanvas implements GLEventListener {
 
@@ -117,7 +121,7 @@ public void dispose(GLAutoDrawable drawable) {
     }
 
     /**
-     * Initializes screen buffer. Buffer for creating the screen display of rendered texture.
+     * Initializes screen buffer. Buffer for creating the screen render of rendered texture.
      *
      * @param gl GL Interface
      */

diff --git a/.../palasjir/viewer/ShaderProgramHelper.java → ...jir/viewer/utils/ShaderProgramHelper.java b/.../palasjir/viewer/ShaderProgramHelper.java → ...jir/viewer/utils/ShaderProgramHelper.java
@@ -1,4 +1,4 @@
-package palasjir.viewer;
+package palasjir.viewer.utils;
 
 import com.jogamp.opengl.GL4;
 import com.jogamp.opengl.util.glsl.ShaderCode;

diff --git a/src/main/java/palasjir/viewer/Utils.java → ...ain/java/palasjir/viewer/utils/Utils.java b/src/main/java/palasjir/viewer/Utils.java → ...ain/java/palasjir/viewer/utils/Utils.java
@@ -1,4 +1,4 @@
-package palasjir.viewer;
+package palasjir.viewer.utils;
 
 import com.hackoeur.jglm.Mat3;
 import com.hackoeur.jglm.Mat4;

diff --git a/...main/java/palasjir/viewer/VolumeData.java → ...ava/palasjir/viewer/utils/VolumeData.java b/...main/java/palasjir/viewer/VolumeData.java → ...ava/palasjir/viewer/utils/VolumeData.java
@@ -1,4 +1,4 @@
-package palasjir.viewer;
+package palasjir.viewer.utils;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;