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

lol

Browse Source
master
Jan Ehehalt 6 years ago
parent 02b858201f
commit 3ada61b494
7 changed files with 104 additions and 81 deletions
Show Stats Download Patch File Download Diff File

BIN
android/release/Throwgame_V1.0-alpha.apk
View File

Binary file not shown.

BIN
android/release/Throwgame_V1.5.1.alpha.apk
View File

Binary file not shown.

BIN
android/release/android-release.apk
View File

Binary file not shown.

5
core/src/controller/Controller.java
Unescape View File

@ -210,6 +210,11 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
else if(ws != null) ws.render(batch); else if(ws != null) ws.render(batch);
else if(le != null){ else if(le != null){
le.render(batch); le.render(batch);
if(le.getToSave()){
le.dispose();
le = null;
ts = new Titlescreen(GAME_WORLD_WIDTH, GAME_WORLD_HEIGHT);
}
} }
batch.end(); batch.end();
} }

9
core/src/model/Button.java
Unescape View File

@ -19,17 +19,15 @@ public class Button {
private int width; private int width;
private int height; private int height;
private int id; private int id;
private int listId;
private Rectangle rect; private Rectangle rect;
public Button(String text, int xPos, int yPos, int width, int height, int id, int listId){ public Button(String text, int xPos, int yPos, int width, int height, int id){
this.text = text; this.text = text;
this.xPos = xPos; this.xPos = xPos;
this.yPos = yPos; this.yPos = yPos;
this.width = width; this.width = width;
this.height = height; this.height = height;
this.id = id; //0: pivot, 1: goal, 2: rect, 3: addRect this.id = id; //0: pivot, 1: goal, 2: rect, 3: addRect, 4: save
this.listId = listId;
rect = new Rectangle(xPos, yPos, width, height); rect = new Rectangle(xPos, yPos, width, height);
} }
@ -117,8 +115,5 @@ public class Button {
public int getId(){ public int getId(){
return id; return id;
} }
public int getListId(){
return listId;
}
} }

149
core/src/view/Leveleditor.java
Unescape View File

