From 7f7b53b8a00e77339654e379bdfefd41406a7593 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 10 May 2018 17:31:26 +0200
Subject: [PATCH] Made toolbuttons opengl rendered Not clickable yet
Progressbar-filled-animation missing
---
.../debug/android/support/v7/appcompat/R.java | 118 ++--
.../incremental/mergeDebugAssets/merger.xml | 2 +-
.../mergeDebugResources/merger.xml | 4 +-
app/build/intermediates/symbols/debug/R.txt | 504 +++++++++---------
.../main/assets/levelpacks/Icy Mountains.xml | 226 +++++++-
.../main/assets/shader/guiFragmentShader.glsl | 51 ++
.../data/{Color.java => Color3f.java} | 14 +-
.../de/frajul/endlessroll/data/Color4f.java | 58 ++
.../entities/{ => guis}/Countdown.java | 4 +-
.../frajul/endlessroll/entities/guis/Gui.java | 33 ++
.../entities/guis/Progressbar.java | 42 ++
.../endlessroll/entities/guis/ToolButton.java | 127 +++++
.../entities/guis/ToolButtonBar.java | 75 +++
.../entities/particles/Particle.java | 8 +-
.../attributeValues/TintTimeline.java | 6 +-
.../attributeValues/TintTimelinePoint.java | 8 +-
.../entities/shapes/PlayerShape.java | 16 +-
.../entities/textures/TexturePack.java | 12 +-
.../endlessroll/entities/tools/ToolType.java | 14 +-
.../endlessroll/main/DataStorageHandler.java | 11 -
.../de/frajul/endlessroll/main/game/Game.java | 34 +-
.../frajul/endlessroll/main/game/Scene.java | 5 +-
.../main/game/TestScreenScene.java | 22 +-
.../main/screens/SettingsScreen.java | 6 -
.../rendering/renderer/GameRenderer.java | 14 +-
.../rendering/shader/GuiShader.java | 28 +-
.../rendering/shader/ParticleShader.java | 4 +-
...lButtonBar.java => ToolButtonBarView.java} | 35 +-
.../{ToolButton.java => ToolButtonView.java} | 4 +-
.../frajul/endlessroll/views/ViewManager.java | 13 +-
.../{countdown_1.png => guis_countdown_1.png} | Bin
.../{countdown_2.png => guis_countdown_2.png} | Bin
.../{countdown_3.png => guis_countdown_3.png} | Bin
app/src/main/res/drawable/white.png | Bin 0 -> 78 bytes
app/src/main/res/layout/game.xml | 16 +-
app/src/main/res/layout/settings.xml | 7 -
app/src/main/res/values-de/strings.xml | 1 -
app/src/main/res/values/strings.xml | 1 -
38 files changed, 1066 insertions(+), 457 deletions(-)
create mode 100644 app/src/main/assets/shader/guiFragmentShader.glsl
rename app/src/main/java/de/frajul/endlessroll/data/{Color.java => Color3f.java} (77%)
create mode 100644 app/src/main/java/de/frajul/endlessroll/data/Color4f.java
rename app/src/main/java/de/frajul/endlessroll/entities/{ => guis}/Countdown.java (97%)
create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/guis/Gui.java
create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/guis/Progressbar.java
create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/guis/ToolButton.java
create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/guis/ToolButtonBar.java
rename app/src/main/java/de/frajul/endlessroll/views/{ToolButtonBar.java => ToolButtonBarView.java} (74%)
rename app/src/main/java/de/frajul/endlessroll/views/{ToolButton.java => ToolButtonView.java} (97%)
rename app/src/main/res/drawable/{countdown_1.png => guis_countdown_1.png} (100%)
rename app/src/main/res/drawable/{countdown_2.png => guis_countdown_2.png} (100%)
rename app/src/main/res/drawable/{countdown_3.png => guis_countdown_3.png} (100%)
create mode 100644 app/src/main/res/drawable/white.png
diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
index 1a93b5a..f115fc9 100644
--- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
+++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
@@ -494,64 +494,64 @@ public final class R {
public static final int end_padder = 0x7f08002d;
public static final int expand_activities_button = 0x7f08002e;
public static final int expanded_menu = 0x7f08002f;
- public static final int home = 0x7f080046;
- public static final int homeAsUp = 0x7f080047;
- public static final int icon = 0x7f080048;
- public static final int ifRoom = 0x7f080049;
- public static final int image = 0x7f08004a;
- public static final int info = 0x7f08004b;
- public static final int line1 = 0x7f080058;
- public static final int line3 = 0x7f080059;
- public static final int listMode = 0x7f08005b;
- public static final int list_item = 0x7f08005c;
- public static final int media_actions = 0x7f08005d;
- public static final int middle = 0x7f08005e;
- public static final int multiply = 0x7f08005f;
- public static final int never = 0x7f080060;
- public static final int none = 0x7f080061;
- public static final int normal = 0x7f080062;
- public static final int parentPanel = 0x7f080063;
- public static final int progress_circular = 0x7f080068;
- public static final int progress_horizontal = 0x7f080069;
- public static final int radio = 0x7f08006a;
- public static final int screen = 0x7f08006b;
- public static final int scrollIndicatorDown = 0x7f08006c;
- public static final int scrollIndicatorUp = 0x7f08006d;
- public static final int scrollView = 0x7f08006e;
- public static final int search_badge = 0x7f08006f;
- public static final int search_bar = 0x7f080070;
- public static final int search_button = 0x7f080071;
- public static final int search_close_btn = 0x7f080072;
- public static final int search_edit_frame = 0x7f080073;
- public static final int search_go_btn = 0x7f080074;
- public static final int search_mag_icon = 0x7f080075;
- public static final int search_plate = 0x7f080076;
- public static final int search_src_text = 0x7f080077;
- public static final int search_voice_btn = 0x7f080078;
- public static final int select_dialog_listview = 0x7f080079;
- public static final int shortcut = 0x7f08008f;
- public static final int showCustom = 0x7f080094;
- public static final int showHome = 0x7f080095;
- public static final int showTitle = 0x7f080096;
- public static final int spacer = 0x7f080097;
- public static final int split_action_bar = 0x7f080098;
- public static final int src_atop = 0x7f080099;
- public static final int src_in = 0x7f08009a;
- public static final int src_over = 0x7f08009b;
- public static final int status_bar_latest_event_content = 0x7f0800a1;
- public static final int submit_area = 0x7f0800a2;
- public static final int tabMode = 0x7f0800a3;
- public static final int text = 0x7f0800a5;
- public static final int text2 = 0x7f0800a6;
- public static final int textSpacerNoButtons = 0x7f0800a7;
- public static final int time = 0x7f0800a8;
- public static final int title = 0x7f0800a9;
- public static final int title_template = 0x7f0800aa;
- public static final int topPanel = 0x7f0800c2;
- public static final int up = 0x7f0800d4;
- public static final int useLogo = 0x7f0800d5;
- public static final int withText = 0x7f0800d6;
- public static final int wrap_content = 0x7f0800df;
+ public static final int home = 0x7f080045;
+ public static final int homeAsUp = 0x7f080046;
+ public static final int icon = 0x7f080047;
+ public static final int ifRoom = 0x7f080048;
+ public static final int image = 0x7f080049;
+ public static final int info = 0x7f08004a;
+ public static final int line1 = 0x7f080057;
+ public static final int line3 = 0x7f080058;
+ public static final int listMode = 0x7f08005a;
+ public static final int list_item = 0x7f08005b;
+ public static final int media_actions = 0x7f08005c;
+ public static final int middle = 0x7f08005d;
+ public static final int multiply = 0x7f08005e;
+ public static final int never = 0x7f08005f;
+ public static final int none = 0x7f080060;
+ public static final int normal = 0x7f080061;
+ public static final int parentPanel = 0x7f080062;
+ public static final int progress_circular = 0x7f080067;
+ public static final int progress_horizontal = 0x7f080068;
+ public static final int radio = 0x7f080069;
+ public static final int screen = 0x7f08006a;
+ public static final int scrollIndicatorDown = 0x7f08006b;
+ public static final int scrollIndicatorUp = 0x7f08006c;
+ public static final int scrollView = 0x7f08006d;
+ public static final int search_badge = 0x7f08006e;
+ public static final int search_bar = 0x7f08006f;
+ public static final int search_button = 0x7f080070;
+ public static final int search_close_btn = 0x7f080071;
+ public static final int search_edit_frame = 0x7f080072;
+ public static final int search_go_btn = 0x7f080073;
+ public static final int search_mag_icon = 0x7f080074;
+ public static final int search_plate = 0x7f080075;
+ public static final int search_src_text = 0x7f080076;
+ public static final int search_voice_btn = 0x7f080077;
+ public static final int select_dialog_listview = 0x7f080078;
+ public static final int shortcut = 0x7f08008d;
+ public static final int showCustom = 0x7f080092;
+ public static final int showHome = 0x7f080093;
+ public static final int showTitle = 0x7f080094;
+ public static final int spacer = 0x7f080095;
+ public static final int split_action_bar = 0x7f080096;
+ public static final int src_atop = 0x7f080097;
+ public static final int src_in = 0x7f080098;
+ public static final int src_over = 0x7f080099;
+ public static final int status_bar_latest_event_content = 0x7f08009f;
+ public static final int submit_area = 0x7f0800a0;
+ public static final int tabMode = 0x7f0800a1;
+ public static final int text = 0x7f0800a3;
+ public static final int text2 = 0x7f0800a4;
+ public static final int textSpacerNoButtons = 0x7f0800a5;
+ public static final int time = 0x7f0800a6;
+ public static final int title = 0x7f0800a7;
+ public static final int title_template = 0x7f0800a8;
+ public static final int topPanel = 0x7f0800c0;
+ public static final int up = 0x7f0800d2;
+ public static final int useLogo = 0x7f0800d3;
+ public static final int withText = 0x7f0800d4;
+ public static final int wrap_content = 0x7f0800dd;
}
public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000;
@@ -619,7 +619,7 @@ public final class R {
public static final int abc_shareactionprovider_share_with = 0x7f0d0010;
public static final int abc_shareactionprovider_share_with_application = 0x7f0d0011;
public static final int abc_toolbar_collapse_description = 0x7f0d0012;
- public static final int status_bar_notification_info_overflow = 0x7f0d005d;
+ public static final int status_bar_notification_info_overflow = 0x7f0d005c;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0e0000;
diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 020cf98..b701472 100644
--- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 039fd68..8ba3007 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1351,7 +1351,7 @@
GrasslandsIcy MountainsTestcave
- #17b3f5#1791f5#ffb637#ffeb37#ff8e37#e2ffb637#57ffb637#ff0000#000000#00000000#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#9d000000#5b000000#3d00000030dp170dp170dp70dp60dpEndless RollClick me!I\'m a text!997.5Show FpsBoost performanceSet the bomb on an obstacle0.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Level UpGAME OVERLEVEL FINISHEDTo menuTry againRestartRestart level %dNext level: %dNext world:\n%sLOADING...ContinueExitPlayUnlock all levelsGain 90 epFinish the first world!Test GL Stuff!!!Level: 24Level: %dReset progressCreditsMusicSoundsRamp unlockedGreat world21/15%s%s unlocked!New slot unlockedNew shape unlockedLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyWheelSun\?\?\?Keep calm and roll onTick tack!Hypnotizes you for more funPACMAN!Don\'t worry, roll happy!A nice car without the... carShine bright like the sunA new shape for more funEmpty taskCollect %d stars (%d/%d)Collect %d energy (%d/%d)Collect %d starsCollect %d energyFinish the %d. world%d/%dYou will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the airYou are pulled towards it. Just try it out!Blow up all obstacles near the bombThis will give you super-powers for a few secondsFreezes a certain area which leads to longer in-air time\?\?\?RampSpringMagnetBombMushroomStasisLevel: %dYesNoThis is a beautiful ConfirmDialog placeholder!Do you really want to exit the game?Do you really want to reset ALL your progress?Do you really want to finish the first world?\nYour old progress will be DELETED!This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!Click anywhere on the screen to place the rampTry to place your ramp in front of the gapGreat job!\nNow place it in front of the obstacleYou can even set a Tool in mid-air.\nTime carefully!Now try again!Congratulations! You have leveled up!\nNow go to the toolshopWell done! Now you can start the next levelFor this level you will need two tools equippedTo select a tool just click on itENDLESS ROLLby FrajulTESTERSTester1\nTester2\nTester3\nTester4SOUNDS„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“, „Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)MUSIC\"Balloon Game\", \"Bit Shift\", \"Digital Lemonade\"\nKevin MacLeod (incompetech.com)\nLicensed under Creative Commons: By Attribution 3.0\nhttp://creativecommons.org/licenses/by/3.0/Why am I blue?I\'m blue