Cleaned up the whole project
Added Copyrights --> Version 0.7.1
This commit is contained in:
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
~ Copyright (c) 2018. All rights reserved.
|
||||
~ Last modified 7/10/18 3:54 PM
|
||||
~
|
||||
-->
|
||||
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="de.frajul.endlessroll">
|
||||
|
||||
@ -6,13 +13,14 @@
|
||||
android:glEsVersion="0x00020000"
|
||||
android:required="true" />
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/AppTheme">
|
||||
|
||||
<activity
|
||||
android:name=".main.GameActivity"
|
||||
android:configChanges="orientation|screenSize|keyboardHidden"
|
||||
@ -25,4 +33,4 @@
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
</manifest>
|
||||
@ -1,3 +1,10 @@
|
||||
<!--
|
||||
~ Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
~ Copyright (c) 2018. All rights reserved.
|
||||
~ Last modified 7/10/18 3:54 PM
|
||||
~
|
||||
-->
|
||||
|
||||
<levelPack id="1">
|
||||
<world>GRASSLANDS</world>
|
||||
<levels class="java.util.ArrayList">
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
<!--
|
||||
~ Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
~ Copyright (c) 2018. All rights reserved.
|
||||
~ Last modified 7/10/18 3:54 PM
|
||||
~
|
||||
-->
|
||||
|
||||
<levelPack id="2">
|
||||
<world>ICY_MOUNTAINS</world>
|
||||
<levels class="java.util.ArrayList">
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.data;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.data;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.data;
|
||||
|
||||
/**
|
||||
@ -24,10 +31,9 @@ public class Vector {
|
||||
return "Vector(" + x + ", " + y + ")";
|
||||
}
|
||||
|
||||
public Vector set(float x, float y) {
|
||||
public void set(float x, float y) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
return this;
|
||||
}
|
||||
|
||||
public float length() {
|
||||
@ -53,7 +59,7 @@ public class Vector {
|
||||
return this;
|
||||
}
|
||||
|
||||
public Vector abs(){
|
||||
public Vector abs() {
|
||||
this.x = Math.abs(x);
|
||||
this.y = Math.abs(y);
|
||||
return this;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
@ -17,7 +24,7 @@ public class AnimatedEntity extends Entity {
|
||||
animation = new Animation();
|
||||
}
|
||||
|
||||
public void update(Timer timer){
|
||||
public void update(Timer timer) {
|
||||
animation.update(timer);
|
||||
super.setTextureAtlasIndex(animation.getCurrentTexIndex());
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import de.frajul.endlessroll.main.game.Timer;
|
||||
@ -15,7 +22,7 @@ public class Animation {
|
||||
private boolean stillRunning = true;
|
||||
private long lastSwitchTime = -1;
|
||||
|
||||
public void disable(){
|
||||
public void disable() {
|
||||
stillRunning = false;
|
||||
}
|
||||
|
||||
|
||||
@ -1,10 +1,16 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
import de.frajul.endlessroll.entities.textures.Texture;
|
||||
|
||||
/**
|
||||
@ -29,16 +35,16 @@ public class Background {
|
||||
}
|
||||
|
||||
public void move(float playerMoveX, float cameraX) {
|
||||
synchronized (layers){
|
||||
for(BackgroundLayer layer : layers){
|
||||
synchronized (layers) {
|
||||
for (BackgroundLayer layer : layers) {
|
||||
layer.move(playerMoveX, cameraX);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void resetPosition() {
|
||||
synchronized (layers){
|
||||
for(BackgroundLayer layer : layers)
|
||||
synchronized (layers) {
|
||||
for (BackgroundLayer layer : layers)
|
||||
layer.resetPosition();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,11 @@
|
||||
package de.frajul.endlessroll.entities;
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
import java.util.List;
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import de.frajul.endlessroll.data.SynchronizedArrayList;
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import android.support.annotation.Nullable;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -15,7 +22,6 @@ import de.frajul.endlessroll.main.game.Timer;
|
||||
*/
|
||||
public class Player extends Entity {
|
||||
|
||||
private final float ROTATION_SPEED = -400;
|
||||
public final float RADIUS = 0.1f;
|
||||
private final float START_X = -0.9f;
|
||||
private final float SPEED = 0.002f;
|
||||
@ -39,10 +45,6 @@ public class Player extends Entity {
|
||||
super.setHeight(RADIUS * 2);
|
||||
}
|
||||
|
||||
public void reset(){
|
||||
|
||||
}
|
||||
|
||||
public void startSuperPower(long duration) {
|
||||
this.superPowerDuration = duration;
|
||||
currentSuperPowerDuration = 0;
|
||||
@ -104,7 +106,11 @@ public class Player extends Entity {
|
||||
forces.clear();
|
||||
}
|
||||
|
||||
public float getProgress() {
|
||||
public float getProgress(float goalX) {
|
||||
return (getPosition().x - START_X) / (goalX - START_X);
|
||||
}
|
||||
|
||||
public float getXFromStart(){
|
||||
return getPosition().x - START_X;
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities;
|
||||
|
||||
import de.frajul.endlessroll.main.GameLog;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collectables;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -34,7 +41,7 @@ public class Collectables extends SynchronizedArrayList<Entity> {
|
||||
|
||||
@Override
|
||||
public synchronized boolean remove(Object object) {
|
||||
if(object instanceof Star)
|
||||
if (object instanceof Star)
|
||||
stars.remove(object);
|
||||
else
|
||||
energy = null;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collectables;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collectables;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
@ -16,9 +23,7 @@ public class CircleTriangleCollisionDetector {
|
||||
if (circleCenterInsideTriangle(circle, triangle))
|
||||
return true;
|
||||
|
||||
if (circleIntersectingWithTriangleEdges(circle, triangle))
|
||||
return true;
|
||||
return false;
|
||||
return circleIntersectingWithTriangleEdges(circle, triangle);
|
||||
}
|
||||
|
||||
private boolean circleIntersectingWithTriangleEdges(Circle circle, Triangle triangle) {
|
||||
@ -42,8 +47,7 @@ public class CircleTriangleCollisionDetector {
|
||||
k = k / length;
|
||||
|
||||
if (k < length)
|
||||
if (Math.sqrt(vertexToCenter.x * vertexToCenter.x + vertexToCenter.y * vertexToCenter.y - k * k) <= circle.getRadius())
|
||||
return true;
|
||||
return Math.sqrt(vertexToCenter.x * vertexToCenter.x + vertexToCenter.y * vertexToCenter.y - k * k) <= circle.getRadius();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
import de.frajul.endlessroll.entities.Entity;
|
||||
import de.frajul.endlessroll.entities.Obstacle;
|
||||
import de.frajul.endlessroll.entities.Player;
|
||||
import de.frajul.endlessroll.entities.collision.collisionData.EntityCollisionData;
|
||||
import de.frajul.endlessroll.entities.collision.geometry.Circle;
|
||||
@ -52,9 +58,7 @@ public class CollisionDetector {
|
||||
|
||||
public boolean isPointInQuad(Vector point, Quad quad) {
|
||||
if (point.getX() >= quad.getLeftEdge() && point.getX() <= quad.getRightEdge()) {
|
||||
if (point.getY() >= quad.getBottomEdge() && point.getY() <= quad.getTopEdge()) {
|
||||
return true;
|
||||
}
|
||||
return point.getY() >= quad.getBottomEdge() && point.getY() <= quad.getTopEdge();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -95,9 +99,7 @@ public class CollisionDetector {
|
||||
float yDistance = Math.abs(q2.getPosition().y - q1.getPosition().y);
|
||||
if (xDistance >= q1.getWidth() / 2 + q2.getWidth() / 2)
|
||||
return false;
|
||||
if (yDistance >= q1.getHeight() / 2 + q2.getHeight() / 2)
|
||||
return false;
|
||||
return true;
|
||||
return !(yDistance >= q1.getHeight() / 2 + q2.getHeight() / 2);
|
||||
}
|
||||
|
||||
public boolean isTriangleTriangleCollision(Triangle triangle1, Triangle triangle2) {
|
||||
@ -117,9 +119,7 @@ public class CollisionDetector {
|
||||
if (triangle2Vertex2InTriangle1)
|
||||
return true;
|
||||
boolean triangle2Vertex3InTriangle1 = isVertexInTriangle(triangle2.getBottomLeftVertex(), triangle1);
|
||||
if (triangle2Vertex3InTriangle1)
|
||||
return true;
|
||||
return false;
|
||||
return triangle2Vertex3InTriangle1;
|
||||
}
|
||||
|
||||
public boolean isQuadTriangleCollision(Quad quad, Triangle triangle) {
|
||||
@ -148,9 +148,7 @@ public class CollisionDetector {
|
||||
boolean triangleVertex3InQuad = isPointInQuad(triangle.getBottomLeftVertex(), quad);
|
||||
if (triangleVertex3InQuad)
|
||||
return true;
|
||||
if (triangle.getTopEdge() >= quad.getTopEdge() && triangle.getBottomEdge() <= quad.getBottomEdge() && ((triangle.getLeftEdge() <= quad.getRightEdge() && triangle.getLeftEdge() >= quad.getLeftEdge()) || (triangle.getRightEdge() <= quad.getRightEdge() && triangle.getRightEdge() >= quad.getLeftEdge())))
|
||||
return true;
|
||||
return false;
|
||||
return triangle.getTopEdge() >= quad.getTopEdge() && triangle.getBottomEdge() <= quad.getBottomEdge() && ((triangle.getLeftEdge() <= quad.getRightEdge() && triangle.getLeftEdge() >= quad.getLeftEdge()) || (triangle.getRightEdge() <= quad.getRightEdge() && triangle.getRightEdge() >= quad.getLeftEdge()));
|
||||
}
|
||||
|
||||
private boolean isVertexInTriangle(Vector vertex, Triangle triangle) {
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision;
|
||||
|
||||
import de.frajul.endlessroll.entities.DestroyEffect;
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision;
|
||||
|
||||
public enum Edge {
|
||||
LEFT, RIGHT, TOP, BOTTOM, NONE;
|
||||
LEFT, RIGHT, TOP, BOTTOM, NONE
|
||||
}
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision.collisionData;
|
||||
|
||||
import de.frajul.endlessroll.entities.Entity;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision.collisionData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision.collisionData;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision.collisionData;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision.geometry;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
import de.frajul.endlessroll.entities.Player;
|
||||
import de.frajul.endlessroll.entities.collision.CollisionDetector;
|
||||
|
||||
/**
|
||||
* Created by Julian on 01.12.2015.
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision.geometry;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision.geometry;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.collision.geometry;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,9 +1,15 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.guis;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
import de.frajul.endlessroll.entities.Entity;
|
||||
import de.frajul.endlessroll.entities.textures.Texture;
|
||||
import de.frajul.endlessroll.entities.textures.TexturePack;
|
||||
import de.frajul.endlessroll.main.game.Game;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.guis;
|
||||
|
||||
import de.frajul.endlessroll.data.Color4f;
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.guis;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
import de.frajul.endlessroll.entities.textures.Texture;
|
||||
import de.frajul.endlessroll.main.GameLog;
|
||||
|
||||
public class Progressbar extends Gui {
|
||||
|
||||
@ -14,13 +20,13 @@ public class Progressbar extends Gui {
|
||||
this.maxTime = maxTime;
|
||||
}
|
||||
|
||||
public void update(float frameTime){
|
||||
public void update(float frameTime) {
|
||||
progress += frameTime / maxTime;
|
||||
if (progress >= 1f)
|
||||
progress = 1f;
|
||||
}
|
||||
|
||||
public boolean hasFinished(){
|
||||
public boolean hasFinished() {
|
||||
return progress == 1;
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.guis;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.guis;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.guis;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles;
|
||||
|
||||
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.Range;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -59,7 +66,7 @@ public class ParticleEffect {
|
||||
}
|
||||
|
||||
public ParticleData createParticleData() {
|
||||
return new ParticleData(life.getRange(), scale, velocity, angle, rotation, transparency, tint, wind , gravity);
|
||||
return new ParticleData(life.getRange(), scale, velocity, angle, rotation, transparency, tint, wind, gravity);
|
||||
}
|
||||
|
||||
public Random getRandom() {
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -128,7 +135,7 @@ public class ParticleSource {
|
||||
setUpParticle(new Vector(position).translate(xOff, yOff));
|
||||
}
|
||||
|
||||
private Particle setUpParticle(Vector position) {
|
||||
private void setUpParticle(Vector position) {
|
||||
Particle particle;
|
||||
if (inactiveParticles.size() > 0)
|
||||
particle = inactiveParticles.remove(0);
|
||||
@ -140,7 +147,6 @@ public class ParticleSource {
|
||||
activeParticleLock.lock();
|
||||
activeParticles.add(particle);
|
||||
activeParticleLock.unlock();
|
||||
return particle;
|
||||
}
|
||||
|
||||
private float calcEmittPause() {
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles;
|
||||
|
||||
import android.content.Context;
|
||||
@ -39,7 +46,7 @@ public class ParticleSystem {
|
||||
superPower = reader.read("particleEffects/superPower.pe");
|
||||
snow = reader.read("particleEffects/snow.pe");
|
||||
|
||||
effects = new ParticleEffect[]{stasis, testFire,colorChange, explosion, magnet, starCollect, energyCollect, firework, superPower, snow};
|
||||
effects = new ParticleEffect[]{stasis, testFire, colorChange, explosion, magnet, starCollect, energyCollect, firework, superPower, snow};
|
||||
}
|
||||
|
||||
public void update(Timer timer) {
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes;
|
||||
|
||||
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.ImagePath;
|
||||
@ -55,21 +62,21 @@ public class AttributeValueReader {
|
||||
((ImagePath) attribute.get(ParticleAttributeValueType.IMAGE_PATH)).setImagePath(line);
|
||||
}
|
||||
|
||||
private int parseTimeLineIndex(String start, String line) throws Exception {
|
||||
private int parseTimeLineIndex(String start, String line) {
|
||||
String asString = line.split(start)[1].split(":")[0];
|
||||
return Integer.parseInt(asString);
|
||||
}
|
||||
|
||||
private float parseFloat(String line) throws Exception {
|
||||
private float parseFloat(String line) {
|
||||
String asString = line.split(" ")[1];
|
||||
return Float.parseFloat(asString);
|
||||
}
|
||||
|
||||
private String parseString(String line) throws Exception {
|
||||
private String parseString(String line) {
|
||||
return line.split(" ")[1];
|
||||
}
|
||||
|
||||
private boolean parseBoolean(String line) throws Exception {
|
||||
private boolean parseBoolean(String line) {
|
||||
String asString = line.split(" ")[1];
|
||||
return Boolean.parseBoolean(asString);
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes;
|
||||
|
||||
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.ParticleAttributeValueType;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
public class TimelinePoint {
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -47,7 +54,7 @@ public class TintTimeline extends ParticleAttributeValue {
|
||||
float leftMultiplier = leftDist / totalDist;
|
||||
float rightMultiplier = rightDist / totalDist;
|
||||
|
||||
return left.getColor().interpolate(leftMultiplier,rightMultiplier, right.getColor());
|
||||
return left.getColor().interpolate(leftMultiplier, rightMultiplier, right.getColor());
|
||||
}
|
||||
return left.getColor();
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
|
||||
|
||||
import de.frajul.endlessroll.data.Color3f;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.shapes;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.shapes;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.shapes;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.shapes;
|
||||
|
||||
import android.content.Context;
|
||||
@ -9,7 +16,7 @@ import de.frajul.endlessroll.levels.LevelManager;
|
||||
* Created by Julian on 30.10.2017.
|
||||
*/
|
||||
|
||||
public class EmptyTask extends Task{
|
||||
public class EmptyTask extends Task {
|
||||
|
||||
public EmptyTask() {
|
||||
super(0);
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.shapes;
|
||||
|
||||
import android.support.annotation.DrawableRes;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.shapes;
|
||||
|
||||
import de.frajul.endlessroll.views.PlayerShapeButton;
|
||||
@ -8,6 +15,6 @@ import de.frajul.endlessroll.views.PlayerShapeButton;
|
||||
|
||||
public interface PlayerShapeButtonOnClickListener {
|
||||
|
||||
public void onClick(PlayerShapeButton button);
|
||||
void onClick(PlayerShapeButton button);
|
||||
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.shapes;
|
||||
|
||||
import android.content.Context;
|
||||
@ -17,7 +24,7 @@ public abstract class Task {
|
||||
this.condition = condition;
|
||||
}
|
||||
|
||||
public void update(LevelManager levelManager){
|
||||
public void update(LevelManager levelManager) {
|
||||
conditionFulfilled = checkConditionFulfilled(levelManager);
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.textures;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.textures;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@ -1,7 +1,13 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.textures;
|
||||
|
||||
import android.content.Context;
|
||||
import android.opengl.GLES20;
|
||||
import android.support.annotation.DrawableRes;
|
||||
|
||||
import de.frajul.endlessroll.R;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tileLists;
|
||||
|
||||
import de.frajul.endlessroll.entities.textures.Texture;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tileLists;
|
||||
|
||||
import de.frajul.endlessroll.entities.textures.Texture;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tileLists;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tileLists;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -53,7 +60,7 @@ public class TileList extends SynchronizedArrayList<Tile> {
|
||||
float leftEdge = data.getX() - data.getWidth() / 2;
|
||||
float rightEdge = data.getX() + data.getWidth() / 2;
|
||||
if (Math.abs(lastRightEdge - leftEdge) < 0.1f)
|
||||
GameLog.i("!!! Too small gap found !!! " + toMeters(lastRightEdge) + "m; " + lastRightEdge + "-"+leftEdge+"; iRight="+tileData.indexOf(data));
|
||||
GameLog.i("!!! Too small gap found !!! " + toMeters(lastRightEdge) + "m; " + lastRightEdge + "-" + leftEdge + "; iRight=" + tileData.indexOf(data));
|
||||
lastRightEdge = rightEdge;
|
||||
super.add(new Tile(type, texture, edge, data));
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
@ -33,7 +40,7 @@ public class Bomb extends Tool {
|
||||
delta += timer.getFrameTimeMilliseconds();
|
||||
int currentExplosionState = Math.min((int) (delta / (explosionDuration / 3f)), 3);
|
||||
if (attachedObstacle != null) {
|
||||
if(attachedObstacle.isMoving())
|
||||
if (attachedObstacle.isMoving())
|
||||
super.setPosition(new Vector(attachedObstacle.getPosition()).translate(offsetToObstaclePosition));
|
||||
attachedObstacle.setBombExplosionState(currentExplosionState);
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
@ -17,7 +24,7 @@ public class Spring extends Tool {
|
||||
|
||||
public Spring(Vector position, SoundManager soundManager) {
|
||||
super(ToolType.SPRING, position, .3f, .35f, true, true);
|
||||
animation.setIndexSequence(new int[]{1,3,3,1});
|
||||
animation.setIndexSequence(new int[]{1, 3, 3, 1});
|
||||
animation.setRequiredDelta(80);
|
||||
this.soundManager = soundManager;
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import de.frajul.endlessroll.data.Vector;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import de.frajul.endlessroll.R;
|
||||
@ -22,7 +29,7 @@ public class ToolSlot {
|
||||
public int getDrawable() {
|
||||
if (locked)
|
||||
return R.drawable.tools_button_locked;
|
||||
else if(toolType != null)
|
||||
else if (toolType != null)
|
||||
return toolType.getButtonDrawable();
|
||||
else
|
||||
return R.drawable.tools_button_empty;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
import android.support.annotation.Nullable;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
/**
|
||||
@ -6,6 +13,6 @@ package de.frajul.endlessroll.entities.tools;
|
||||
|
||||
public enum ToolUpgradeType {
|
||||
|
||||
COOLDOWN, DURATION, FORCE, SIZE;
|
||||
COOLDOWN, DURATION, FORCE, SIZE
|
||||
|
||||
}
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels;
|
||||
|
||||
import org.simpleframework.xml.Attribute;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels;
|
||||
|
||||
import org.simpleframework.xml.Attribute;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels;
|
||||
|
||||
import org.simpleframework.xml.Attribute;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels;
|
||||
|
||||
import org.simpleframework.xml.Attribute;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels;
|
||||
|
||||
import org.simpleframework.xml.Attribute;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels;
|
||||
|
||||
import org.simpleframework.xml.Attribute;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels;
|
||||
|
||||
import org.simpleframework.xml.Attribute;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.levels.worlds;
|
||||
|
||||
import android.support.annotation.DrawableRes;
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
package de.frajul.endlessroll.main;
|
||||
|
||||
import de.frajul.endlessroll.user.User;
|
||||
|
||||
/**
|
||||
* Created by Julian on 15.07.2016.
|
||||
*/
|
||||
public class DataSafer {
|
||||
|
||||
private User user;
|
||||
|
||||
}
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.main;
|
||||
|
||||
import android.app.Activity;
|
||||
@ -19,6 +26,7 @@ public class DataStorageHandler {
|
||||
private final String SOUNDS_MUTED = "SoundsMuted";
|
||||
private final String MUSIC_MUTED = "MusicMuted";
|
||||
private final String USER_EP = "EP";
|
||||
|
||||
private final String USER_LEVEL = "Level";
|
||||
private final String USER_STARS = "Stars";
|
||||
private final String USER_ENERGY = "Energy";
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.main;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,10 +1,16 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.main;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.ActivityManager;
|
||||
import android.content.Context;
|
||||
import android.content.pm.ConfigurationInfo;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.Typeface;
|
||||
import android.os.Bundle;
|
||||
import android.view.KeyEvent;
|
||||
@ -60,15 +66,8 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
|
||||
|
||||
private MyGlSurfaceView glSurfaceView;
|
||||
private ScreenFlipper flipper;
|
||||
private PreStartScreen preStartScreen;
|
||||
private StartScreen startScreen;
|
||||
private GLTestScreen glTestScreen;
|
||||
private WorldsScreen worldsScreen;
|
||||
private LevelsScreen levelsScreen;
|
||||
private ToolShopScreen toolShopScreen;
|
||||
private PlayerShapeShopScreen shapeShopScreen;
|
||||
private GameScreen gameScreen;
|
||||
private SettingsScreen settingsScreen;
|
||||
|
||||
private LevelupMessage levelupMessage;
|
||||
private TaskCompletedMessage taskCompletedMessage;
|
||||
@ -108,15 +107,15 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
|
||||
this.glSurfaceView = new MyGlSurfaceView(this, new GameRenderer(this));
|
||||
typeface = Typeface.createFromAsset(getAssets(), "fontBaron.ttf");
|
||||
|
||||
preStartScreen = new PreStartScreen(this);
|
||||
startScreen = new StartScreen(this, glSurfaceView);
|
||||
glTestScreen = new GLTestScreen(this, glSurfaceView);
|
||||
worldsScreen = new WorldsScreen(this);
|
||||
PreStartScreen preStartScreen = new PreStartScreen(this);
|
||||
StartScreen startScreen = new StartScreen(this, glSurfaceView);
|
||||
GLTestScreen glTestScreen = new GLTestScreen(this, glSurfaceView);
|
||||
WorldsScreen worldsScreen = new WorldsScreen(this);
|
||||
levelsScreen = new LevelsScreen(this);
|
||||
toolShopScreen = new ToolShopScreen(this);
|
||||
shapeShopScreen = new PlayerShapeShopScreen(this);
|
||||
ToolShopScreen toolShopScreen = new ToolShopScreen(this);
|
||||
PlayerShapeShopScreen shapeShopScreen = new PlayerShapeShopScreen(this);
|
||||
gameScreen = new GameScreen(this, glSurfaceView);
|
||||
settingsScreen = new SettingsScreen(this);
|
||||
SettingsScreen settingsScreen = new SettingsScreen(this);
|
||||
|
||||
levelupMessage = new LevelupMessage(this);
|
||||
taskCompletedMessage = new TaskCompletedMessage(this);
|
||||
@ -134,7 +133,6 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
|
||||
setContentView(relativeLayout);
|
||||
} catch (Exception e) {
|
||||
onException(e);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -317,11 +315,6 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConfigurationChanged(Configuration newConfig) {
|
||||
super.onConfigurationChanged(newConfig);
|
||||
}
|
||||
|
||||
private boolean hasGLES20() {
|
||||
ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
|
||||
ConfigurationInfo info = am.getDeviceConfigurationInfo();
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.main;
|
||||
|
||||
import android.widget.RelativeLayout;
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
/*
|
||||
* Created by Julian Mutter on 7/10/18 3:58 PM
|
||||
* Copyright (c) 2018. All rights reserved.
|
||||
* Last modified 7/10/18 3:54 PM
|
||||
*
|
||||
*/
|
||||
|
||||
package de.frajul.endlessroll.main;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user