From 0ec17dfe39e84fde79837f80ce7b8443b79e8a57 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 7 May 2018 16:25:27 +0200 Subject: [PATCH] Countdown now opengl-rendered -> no more bugs Fixed minor bugs --- .../debug/android/support/v7/appcompat/R.java | 120 ++--- .../incremental/mergeDebugAssets/merger.xml | 2 +- .../mergeDebugResources/merger.xml | 4 +- app/build/intermediates/symbols/debug/R.txt | 416 +++++++++--------- .../main/assets/levelpacks/Icy Mountains.xml | 94 ++-- .../main/assets/shader/guiVertexShader.glsl | 15 + .../endlessroll/entities/Countdown.java | 95 ++++ .../entities/textures/TexturePack.java | 5 + .../de/frajul/endlessroll/main/game/Game.java | 12 +- .../frajul/endlessroll/main/game/Scene.java | 5 + .../main/screens/PreStartScreen.java | 3 + .../endlessroll/rendering/MatrixCreator.java | 12 + .../rendering/renderer/GameRenderer.java | 31 +- .../rendering/shader/GuiShader.java | 39 ++ .../frajul/endlessroll/views/Countdown.java | 106 ----- .../frajul/endlessroll/views/ViewManager.java | 15 - app/src/main/res/drawable/countdown_1.png | Bin 0 -> 1076 bytes app/src/main/res/drawable/countdown_2.png | Bin 0 -> 2654 bytes app/src/main/res/drawable/countdown_3.png | Bin 0 -> 2815 bytes app/src/main/res/layout/game.xml | 11 - app/src/main/res/layout/pre_start_screen.xml | 4 +- app/src/main/res/values/colors.xml | 4 - 22 files changed, 530 insertions(+), 463 deletions(-) create mode 100644 app/src/main/assets/shader/guiVertexShader.glsl create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/Countdown.java create mode 100644 app/src/main/java/de/frajul/endlessroll/rendering/shader/GuiShader.java delete mode 100644 app/src/main/java/de/frajul/endlessroll/views/Countdown.java create mode 100644 app/src/main/res/drawable/countdown_1.png create mode 100644 app/src/main/res/drawable/countdown_2.png create mode 100644 app/src/main/res/drawable/countdown_3.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 e6f9e65..1a93b5a 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 @@ -266,48 +266,48 @@ public final class R { public static final int bright_foreground_material_light = 0x7f05001d; public static final int button_material_dark = 0x7f05001e; public static final int button_material_light = 0x7f05001f; - public static final int dim_foreground_disabled_material_dark = 0x7f050023; - public static final int dim_foreground_disabled_material_light = 0x7f050024; - public static final int dim_foreground_material_dark = 0x7f050025; - public static final int dim_foreground_material_light = 0x7f050026; - public static final int foreground_material_dark = 0x7f050027; - public static final int foreground_material_light = 0x7f050028; - public static final int highlighted_text_material_dark = 0x7f050029; - public static final int highlighted_text_material_light = 0x7f05002a; - public static final int hint_foreground_material_dark = 0x7f05002b; - public static final int hint_foreground_material_light = 0x7f05002c; - public static final int material_blue_grey_800 = 0x7f05002d; - public static final int material_blue_grey_900 = 0x7f05002e; - public static final int material_blue_grey_950 = 0x7f05002f; - public static final int material_deep_teal_200 = 0x7f050030; - public static final int material_deep_teal_500 = 0x7f050031; - public static final int material_grey_100 = 0x7f050032; - public static final int material_grey_300 = 0x7f050033; - public static final int material_grey_50 = 0x7f050034; - public static final int material_grey_600 = 0x7f050035; - public static final int material_grey_800 = 0x7f050036; - public static final int material_grey_850 = 0x7f050037; - public static final int material_grey_900 = 0x7f050038; - public static final int primary_dark_material_dark = 0x7f05003c; - public static final int primary_dark_material_light = 0x7f05003d; - public static final int primary_material_dark = 0x7f05003e; - public static final int primary_material_light = 0x7f05003f; - public static final int primary_text_default_material_dark = 0x7f050040; - public static final int primary_text_default_material_light = 0x7f050041; - public static final int primary_text_disabled_material_dark = 0x7f050042; - public static final int primary_text_disabled_material_light = 0x7f050043; - public static final int ripple_material_dark = 0x7f050045; - public static final int ripple_material_light = 0x7f050046; - public static final int secondary_text_default_material_dark = 0x7f05004c; - public static final int secondary_text_default_material_light = 0x7f05004d; - public static final int secondary_text_disabled_material_dark = 0x7f05004e; - public static final int secondary_text_disabled_material_light = 0x7f05004f; - public static final int switch_thumb_disabled_material_dark = 0x7f050050; - public static final int switch_thumb_disabled_material_light = 0x7f050051; - public static final int switch_thumb_material_dark = 0x7f050052; - public static final int switch_thumb_material_light = 0x7f050053; - public static final int switch_thumb_normal_material_dark = 0x7f050054; - public static final int switch_thumb_normal_material_light = 0x7f050055; + public static final int dim_foreground_disabled_material_dark = 0x7f050020; + public static final int dim_foreground_disabled_material_light = 0x7f050021; + public static final int dim_foreground_material_dark = 0x7f050022; + public static final int dim_foreground_material_light = 0x7f050023; + public static final int foreground_material_dark = 0x7f050024; + public static final int foreground_material_light = 0x7f050025; + public static final int highlighted_text_material_dark = 0x7f050026; + public static final int highlighted_text_material_light = 0x7f050027; + public static final int hint_foreground_material_dark = 0x7f050028; + public static final int hint_foreground_material_light = 0x7f050029; + public static final int material_blue_grey_800 = 0x7f05002a; + public static final int material_blue_grey_900 = 0x7f05002b; + public static final int material_blue_grey_950 = 0x7f05002c; + public static final int material_deep_teal_200 = 0x7f05002d; + public static final int material_deep_teal_500 = 0x7f05002e; + public static final int material_grey_100 = 0x7f05002f; + public static final int material_grey_300 = 0x7f050030; + public static final int material_grey_50 = 0x7f050031; + public static final int material_grey_600 = 0x7f050032; + public static final int material_grey_800 = 0x7f050033; + public static final int material_grey_850 = 0x7f050034; + public static final int material_grey_900 = 0x7f050035; + public static final int primary_dark_material_dark = 0x7f050039; + public static final int primary_dark_material_light = 0x7f05003a; + public static final int primary_material_dark = 0x7f05003b; + public static final int primary_material_light = 0x7f05003c; + public static final int primary_text_default_material_dark = 0x7f05003d; + public static final int primary_text_default_material_light = 0x7f05003e; + public static final int primary_text_disabled_material_dark = 0x7f05003f; + public static final int primary_text_disabled_material_light = 0x7f050040; + public static final int ripple_material_dark = 0x7f050042; + public static final int ripple_material_light = 0x7f050043; + public static final int secondary_text_default_material_dark = 0x7f050049; + public static final int secondary_text_default_material_light = 0x7f05004a; + public static final int secondary_text_disabled_material_dark = 0x7f05004b; + public static final int secondary_text_disabled_material_light = 0x7f05004c; + public static final int switch_thumb_disabled_material_dark = 0x7f05004d; + public static final int switch_thumb_disabled_material_light = 0x7f05004e; + public static final int switch_thumb_material_dark = 0x7f05004f; + public static final int switch_thumb_material_light = 0x7f050050; + public static final int switch_thumb_normal_material_dark = 0x7f050051; + public static final int switch_thumb_normal_material_light = 0x7f050052; } public static final class dimen { public static final int abc_action_bar_content_inset_material = 0x7f060000; @@ -456,7 +456,7 @@ public final class R { public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f070042; public static final int abc_textfield_search_default_mtrl_alpha = 0x7f070043; public static final int abc_textfield_search_material = 0x7f070044; - public static final int notification_template_icon_bg = 0x7f070067; + public static final int notification_template_icon_bg = 0x7f07006a; } public static final class id { public static final int action0 = 0x7f080000; @@ -494,23 +494,23 @@ 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 = 0x7f080047; - public static final int homeAsUp = 0x7f080048; - public static final int icon = 0x7f080049; - public static final int ifRoom = 0x7f08004a; - public static final int image = 0x7f08004b; - public static final int info = 0x7f08004c; - public static final int line1 = 0x7f080059; - public static final int line3 = 0x7f08005a; - public static final int listMode = 0x7f08005c; - public static final int list_item = 0x7f08005d; - public static final int media_actions = 0x7f08005e; - public static final int middle = 0x7f08005f; - public static final int multiply = 0x7f080060; - public static final int never = 0x7f080061; - public static final int none = 0x7f080062; - public static final int normal = 0x7f080063; - public static final int parentPanel = 0x7f080064; + 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; diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index f731dca..020cf98 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 2b82696..039fd68 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1351,7 +1351,7 @@ Grasslands Icy Mountains Testcave - #17b3f5#1791f5#ffb637#ffeb37#ff8e37#e2ffb637#57ffb637#ff0000#000000#00000000#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f41602#f47b02#f4d802#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