Face interaction - Issue #3

+ Changed the mouse button for selecting nodes from left mouse button to right mouse button, to avoid 
    selecting nodes while rotating the object

+ Added face interaction
  -> You can select and highlight single faces by rightclicking them. Hold down control to add multiple nodes to 
       the selection

+ Added experimental volume interaction
  -> When clicking a face that is part of a volume, you will select all the faces in that subset (will be changed later)

+ Cycling through the subsets now also works with the plus and minus button, instead of only the numpad add/subtract

src/main/java/edu/gcsc/jfx3d/Geometry2D.java

@@ -12,10 +12,12 @@
 public abstract class Geometry2D {
 
     private int[] nodes;
+    private int index;
 
     public abstract int[] getNodes();
     public abstract void setNodes(int[] array);
     public abstract int[] getFacesArray();
+    public abstract int getIndex();
 
 
 

src/main/java/edu/gcsc/jfx3d/Main.java

@@ -186,15 +186,14 @@ public Group createContent() {
 
         String filePath = "../VRL-JFXVis/src/main/java/edu/gcsc/jfx3d/ugx/bigSpineBigAppBot.ugx";
         UGXReader ugxr = new UGXReader(filePath);
-        ugxGeometry = ugxr.xbuildUGX(false, false);
+        ugxGeometry = ugxr.xbuildUGX(true, true);
         subsetNameArray = ugxr.getSubssetNameArray();
 
         root.getChildren().add(ugxGeometry);
 
         VFX3DUtil.addMouseBehavior(ugxGeometry, ugxGeometry, MouseButton.PRIMARY,
                 Rotate.X_AXIS, Rotate.Y_AXIS);
-        VFX3DUtil.addMouseBehavior(ugxGeometry, ugxGeometry, MouseButton.SECONDARY,
-                Rotate.X_AXIS, Rotate.Z_AXIS);
+
 
         ugxSubsetCount = ugxr.getNumberOfSubsets();
 
@@ -247,25 +246,25 @@ private void handleKeyboard(Scene scene,PerspectiveCamera camera){
                 camera.setTranslateZ(0);
 
             }
-            if(keycode == KeyCode.ADD){
+            if(keycode == KeyCode.ADD || keycode == KeyCode.PLUS){
 
                 ugxSwitchCounter = (ugxSwitchCounter +1) % ugxSubsetCount;
                 for (int i = 0; i < ugxSubsetCount; i++) {
                     if (i == ugxSwitchCounter) {
-                        ugxGeometry.getChildren().get(i).setOpacity(1);
+                        ugxGeometry.getChildren().get(i).setVisible(true);
                         System.out.println("Currently shown subset: " + ugxSwitchCounter +" of "+ (ugxSubsetCount-1) + ", "  + subsetNameArray[ugxSwitchCounter]);
                     }
                     else{
-                        ugxGeometry.getChildren().get(i).setOpacity(0);
+                        ugxGeometry.getChildren().get(i).setVisible(false);
                     }
                 }
 
             }
 
-            if (keycode == KeyCode.SUBTRACT) {
+            if (keycode == KeyCode.SUBTRACT || keycode == KeyCode.MINUS) {
                 ugxSwitchCounter = -1;
                 for (int i = 0; i < ugxSubsetCount; i++) {
-                    ugxGeometry.getChildren().get(i).setOpacity(1);
+                    ugxGeometry.getChildren().get(i).setVisible(true);
                 }
                 System.out.println("Currently shown subset: All");
             }

src/main/java/edu/gcsc/jfx3d/UGXfile.java

@@ -262,7 +262,7 @@ public void convertReaderStringToData(){
 //                    System.out.println(pp3);
 //                    System.out.println("--------------");
 
-                    quadrilaterals.add(new Quadrilateral(pp0, pp1, pp2, pp3, geometryCounter2D++));
+                    quadrilaterals.add(new Quadrilateral(pp0, pp1, pp2, pp3, geometryCounter2D+=2));
                 }
                 containsQuadrilaterals = true;
             }
@@ -486,6 +486,9 @@ public boolean containsPyramids() {
         return containsPyramids;
     }
 
+    public int getGeometryCounter2D(){
+        return geometryCounter2D;
+    }