@ -37,43 +37,50 @@ import model.Projectile;
*/ */
public class Leveleditor{ public class Leveleditor{
ShapeRenderer shapeRenderer;
float GAME_WORLD_WIDTH; float GAME_WORLD_WIDTH;
float GAME_WORLD_HEIGHT; float GAME_WORLD_HEIGHT;
ArrayList<Button> buttons; // SHAPE RENDERER
ShapeRenderer shapeRenderer;
float mouseX;
float mouseY;
int listNumber; // BUTTONS
int selectedRect; ArrayList<Button> buttons;
// VARIABLES
boolean goalSet;
boolean pivotSet;
boolean toSave;
int state; //-1: nothig selected, 0: place pivot, 2: pivot direction, 3: goal, 4: obstacles int state; //-1: nothig selected, 0: place pivot, 2: pivot direction, 3: goal, 4: obstacles
// BITMAP FONT
BitmapFont font; BitmapFont font;
// LEVEL TO BE EDITED AND SAVED
Level level; Level level;
public Leveleditor(float width, float height, Matrix4 matrix){ public Leveleditor(float width, float height, Matrix4 matrix){
GAME_WORLD_WIDTH = width; GAME_WORLD_WIDTH = width;
GAME_WORLD_HEIGHT = height; GAME_WORLD_HEIGHT = height;
// CREATING LEVEL, TO BE EDITED AND SAVED
level = new Level(new Goal(0, 0, 200, 150, 0.2f), new Projectile(0, 0, 0), 0, 0); level = new Level(new Goal(0, 0, 200, 150, 0.2f), new Projectile(0, 0, 0), 0, 0);
// VARIABLES
state = -1; state = -1;
toSave = false;
// SHAPE RENDERER
shapeRenderer = new ShapeRenderer(); shapeRenderer = new ShapeRenderer();
shapeRenderer.setProjectionMatrix(matrix); shapeRenderer.setProjectionMatrix(matrix);
// CREATE DEFAULT BUTTONS
buttons = new ArrayList(); buttons = new ArrayList();
buttons.add(new Button("Pivot", (int)(GAME_WORLD_WIDTH * 0.02),(int) (GAME_WORLD_HEIGHT - (buttons.size()+1) * 0.07 * GAME_WORLD_HEIGHT), 200, 50, 0, listNumber)); buttons.add(new Button("Pivot", (int)(GAME_WORLD_WIDTH * 0.02),(int) (GAME_WORLD_HEIGHT - (buttons.size()+1) * 0.07 * GAME_WORLD_HEIGHT), 200, 50, 0));
listNumber++; buttons.add(new Button("Goal", (int)(GAME_WORLD_WIDTH * 0.02), (int)(GAME_WORLD_HEIGHT - (buttons.size()+1) * 0.07 * GAME_WORLD_HEIGHT), 200, 50, 1));
buttons.add(new Button("Goal", (int)(GAME_WORLD_WIDTH * 0.02), (int)(GAME_WORLD_HEIGHT - (buttons.size()+1) * 0.07 * GAME_WORLD_HEIGHT), 200, 50, 1, listNumber)); buttons.add(new Button("new Obstacle", (int)(GAME_WORLD_WIDTH * 0.02), (int)(GAME_WORLD_HEIGHT - (buttons.size()+1) * 0.07 * GAME_WORLD_HEIGHT), 200, 50, 2));
listNumber++; buttons.add(new Button("SAVE", (int)(GAME_WORLD_WIDTH * 0.8), (int)(GAME_WORLD_HEIGHT - (buttons.size()+1) * 0.07 * GAME_WORLD_HEIGHT), 200, 50, 4));
buttons.add(new Button("add Rect", (int)(GAME_WORLD_WIDTH * 0.02), (int)(GAME_WORLD_HEIGHT - (buttons.size()+1) * 0.07 * GAME_WORLD_HEIGHT), 200, 50, 2, listNumber));
listNumber++;
buttons.add(new Button("SAVE", (int)(GAME_WORLD_WIDTH * 0.8), (int)(GAME_WORLD_HEIGHT - (buttons.size()+1) * 0.07 * GAME_WORLD_HEIGHT), 200, 50, 4, listNumber));
listNumber++;
// CREATE BITMAP FONT
font = new BitmapFont(); font = new BitmapFont();
FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("font.ttf")); FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("font.ttf"));
FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter(); FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter();
@ -91,41 +98,53 @@ public class Leveleditor{
batch.end(); batch.end();
shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); shapeRenderer.begin(ShapeRenderer.ShapeType.Filled);
shapeRenderer.setColor(Color.BLACK); shapeRenderer.setColor(Color.BLACK);
shapeRenderer.rectLine((float) level.getPivotX(), (float) level.getPivotY(), (float) level.getProjectile().getxPos(), (float) level.getProjectile().getyPos(), 3); // DRAW PIVOT
shapeRenderer.setColor(Color.GRAY); if(pivotSet) {
shapeRenderer.circle(level.getPivotX(), level.getPivotY(), 5); shapeRenderer.rectLine((float) level.getPivotX(), (float) level.getPivotY(), (float) level.getProjectile().getxPos(), (float) level.getProjectile().getyPos(), 3);
shapeRenderer.setColor(Color.BLACK); shapeRenderer.setColor(Color.GRAY);
shapeRenderer.circle(level.getPivotX(), level.getPivotY() + 150, level.getProjectile().getRadius()); shapeRenderer.circle(level.getPivotX(), level.getPivotY(), 5);
shapeRenderer.setColor(Color.BLACK);
shapeRenderer.circle(level.getPivotX(), level.getPivotY() + 150, level.getProjectile().getRadius());
}
// DRAW BUTTONS
if(state == -1){ if(state == -1){
for(Button button : buttons){ for(Button button : buttons){
shapeRenderer.rectLine(button.getxPos(), button.getyPos(), button.getxPos() + button.getWidth(), button.getyPos(), 4); if(button.getId() == 4 && (!goalSet || !pivotSet)){
shapeRenderer.rectLine(button.getxPos(), button.getyPos(), button.getxPos(), button.getyPos() + button.getHeight(), 4);
shapeRenderer.rectLine(button.getxPos(), button.getyPos()+button.getHeight(), button.getxPos()+button.getWidth(), button.getyPos() + button.getHeight(), 4); }
shapeRenderer.rectLine(button.getxPos() + button.getWidth(), button.getyPos(),button.getxPos() + button.getWidth(), button.getyPos() + button.getHeight(), 4); else{
shapeRenderer.end(); shapeRenderer.rectLine(button.getxPos(), button.getyPos(), button.getxPos() + button.getWidth(), button.getyPos(), 4);
batch.begin(); shapeRenderer.rectLine(button.getxPos(), button.getyPos(), button.getxPos(), button.getyPos() + button.getHeight(), 4);
font.getData().setScale(1.5f); shapeRenderer.rectLine(button.getxPos(), button.getyPos()+button.getHeight(), button.getxPos()+button.getWidth(), button.getyPos() + button.getHeight(), 4);
font.draw(batch, button.getText(),button.getxPos() + button.getWidth()/2 - getTextWidth(button.getText())/2, button.getyPos() + button.getHeight()/2 + getTextHeight(button.getText())/2); shapeRenderer.rectLine(button.getxPos() + button.getWidth(), button.getyPos(),button.getxPos() + button.getWidth(), button.getyPos() + button.getHeight(), 4);
batch.end(); shapeRenderer.end();
shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); batch.begin();
font.getData().setScale(1.5f);
font.draw(batch, button.getText(),button.getxPos() + button.getWidth()/2 - getTextWidth(button.getText())/2, button.getyPos() + button.getHeight()/2 + getTextHeight(button.getText())/2);
batch.end();
shapeRenderer.begin(ShapeRenderer.ShapeType.Filled);
}
} }
} }
// DRAW OBSTACLES
for(Rectangle rect : level.getObjects()){ for(Rectangle rect : level.getObjects()){
shapeRenderer.rect(rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight()); shapeRenderer.rect(rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight());
} }
// DRAW GOAL
shapeRenderer.setColor(Color.BLACK); shapeRenderer.setColor(Color.BLACK);
float x = level.getGoal().getxPos(); if(goalSet) {
float y = level.getGoal().getyPos(); float x = level.getGoal().getxPos();
float w = level.getGoal().getSizeX(); float y = level.getGoal().getyPos();
float h = level.getGoal().getSizeY(); float w = level.getGoal().getSizeX();
float th = level.getGoal().getThickness(); float h = level.getGoal().getSizeY();
shapeRenderer.rect(x, y,th * w, h); float th = level.getGoal().getThickness();
shapeRenderer.rect(x + th * w,y, th*3 * w,th * h); shapeRenderer.rect(x, y, th * w, h);
shapeRenderer.rect(x + th *w + th*3 * w, y, th * w,h); shapeRenderer.rect(x + th * w, y, th * 3 * w, th * h);
shapeRenderer.rect(x + th * w + th * 3 * w, y, th * w, h);
}
shapeRenderer.end(); shapeRenderer.end();
batch.begin(); batch.begin();
@ -133,61 +152,54 @@ public class Leveleditor{
} }
public void dispose() { public void dispose() {
}
public void setMousePos(float x, float y){
mouseX = x;
mouseY = y;
} }
public void setGoal(){}
public void touchDown(int x, int y){ public void touchDown(int x, int y){
switch(state){ switch(state){
case -1: case -1: // NO BUTTON SELECTED
Rectangle mouse = new Rectangle(x, (int)GAME_WORLD_HEIGHT -y, 1, 1); Rectangle mouse = new Rectangle(x, (int)GAME_WORLD_HEIGHT -y, 1, 1);
for(Button button : buttons){ for(Button button : buttons){
if(Intersector.overlaps(mouse, button.getRectangle())){ if(Intersector.overlaps(mouse, button.getRectangle())){
state = button.getId(); if(button.getId() == 4 && (!goalSet || !pivotSet)){ // DONT SAVE WHEN GOAL OR PIVOT NOT SET
if(button.getId() == 3){ }
selectedRect = button.getListId(); else if(button.getId() == 4){ // SAVE IF GOAL AND PIVOT SET
save();
}
else { // NOT SAVE -> STATE = BUTTONS ID
state = button.getId();
} }
break; break;
} }
} }
for(Rectangle rect : level.getObjects()){ for(Rectangle rect : level.getObjects()){ // DELETE RECTANGLE IF PRESSED
if(Intersector.overlaps(mouse, rect)){ if(Intersector.overlaps(mouse, rect)){
level.removeObstacle(rect); level.removeObstacle(rect);
break; break;
} }
} }
break; break;
case 0: case 0: // SET PIVOT
level.setPivot(x, (int)GAME_WORLD_HEIGHT - y); level.setPivot(x, (int)GAME_WORLD_HEIGHT - y);
level.getProjectile().setxPos(x); level.getProjectile().setxPos(x);
level.getProjectile().setyPos((int) GAME_WORLD_HEIGHT - y + 150); level.getProjectile().setyPos((int) GAME_WORLD_HEIGHT - y + 150);
pivotSet = true;
state = -1; state = -1;
break; break;
case 1: case 1: // SET GOAL
level.setGoal(x, (int)GAME_WORLD_HEIGHT-y); level.setGoal(x, (int)GAME_WORLD_HEIGHT-y);
state = -1; state = -1;
goalSet = true;
break; break;
case 2: case 2: // NEW OBSTACLE
level.addRectangle(x,(int)GAME_WORLD_HEIGHT-y,200,100); level.addRectangle(x,(int)GAME_WORLD_HEIGHT-y,200,100);
state = -1; state = -1;
break; break;
case 3: default:
state = -1;
break;
case 4:
Json json = new Json();
FileHandle file = Gdx.files.local("levels/level2.json");
file.writeString(json.toJson(level), false);
break; break;
} }
} }
public float getTextWidth(String text){ public float getTextWidth(String text){
GlyphLayout glyphLayout = new GlyphLayout(); GlyphLayout glyphLayout = new GlyphLayout();
glyphLayout.setText(font,text); glyphLayout.setText(font,text);
@ -199,4 +211,15 @@ public class Leveleditor{
return glyphLayout.height; return glyphLayout.height;
} }
public boolean getToSave(){
return toSave;
}
public void save(){
Json json = new Json();
FileHandle file = Gdx.files.local("levels/level2.json");
file.writeString(json.toJson(level), false);
toSave = true;
}
} }

2
levels/level2.json
Unescape View File

@ -1 +1 @@
{goal:{xPos:560,yPos:355,sizeX:300,sizeY:200,thickness:0.2},projectile:{xPos:306,yPos:707,mass:5,radius:10},math:{},xPosPivot:306,yPosPivot:557,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[]} {goal:{xPos:764,yPos:492,sizeX:300,sizeY:200,thickness:0.2},projectile:{xPos:401,yPos:501,mass:5,radius:10},math:{},xPosPivot:401,yPosPivot:351,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[{x:356,y:468,width:200,height:100}]}
Write Preview
Loading…
Cancel
Save