diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..7bc07ec --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Environment-dependent path to Maven home directory +/mavenHomeManager.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..3902724 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ObjetGraphique.java \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..89ee753 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e786817 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Projet_DEV.iml b/Projet_DEV.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/Projet_DEV.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/gitignore.txt b/gitignore.txt index 72690d5..dc3d74d 100644 --- a/gitignore.txt +++ b/gitignore.txt @@ -10,6 +10,8 @@ *.zip *.tar.gz *.rar +*.idea +*.out ### --- Dossiers de Build --- ### target/ diff --git a/out/production/Projet_DEV/linea/Cercle.class b/out/production/Projet_DEV/linea/Cercle.class new file mode 100644 index 0000000..dfb017c Binary files /dev/null and b/out/production/Projet_DEV/linea/Cercle.class differ diff --git a/out/production/Projet_DEV/linea/Jeu.class b/out/production/Projet_DEV/linea/Jeu.class new file mode 100644 index 0000000..7df8283 Binary files /dev/null and b/out/production/Projet_DEV/linea/Jeu.class differ diff --git a/out/production/Projet_DEV/linea/Ligne.class b/out/production/Projet_DEV/linea/Ligne.class new file mode 100644 index 0000000..b335477 Binary files /dev/null and b/out/production/Projet_DEV/linea/Ligne.class differ diff --git a/out/production/Projet_DEV/linea/LineaAppli.class b/out/production/Projet_DEV/linea/LineaAppli.class new file mode 100644 index 0000000..869d002 Binary files /dev/null and b/out/production/Projet_DEV/linea/LineaAppli.class differ diff --git a/out/production/Projet_DEV/linea/ObjetGraphique.class b/out/production/Projet_DEV/linea/ObjetGraphique.class new file mode 100644 index 0000000..7d24826 Binary files /dev/null and b/out/production/Projet_DEV/linea/ObjetGraphique.class differ diff --git a/out/production/Projet_DEV/linea/Segment.class b/out/production/Projet_DEV/linea/Segment.class new file mode 100644 index 0000000..46082d3 Binary files /dev/null and b/out/production/Projet_DEV/linea/Segment.class differ diff --git a/out/production/Projet_DEV/linea/ZoneDessin.class b/out/production/Projet_DEV/linea/ZoneDessin.class new file mode 100644 index 0000000..039fc64 Binary files /dev/null and b/out/production/Projet_DEV/linea/ZoneDessin.class differ diff --git a/src/linea/Cercle.java b/src/linea/Cercle.java index 746fda0..801550e 100644 --- a/src/linea/Cercle.java +++ b/src/linea/Cercle.java @@ -69,7 +69,8 @@ public class Cercle extends ObjetGraphique{ // il s'agit plutôt d'arcs de cercl // -> le booléen permet de ne plus être tributaire // de la vitesse de répétition du clavier //------------------------------------------------------------------------- - public void Monter(){ + public void Monter(){ + montee = true; } diff --git a/src/linea/Jeu.java b/src/linea/Jeu.java index d972b46..a987891 100644 --- a/src/linea/Jeu.java +++ b/src/linea/Jeu.java @@ -23,6 +23,7 @@ public class Jeu implements KeyListener, ActionListener{ // un qui passera dessus protected Cercle demiCercleAvant = new Cercle(90,-180); // celui qui est sur la ligne protected Cercle demiCercleArriere = new Cercle(90,180); // celui qui est derrière la ligne + Ligne laligne = new Ligne(); // A FAIRE : ajouter les objets graphiques manquants, s'il y en a @@ -46,12 +47,10 @@ public class Jeu implements KeyListener, ActionListener{ //------------------------------------------------------------------------- public Jeu(){ // Gestion du score : a réactiver en fin de TP, inutile au début - /* labScore = new JLabel(); labScore.setText("

score : 0

"); labScore.setBounds(20, 0, 200, 50); ecran.add(labScore); - */ } @@ -111,7 +110,6 @@ public class Jeu implements KeyListener, ActionListener{ // Création d'une fenêtre JFrame fenetre = new JFrame(); - Ligne laligne = new Ligne(); ecran.ajouterObjet(demiCercleArriere); ecran.ajouterObjet(demiCercleAvant); ecran.ajouterObjet(laligne); @@ -127,7 +125,7 @@ public class Jeu implements KeyListener, ActionListener{ fenetre.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // Démarrage du timer, qui rythmera l'animation - horloge = new Timer(40, this); + horloge = new Timer(20, this); horloge.start(); demiCercleArriere.setCouleur(new Color(0.8f, 0.0f, 0.0f)); @@ -140,7 +138,7 @@ public class Jeu implements KeyListener, ActionListener{ //------------------------------------------------------------------------- @Override public void actionPerformed(ActionEvent e) { - + ecran.traiterBoucleAnimation(); } } diff --git a/src/linea/Ligne.java b/src/linea/Ligne.java index da944e1..5a4fba9 100644 --- a/src/linea/Ligne.java +++ b/src/linea/Ligne.java @@ -36,19 +36,26 @@ public class Ligne extends ObjetGraphique{// Hérite de la classe ObjetGraphique // Valeurs initiales pour la position de la Ligne double x = 800; double y = 200; - double dx,dy; + + double xCourant = x; + double yCourant = y; + double dx = 0,dy=0; + // Création de la liste de segments qui composent la ligne - Segment s; + Segment s = new Segment(xCourant,yCourant,dx,dy); + + for (int i=0; i