complete shooting bullet

src/UI/GameFrame.java

@@ -3,30 +3,20 @@ package UI;
 import UI.GameState.BulletState;
 import UI.GameState.TankState;
 import UI.GameState.WallState;
-import UI.LogIn.Setting;
-
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.awt.image.AffineTransformOp;
 import java.awt.image.BufferStrategy;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 
 public class GameFrame extends JFrame {
 
     private long lastRender;
     private BufferStrategy bufferStrategy;
-    private ArrayList<Float> fpsHistory;
-    private Image image1;
-    private Image image2;
+    private Rendering rendering = new Rendering();
     public static final int GAME_HEIGHT = 720;                  // 720p game resolution
     public static final int GAME_WIDTH = 16 * GAME_HEIGHT / 9;  // wide aspect ratio
     public WallState wallState = new WallState(GAME_WIDTH ,GAME_HEIGHT);
-    private Setting setting = new Setting();
+
 
     public GameFrame(String gameName) {
         lastRender = -1;
@@ -35,8 +25,7 @@ public class GameFrame extends JFrame {
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         setSize(GAME_WIDTH, GAME_HEIGHT);
         setResizable(false);
-        int lastRender = -1;
-        fpsHistory = new ArrayList<>(100);
+
     }
 
     /**
@@ -54,19 +43,14 @@ public class GameFrame extends JFrame {
      * Game rendering with triple-buffering using BufferStrategy.
      */
 
-    public void render(TankState tankState , BulletState bulletState) {
+    public void render(TankState tankState , ArrayList<BulletState> bullets) {
 
         do {
-            // The following loop ensures that the contents of the drawing buffer
-            // are consistent in case the underlying surface was recreated
             do {
-                // Get a new graphics context every time through the loop
-                // to make sure the strategy is validated
-
                 Graphics2D graphics = (Graphics2D) bufferStrategy.getDrawGraphics();
 
                 try {
-                    doRendering(graphics, tankState , bulletState);
+                    rendering.doRendering(graphics, tankState , bullets );
                 } finally {
                     // Dispose the graphics
                     graphics.dispose();
@@ -84,74 +68,6 @@ public class GameFrame extends JFrame {
         } while (bufferStrategy.contentsLost());
     }
 
-    /**
-     * Rendering all game elements based on the game state.
-     */
-    // Draw all game elements according
-    //  to the game 'state' using 'g2d' ...
-    private void doRendering(Graphics2D g2d, TankState tankState , BulletState bulletState) {
-        // Draw background
-        wallState.paintComponent(g2d);
-
-        // Draw tank;
-        try {
-            System.out.println("3"+setting.getTankShapePath());
-            image1 = ImageIO.read(new File(setting.getTankShapePath()));
-            //   image2 = ImageIO.read(new File("C:\\Users\\Lenovo\\IdeaProjects\\JTankTrouble\\pics\\tank_sand.png"));
-        } catch (IOException e) {
-            System.out.println(e);
-        }
-// Rotation information
-        double rotationRequired = Math.toRadians (tankState.rotate);
-        BufferedImage image11 = (BufferedImage)image1;
-        double locationX = image11.getWidth() / 2;
-        double locationY = image11.getHeight() / 2;
-        AffineTransform tx = AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
-        AffineTransformOp op = new AffineTransformOp(tx, AffineTransformOp.TYPE_BILINEAR);
-// Drawing the rotated image at the required drawing locations
-        g2d.drawImage(op.filter( image11, null),tankState.locX , tankState.locY , null);
-        //   g2d.drawImage(image2 , state.locX+30 , state.locY+30 , null);
-
-        //Draw bullet
-        g2d.setColor(Color.GRAY);
-        g2d.fillOval(bulletState.locX, bulletState.locY, bulletState.diam, bulletState.diam);
-
-
-        // Print FPS info
-        long currentRender = System.currentTimeMillis();
-        if (lastRender > 0) {
-            fpsHistory.add(1000.0f / (currentRender - lastRender));
-            if (fpsHistory.size() > 100) {
-                fpsHistory.remove(0); // remove oldest
-            }
-            float avg = 0.0f;
-            for (float fps : fpsHistory) {
-                avg += fps;
-            }
-            avg /= fpsHistory.size();
-            String str = String.format("Average FPS = %.1f , Last Interval = %d ms",
-                    avg, (currentRender - lastRender));
-            g2d.setColor(Color.CYAN);
-            g2d.setFont(g2d.getFont().deriveFont(18.0f));
-            int strWidth = g2d.getFontMetrics().stringWidth(str);
-            int strHeight = g2d.getFontMetrics().getHeight();
-            g2d.drawString(str, (GAME_WIDTH - strWidth) / 2, strHeight + 50);
-        }
-        lastRender = currentRender;
-        // Print user guide
-        String userGuide
-                = "Use the MOUSE or ARROW KEYS to move the BALL. "
-                + "Press ESCAPE to end the game.";
-        g2d.setFont(g2d.getFont().deriveFont(18.0f));
-        g2d.drawString(userGuide, 10, GAME_HEIGHT - 10);
-        // Draw GAME OVER
-        if (tankState.gameOver) {
-            String str = "GAME OVER";
-            g2d.setColor(Color.WHITE);
-            g2d.setFont(g2d.getFont().deriveFont(Font.BOLD).deriveFont(64.0f));
-            int strWidth = g2d.getFontMetrics().stringWidth(str);
-            g2d.drawString(str, (GAME_WIDTH - strWidth) / 2, GAME_HEIGHT / 2);
-        }
-    }
+
 }
 

src/UI/GameLoop.java

@@ -29,8 +29,6 @@ public class GameLoop implements Runnable {
 
     private GameFrame canvas;
     private TankState tankState;
-    private BulletState bulletState ;
-
     public GameLoop(GameFrame frame) {
         canvas = frame;
     }
@@ -41,8 +39,7 @@ public class GameLoop implements Runnable {
     public void init() {
         // Perform all initializations ...
         tankState = new TankState(canvas.wallState);
-        bulletState = new BulletState(canvas.wallState , tankState);
-        canvas.addKeyListener(tankState.getKeyListener());
+        canvas.addKeyListener(tankState.getMyListener());
         canvas.addMouseListener(tankState.getMouseListener());
         canvas.addMouseMotionListener(tankState.getMouseMotionListener());
     }
@@ -53,10 +50,8 @@ public class GameLoop implements Runnable {
         while (!gameOver) {
             try {
                 long start = System.currentTimeMillis();
-                //
                 tankState.update();
-                canvas.render(tankState , bulletState);
-                //
+                canvas.render(tankState , tankState.getBullets());
                 long delay = (1000 / FPS) - (System.currentTimeMillis() - start);
                 if (delay > 0)
                     Thread.sleep(delay);

src/UI/GameState/BulletState.java

 package UI.GameState;
 
-import UI.GameFrame;
+
+import UI.MyListener;
 
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 
-public class BulletState {
+public class BulletState  {
 
-    public static int locX, locY, diam , angle;
+    public int locX, locY, diam , angle;
     private WallState wallState;
+    private boolean keySpace;
+    private KeyHandler2 keyHandler2 = new KeyHandler2();
+    private long createTime;
 
 
     public BulletState(WallState wallState , TankState tankState){
@@ -19,6 +22,36 @@ public class BulletState {
         locY = tankState.locY;
         angle = tankState.rotate;
         diam = 10;
+        keySpace = false;
+        tankState.getMyListener().add(keyHandler2);
+        createTime = System.currentTimeMillis();
+    }
+
+    public void update(){
+            locY += 10*Math.sin(Math.toRadians(angle) ) ;
+            locX += 10*Math.cos(Math.toRadians(angle) ) ;
+    }
+
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    class KeyHandler2 extends KeyAdapter{
+        @Override
+        public void keyPressed(KeyEvent e){
+            if (e.getKeyCode() == KeyEvent.VK_SPACE) {
+                keySpace = true;
+            }
+        }
+
+        @Override
+        public void keyReleased(KeyEvent e){
+            if (e.getKeyCode() == KeyEvent.VK_SPACE) {
+                keySpace = false;
+            }
+        }
+
     }
 
 }

src/UI/GameState/TankState.java

@@ -2,8 +2,10 @@ package UI.GameState;
 /*** In The Name of Allah ***/
 
 import UI.GameFrame;
+import UI.MyListener;
 
 import java.awt.event.*;
+import java.util.ArrayList;
 
 
 /**
@@ -17,18 +19,18 @@ public class TankState {
     public int locX, locY, diam, rotate;
     public boolean gameOver;
 
-    private boolean keyUP, keyDOWN, keyRIGHT, keyLEFT , keySpace;
+    private boolean keyUP, keyDOWN, keyRIGHT, keyLEFT, keySpace;
     private boolean mousePress;
     private int mouseX, mouseY;
-    private KeyHandler keyHandler;
+    private MyListener  myListener = new MyListener();
+    private KeyHandler1 keyHandler1 = new KeyHandler1();
     private MouseHandler mouseHandler;
     private WallState walls;
-    BulletState bulletState = new BulletState(walls , TankState.this);
+    private ArrayList<BulletState> bullets = new ArrayList<>();
 
-    public TankState(){
-    }
 
     public TankState(WallState walls) {
+        myListener.add(keyHandler1);
         this.walls = walls;
         // Initialize the game state and all elements ...
         locX = 100;
@@ -48,9 +50,6 @@ public class TankState {
         mouseX = 0;
         mouseY = 0;
 
-        keyHandler = new KeyHandler();
-        mouseHandler = new MouseHandler();
-        keyHandler = new KeyHandler();
         mouseHandler = new MouseHandler();
     }
 
@@ -70,58 +69,57 @@ public class TankState {
             locX = mouseX - diam / 2;
         }
         if (keyUP) {
-            rotate = rotate % 360;
+            if (rotate == 0)
+                rotate = 360;
+            System.out.println(rotate);
             locY -= 8;
-            if ( (rotate> 90 && rotate <180) || rotate== 90 )
+            if ((rotate > 180 && rotate < 270)|| rotate ==180 )
                 rotate +=10;
-            else if ( (rotate >180 && rotate < 270) || rotate ==270 )
+            else if ( (rotate > 270 && rotate < 360) || rotate == 360)
                 rotate -=10;
+
             else
-                rotate =180;
+                rotate =270;
         }
         if (keyDOWN) {
             rotate = rotate % 360;
             locY += 8;
-            if ( (rotate > 270 && rotate < 360) || rotate ==270 )
+            if ( (rotate  > 0 && rotate < 90 )|| rotate == 0)
                 rotate +=10;
-            else if ( (rotate < 90 && rotate > 0) || rotate == 90 )
+            else if ( (rotate > 90 && rotate <180 )|| rotate == 180 )
                 rotate -=10;
             else
-                rotate = 0;
+                rotate = 90;
         }
         if (keyLEFT ){
             rotate = rotate % 360;
             locX -= 8;
-            if ( (rotate  > 0 && rotate < 90 )|| rotate == 0)
+            if ( (rotate> 90 && rotate <180) || rotate== 90 )
                 rotate +=10;
-            else if ( (rotate > 90 && rotate <180 )|| rotate == 180 )
+            else if ( (rotate >180 && rotate < 270) || rotate ==270 )
                 rotate -=10;
             else
-                rotate = 90;
+                rotate =180;
         }
         if (keyRIGHT ) {
             rotate = rotate % 360;
             locX += 8;
-            if ((rotate > 180 && rotate < 270)|| rotate ==180 )
+            if ( (rotate > 270 && rotate < 360) || rotate ==270 )
                 rotate +=10;
-            else if ( (rotate > 270 && rotate < 360) || rotate == 360)
+            else if ( (rotate < 90 && rotate > 0) || rotate == 90 )
                 rotate -=10;
             else
-                rotate =270;
+                rotate = 0;
         }
-        if (keySpace) {
-
-               // for (int i = 0; i < 100; i++) {
-                    bulletState.locY += 5*Math.sin(rotate) ;
-                    System.out.println(bulletState.locY );
-                    bulletState.locX += 5*Math.cos(rotate) ;
-                    System.out.println("preeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeesssssssssssssedddddddddddddd");
-
-             //   }
-      //      bulletState.locX = locX;
-        //    bulletState.locY = locY;
+        if (keySpace){
+            if (bullets.size() == 0 || System.currentTimeMillis() -bullets.get(bullets.size()-1).getCreateTime()>500 ) {
+                BulletState newBullet = new BulletState(walls, this);
+                bullets.add(newBullet);
+                System.out.println(newBullet.angle);
+            }
         }
 
+
         if (walls.isWall(locX,locY)){
             locX = lastx;
             locY = lasty;
@@ -135,9 +133,14 @@ public class TankState {
     }
 
 
-    public KeyListener getKeyListener() {
-        return keyHandler;
+    public WallState getWalls() {
+        return walls;
+    }
+
+    public ArrayList<BulletState> getBullets() {
+        return bullets;
     }
+
     public MouseListener getMouseListener() {
         return mouseHandler;
     }
@@ -145,12 +148,14 @@ public class TankState {
         return mouseHandler;
     }
 
-
+    public MyListener getMyListener() {
+        return myListener;
+    }
 
     /**
      * The keyboard handler.
      */
-    class KeyHandler extends KeyAdapter {
+    class KeyHandler1 extends KeyAdapter {
 
         @Override
         public void keyPressed(KeyEvent e) {
@@ -168,10 +173,9 @@ public class TankState {
                 case KeyEvent.VK_RIGHT:
                     keyRIGHT = true;
                     break;
-                case KeyEvent.VK_SPACE: {
+                case KeyEvent.VK_SPACE:
                     keySpace = true;
                     break;
-                }
                 case KeyEvent.VK_ESCAPE:
                     gameOver = true;
                     break;
@@ -191,13 +195,12 @@ public class TankState {
                 case KeyEvent.VK_LEFT:
                     keyLEFT = false;
                     break;
-                case KeyEvent.VK_SPACE: {
-                    keySpace = false;
-                    break;
-                }
                 case KeyEvent.VK_RIGHT:
                     keyRIGHT = false;
                     break;
+                case KeyEvent.VK_SPACE:
+                    keySpace = false;
+                    break;
             }
         }
 

src/UI/LogIn/MainPanel.java

@@ -44,6 +44,7 @@ public class MainPanel extends JPanel {
             public void mouseClicked(MouseEvent e) {
                 super.mouseClicked(e);
                 run();
+
             }
         });
 
@@ -57,12 +58,16 @@ public class MainPanel extends JPanel {
                 } catch (IOException ex) {
                     ex.printStackTrace();
                 }
+                MainPanel.this.revalidate();
+                MainPanel.this.repaint();
             }
         });
     }
 
     private JPanel setSettingPanel() throws IOException {
         SettingPanel settingPanel = new SettingPanel();
+        settingPanel.revalidate();
+        settingPanel.revalidate();
         return settingPanel;
     }
 

src/UI/LogIn/Setting.java

@@ -59,12 +59,10 @@ public class Setting {
     }
 
     public String getTankShapePath() {
-        System.out.println(2+tankShapePath);
         return tankShapePath;
     }
 
     public void setTankShapePath(String tankShapePath) {
         this.tankShapePath = tankShapePath;
-        System.out.println(1+getTankShapePath());
     }
 }

src/UI/LogIn/SettingPanel.java

@@ -20,6 +20,8 @@ public class SettingPanel extends JPanel {
         setLayout(new GridLayout(1 , 2));
         add(informationPanel());
         add(changeableComponents());
+        this.revalidate();
+        this.repaint();
     }
 
     private JPanel informationPanel(){
@@ -103,6 +105,8 @@ public class SettingPanel extends JPanel {
                 } catch (IOException ex) {
                     ex.printStackTrace();
                 }
+                SettingPanel.this.revalidate();
+                SettingPanel.this.repaint();
                 setting.setTankShapePath(chosenTankPath);
                 changeableComponents4.removeAll();
                 ImageIcon imageIcon = new ImageIcon(image);
@@ -122,6 +126,8 @@ public class SettingPanel extends JPanel {
                 } catch (IOException ex) {
                     ex.printStackTrace();
                 }
+                SettingPanel.this.revalidate();
+                SettingPanel.this.repaint();
             }
         });
 
@@ -136,8 +142,6 @@ public class SettingPanel extends JPanel {
         changeableComponents.add(changeableComponents3);
         changeableComponents.add(changeableComponents4);
         changeableComponents.add(back);
-
-
         return changeableComponents;
     }
 }

src/UI/MyListener.java

+package UI;
+
+
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+
+public class MyListener extends KeyAdapter {
+    public static ArrayList<KeyAdapter> list = new ArrayList<>();
+
+    public static void add(KeyAdapter keyAdapter){
+        list.add(keyAdapter);
+    }
+
+    @Override
+    public void keyPressed(KeyEvent e) {
+        for (KeyAdapter keyAdapter : list){
+            if (keyAdapter != null){
+                keyAdapter.keyPressed(e);
+            }
+        }
+    }
+
+    @Override
+    public void keyReleased(KeyEvent e) {
+        for (KeyAdapter keyAdapter : list){
+            if (keyAdapter != null){
+                keyAdapter.keyReleased(e);
+            }
+        }
+    }
+}

src/UI/Rendering.java

+package UI;
+import UI.GameState.BulletState;
+import UI.GameState.TankState;
+import UI.LogIn.Setting;
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.geom.AffineTransform;
+import java.awt.image.AffineTransformOp;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class Rendering {
+
+    private Image image1;
+    private Image image2;
+    public static final int GAME_HEIGHT = 720;                  // 720p game resolution
+    public static final int GAME_WIDTH = 16 * GAME_HEIGHT / 9;  // wide aspect ratio
+    int lastRender = -1;
+    private ArrayList<Float> fpsHistory;
+    private Setting setting = new Setting();
+
+    public Rendering(){
+        fpsHistory = new ArrayList<>(100);
+    }
+
+    /**
+     * Rendering all game elements based on the game state.
+     */
+    // Draw all game elements according
+    //  to the game 'state' using 'g2d' ...
+    public void doRendering(Graphics2D g2d, TankState tankState , ArrayList<BulletState> bullets) {
+        // Draw background
+        tankState.getWalls().paintComponent(g2d);
+
+        // Draw tank;
+        try {
+            image1 = ImageIO.read(new File(setting.getTankShapePath()));
+            //   image2 = ImageIO.read(new File("C:\\Users\\Lenovo\\IdeaProjects\\JTankTrouble\\pics\\tank_sand.png"));
+        } catch (IOException e) {
+            System.out.println(e);
+        }
+// Rotation information
+        double rotationRequired = Math.toRadians (tankState.rotate);
+        BufferedImage image11 = (BufferedImage)image1;
+        double locationX = image11.getWidth() / 2;
+        double locationY = image11.getHeight() / 2;
+        AffineTransform tx = AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
+        AffineTransformOp op = new AffineTransformOp(tx, AffineTransformOp.TYPE_BILINEAR);
+// Drawing the rotated image at the required drawing locations
+        g2d.drawImage(op.filter( image11, null),tankState.locX , tankState.locY , null);
+        //   g2d.drawImage(image2 , state.locX+30 , state.locY+30 , null);
+
+        //Draw bullet
+        if (bullets.size() != 0) {
+            for (BulletState bullet : bullets) {
+                if (System.currentTimeMillis() - bullet.getCreateTime() > 4000) {
+                  //  bullets.remove(bullet);
+                    continue;
+                }
+                bullet.update();
+                g2d.setColor(Color.GRAY);
+                g2d.fillOval(bullet.locX, bullet.locY, bullet.diam, bullet.diam);
+            }
+        }
+
+
+        // Print FPS info
+        long currentRender = System.currentTimeMillis();
+        if (lastRender > 0) {
+            fpsHistory.add(1000.0f / (currentRender - lastRender));
+            if (fpsHistory.size() > 100) {
+                fpsHistory.remove(0); // remove oldest
+            }
+            float avg = 0.0f;
+            for (float fps : fpsHistory) {
+                avg += fps;
+            }
+            avg /= fpsHistory.size();
+            String str = String.format("Average FPS = %.1f , Last Interval = %d ms",
+                    avg, (currentRender - lastRender));
+            g2d.setColor(Color.CYAN);
+            g2d.setFont(g2d.getFont().deriveFont(18.0f));
+            int strWidth = g2d.getFontMetrics().stringWidth(str);
+            int strHeight = g2d.getFontMetrics().getHeight();
+            g2d.drawString(str, (GAME_WIDTH - strWidth) / 2, strHeight + 50);
+        }
+        lastRender = (int) currentRender;
+        // Print user guide
+        String userGuide
+                = "Use the MOUSE or ARROW KEYS to move the BALL. "
+                + "Press ESCAPE to end the game.";
+        g2d.setFont(g2d.getFont().deriveFont(18.0f));
+        g2d.drawString(userGuide, 10, GAME_HEIGHT - 10);
+        // Draw GAME OVER
+        if (tankState.gameOver) {
+            String str = "GAME OVER";
+            g2d.setColor(Color.WHITE);
+            g2d.setFont(g2d.getFont().deriveFont(Font.BOLD).deriveFont(64.0f));
+            int strWidth = g2d.getFontMetrics().stringWidth(str);
+            g2d.drawString(str, (GAME_WIDTH - strWidth) / 2, GAME_HEIGHT / 2);
+        }
+    }
+}