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

remove unused imports

Browse Source
This commit is contained in:
Antonin Boyon 2021-03-23 15:56:20 +01:00
parent d7deba49a7
commit 852004a609
2 changed files with 61 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lsystem/Main2D.java
View File

@ -1,11 +1,7 @@
package lsystem; package lsystem;
import java.util.ArrayList;
import lsystem.screen.gl2d.SwingGLCanvas2D; import lsystem.screen.gl2d.SwingGLCanvas2D;
import lsystem.screen.gl3d.GLCanvas;
import lsystem.screen.main.MainFrame; import lsystem.screen.main.MainFrame;
import lsystem.utils.Pair;
public class Main2D { public class Main2D {

130
src/lsystem/screen/gl2d/JoglEventListener2D.java
View File

@ -1,93 +1,85 @@
package lsystem.screen.gl2d; package lsystem.screen.gl2d;
import java.awt.Point;
import java.awt.geom.Point2D;
import java.util.ArrayList;
import com.jogamp.opengl.GL2; import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.GLEventListener;
import com.jogamp.opengl.glu.GLU; import com.jogamp.opengl.glu.GLU;
import com.jogamp.opengl.util.gl2.GLUT; import com.jogamp.opengl.util.gl2.GLUT;
import javafx.scene.control.Tab;
import lsystem.engine.Element; import lsystem.engine.Element;
import lsystem.engine.ElementProperties; import lsystem.engine.ElementProperties;
import lsystem.screen.gl3d.DrawHelper; import lsystem.screen.gl3d.DrawHelper;
import lsystem.screen.gl3d.GLCanvas;
import lsystem.utils.Pair;
public class JoglEventListener2D implements GLEventListener { public class JoglEventListener2D implements GLEventListener {
private final SwingGLCanvas2D canvas; private final SwingGLCanvas2D canvas;
private final GLU glu; private final GLU glu;
private final GLUT glut; private final GLUT glut;
private int fps; private int fps;
public JoglEventListener2D(SwingGLCanvas2D swingGLCanvas) { public JoglEventListener2D(SwingGLCanvas2D swingGLCanvas) {
this.canvas = swingGLCanvas; this.canvas = swingGLCanvas;
this.glu = canvas.glu; this.glu = canvas.glu;
this.glut = canvas.glut; this.glut = canvas.glut;
} }
@Override @Override
public void init(GLAutoDrawable glAutoDrawable) { public void init(GLAutoDrawable glAutoDrawable) {
GL2 gl = glAutoDrawable.getGL().getGL2(); GL2 gl = glAutoDrawable.getGL().getGL2();
gl.glClearColor(0f, 0f, 0f, 1.0f); gl.glClearColor(0f, 0f, 0f, 1.0f);
new Thread(() -> { new Thread(() -> {
while (canvas.frame.isVisible()) { while (canvas.frame.isVisible()) {
try { try {
Thread.sleep(1000); Thread.sleep(1000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
System.out.println(fps); System.out.println(fps);
fps = 0; fps = 0;
} }
}).start(); }).start();
} }
@Override @Override
public void dispose(GLAutoDrawable glAutoDrawable) { public void dispose(GLAutoDrawable glAutoDrawable) {
} }
public void drawAll (GL2 gl, Element actual, lsystem.screen.gl2d.Point2 origin) {
if (actual.property == ElementProperties.DRAW) {
System.out.println("DESSIN");
lsystem.screen.gl2d.Point2 newOrigin = new lsystem.screen.gl2d.Point2 (origin, actual.getRotation2D());
DrawHelper.drawStick(gl, origin, newOrigin);
}
System.out.println(actual.children.isEmpty());
for (Element children : actual.children) {
System.out.println("CHILD");
drawAll(gl, children, new lsystem.screen.gl2d.Point2 (origin, actual.getRotation2D()));
}
}
@Override public void drawAll(GL2 gl, Element actual, lsystem.screen.gl2d.Point2 origin) {
public void display (GLAutoDrawable glAutoDrawable) { if (actual.property == ElementProperties.DRAW) {
/* Element str = new Element(ElementProperties.DRAW, null, new int[]{0, 0, 0}); System.out.println("DESSIN");
lsystem.screen.gl2d.Point2 newOrigin = new lsystem.screen.gl2d.Point2(origin, actual.getRotation2D());
Element child1 = new Element(ElementProperties.DRAW, str, new int[]{0, 0, 0}); DrawHelper.drawStick(gl, origin, newOrigin);
Element child2 = new Element(ElementProperties.DRAW, str, new int[]{45, 0, 0}); }
str.children.add(child1); System.out.println(actual.children.isEmpty());
str.children.add(child2); for (Element children : actual.children) {
Element child11 = new Element(ElementProperties.DRAW, child1, new int[]{225, 0, 0}); System.out.println("CHILD");
Element child12 = new Element(ElementProperties.DRAW, child1, new int[]{270, 0, 0}); drawAll(gl, children, new lsystem.screen.gl2d.Point2(origin, actual.getRotation2D()));
child1.children.add(child11); }
child1.children.add(child12);*/ }
GL2 gl = glAutoDrawable.getGL().getGL2();
drawAll (gl, canvas.getLSystem(), new lsystem.screen.gl2d.Point2(-1.0f, -1.0f));
} @Override
public void display(GLAutoDrawable glAutoDrawable) {
/*
* Element str = new Element(ElementProperties.DRAW, null, new int[]{0, 0, 0});
*
* Element child1 = new Element(ElementProperties.DRAW, str, new int[]{0, 0,
* 0}); Element child2 = new Element(ElementProperties.DRAW, str, new int[]{45,
* 0, 0}); str.children.add(child1); str.children.add(child2); Element child11 =
* new Element(ElementProperties.DRAW, child1, new int[]{225, 0, 0}); Element
* child12 = new Element(ElementProperties.DRAW, child1, new int[]{270, 0, 0});
* child1.children.add(child11); child1.children.add(child12);
*/
@Override GL2 gl = glAutoDrawable.getGL().getGL2();
public void reshape(GLAutoDrawable glAutoDrawable, int x, int y, int width, int height) {
} drawAll(gl, canvas.getLSystem(), new lsystem.screen.gl2d.Point2(-1.0f, -1.0f));
}
@Override
public void reshape(GLAutoDrawable glAutoDrawable, int x, int y, int width, int height) {
}
} }