quentinlegot/L-System
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Scroll works

Browse Source
This commit is contained in:
Arthur 2021-03-02 17:13:43 +01:00
parent 4806109ad6
commit 44250cd124
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lsystem/Main.java
View File

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

3
src/lsystem/screen/listener/JoglEventListener.java
View File

@ -84,6 +84,9 @@ public class JoglEventListener implements GLEventListener {
@Override @Override
public void display(GLAutoDrawable glAutoDrawable) { 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(); GL2 gl = glAutoDrawable.getGL().getGL2();
gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT); gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT);
gl.glLoadIdentity(); gl.glLoadIdentity();

39
src/lsystem/screen/listener/JoglMouseListener.java
View File

@ -64,9 +64,6 @@ public class JoglMouseListener implements MouseListener, MouseMotionListener, Mo
} }
origine = e.getPoint(); origine = e.getPoint();
} }
for (int i = 0; i < canvas.camera.length; i++) {
canvas.camera[i] = canvas.camera[i] % 360;
}
} }
@Override @Override
@ -75,15 +72,41 @@ public class JoglMouseListener implements MouseListener, MouseMotionListener, Mo
@Override @Override
public void mouseWheelMoved(MouseWheelEvent e) { 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; 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; 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; 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; canvas.camera[2] += e.getWheelRotation()*0.25;
}else
canvas.camera[2] += -e.getWheelRotation()*0.25;
} }
} }