Vor merge

core/src/com/dungeoncrawler/model/DungeonGenerator.java

@@ -75,9 +75,6 @@ public class DungeonGenerator {
                         xPos -= 1;
                     }
                     break;
-                default:
-                    System.out.println("Die Random Methode ist kacke!!!!!!!!!!!!!!!!!!");
-                    break;
             }
             
             // An der neuen Stelle vom Cursor gibt es noch keinen Raum

core/src/com/dungeoncrawler/view/Map.java

@@ -6,90 +6,31 @@
 
 package com.dungeoncrawler.view;
 
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.maps.MapLayers;
 import com.badlogic.gdx.maps.tiled.TiledMap;
-import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;
+
-import com.badlogic.gdx.maps.tiled.TiledMapTileLayer.Cell;
-import com.badlogic.gdx.maps.tiled.tiles.StaticTiledMapTile;
 /**
  *
  * @author jonathan
  */
 public class Map {
-    private TiledMap map;
+    private TiledMap[][][] maps;
-    private Texture tiles;
     
     public Map(){
-        map = new TiledMap();
-        tiles = new Texture(Gdx.files.internal("tiles.gif"));
-        
-        generateMap();
-    }
-    
-    private void generateMap(){
-        TextureRegion[][] splitTiles = TextureRegion.split(getTiles(), 48, 48);
-        MapLayers layers = getMap().getLayers();
         
-        //for(int i=0;i<6;i++){
-        int size = 10;
-            TiledMapTileLayer layer = new TiledMapTileLayer(size, size, 48, 48);
-            
-            for(int x=0;x<size;x++){
-                for(int y=0;y<size;y++){
-                    
-                    if(x == 0 || x == size -1 || y == 0 || y == size -1){
-                        
-                            Cell cell = new Cell();
-                            cell.setTile(new StaticTiledMapTile(splitTiles[0][5]));
-                            layer.setCell(x, y, cell);
-                            continue;
-                            
-                    }
-                    
-                    //int ty = (int)(Math.random() * splitTiles.length);
-                    //int tx = (int)(Math.random() * splitTiles[ty].length);
-                    
-                    Cell cell = new Cell();
-                    cell.setTile(new StaticTiledMapTile(splitTiles[0][0]));
-                    layer.setCell(x, y, cell);
-                    
-                }
-                layers.add(layer);
-            }
-        //}
-    }
-
-    /**
-     * @return the map
-     */
-    public TiledMap getMap() {
-        return map;
     }
 
     /**
-     * @param map the map to set
+     * @return the maps
      */
-    public void setMap(TiledMap map) {
+    public TiledMap[][][] getMaps() {
-        this.map = map;
+        return maps;
     }
 
     /**
-     * @return the tiles
+     * @param maps the maps to set
      */
-    public Texture getTiles() {
+    public void setMaps(TiledMap[][][] maps) {
-        return tiles;
+        this.maps = maps;
     }
-
-    /**
-     * @param tiles the tiles to set
-     */
-    public void setTiles(Texture tiles) {
-        this.tiles = tiles;
-    }
-    
-    
     
 }

core/src/com/dungeoncrawler/view/MapGenerator.java

@@ -0,0 +1,88 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.dungeoncrawler.view;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.maps.MapLayers;
+import com.badlogic.gdx.maps.tiled.TiledMap;
+import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;
+import com.badlogic.gdx.maps.tiled.tiles.StaticTiledMapTile;
+import com.dungeoncrawler.model.Dungeon;
+import com.dungeoncrawler.model.Level;
+import com.dungeoncrawler.model.Room;
+
+/**
+ *
+ * @author jonathan
+ */
+public class MapGenerator {
+    Texture tiles;
+    TextureRegion[][] splitTiles;
+    
+    public MapGenerator(Texture tiles){
+        this.tiles = tiles;
+        splitTiles = TextureRegion.split(this.tiles, 48, 48);
+    }
+    
+    public TiledMap[][][] generateMap(int levelAmount, Dungeon d){
+        TiledMap[][][] tempMap = new TiledMap[levelAmount][][];
+        
+        for(int i = 0; i < levelAmount; i++){
+            TiledMap[][] tempLevel = generateLevel(i, d.getLevel()[i]);
+            tempMap[i] = tempLevel;
+        }
+        
+        return tempMap;
+    }
+    
+    private TiledMap[][] generateLevel(int i, Level l){
+        int sizeX = l.getRooms().length;
+        int sizeY = l.getRooms()[0].length;
+        
+        TiledMap[][] tempLevel = new TiledMap[sizeX][sizeY];
+        
+        for(int x = 0; x < sizeX; x++){
+            for(int y = 0; y < sizeY; y++){
+                Room room = l.getRooms()[x][y];
+                
+                if(room != null){
+                    TiledMap tempRoom = generateRoom(room, sizeX, sizeY);
+                    tempLevel[x][y] = tempRoom;
+                }
+                else{
+                    tempLevel[x][y] = null;
+                }
+            }
+        }
+        
+        return tempLevel;
+    }
+    
+    private TiledMap generateRoom(Room r, int sizeX, int sizeY){
+        TiledMap tempRoom = new TiledMap();
+        
+        MapLayers layers = tempRoom.getLayers();
+        TiledMapTileLayer collisionLayer = new TiledMapTileLayer(7, 5, 48, 48);
+        TiledMapTileLayer dynamicLayer = new TiledMapTileLayer(7, 5, 48, 48);
+        TiledMapTileLayer staticLayer = new TiledMapTileLayer(7, 5, 48, 48);
+        
+        for(int x = 0; x < 7; x++){
+            for(int y = 0; y < 5; y++){
+                TiledMapTileLayer.Cell cell = new TiledMapTileLayer.Cell();
+                cell.setTile(new StaticTiledMapTile(splitTiles[0][0]));
+                staticLayer.setCell(x, y, cell);
+            }
+        }
+        
+        layers.add(collisionLayer);
+        layers.add(dynamicLayer);
+        layers.add(staticLayer);
+        
+        return tempRoom;
+    }
+}

core/src/com/dungeoncrawler/view/View.java

@@ -0,0 +1,231 @@
+package com.dungeoncrawler.view;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.Sprite;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.maps.tiled.TiledMap;
+import com.badlogic.gdx.maps.tiled.TiledMapRenderer;
+import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
+import com.dungeoncrawler.model.Dungeon;
+import com.dungeoncrawler.model.DungeonGenerator;
+import com.dungeoncrawler.model.entities.*;
+
+public class View {
+	Texture b;
+        Texture t;
+        Texture p;
+        Texture a;
+        Sprite button;
+        Sprite title;
+        Sprite player;
+        Sprite archer;
+        int PlayerFrame = 0;
+        int PlayerZeile = 0;
+        TextureRegion[][] regions;
+        Timer tunten;
+        Timer toben;
+        Timer tlinks;
+        Timer trechts;
+        
+        Map tm;
+        TiledMapRenderer tmr;
+        TiledMap test;
+        OrthographicCamera camera;
+        Dungeon d;
+        
+	public View() {
+                b = new Texture("Button.png");
+                t = new Texture("Title.png");
+                p = new Texture("animplay.png");
+                a = new Texture("Archer-64.png");
+                button = new Sprite(b);
+                title = new Sprite(t);
+                archer = new Sprite(a);
+                
+                float w = Gdx.graphics.getWidth();
+                float h = Gdx.graphics.getHeight();
+                float wc = w/2;
+                title.setX(wc - (title.getWidth()/2));
+                title.setY(h - 200);
+                button.setX(wc - (button.getWidth()/2));
+                button.setY(400);
+                regions = TextureRegion.split(p, 32, 32);
+                player = new Sprite(regions[0][2]);
+                player.setX(200);
+                player.setY(200);
+                tunten = new Timer();
+                toben = new Timer();
+                tlinks = new Timer();
+                trechts = new Timer();
+                
+                tm = new Map();
+                camera = new OrthographicCamera(1, h/w);
+                d = new DungeonGenerator().generateDungeon(10, 10, 48, new Player());
+                MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tiles.gif")));
+                TiledMap[][][] maps = mg.generateMap(7, d);
+                tm.setMaps(maps);
+                
+                for(int i=0;i<tm.getMaps()[0].length;i++){
+                    for(int j=0;j<tm.getMaps()[0][0].length;j++){
+                        if(tm.getMaps()[0][i][j] != null){
+                            test = tm.getMaps()[0][i][j];
+                        }
+                    }
+                }
+                tmr = new OrthogonalTiledMapRenderer(test);
+
+                
+        tunten.scheduleTask(new Timer.Task() {
+                    @Override
+                    public void run() {
+                        PlayerZeile = 2;
+                        
+                        if(PlayerFrame == 9){
+                            PlayerFrame = 0;
+                        }
+                        else{
+                            PlayerFrame++;
+                        }
+                        
+                        player.setRegion(regions[PlayerZeile][PlayerFrame]);
+                        
+                     }
+                },0,1/5f);
+                tunten.stop();
+                
+                toben.scheduleTask(new Timer.Task() {
+                    @Override
+                    public void run() {
+                        PlayerZeile = 2;
+                        
+                        if(PlayerFrame == 9){
+                            PlayerFrame = 0;
+                        }
+                        else{
+                            PlayerFrame++;
+                        }
+                 
+                        player.setRegion(regions[PlayerZeile][PlayerFrame]);
+                        
+                     }
+                }, 0,1/5f);
+                toben.stop();
+                
+                tlinks.scheduleTask(new Timer.Task() {
+                    @Override
+                    public void run() {
+                        PlayerZeile = 2;
+                        if(player.isFlipX() == true){
+                        
+                        }
+                        else{
+                            player.flip(true, false);
+                        }
+                        if(PlayerFrame == 9){
+                            PlayerFrame = 0;
+                        }
+                        else{
+                            PlayerFrame++;
+                        }
+                        
+                        player.setRegion(regions[PlayerZeile][PlayerFrame]);
+                        
+                     }
+                }, 0,1/5f);
+                tlinks.stop();
+                
+                trechts.scheduleTask(new Timer.Task() {
+                    @Override
+                    public void run() {
+                        PlayerZeile = 2;
+                        if(player.isFlipX() == true){
+                            player.flip(false, false);
+                        }
+                        if(PlayerFrame == 9){
+                            PlayerFrame = 0;
+                        }
+                        else{
+                            PlayerFrame++;
+                        }
+                        
+                 
+                        player.setRegion(regions[PlayerZeile][PlayerFrame]);
+                        
+                     }
+                }, 0,1/5f);
+                trechts.stop();
+                
+	}
+
+        
+	public void render (SpriteBatch batch, Player p, Archer a) {
+		Gdx.gl.glClearColor(0, 0, 0, 1);
+		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+                player.setX(player.getX()+ (float) p.getMovementX());
+                player.setY(player.getY()+ (float) p.getMovementY());
+                archer.setX((float)a.getxPos());
+                archer.setY((float)a.getyPos());
+                
+                if(p.getMovementX() == 3){
+                    trechts.start();
+                    if(player.isFlipX() == true){
+                            player.flip(false, false);
+                        }
+                }
+                if(p.getMovementX() == -3){
+                    tlinks.start();
+                    if(player.isFlipX() == true){
+                        
+                    }
+                    else{
+                        player.flip(true, false);
+                    }
+                }
+                if(p.getMovementY() == 3){
+                    toben.start();
+                }
+                if(p.getMovementY() == -3){
+                    tunten.start();
+                }
+                
+                tmr.setView(camera);
+                tmr.render();
+                camera.zoom = 1000f;
+                camera.update();
+                batch.setProjectionMatrix(camera.combined);
+
+                
+                batch.begin();
+                title.draw(batch);
+                button.draw(batch);
+                player.draw(batch);
+                archer.draw(batch);
+                batch.end();
+	}
+        
+        
+        
+        public void tuntenstop(){
+            tunten.stop();
+            PlayerFrame = 0;
+            player.setRegion(regions[PlayerZeile][PlayerFrame]);}
+        public void tobenstop(){    
+            toben.stop();
+            PlayerFrame = 0;
+            player.setRegion(regions[PlayerZeile][PlayerFrame]);}
+        public void tlinksstop(){    
+            tlinks.stop();
+            PlayerFrame = 0;
+            player.setRegion(regions[PlayerZeile][PlayerFrame]);
+            player.flip(true, false);}
+        public void trechtsstop(){    
+            trechts.stop();
+            PlayerFrame = 0;
+            player.setRegion(regions[PlayerZeile][PlayerFrame]);}
+            
+        }