julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

testCommit

Browse Source
This commit is contained in:
=
2017-11-22 16:00:56 +01:00
parent 9a2353b01c
commit 3324056634
13 changed files with 279 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
app/src/main/assets/particleEffects/colorChange.pe Normal file
View File

@ -0,0 +1,128 @@
Untitled
- Delay -
active: false
- Duration -
lowMin: 1000.0
lowMax: 1000.0
- Count -
min: 0
max: 1000
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 7000.0
highMax: 7000.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life Offset -
active: false
- X Offset -
active: false
- Y Offset -
active: false
- Spawn Shape -
shape: line
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Spawn Height -
lowMin: 0.0
lowMax: 0.0
highMin: 400.0
highMax: 400.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 0.0
lowMax: 0.0
highMin: 80.0
highMax: 80.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Velocity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 100.0
highMax: 100.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Angle -
active: false
- Rotation -
active: false
- Wind -
active: false
- Gravity -
active: false
- Tint -
colorsCount: 15
colors0: 1.0
colors1: 0.0
colors2: 0.0
colors3: 1.0
colors4: 0.41568628
colors5: 0.0
colors6: 0.20784314
colors7: 1.0
colors8: 0.0
colors9: 0.85490197
colors10: 0.0
colors11: 1.0
colors12: 0.0
colors13: 0.5372549
colors14: 1.0
timelineCount: 5
timeline0: 0.0
timeline1: 0.32702237
timeline2: 0.54044753
timeline3: 0.82271945
timeline4: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Options -
attached: false
continuous: true
aligned: false
additive: true
behind: false
premultipliedAlpha: false
- Image Path -
particle.png

50
app/src/main/assets/particleEffects/firework.pe
View File

@ -2,16 +2,16 @@ Untitled
- Delay -
active: false
- Duration -
lowMin: 100.0
lowMax: 100.0
lowMin: 200.0
lowMax: 200.0
- Count -
min: 0
max: 10000
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 1000.0
highMax: 1000.0
highMin: 300.0
highMax: 300.0
relative: false
scalingCount: 1
scaling0: 1.0
@ -72,18 +72,20 @@ timeline2: 1.0
- Velocity -
active: true
lowMin: 0.0
lowMax: 300.0
lowMax: 280.0
highMin: 800.0
highMax: 800.0
relative: false
scalingCount: 3
scalingCount: 4
scaling0: 1.0
scaling1: 1.0
scaling2: 0.0
timelineCount: 3
scaling3: 0.0
timelineCount: 4
timeline0: 0.0
timeline1: 0.29791272
timeline2: 0.2989127
timeline3: 1.0
- Angle -
active: true
lowMin: 89.0
@ -107,8 +109,8 @@ active: false
active: true
lowMin: 0.0
lowMax: 0.0
highMin: -50.0
highMax: -100.0
highMin: -100.0
highMax: -150.0
relative: false
scalingCount: 4
scaling0: 0.0
@ -121,20 +123,28 @@ timeline1: 0.29981026
timeline2: 0.65753424
timeline3: 0.75342464
- Tint -
colorsCount: 9
colors0: 0.0
colors1: 0.4
colors2: 1.0
colorsCount: 15
colors0: 1.0
colors1: 0.0
colors2: 0.0
colors3: 1.0
colors4: 0.0
colors4: 0.41568628
colors5: 0.0
colors6: 1.0
colors6: 0.20784314
colors7: 1.0
colors8: 1.0
timelineCount: 3
colors8: 0.0
colors9: 0.85490197
colors10: 0.0
colors11: 1.0
colors12: 0.0
colors13: 0.5372549
colors14: 1.0
timelineCount: 5
timeline0: 0.0
timeline1: 0.35800344
timeline2: 1.0
timeline1: 0.32702237
timeline2: 0.54044753
timeline3: 0.82271945
timeline4: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
@ -144,7 +154,7 @@ relative: false
scalingCount: 3
scaling0: 1.0
scaling1: 1.0
scaling2: 0.0
scaling2: 0.2
timelineCount: 3
timeline0: 0.0
timeline1: 0.70547944

4
app/src/main/assets/shader/particleFragmentShader.glsl
View File

