added freecam, changed agent draw functions

Author: boraakoguz

JavaRacer/Agent.java

@@ -6,26 +6,24 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Random;
-
 import javax.imageio.ImageIO;
 
 public class Agent {
-    public int agentX,agentY; //x,y coordinates and rotation of the car in degrees. 0 representing right as in cartesian system(stored in velocity)
-    public Rectangle solidArea = new Rectangle(); // aka hitbox of the car
+    static Random rand = new Random(0);
+
+    int agentX,agentY; //x,y coordinates in the world and rotation of the car in degrees. 0 representing right as in cartesian system(stored in velocity)
+    int screenX, screenY; //the x,y coordinates of the car on screen
+    Rectangle solidArea = new Rectangle(); // aka hitbox of the car
     public double frictionCoefficient; //road friction: 1 in asphalt, 0.1 in grass checked by CollisionControl class
     public int points, laps = 0;
     public boolean onFinishLine, offFinishLine, isCollided = false; //flags for game logic
     public int[] instructions = new int[100];
     int nextActionTimer,instructionIndex;
-    int screenMidX, screenMidY; 
     public BufferedImage playerModel;
     GameWindow gameWindow;
     Velocity velocity;
     int counter;
 
-
-    Random rand = new Random(0);
-
     public Agent(GameWindow gw){
         this.gameWindow = gw;
         setDefault();
@@ -34,9 +32,14 @@ public void setDefault(){
         this.agentX=MapLoader.spawnX*gameWindow.tileSize;
         this.agentY=MapLoader.spawnY*gameWindow.tileSize;
         this.velocity = new Velocity();
+        for(int i = 0; i<100; i++){
+            instructions[i] = 4;
+        }
+        /* 
         for(int i = 0; i<50; i++){
             instructions[i] = rand.nextInt(5);
         }
+        */
         switch (MapLoader.spawnDirection) {
             case 0:
                 velocity.angle = 0;
@@ -61,8 +64,6 @@ public void setDefault(){
         try {
             File tmp = new File("source/car.png");
             playerModel = ImageIO.read(tmp);
-            this.screenMidX = this.gameWindow.WIDTH/2 - (playerModel.getWidth()/4);
-            this.screenMidY = this.gameWindow.HEIGHT/2 -(playerModel.getHeight()/4);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -141,7 +142,42 @@ public void calculatePoints(){
         }
     }
     public void draw(Graphics2D graphics){
-        graphics.rotate(Math.toRadians(-velocity.angle),agentX+playerModel.getWidth()/4,agentY+playerModel.getHeight()/4);
-        graphics.drawImage(playerModel,agentX,agentY,playerModel.getWidth()/2,playerModel.getHeight()/2,null);
+        int camX = gameWindow.camera.getWorldX();
+        int camY =  gameWindow.camera.getWorldY();
+        int screenMidX = gameWindow.camera.getScreenMidX();
+        int screenMidY = gameWindow.camera.getScreenMidY();
+        int tileSize = gameWindow.getTileSize();
+
+        int screenX = agentX - camX + screenMidX;
+        int screenY = agentY - camY + screenMidY;
+
+        if(agentX>camX-screenMidX -1*tileSize&&
+        agentX<agentX+screenMidX+3*tileSize&&
+        agentY>agentY-screenMidY-1*tileSize&&
+        agentY<agentY+screenMidY+3*tileSize){
+            graphics.rotate(Math.toRadians(-velocity.angle),screenX+playerModel.getWidth()/4,screenY+playerModel.getHeight()/4);
+            graphics.drawImage(playerModel,screenX,screenY,playerModel.getWidth()/2,playerModel.getHeight()/2,null);
+        }
+    }
+    public String toString(){
+        return this.agentX + " " + this.agentY;
+    }
+    public int getAgentX(){
+        return this.agentX;
+    }
+    public int getAgentY(){
+        return this.agentY;
+    }
+    public int getPoints(){
+        return this.points;
+    }
+    public int getLaps(){
+        return this.laps;
+    }
+    public Velocity getVelocity(){
+        return this.velocity;
+    }
+    public boolean getIsCollided(){
+        return this.isCollided;
     }
 }

JavaRacer/Camera.java

@@ -0,0 +1,48 @@
+package JavaRacer;
+
+public class Camera {
+    int worldX, worldY;
+    int screenMidX, screenMidY;
+    KeyHandler keyHandle;
+    GameWindow gameWindow;
+    public Camera(GameWindow gw, KeyHandler kh, int worldX, int worldY){
+        this.gameWindow = gw;
+        this.keyHandle = kh;
+        this.worldX = worldX;
+        this.worldY = worldY;
+        this.screenMidX = gw.WIDTH/2;
+        this.screenMidY = gw.HEIGHT/2;
+    }
+    public void update(){
+        if (keyHandle.aPressed){
+            this.worldX -=8;
+        }
+        else if(keyHandle.dPressed){
+            this.worldX += 8;
+        }   
+        else if(keyHandle.wPressed){
+            this.worldY -=8;
+        }
+        else if(keyHandle.sPressed){
+            this.worldY += 8;
+        }
+    }
+    public int getWorldX(){
+        return this.worldX;
+    }
+    public void setWorldX(int worldX){
+        this.worldX = worldX;
+    }
+    public int getWorldY(){
+        return this.worldY;
+    }
+    public void setWorldY(int worldY){
+        this.worldY = worldY;
+    }
+    public int getScreenMidX(){
+        return this.screenMidX;
+    }
+    public int getScreenMidY(){
+        return this.screenMidY;
+    }
+}

JavaRacer/GameWindow.java

@@ -17,13 +17,16 @@ public class GameWindow extends JPanel implements Runnable{
     TileManager tileManager = new TileManager(this);
     Agent[] agents = new Agent[10];
     CollisionControl collisionControl = new CollisionControl(this);
+    Camera camera;
 
     public GameWindow(){
         Color backgroundColor = new Color(34, 139, 34);
         for(int i = 0; i<agents.length;i++){
-            agents[i] = new Agent(this);        
+            agents[i] = new Agent(this);
+            agents[i].agentX += i*50;  
+            agents[i].agentY += i*50;      
         }
-
+        this.camera = new Camera(this,keyHandle, agents[0].agentX, agents[0].agentY);
         this.setBackground(backgroundColor);
         this.setPreferredSize(new Dimension(WIDTH, HEIGHT));
         this.setDoubleBuffered(true);
@@ -55,19 +58,29 @@ public void run() {
     }
 
     public void update(){
-        for (Agent agent : agents) {
-            agent.update();
+        for(int i = 0; i<agents.length;i++){
+            agents[i].update();
         }
+        camera.update();
     }
     public void paintComponent(Graphics graphics){
         super.paintComponent(graphics);
         Graphics2D graphic = (Graphics2D)graphics;
 
-        tileManager.draw(graphic,this.agents[0]);
+        tileManager.draw(graphic,camera);
         for (Agent agent : agents) {
             agent.draw(graphic);
         }
 
         graphic.dispose();
     }
+    public int getTileSize(){
+        return this.tileSize;
+    }
+    public int getRow(){
+        return this.row;
+    }
+    public int getCollumn(){
+        return this.collumn;
+    }
 }

JavaRacer/TileManager.java

@@ -1,7 +1,5 @@
 package JavaRacer;
 
-import java.awt.Color;
-import java.awt.Font;
 import java.awt.Graphics2D;
 import java.io.File;
 import java.io.IOException;
@@ -12,12 +10,16 @@ public class TileManager {
     GameWindow gameWindow;
     MapTiles[] tiles;
     public int[][] map;
+    int row,collumn,tileSize;
 
     public TileManager(GameWindow gw){
         this.gameWindow = gw;
         tiles = new MapTiles[9];
         loadTileImages();
         map = MapLoader.loadMap();
+        row = gameWindow.getRow();
+        collumn = gameWindow.getCollumn();
+        tileSize = gameWindow.getTileSize();
     }
     public void loadTileImages(){
          try {
@@ -62,29 +64,24 @@ public void loadTileImages(){
             e.printStackTrace();
         }
     }
-    public void draw(Graphics2D graphics2d, Agent agent){ //Draws the map around the agent
-        for(int i = 0; i<gameWindow.row;i++){
-            int worldY = i*gameWindow.tileSize;
-            int screenY = worldY - agent.agentY + agent.screenMidY;
-            for(int j = 0; j<gameWindow.collumn; j++){
-                int worldX = j*gameWindow.tileSize;
-                int screenX = worldX - agent.agentX + agent.screenMidX;
-                if(worldX>agent.agentX-agent.screenMidX -1*gameWindow.tileSize&&
-                worldX<agent.agentX+agent.screenMidX+3*gameWindow.tileSize&&
-                worldY>agent.agentY-agent.screenMidY-1*gameWindow.tileSize&&
-                worldY<agent.agentY+agent.screenMidY+3*gameWindow.tileSize){
-                    graphics2d.drawImage(tiles[map[i][j]].image,screenX,screenY,gameWindow.tileSize,gameWindow.tileSize,null);
+    public void draw(Graphics2D graphics2d, Camera camera){ //Draws the map around the agent
+        int cameraX = camera.getWorldX();
+        int cameraY = camera.getWorldY();
+        int screenMidX = camera.getScreenMidX();
+        int screenMidY = camera.getScreenMidY();
+        for(int i = 0; i<row;i++){
+            int worldY = i*tileSize;
+            int screenY = worldY - cameraY + screenMidY;
+            for(int j = 0; j<collumn; j++){
+                int worldX = j*tileSize;
+                int screenX = worldX - cameraX + screenMidX;
+                if(worldX>cameraX-screenMidX -1*tileSize&&
+                worldX<cameraX+screenMidX+3*tileSize&&
+                worldY>cameraY-screenMidY-1*tileSize&&
+                worldY<cameraY+screenMidY+3*tileSize){
+                    graphics2d.drawImage(tiles[map[i][j]].image,screenX,screenY,tileSize,tileSize,null);
                 }
             }
         }
-        graphics2d.setFont(new Font("TimesRoman", Font.BOLD, 30));
-        graphics2d.setColor(Color.BLACK);
-        graphics2d.drawString("Points: " + Integer.toString(agent.points), 10, 30);
-        graphics2d.drawString("Laps: " + Integer.toString(agent.laps), 10, 60);
-        graphics2d.drawString("Speed: " + Integer.toString((int)Math.floor(agent.velocity.netVelocity())), gameWindow.tileSize*25, 30);
-        if(agent.isCollided){
-            graphics2d.setColor(Color.red);
-            graphics2d.drawString("-1000", agent.screenMidX, agent.screenMidY-50);
-        }
     }
 }