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

vor merge

Browse Source
master
Jonathan Hager 6 years ago
parent c9b66f4e40 0b9256c3cb
commit a3f72cc512
3 changed files with 35 additions and 95 deletions
Show Stats Download Patch File Download Diff File

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

@ -252,7 +252,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
public boolean keyDown(int keycode) {
if(keycode == Input.Keys.A){
if(v != null){
v.moveCursor(3);
}
if(m != null){
d.getPlayer().setMovementX(-3f);
@ -261,7 +260,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(keycode == Input.Keys.D){
if(v != null){
v.moveCursor(1);
}
if(m != null){
d.getPlayer().setMovementX(+3f);
@ -270,7 +268,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(keycode == Input.Keys.S){
if(v != null){
v.moveCursor(2);
}
if(m != null){
d.getPlayer().setMovementY(-3f);
@ -279,29 +276,12 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(keycode == Input.Keys.W){
if(v != null){
v.moveCursor(0);
}
if(m != null){
d.getPlayer().setMovementY(3f);
}
}
if(keycode == Input.Keys.ENTER){
if(v != null){
if(v.click() == -1){}
else if(v.click() == 0){
v.cleanUp();
v = null;
m = new GameScreen(d);
newEntity(new Archer(0,0,0),96,96,0);
newEntity(new Archer(0,0,0),96,144,0);
newEntity(new Swordsman(0,0,0),288,96,0);
newEntity(new Swordsman(0,0,0),288,144,0);
newEntity(new Swordsman(0,0,0),48,144,0);
}
}
}
if(keycode == Input.Keys.E){
if(v != null){}
if(m != null){
@ -315,7 +295,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
public boolean keyUp(int keycode) {
if(keycode == Input.Keys.A){
if(v != null){
v.stopCursor(3);
}
if(m != null){
d.getPlayer().setMovementX(0);
@ -324,7 +303,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(keycode == Input.Keys.D){
if(v != null){
v.stopCursor(1);
}
if(m != null){
d.getPlayer().setMovementX(0);
@ -333,7 +311,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(keycode == Input.Keys.S){
if(v != null){
v.stopCursor(2);
}
if(m != null){
d.getPlayer().setMovementY(0);
@ -342,20 +319,12 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(keycode == Input.Keys.W){
if(v != null){
v.stopCursor(0);
}
if(m != null){
d.getPlayer().setMovementY(0);
}
}
if(keycode == Input.Keys.ENTER){
if(v != null){
}
if(m != null){
}
}
return true;
}
@ -367,8 +336,30 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
@Override
public boolean touchDown(int screenX, int screenY, int pointer, int button)
{
return false;
if(button == Input.Buttons.LEFT){
if(v != null){
switch(v.click(screenX, screenY)){
case -1:
return true;
case 0:
v.cleanUp();
v = null;
m = new GameScreen(d);
return true;
case 1:
return true;
}
return true;
}
if(m != null){
return true;
}
}
return true;
}
@Override

69
core/src/com/dungeoncrawler/view/MainMenu.java
Unescape View File

@ -8,9 +8,6 @@ import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.math.Rectangle;
import com.dungeoncrawler.model.entities.*;
import com.dungeoncrawler.model.Entity;
public class MainMenu{
@ -22,13 +19,6 @@ public class MainMenu{
Sprite quitButtonSprite;
Sprite backgroundSprite;
//ENTITIES
//CURSOR
Texture c;
Sprite cursor;
float CursorMoveX;
float CursorMoveY;
//CAMERA
float w = Gdx.graphics.getWidth();
@ -54,13 +44,12 @@ public class MainMenu{
quitButtonSprite = new Sprite(quitButtonTexture);
backgroundSprite = new Sprite(backgroundTexture);
startButtonSprite.setX(100f);
startButtonSprite.setY(350f);
quitButtonSprite.setX(50f);
quitButtonSprite.setY(50f);
startButtonSprite.setBounds(100f, 350f, startButtonTexture.getWidth(), startButtonTexture.getHeight());
quitButtonSprite.setBounds(50f, 50f, quitButtonTexture.getWidth(), quitButtonTexture.getHeight());
backgroundSprite.setX(0f);
backgroundSprite.setY(0f);
camera = new OrthographicCamera(1, h/w);
camera.zoom = 1200f;
camera.translate(backgroundSprite.getWidth()/2, backgroundSprite.getHeight()/2);
@ -72,14 +61,6 @@ public class MainMenu{
//ENTITIES
//CURSOR
c = new Texture("cursor.png");
cursor = new Sprite(c);
cursor.setX((float) w/2);
cursor.setY((float) h/2);
CursorMoveX = 0f;
CursorMoveY = 0f;
//PLAYER
// Sound
@ -91,57 +72,25 @@ public class MainMenu{
public void render (SpriteBatch batch) {
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
cursor.setX(cursor.getX()+ CursorMoveX);
cursor.setY(cursor.getY()+ CursorMoveY);
batch.begin();
batch.setProjectionMatrix(camera.combined);
backgroundSprite.draw(batch);
startButtonSprite.draw(batch);
quitButtonSprite.draw(batch);
cursor.draw(batch);
batch.end();
}
public void moveCursor(int direction){
switch(direction){ //starts the directional movement of the cursor in one direction depending on the pressed key
case 0:
CursorMoveY = 10f; break;
case 1:
CursorMoveX = 10f; break;
case 2:
CursorMoveY = -10f; break;
case 3:
CursorMoveX = -10f; break;
public int click(int x, int y){ // prueft ob cursor mit button (START) ueberlappt
if(x >= (int) startButtonSprite.getX() && x <= (int) startButtonSprite.getX()+ (int) startButtonSprite.getWidth() && y>= (int) startButtonSprite.getY() && y <= (int) startButtonSprite.getY() + (int) startButtonSprite.getHeight()){
return 0;
}
}
public void stopCursor(int direction){ //stops the directional movement of the cursor in one direction depending on the released key
switch(direction){
case 0:
CursorMoveY = 0f; break;
case 1:
CursorMoveX = 0f; break;
case 2:
CursorMoveY = 0f; break;
case 3:
CursorMoveX = 0f; break;
}
}
public int click(){ // prueft ob cursor mit button (START) ueberlappt
Rectangle rectangleCursor = cursor.getBoundingRectangle();
boolean overlapsPlay = rectangleCursor.overlaps(startButtonSprite.getBoundingRectangle());
boolean overlapsQuit = rectangleCursor.overlaps(quitButtonSprite.getBoundingRectangle());
if(overlapsPlay == true){
return 0; // ints weil fuer mehr buttons eine ID festgelegt werden kann. 0 = START || 1 = QUIT ||| -1 = kein button
}
else if(overlapsQuit == true){
if(x >= (int) quitButtonSprite.getX() && x <= (int) quitButtonSprite.getX()+ (int) quitButtonSprite.getWidth() && y>= (int) quitButtonSprite.getY() && y <= (int) quitButtonSprite.getY() + (int) quitButtonSprite.getHeight()){
return 1;
}
else{return -1;}
return -1;
}
public void cleanUp(){

2
desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java
Unescape View File

@ -13,8 +13,8 @@ public class DesktopLauncher {
config.height = 900;
config.title = "The Restless Caverns";
config.resizable = false;
//config.addIcon("logo.png", Files.FileType.Internale);
//config.addIcon("logo.png", Files.FileType.Internale);
new LwjglApplication(new Controller(), config);
}
}

Write Preview
Loading…
Cancel
Save