Merge branch 'master' of https://forge.info.unicaen.fr/git/l-system

src/lsystem/Main.java

@@ -3,10 +3,12 @@ package lsystem;
 import lsystem.screen.MainFrame;
 import lsystem.screen.SwingGLCanvas;
 
+import java.util.Arrays;
+
 public class Main {
 
     public static void main(String[] args) {
-
+        System.out.println(-180%360);
         MainFrame frame = new MainFrame();
         frame.setVisible(true);
         SwingGLCanvas canvas = new SwingGLCanvas();

src/lsystem/screen/MainFrame.java

@@ -12,6 +12,7 @@ public class MainFrame extends JFrame {
 
 	private static final long serialVersionUID = -7898079642230075807L;
 	private int nbTabs;
+	private int nbHelpWindow;
 	private JPanel basePanel;
 	private JTabbedPane tabs;
 	private JButton newGen;
@@ -45,10 +46,16 @@ public class MainFrame extends JFrame {
     }
 
 	public void newHelp() {
+		if(nbHelpWindow>0){
+			JOptionPane.showMessageDialog(null, "Une fenêtre d'aide est déjà ouverte.");
+		}
+		else {
+			nbHelpWindow++;
+
 			JFrame aide = new JFrame();
 			aide.setTitle("Aide");
 			aide.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-		aide.setSize(700,800);
+			aide.setSize(700,500);
 			aide.setLocationRelativeTo(null);
 			aide.setVisible(true);
 
@@ -56,7 +63,12 @@ public class MainFrame extends JFrame {
     	helpText.setText(Constants.HELP);
     	helpText.setEditable(false);
 
-        aide.add(helpText);
+			JScrollPane scrollbar = new JScrollPane(helpText);
+			scrollbar.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+			scrollbar.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
+
+			aide.add(scrollbar);
+		}
 	}
 	public void newTab() {
 		if(nbTabs>2)

src/lsystem/screen/listener/JoglEventListener.java

@@ -84,6 +84,9 @@ public class JoglEventListener implements GLEventListener {
 
     @Override
     public void display(GLAutoDrawable glAutoDrawable) {
+        for (int i = 0; i < canvas.camera.length; i++) {
+            canvas.camera[i] = canvas.camera[i] % 360;
+        }
         GL2 gl = glAutoDrawable.getGL().getGL2();
         gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT);
         gl.glLoadIdentity();

src/lsystem/screen/listener/JoglMouseListener.java

@@ -53,7 +53,7 @@ public class JoglMouseListener implements MouseListener, MouseMotionListener, Mo
         if(origine != null) {
             double xDiff = origine.getX() - e.getPoint().getX();
             double yDiff = origine.getY() - e.getPoint().getY();
-            /* if(button == 2) {
+            /* if(button == 1) {
                 canvas.camera[0] += Math.cos(canvas.camera[3]) * xDiff * 0.01;
                 canvas.camera[1] += Math.cos(canvas.camera[4]) * yDiff * 0.01;
                 canvas.camera[2] += Math.sin(canvas.camera[3]) * xDiff * 0.01;
@@ -64,9 +64,6 @@ public class JoglMouseListener implements MouseListener, MouseMotionListener, Mo
             }
             origine = e.getPoint();
         }
-        for (int i = 0; i < canvas.camera.length; i++) {
-            canvas.camera[i] = canvas.camera[i] % 360;
-        }
     }
 
     @Override
@@ -75,15 +72,41 @@ public class JoglMouseListener implements MouseListener, MouseMotionListener, Mo
 
     @Override
     public void mouseWheelMoved(MouseWheelEvent e) {
-        if( 45 > Math.abs(canvas.camera[3]) && 45>Math.abs(canvas.camera[4]))
+        // Gestion de la position x:
+        if(Math.abs(canvas.camera[3]) < 90 || Math.abs(canvas.camera[3]) > 270 ) {
             canvas.camera[0] += e.getWheelRotation() * Math.tan(Math.toRadians(-canvas.camera[3])) * 0.25;
-        else
+        }
+        else if(Math.abs(canvas.camera[3]) > 90 || Math.abs(canvas.camera[3]) < 270){
             canvas.camera[0] += e.getWheelRotation() * Math.tan(Math.toRadians(canvas.camera[3])) * 0.25;
+        }
+        // Gestion de la position y:
+        if(Math.abs(canvas.camera[4]) < 90 || Math.abs(canvas.camera[4]) > 270) {
             canvas.camera[1] += e.getWheelRotation() * Math.tan(Math.toRadians(canvas.camera[4])) * 0.25;
-        if( 45 < Math.abs(canvas.camera[3]) || 45 < Math.abs(canvas.camera[4]))
+        }
-            canvas.camera[2] += -e.getWheelRotation()*0.25;
+        else if(Math.abs(canvas.camera[4]) > 90 || Math.abs(canvas.camera[4]) < 270){
-        else
+            canvas.camera[1] += e.getWheelRotation() * Math.tan(Math.toRadians(-canvas.camera[4])) * 0.25;
+        }
+
+        if( 90 == canvas.camera[3]){
+            canvas.camera[0] +=e.getWheelRotation()*0.25;
+            canvas.camera[2] += 0;
+        }
+        if( 90 == canvas.camera[4]){
+            canvas.camera[1] +=e.getWheelRotation()*0.25;
+            canvas.camera[2] += 0;
+        }
+        if( -90 == canvas.camera[3]){
+            canvas.camera[0] +=-e.getWheelRotation()*0.25;
+            canvas.camera[2] += 0;
+        }
+        if( -90 == canvas.camera[4]){
+            canvas.camera[1] +=e.getWheelRotation()*0.25;
+            canvas.camera[2] += 0;
+        }
+        if(Math.abs(canvas.camera[3]) < 90 || Math.abs(canvas.camera[3]) > 270 && Math.abs(canvas.camera[4]) < 90 || Math.abs(canvas.camera[4]) > 270){
             canvas.camera[2] += e.getWheelRotation()*0.25;
+        }else
+            canvas.camera[2] += -e.getWheelRotation()*0.25;
 
     }
 }

src/lsystem/screen/listener/KeyboardListener.java

@@ -19,16 +19,40 @@ public class KeyboardListener implements KeyListener {
 
         switch (e.getKeyChar()) {
             case 'z':
+                if(Math.abs(canvas.camera[3]) < 90 || Math.abs(canvas.camera[3])>270 ){
                     canvas.camera[2] -= 0.1f;
+                    canvas.camera[0] += 0.1f*Math.tan(Math.toRadians(canvas.camera[3]));
+                }else{
+                    canvas.camera[2] += 0.1f;
+                    canvas.camera[0] -= 0.1f*Math.tan(Math.toRadians(canvas.camera[3]));
+                }
                 break;
             case 's':
+                if(Math.abs(canvas.camera[3]) < 90 || Math.abs(canvas.camera[3])>270 ){
                     canvas.camera[2] += 0.1f;
+                    canvas.camera[0] -= 0.1f*Math.tan(Math.toRadians(canvas.camera[3]));
+                }else{
+                    canvas.camera[2] -= 0.1f;
+                    canvas.camera[0] += 0.1f*Math.tan(Math.toRadians(canvas.camera[3]));
+                }
                 break;
             case 'q':
+                if(Math.abs(canvas.camera[3]) < 90 || Math.abs(canvas.camera[3])>270 ){
                     canvas.camera[0] -= 0.1f;
+                    canvas.camera[2] -= 0.1f*Math.tan(Math.toRadians(canvas.camera[3]));
+                }else{
+                    canvas.camera[0] += 0.1f;
+                    canvas.camera[2] -= 0.1f*Math.tan(Math.toRadians(canvas.camera[3]));
+                }
                 break;
             case 'd':
+                if(Math.abs(canvas.camera[3]) < 180 || Math.abs(canvas.camera[3])>0 ){
                     canvas.camera[0] += 0.1f;
+                    canvas.camera[2] += 0.1f*Math.tan(Math.toRadians(canvas.camera[3]));
+                }else{
+                    canvas.camera[0] -= 0.1f;
+                    canvas.camera[2] += 0.1f*Math.tan(Math.toRadians(canvas.camera[3]));
+                }
                 break;
             case 'a':
                 canvas.camera[3] -= 1;