@ -11,9 +11,9 @@ vec3 saturateColor(in vec3 color, in float a);
void main() {
float a = texture2D(texture, pass_TexCoords).a * alpha;
gl_FragColor = vec4(color, a);
vec3 black = vec3(0.0, 0.0, 0.0);
gl_FragColor.rgb = mix(color, black, 1.0 - gl_FragColor.a);
gl_FragColor.rgb = mix(color, black, 1.0 - a);
gl_FragColor.a = a;
}

4
app/src/main/java/de/frajul/endlessroll/entities/particles/Firework.java
View File

@ -23,8 +23,8 @@ public class Firework {
public void start() {
randomExplosion(0);
randomExplosion(500);
randomExplosion(700);
randomExplosion(100);
randomExplosion(300);
}
private void randomExplosion(float delay) {

3
app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java
View File

@ -16,7 +16,8 @@ public class TestScreenScene extends Scene {
public TestScreenScene(TexturePack texturePack, ParticleSystem particleSystem) {
super(texturePack, particleSystem);
terrain.createEndless(World.ICY_MOUNTAINS, -1.0f);
new ParticleSource(new Vector(0, -0.5f), particleSystem.testFire).start();
background.changeTexture(World.ICY_MOUNTAINS.getBackgroundTexture());
new ParticleSource(new Vector(0, 0.0f), particleSystem.colorChange).start();
}
}

10
app/src/main/java/de/frajul/endlessroll/main/tutorial/ToolShopTutorial.java
View File

@ -12,11 +12,17 @@ import de.frajul.endlessroll.entities.tools.ToolType;
public class ToolShopTutorial extends Tutorial {
public enum ToolShopTutorialState{
NONE, TO_TOOLSHOP, SELECT_SPRING, BUY_SPRING, EQUIP_SPRING;
}
private List<BreakPoint> atStartBreakPoints = new ArrayList<>();
private List<BreakPoint> afterSpringBoughtBreakPoints = new ArrayList<>();
private boolean firstPartShown;
private ToolShopTutorialState state = ToolShopTutorialState.TO_TOOLSHOP;
public ToolShopTutorial() {
super(-1, -1, new BreakPoint(0, R.string.tutorial_toolshop_welcome, -1),
new BreakPoint(0, R.string.tutorial_toolshop_toolbar,
@ -65,4 +71,8 @@ public class ToolShopTutorial extends Tutorial {
public void setFirstPartShown(boolean firstPartShown) {
this.firstPartShown = firstPartShown;
}
public ToolShopTutorialState getState() {
return state;
}
}

18
app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java
View File

@ -1,6 +1,7 @@
package de.frajul.endlessroll.views;
import android.graphics.Typeface;
import android.view.KeyEvent;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
@ -39,6 +40,7 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
topBar = new TopBar(gameActivity, Screen.ScreenType.GAME,
layout.findViewById(R.id.goal_message_topbar));
topBar.setShopsEnabled(true);
TextView title = (TextView) layout.findViewById(R.id.goal_message_title);
title.setTypeface(typeface);
restart = new GoalMessageLevelButton(gameActivity, this,
@ -50,7 +52,7 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
toMenu.setOnClickListener(this);
}
public void fadeIn(LevelPack levelPack, Level level) {
public void fadeInWithDelay(LevelPack levelPack, final Level level) {
this.levelPack = levelPack;
topBar.update();
restart.init(R.string.goal_message_restart_format_d, level);
@ -60,7 +62,12 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
nextLevel
.init(R.string.goal_message_next_level_format_d, levelPack.getNextLevel(level));
layout.startAnimation(fadeIn);
layout.postDelayed(new Runnable() {
@Override
public void run() {
layout.startAnimation(fadeIn);
}
}, 500);
}
private void hide() {
@ -71,8 +78,8 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
@Override
public void onClick(View v) {
if (v.equals(toMenu)) {
hide();
game.toLevelsScreen();
hide();
}
}
@ -81,4 +88,9 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
hide();
gameActivity.startGame(levelPack, goalMessageLevelButton.getLevel());
}
public void onKeyBack(){
game.toLevelsScreen();
hide();
}
}

6
app/src/main/res/anim/pulse.xml
View File

@ -2,12 +2,12 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:repeatMode="reverse">
<scale
android:duration="1000"
android:duration="700"
android:fromXScale="1.2"
android:fromYScale="1.2"
android:repeatCount="infinite"
android:pivotX="50%"
android:pivotY="50%"
android:toXScale="0.8"
android:toYScale="0.8" />
android:toXScale="0.9"
android:toYScale="0.9" />
</set>