JonathanHager
/
dungeoncrawler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Umbau im Ansatz vorhanden

Browse Source
master
Jonathan Hager 6 years ago
parent c206b30815
commit 81c0543702
3 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File

38
core/src/com/dungeoncrawler/control/Controller.java
Unescape View File

@ -9,7 +9,6 @@ import com.badlogic.gdx.ApplicationAdapter;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputProcessor; import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.dungeoncrawler.view.*; import com.dungeoncrawler.view.*;
import com.dungeoncrawler.model.Dungeon; import com.dungeoncrawler.model.Dungeon;
@ -23,7 +22,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
Dungeon d; Dungeon d;
DungeonGenerator dg; DungeonGenerator dg;
MainMenu v; MainMenu v;
Player p;
Entity[] e; Entity[] e;
Timer t; Timer t;
View m; View m;
@ -35,8 +33,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
batch = new SpriteBatch(); batch = new SpriteBatch();
v = new MainMenu(); v = new MainMenu();
p = new Player(); d = new Dungeon(new Player());
d = new Dungeon(p);
dg = new DungeonGenerator(); dg = new DungeonGenerator();
dg.ichWillSpielen(); dg.ichWillSpielen();
e = new Entity[5]; e = new Entity[5];
@ -78,10 +75,19 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
@Override @Override
public void render(){ public void render(){
if(v != null){ if(v != null){
v.render(batch, p , e); v.render(batch, d.getPlayer() , e);
} }
if(v == null){ if(v == null){
m.render(batch, p, a); int xPosRoom = d.getPlayer().getxPos() / 48;
int yPosRoom = d.getPlayer().getyPos() / 48;
System.out.println(xPosRoom + " " + yPosRoom);
d.getPlayer().setxPos(d.getPlayer().getxPos()+ d.getPlayer().getMovementX());
d.getPlayer().setyPos(d.getPlayer().getyPos()+ d.getPlayer().getMovementY());
// Render methode zum rendern der einzelnen Sprites wird aufgerufen
m.render(batch, d.getPlayer(), a, xPosRoom, yPosRoom);
} }
} }
@ -94,19 +100,19 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
public boolean keyDown(int keycode) { public boolean keyDown(int keycode) {
if(keycode == Input.Keys.LEFT){ if(keycode == Input.Keys.LEFT){
if(v != null){ if(v != null){
v.moveCursor(3); v.moveCursor(3);
} }
if(m != null){ if(m != null){
p.setMovementX(-3); d.getPlayer().setMovementX(-3);
} }
} }
if(keycode == Input.Keys.RIGHT){ if(keycode == Input.Keys.RIGHT){
if(v != null){ if(v != null){
v.moveCursor(1); v.moveCursor(1);
} }
if(m != null){ if(m != null){
p.setMovementX(3); d.getPlayer().setMovementX(3);
} }
} }
@ -115,7 +121,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
v.moveCursor(2); v.moveCursor(2);
} }
if(m != null){ if(m != null){
p.setMovementY(-3); d.getPlayer().setMovementY(-3);
} }
} }
@ -124,7 +130,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
v.moveCursor(0); v.moveCursor(0);
} }
if(m != null){ if(m != null){
p.setMovementY(3); d.getPlayer().setMovementY(3);
} }
} }
@ -148,7 +154,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
v.stopCursor(3); v.stopCursor(3);
} }
if(m != null){ if(m != null){
p.setMovementX(0); d.getPlayer().setMovementX(0);
} }
} }
@ -157,7 +163,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
v.stopCursor(1); v.stopCursor(1);
} }
if(m != null){ if(m != null){
p.setMovementX(0); d.getPlayer().setMovementX(0);
} }
} }
@ -166,7 +172,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
v.stopCursor(2); v.stopCursor(2);
} }
if(m != null){ if(m != null){
p.setMovementY(0); d.getPlayer().setMovementY(0);
} }
} }
@ -175,7 +181,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
v.stopCursor(0); v.stopCursor(0);
} }
if(m != null){ if(m != null){
p.setMovementY(0); d.getPlayer().setMovementY(0);
} }
} }

2
core/src/com/dungeoncrawler/model/entities/Player.java
Unescape View File

@ -24,6 +24,4 @@ public class Player extends Entity {
// TODO: Sinnvolle Werte finden // TODO: Sinnvolle Werte finden
} }
} }

20
core/src/com/dungeoncrawler/view/View.java
Unescape View File

@ -28,7 +28,7 @@ public class View {
Sprite[] entitySprites; Sprite[] entitySprites;
//MAP //MAP
Map tm; Map m;
TiledMapRenderer tmr; TiledMapRenderer tmr;
TiledMap test; TiledMap test;
OrthographicCamera camera; OrthographicCamera camera;
@ -52,17 +52,17 @@ public class View {
//MAP //MAP
tm = new Map(); m = new Map();
camera = new OrthographicCamera(1, h/w); camera = new OrthographicCamera(1, h/w);
d = new DungeonGenerator().generateDungeon(10, 10, 48, new Player()); d = new DungeonGenerator().generateDungeon(10, 10, 48, new Player());
MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tiles.gif"))); MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tiles.gif")));
TiledMap[][][] maps = mg.generateMap(7, d); TiledMap[][][] maps = mg.generateMap(7, d);
tm.setMaps(maps); m.setMaps(maps);
for(int i=0;i<tm.getMaps()[0].length;i++){ for(int i=0;i<m.getMaps()[0].length;i++){
for(int j=0;j<tm.getMaps()[0][0].length;j++){ for(int j=0;j<m.getMaps()[0][0].length;j++){
if(tm.getMaps()[0][i][j] != null){ if(m.getMaps()[0][i][j] != null){
test = tm.getMaps()[0][i][j]; test = m.getMaps()[0][i][j];
} }
} }
} }
@ -71,12 +71,12 @@ public class View {
} }
public void render (SpriteBatch batch, Player p, Archer a) { public void render (SpriteBatch batch, Player p, Archer a, int xPosRoom, int yPosRoom) {
Gdx.gl.glClearColor(0, 0, 0, 1); Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
player.setX(player.getX()+ p.getMovementX());
player.setY(player.getY()+ p.getMovementY());
player.setX(p.getxPos());
player.setY(p.getyPos());
if(p.getMovementX() == 3){ if(p.getMovementX() == 3){
player.setRegion(regions[0][1]); player.setRegion(regions[0][1]);

Write Preview
Loading…
Cancel
Save