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

First implementation of L-System in 3D

Browse Source
This commit is contained in:
Quentin Legot 2021-03-10 11:51:06 +01:00
parent 4129724064
commit 6371082665
5 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lsystem/engine/Element.java
View File

@ -6,17 +6,17 @@ public class Element {
public final ElementProperties property;
public final Element parent;
public final float[] values;
public final float[] rotation;
public final LinkedList<Element> children = new LinkedList<>();
public Element(ElementProperties property, Element parent) {
this(property, parent, new float[]{0f, 0f, 0f});
}
public Element(ElementProperties property, Element parent, float[] values) {
public Element(ElementProperties property, Element parent, float[] rotation) {
this.property = property;
this.parent = parent;
this.values = values;
this.rotation = rotation;
}
}

12
src/lsystem/screen/AbstractCanvas.java
View File

@ -19,7 +19,7 @@ import java.util.List;
public abstract class AbstractCanvas {
private Element lsystem;
private Element lSystem;
public State parsedState = State.FINISH_OR_NULL;
public JFrame frame;
protected FPSAnimator animator;
@ -41,7 +41,7 @@ public abstract class AbstractCanvas {
public void windowClosing(WindowEvent e) {
frame.dispose();
setVisible(false);
lsystem = null;
lSystem = null;
parsedState = State.FINISH_OR_NULL;
System.gc();
}
@ -61,9 +61,13 @@ public abstract class AbstractCanvas {
frame.setVisible(bl);
}
public void setLsystem(String axiom, List<Pair<String, String>> rules, int iterations) {
public Element getLSystem() {
return lSystem;
}
public void setLSystem(String axiom, List<Pair<String, String>> rules, int iterations) {
parsedState = State.LOAD;
this.lsystem = Parser.parse(Rewrite.rewrite(axiom, rules, iterations));
this.lSystem = Parser.parse(Rewrite.rewrite(axiom, rules, iterations));
parsedState = State.FINISH_OR_NULL;
}

41
src/lsystem/screen/gl3d/GLEventListener.java
View File

@ -4,6 +4,7 @@ import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLAutoDrawable;
import com.jogamp.opengl.glu.GLU;
import com.jogamp.opengl.util.gl2.GLUT;
import lsystem.engine.Element;
import lsystem.utils.Pair;
import java.util.LinkedList;
@ -18,8 +19,6 @@ public class GLEventListener implements com.jogamp.opengl.GLEventListener {
private final float[] light_0_position = {1000f, 1000f, 1000f, 1f};
private final float[] material_specular = {0.8f, 0.8f, 0.8f, 0.8f};
private float angle = 0f;
private final LinkedList<Pair<Integer, Integer>> prismPosition = new LinkedList<>();
private final GLU glu;
@ -89,35 +88,33 @@ public class GLEventListener implements com.jogamp.opengl.GLEventListener {
gl.glTranslatef(0, 0, 0);
DrawHelper.placeCamera(gl, canvas);
glu.gluLookAt(canvas.camera[0], canvas.camera[1], canvas.camera[2], canvas.camera[0], canvas.camera[1], canvas.camera[2] - 1, 0f, 1f, 0f);
gl.glPushMatrix();
gl.glTranslatef(0f, 0f, -4f);
gl.glRotatef(angle, 0f, 1f, 0f);
gl.glColor3f(1.0f, 0.0f, 1.0f);
glut.glutSolidSphere(2f, 20, 20);
gl.glRotatef(90f, -1f, 0f, 0f);
displayLSystem(gl, glut, canvas.getLSystem());
gl.glPopMatrix();
gl.glPushMatrix();
gl.glTranslatef(2f, 0.75f, 1.25f);
gl.glRotatef(angle, 0f, 1f, 0f);
gl.glColor3f(0.5f, 0.0f, 1.0f);
glut.glutSolidSphere(0.75f, 20, 20);
gl.glPopMatrix();
gl.glPushMatrix();
gl.glColor3f(1f, 1f, 1f);
DrawHelper.drawRectangularPrism(gl, -3f, 0f, -2f, -2.5f, 1.5f, -1.5f);
glut.glutSolidCylinder(0.25f, 1.5f, 15, 2);
gl.glPopMatrix();
angle = (angle + 0.1f) % 360;
DrawHelper.drawAxes(gl, glut);
DrawHelper.drawDebugInformation(gl, glut, canvas);
gl.glFlush();
fps++;
}
private void displayLSystem(GL2 gl, GLUT glut, Element element) {
gl.glPushMatrix();
gl.glRotatef(element.rotation[0] * 360 , 1f, 0f, 0f);
gl.glRotatef(element.rotation[1] * 360, 0f, 1f, 0f);
gl.glRotatef((element.rotation[0] + element.rotation[1]) * 360, 0f, 0f, 1f);
gl.glTranslated(-Math.sin(element.rotation[0]), -Math.sin(element.rotation[1]), -Math.sin(element.rotation[0] + element.rotation[1]));
gl.glBegin(GL2.GL_LINES);
glut.glutSolidCylinder(0.25f, 1f, 20, 20);
gl.glEnd();
gl.glTranslatef(0f, 0f, 1f);
for(Element child : element.children) {
displayLSystem(gl, glut, child);
}
gl.glPopMatrix();
}
@Override
public void reshape(GLAutoDrawable glAutoDrawable, int x, int y, int width, int height) {
GL2 gl = glAutoDrawable.getGL().getGL2();

10
src/lsystem/screen/main/Listener.java
View File

@ -17,6 +17,7 @@ public class Listener implements ActionListener, KeyListener {
Integer index;
String type;
Integer nbAxioms;
Thread parserThread = null;
public Listener(MainFrame frame, Integer index, String type, Tab tab){
this.tab = tab;
@ -25,6 +26,7 @@ public class Listener implements ActionListener, KeyListener {
this.type = type;
nbAxioms = 0;
}
@Override
public void actionPerformed(ActionEvent e) {
switch (type) {
@ -52,13 +54,15 @@ public class Listener implements ActionListener, KeyListener {
openDialog("Veuillez fermer la fenêtre 3D avant de lancer une nouvelle génération");
} else if(Main.joglFrame.parsedState == AbstractCanvas.State.LOAD) {
openDialog("Une génération est actuellement en cours, impossible d'en relancer un autre");
openDialog("Une génération est actuellement en cours, impossible d'en relancer un autre");
} else if (!parser.isCorrect()) {
openDialog("Vos règles ou votre axiome ne sont pas correctement écrites, veuillez recommencer");
} else {
new Thread(() -> {
Main.joglFrame.setLsystem(axiom, parser.parseRules(), tab.getNbIterations());
parserThread = new Thread(() -> {
Main.joglFrame.setLSystem(axiom, parser.parseRules(), tab.getNbIterations());
Main.joglFrame.setVisible(true);
}).start();
});
parserThread.start();
}
break;

11
src/lsystem/screen/main/Tab.java
View File

@ -2,8 +2,7 @@ package lsystem.screen.main;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
public class Tab extends JPanel{
@ -107,7 +106,7 @@ public class Tab extends JPanel{
JOptionPane.showMessageDialog(null, "Nombre maximal d'axiomes créés");
else {
list.append(stringToAdd);
if (stringToAdd == ";")
if (stringToAdd.equals(";"))
nbAxioms++;
}
@ -118,14 +117,10 @@ public class Tab extends JPanel{
return str;
}
public java.util.List<String> getRules(){
List<String> list = new ArrayList<>();
String str = rulesList.getText();
str = str.substring(10).replaceAll(";", "");
String[] strsplit = str.split("\n");
for(int y = 0;y<strsplit.length;y++){
list.add(strsplit[y]);
}
return list;
return Arrays.asList(strsplit);
}
public int getNbIterations(){
return (int) itSpinner.getValue();