JonathanHager
/
trc-mobile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lol

Browse Source
master
GammelJan 6 years ago
parent 2acc4c4b14
commit b329934dfd
2 changed files with 160 additions and 154 deletions
Show Stats Download Patch File Download Diff File

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

@ -336,6 +336,18 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
isPaused = true; isPaused = true;
entityMovement.stop(); entityMovement.stop();
gs.end(); gs.end();
GAME_WORLD_WIDTH = 1600;
GAME_WORLD_HEIGHT = 900;
camera = null;
viewport = null;
camera = new OrthographicCamera();
camera.update();
viewport = new FitViewport(GAME_WORLD_WIDTH, GAME_WORLD_HEIGHT, camera);
viewport.update(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
viewport.apply();
camera.position.set(GAME_WORLD_WIDTH / 2, GAME_WORLD_HEIGHT / 2, 0);
camera.update();
batch.setProjectionMatrix(camera.combined);
gs = null; gs = null;
hc = null; hc = null;
es = new EndScreen(kills); es = new EndScreen(kills);
@ -930,7 +942,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
mm.cleanUp(); mm.cleanUp();
mm = null; mm = null;
GAME_WORLD_WIDTH = 700; GAME_WORLD_WIDTH = 700;
GAME_WORLD_HEIGHT = 380; GAME_WORLD_HEIGHT = 394;
camera = null; camera = null;
viewport = null; viewport = null;
camera = new OrthographicCamera(); camera = new OrthographicCamera();
@ -1014,7 +1026,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(gs != null){ if(gs != null){
if(!d.getPlayer().isToDelete()) { if(!d.getPlayer().isToDelete()) {
switch(gs.click(screenX, screenY)){ // -1: nix, 0: left, 1: up, 2: right, 3: down, 4: attackLeft, 5: attackUp, 6: attackRight, 7: attackDown ArrayList<Integer> clicked = gs.click(screenX,screenY);
for (Integer i : clicked) {
switch (i) { // -1: nix, 0: left, 1: up, 2: right, 3: down, 4: attackLeft, 5: attackUp, 6: attackRight, 7: attackDown
case 0: case 0:
d.getPlayer().setMovementX(-d.getPlayer().getMovementSpeed()); d.getPlayer().setMovementX(-d.getPlayer().getMovementSpeed());
break; break;
@ -1086,7 +1100,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
break; break;
} }
} }
}
} }
return true; return true;
} }
@ -1098,7 +1112,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(ps != null){ if(ps != null){
return ps.click(x,y); return ps.click(x,y);
} }
if(mm != null && mm.getHidden() == false){ if(mm != null && !mm.getHidden()){
return mm.click(x, y); return mm.click(x, y);
} }
if(ss != null){ if(ss != null){
@ -1107,9 +1121,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(cs != null){ if(cs != null){
return cs.click(x, y); return cs.click(x, y);
} }
if(gs != null && isPaused == true){
return gs.click(x,y);
}
return -1; return -1;
} }
@ -1117,9 +1128,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
@Override @Override
public boolean touchUp(int screenX, int screenY, int i2, int i3) { public boolean touchUp(int screenX, int screenY, int i2, int i3) {
if(gs != null){ if(gs != null){
if(gs.click(screenX,screenY) == 0 || gs.click(screenX,screenY) == 1 || gs.click(screenX,screenY) == 2 || gs.click(screenX,screenY) == 3){ if(gs.click(screenX,screenY).contains(0) || gs.click(screenX,screenY).contains(1)|| gs.click(screenX,screenY).contains(2)|| gs.click(screenX,screenY).contains(3)){
d.getPlayer().setMovementX(0);
d.getPlayer().setMovementY(0);
d.getPlayer().setMovementX(0); d.getPlayer().setMovementX(0);
d.getPlayer().setMovementY(0); d.getPlayer().setMovementY(0);
} }
@ -1129,30 +1138,24 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
@Override @Override
public boolean touchDragged(int screenX, int screenY, int i2) { public boolean touchDragged(int screenX, int screenY, int i2) {
//d.getPlayer().setMovementX(0); d.getPlayer().setMovementX(0);
//d.getPlayer().setMovementY(0); d.getPlayer().setMovementY(0);
//d.getPlayer().setMovementX(0); if(gs != null){
//d.getPlayer().setMovementY(0);
switch(click(screenX, screenY)){ // -1: nix, 0: left, 1: up, 2: right, 3: down, 4: attackLeft, 5: attackUp, 6: attackRight, 7: attackDown
case 0:
if(!d.getPlayer().isToDelete()) { if(!d.getPlayer().isToDelete()) {
ArrayList<Integer> clicked = gs.click(screenX,screenY);
for (Integer i : clicked) {
switch (i) { // -1: nix, 0: left, 1: up, 2: right, 3: down, 4: attackLeft, 5: attackUp, 6: attackRight, 7: attackDown
case 0:
d.getPlayer().setMovementX(-d.getPlayer().getMovementSpeed()); d.getPlayer().setMovementX(-d.getPlayer().getMovementSpeed());
}
break; break;
case 1: case 1:
if(!d.getPlayer().isToDelete()){ d.getPlayer().setMovementY(d.getPlayer().getMovementSpeed());
d.getPlayer().setMovementX(d.getPlayer().getMovementSpeed());
}
break; break;
case 2: case 2:
if(!d.getPlayer().isToDelete()){ d.getPlayer().setMovementX(d.getPlayer().getMovementSpeed());
d.getPlayer().setMovementY(-d.getPlayer().getMovementSpeed());
}
break; break;
case 3: case 3:
if(!d.getPlayer().isToDelete()){ d.getPlayer().setMovementY(-d.getPlayer().getMovementSpeed());
d.getPlayer().setMovementY(d.getPlayer().getMovementSpeed());
}
break; break;
case 4: case 4:
if (!gs.getIsLoading() && !d.getPlayer().isToDelete()) { if (!gs.getIsLoading() && !d.getPlayer().isToDelete()) {
@ -1212,7 +1215,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
break; break;
} }
return false; }
}
}
return true;
} }
@Override @Override
@ -1253,7 +1259,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
public void resume(){ public void resume(){
GAME_WORLD_WIDTH = 700; GAME_WORLD_WIDTH = 700;
GAME_WORLD_HEIGHT = 380; GAME_WORLD_HEIGHT = 394;
camera = null; camera = null;
viewport = null; viewport = null;
camera = new OrthographicCamera(); camera = new OrthographicCamera();

18
core/src/com/dungeoncrawler/view/GameScreen.java
Unescape View File

@ -13,6 +13,7 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.maps.tiled.TiledMap; import com.badlogic.gdx.maps.tiled.TiledMap;
import com.badlogic.gdx.maps.tiled.TiledMapRenderer; import com.badlogic.gdx.maps.tiled.TiledMapRenderer;
import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer; import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
import com.badlogic.gdx.math.Circle;
import com.badlogic.gdx.math.Intersector; import com.badlogic.gdx.math.Intersector;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer;
@ -289,16 +290,16 @@ public class GameScreen {
batch.end(); batch.end();
// BUTTON HITBOXES // BUTTON HITBOXES
/*
ShapeRenderer lol = new ShapeRenderer(); ShapeRenderer lol = new ShapeRenderer();
lol.setProjectionMatrix(camera.combined); lol.setProjectionMatrix(camera.combined);
lol.begin(ShapeRenderer.ShapeType.Filled); lol.begin(ShapeRenderer.ShapeType.Filled);
for(Button button : controls){ for(Button button : controls){
lol.rect(button.getxPos(), button.getyPos(), button.getWidth(), button.getHeight()); lol.rect(button.getxPos(), button.getyPos(), button.getWidth(), button.getHeight());
} }
lol.circle(mouseX,mouseY,5); lol.circle(mouseX,mouseY,15);
lol.end(); lol.end();
*/
} }
public void generateEntitySprites(Entity[] e){ public void generateEntitySprites(Entity[] e){
@ -548,19 +549,18 @@ public class GameScreen {
} }
} }
} }
public int click(int x, int y){ public ArrayList<Integer> click(int x, int y){
x = (int)(((float)x) / (float)Gdx.graphics.getWidth() * 700f) -170; x = (int)(((float)x) / (float)Gdx.graphics.getWidth() * 700f) -170;
y = 380- (int)(((float)y) / (float)Gdx.graphics.getHeight() * 380f)+ 25; y = 380- (int)(((float)y) / (float)Gdx.graphics.getHeight() * 380f)+ 25;
mouseX = x; mouseX = x;
mouseY = y; mouseY = y;
System.out.println("X: "+x+"| Y: "+y); ArrayList<Integer> clicks = new ArrayList();
Rectangle mouse = new Rectangle(x,y,1,1); Circle mouse = new Circle(x,y,20);
for(Button button : controls){ for(Button button : controls){
if(Intersector.overlaps(mouse, button.getSprite().getBoundingRectangle())){ if(Intersector.overlaps(mouse, button.getSprite().getBoundingRectangle())){
System.out.println(button.getId()); clicks.add(button.getId());
return button.getId();
} }
} }
return -1; return clicks;
} }
} }

Write Preview
Loading…
Cancel
Save