From 5550543b77c0f62f195172147d98597db55b3825 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Sat, 13 Jan 2018 18:17:03 +0100
Subject: [PATCH] Fixed bug with collision detection (when player fell too fast
 on rightTop Edge of Obstacle, Center went over test-diagonal -> RightEdge was
 returned)

---
 .../mergeDebugResources/merger.xml            |  2 +-
 .../entities/collision/CollisionDetector.java | 23 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index d3c3bfd..2aea267 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1352,7 +1352,7 @@
         <item>Icy Mountains</item>
         <item>Testcave</item>
         <item>Mysterious fireworld</item>
-    </string-array></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\colors.xml" qualifiers=""><color name="level_finished">#ffda45</color><color name="game_over">#f11e6f</color><color name="retry">#39be27</color><color name="game_progress_text">#ffb405</color><color name="message_views">#daf10d</color><color name="toolbuttonInactiveNotReady">#db911c0f</color><color name="toolbuttonInactiveReady">#dbfff200</color><color name="toolbuttonActiveNotReady">#e5dc1522</color><color name="toolbuttonActiveReady">#db41e42b</color><color name="toolbuttonLocked">#db494b49</color><color name="toolslotDisabled">#715f5f</color><color name="toolslotDisabledSelected">#60715f</color><color name="toolslotEnabled">#db41e42b</color><color name="toolslotEnabledSelected">#b3d700</color><color name="countdown3">#f0f41e02</color><color name="countdown2">#f0f28117</color><color name="countdown1">#f0d7b106</color><color name="background_levelup_message">#9d000000</color><color name="background_short_menu">#5b000000</color><color name="background_tutorial">#3d000000</color></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\dimen.xml" qualifiers=""><dimen name="tool_inspector_width">170dp</dimen><dimen name="shape_inspector_width">170dp</dimen><dimen name="tool_button_width">70dp</dimen><dimen name="tool_button_height">60dp</dimen></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Endless Roll</string><string name="placeholder_button">Click me!</string><string name="placeholder_textview">I\'m a text!</string><string name="placeholder_number">997.5</string><string name="placeholder_percent">85.1%</string><string name="game_playerprogress_placeholder">0.0m</string><string name="game_playerprogress_format_f">%.1fm</string><string name="game_playerspeed_placeholder">0.0m/s</string><string name="game_playerspeed_format_f">%.1fm/s</string><string name="game_fps_placeholder">Fps: 00</string><string name="game_fps_format_d">Fps: %d</string><string name="game_countdown_placeholder">3</string><string name="task_completed">Task completed</string><string name="levelup">Level Up</string><string name="message_game_over">GAME OVER</string><string name="message_level_finished">LEVEL FINISHED</string><string name="message_tools">Tools</string><string name="message_to_menu">To menu</string><string name="message_try_again">Try again</string><string name="message_restart">Restart</string><string name="message_next_level">Next level</string><string name="goal_message_restart_format_d">Restart Level %d</string><string name="goal_message_next_level_format_d">Next Level: %d</string><string name="pre_start_screen_loading">LOADING...</string><string name="short_menu_continue">Continue</string><string name="short_menu_restart">Restart</string><string name="short_menu_exit">Exit</string><string name="start_screen_play">Play</string><string name="start_screen_unlock_all_levels">Unlock all levels (Yes! It\'s magic!)</string><string name="start_screen_gain_90_ep">Gain 90 ep (Nope! No magic at all!)</string><string name="start_screen_to_gl_test_screen">Test GL Stuff!!!</string><string name="tool_upgrade_title_placeholder">Time (Lv12)</string><string name="topbar_level_placeholder">Level: 24</string><string name="topbar_level_format_d">Level: %d</string><string name="settings_reset">Reset</string><string name="topbar_toolshop">Toolshop</string><string name="unlock_message_placeholder">Ramp unlocked</string><string name="world_button_title_placeholder">Great world</string><string name="world_button_progress_placeholder">21/15</string><string name="bounty_message_resource_format_s">%s</string><string name="bounty_message_tool_format_s">%s unlocked!</string><string name="bounty_message_tool_slot">You unlocked a Toolslot</string><string name="bounty_message_shape_unlocked">New shape unlocked</string><string name="level_button_format_d">Level: %d</string><string name="price_button_buy">Buy</string><string name="price_button_upgrade">Upgrade</string><string name="playershape_name_ball">Ball</string><string name="playershape_name_clock">Clock</string><string name="playershape_name_hypno_spiral">Hypno</string><string name="playershape_name_pacman">Pacman</string><string name="playershape_name_smiley">Smiley</string><string name="playershape_name_wheel">Wheel</string><string name="playershape_name_sun">Sun</string><string name="playershape_name_locked">\?\?\?</string><string name="playershape_description_ball">Keep calm and roll on</string><string name="playershape_description_clock">Tick tack!</string><string name="playershape_description_hypno_spiral">Hypnotizes you for more fun</string><string name="playershape_description_pacman">PACMAN!</string><string name="playershape_description_smiley">Don\'t worry, roll happy!</string><string name="playershape_description_wheel">A nice car without the... car</string><string name="playershape_description_sun">Shine bright like the sun</string><string name="playershape_description_locked">A new shape for more fun</string><string name="task_empty">Empty task</string><string name="task_collect_stars_progress_format_ddd">Collect %d stars (%d/%d)</string><string name="task_collect_energy_progress_format_ddd">Collect %d energy (%d/%d)</string><string name="task_collect_stars_format_d">Collect %d stars</string><string name="task_collect_energy_format_d">Collect %d energy</string><string name="task_complete_world_format_d">Finish the %d. world</string><string name="world_button_count_format_dd">%d/%d</string><string name="tool_description_locked_format_d">You will unlock this mysterious tool at level %d</string><string name="tool_description_ramp">Roll up the ramp to gain height</string><string name="tool_description_spring">Shoots you in the air</string><string name="tool_description_magnet">Difficult to handle, but give it a try</string><string name="tool_description_bomb">Blow up all obstacles near the bomb</string><string name="tool_description_power_mushroom">This will give you super-powers for a few seconds</string><string name="tool_description_stasis">Freezes a certain area which leads to longer in-air time</string><string name="tool_name_locked">\?\?\?</string><string name="tool_name_ramp">Ramp</string><string name="tool_name_spring">Spring</string><string name="tool_name_magnet">Magnet</string><string name="tool_name_bomb">Bomb</string><string name="tool_name_power_mushroom">Mushroom</string><string name="tool_name_stasis">Stasis</string><string name="tool_level_format_d">Level: %d</string><string name="tool_upgrade_title_format_sd">%1$s (Lv%2$d)</string><string name="tool_upgrade_none">None</string><string name="tool_upgrade_time">Time</string><string name="tool_upgrade_radius">Radius</string><string name="tool_upgrade_force">Force</string><string name="tool_upgrade_value_max">Max.</string><string name="tutorial_placeholder">This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?</string><string name="tutorial_welcome">Welcome to Endless Roll!\nHave fun!</string><string name="tutorial_place_tools">Click anywhere on the screen to place the ramp</string><string name="tutorial_place_ramp_gap">Try to place your ramp in front of the gap</string><string name="tutorial_place_ramp_obstacle">Great job!\nNow place it in front of the obstacle</string><string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTime carefully!</string><string name="tutorial_place_ramp_air_2">Now try again!</string><string name="tutorial_toolshop_welcome">Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.</string><string name="tutorial_toolshop_toolbar">Right! That is your toolbar.</string><string name="tutorial_toolshop_all_tools">Here you can see all the tools you will be able to buy and use.</string><string name="tutorial_toolshop_inspector">Here one can buy and upgrade the selected tool.</string><string name="tutorial_toolshop_select_buy_spring">Now select the spring and buy it!</string><string name="tutorial_toolshop_equip_spring">Now tip on an unlocked slot of your toolbar to equip the spring!\n(It is the same where the ramp is attached at the moment)\nAfter that you will be able to complete the next level.</string><string name="tutorial_leveled_up_to_toolshop">Congratulations! You have leveled up!\nNow go to the toolshop</string><string name="tutorial_switch_tools_two_neccessary">For this level you will need two tools equipped</string><string name="tutorial_switch_tools_switch">To select a tool just click on it</string><string name="tutorial_spring_equipped">Well done! Now you can start the next level</string><string name="start_screen_finish_world_1">Finish the first world!</string><string name="confirm_dialog_button_yes">Yes</string><string name="confirm_dialog_placeholder">This is a beautiful ConfirmDialog placeholder!</string><string name="confirm_dialog_reset">Do you really want to reset ALL your progress?</string><string name="confirm_dialog_button_no">No</string><string name="confirm_dialog_exit">Do you really want to exit the game?</string><string name="confirm_dialog_finish_world_1">Do you really want to finish the first world?\nYour old progress will be DELETED!</string><string name="goal_message_next_world_format_s">Go to the next world:\n%s</string></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\styles.xml" qualifiers=""><style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    </string-array></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\colors.xml" qualifiers=""><color name="level_finished">#ffda45</color><color name="game_over">#f11e6f</color><color name="retry">#39be27</color><color name="game_progress_text">#ffb405</color><color name="message_views">#daf10d</color><color name="toolbuttonInactiveNotReady">#db911c0f</color><color name="toolbuttonInactiveReady">#dbfff200</color><color name="toolbuttonActiveNotReady">#e5dc1522</color><color name="toolbuttonActiveReady">#db41e42b</color><color name="toolbuttonLocked">#db494b49</color><color name="toolslotDisabled">#715f5f</color><color name="toolslotDisabledSelected">#60715f</color><color name="toolslotEnabled">#db41e42b</color><color name="toolslotEnabledSelected">#b3d700</color><color name="countdown3">#f0f41e02</color><color name="countdown2">#f0f28117</color><color name="countdown1">#f0d7b106</color><color name="background_levelup_message">#9d000000</color><color name="background_short_menu">#5b000000</color><color name="background_tutorial">#3d000000</color></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\dimen.xml" qualifiers=""><dimen name="tool_inspector_width">170dp</dimen><dimen name="shape_inspector_width">170dp</dimen><dimen name="tool_button_width">70dp</dimen><dimen name="tool_button_height">60dp</dimen></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Endless Roll</string><string name="placeholder_button">Click me!</string><string name="placeholder_textview">I\'m a text!</string><string name="placeholder_number">997.5</string><string name="placeholder_percent">85.1%</string><string name="game_playerprogress_placeholder">0.0m</string><string name="game_playerprogress_format_f">%.1fm</string><string name="game_playerspeed_placeholder">0.0m/s</string><string name="game_playerspeed_format_f">%.1fm/s</string><string name="game_fps_placeholder">Fps: 00</string><string name="game_fps_format_d">Fps: %d</string><string name="game_countdown_placeholder">3</string><string name="task_completed">Task completed</string><string name="levelup">Level Up</string><string name="message_game_over">GAME OVER</string><string name="message_level_finished">LEVEL FINISHED</string><string name="message_tools">Tools</string><string name="message_to_menu">To menu</string><string name="message_try_again">Try again</string><string name="message_restart">Restart</string><string name="message_next_level">Next level</string><string name="goal_message_restart_format_d">Restart Level %d</string><string name="goal_message_next_level_format_d">Next Level: %d</string><string name="pre_start_screen_loading">LOADING...</string><string name="short_menu_continue">Continue</string><string name="short_menu_restart">Restart</string><string name="short_menu_exit">Exit</string><string name="start_screen_play">Play</string><string name="start_screen_unlock_all_levels">Unlock all levels (Yes! It\'s magic!)</string><string name="start_screen_gain_90_ep">Gain 90 ep (Nope! No magic at all!)</string><string name="start_screen_to_gl_test_screen">Test GL Stuff!!!</string><string name="tool_upgrade_title_placeholder">Time (Lv12)</string><string name="topbar_level_placeholder">Level: 24</string><string name="topbar_level_format_d">Level: %d</string><string name="settings_reset">Reset</string><string name="topbar_toolshop">Toolshop</string><string name="unlock_message_placeholder">Ramp unlocked</string><string name="world_button_title_placeholder">Great world</string><string name="world_button_progress_placeholder">21/15</string><string name="bounty_message_resource_format_s">%s</string><string name="bounty_message_tool_format_s">%s unlocked!</string><string name="bounty_message_tool_slot">You unlocked a Toolslot</string><string name="bounty_message_shape_unlocked">New shape unlocked</string><string name="level_button_format_d">Level: %d</string><string name="price_button_buy">Buy</string><string name="price_button_upgrade">Upgrade</string><string name="playershape_name_ball">Ball</string><string name="playershape_name_clock">Clock</string><string name="playershape_name_hypno_spiral">Hypno</string><string name="playershape_name_pacman">Pacman</string><string name="playershape_name_smiley">Smiley</string><string name="playershape_name_wheel">Wheel</string><string name="playershape_name_sun">Sun</string><string name="playershape_name_locked">\?\?\?</string><string name="playershape_description_ball">Keep calm and roll on</string><string name="playershape_description_clock">Tick tack!</string><string name="playershape_description_hypno_spiral">Hypnotizes you for more fun</string><string name="playershape_description_pacman">PACMAN!</string><string name="playershape_description_smiley">Don\'t worry, roll happy!</string><string name="playershape_description_wheel">A nice car without the... car</string><string name="playershape_description_sun">Shine bright like the sun</string><string name="playershape_description_locked">A new shape for more fun</string><string name="task_empty">Empty task</string><string name="task_collect_stars_progress_format_ddd">Collect %d stars (%d/%d)</string><string name="task_collect_energy_progress_format_ddd">Collect %d energy (%d/%d)</string><string name="task_collect_stars_format_d">Collect %d stars</string><string name="task_collect_energy_format_d">Collect %d energy</string><string name="task_complete_world_format_d">Finish the %d. world</string><string name="world_button_count_format_dd">%d/%d</string><string name="tool_description_locked_format_d">You will unlock this mysterious tool at level %d</string><string name="tool_description_ramp">Roll up the ramp to gain height</string><string name="tool_description_spring">Shoots you in the air</string><string name="tool_description_magnet">You are pulled towards it. Just try it out!</string><string name="tool_description_bomb">Blow up all obstacles near the bomb</string><string name="tool_description_power_mushroom">This will give you super-powers for a few seconds</string><string name="tool_description_stasis">Freezes a certain area which leads to longer in-air time</string><string name="tool_name_locked">\?\?\?</string><string name="tool_name_ramp">Ramp</string><string name="tool_name_spring">Spring</string><string name="tool_name_magnet">Magnet</string><string name="tool_name_bomb">Bomb</string><string name="tool_name_power_mushroom">Mushroom</string><string name="tool_name_stasis">Stasis</string><string name="tool_level_format_d">Level: %d</string><string name="tool_upgrade_title_format_sd">%1$s (Lv%2$d)</string><string name="tool_upgrade_none">None</string><string name="tool_upgrade_time">Time</string><string name="tool_upgrade_radius">Radius</string><string name="tool_upgrade_force">Force</string><string name="tool_upgrade_value_max">Max.</string><string name="tutorial_placeholder">This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?</string><string name="tutorial_welcome">Welcome to Endless Roll!\nHave fun!</string><string name="tutorial_place_tools">Click anywhere on the screen to place the ramp</string><string name="tutorial_place_ramp_gap">Try to place your ramp in front of the gap</string><string name="tutorial_place_ramp_obstacle">Great job!\nNow place it in front of the obstacle</string><string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTime carefully!</string><string name="tutorial_place_ramp_air_2">Now try again!</string><string name="tutorial_toolshop_welcome">Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.</string><string name="tutorial_toolshop_toolbar">Right! That is your toolbar.</string><string name="tutorial_toolshop_all_tools">Here you can see all the tools you will be able to buy and use.</string><string name="tutorial_toolshop_inspector">Here one can buy and upgrade the selected tool.</string><string name="tutorial_toolshop_select_buy_spring">Now select the spring and buy it!</string><string name="tutorial_toolshop_equip_spring">Now tip on an unlocked slot of your toolbar to equip the spring!\n(It is the same where the ramp is attached at the moment)\nAfter that you will be able to complete the next level.</string><string name="tutorial_leveled_up_to_toolshop">Congratulations! You have leveled up!\nNow go to the toolshop</string><string name="tutorial_switch_tools_two_neccessary">For this level you will need two tools equipped</string><string name="tutorial_switch_tools_switch">To select a tool just click on it</string><string name="tutorial_spring_equipped">Well done! Now you can start the next level</string><string name="start_screen_finish_world_1">Finish the first world!</string><string name="confirm_dialog_button_yes">Yes</string><string name="confirm_dialog_placeholder">This is a beautiful ConfirmDialog placeholder!</string><string name="confirm_dialog_reset">Do you really want to reset ALL your progress?</string><string name="confirm_dialog_button_no">No</string><string name="confirm_dialog_exit">Do you really want to exit the game?</string><string name="confirm_dialog_finish_world_1">Do you really want to finish the first world?\nYour old progress will be DELETED!</string><string name="goal_message_next_world_format_s">Go to the next world:\n%s</string></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\styles.xml" qualifiers=""><style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:buttonStyle">@style/GameButton</item>
         <item name="android:textColor">#000000</item>
     </style><style name="GameButton">
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java b/app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java
index a94a01c..e0d6e62 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java
@@ -156,10 +156,12 @@ public class CollisionDetector {
         }
         if (circleFullyInsideQuad)
             return circleCenterInQuadCollisionEdge(circle, circleMovement, quad, quadMovement);
-        return circlePartlyOutsideQuadCollisionEdge(circle, quad);
+        return circlePartlyOutsideQuadCollisionEdge(circle, circleMovement, quad, quadMovement);
     }
 
-    private Edge circlePartlyOutsideQuadCollisionEdge(Circle circle, Quad quad) {
+    private Edge circlePartlyOutsideQuadCollisionEdge(Circle circle, Vector circleMovement, Quad quad, Vector quadMovement) {
+        Vector relativeMovement = circleMovement.translate(quadMovement.negate());
+
         Edge edge = Edge.NONE;
         if (circle.getCenter().getY() + circle.getRadius() >= quad.getTopEdge())
             edge = Edge.TOP;
@@ -187,12 +189,17 @@ public class CollisionDetector {
         } else if (circle.getCenter().getX() + circle.getRadius() >= quad.getRightEdge()) {
             if (edge != Edge.NONE) {
                 if (edge == Edge.TOP) {
-                    float m = 1;
-                    float t = quad.getTopEdge() - m * quad.getRightEdge();
-                    if (circle.getCenter().getY() >= m * circle.getCenter().getX() + t)
-                        edge = Edge.TOP;
-                    else
-                        edge = Edge.RIGHT;
+                    //This movement check is because if player falls with too much speed on topLeft Vertex, sometimes RIGHT-Edge is returned
+                    if (relativeMovement.getY() < 0) {
+                        return Edge.TOP;
+                    } else {
+                        float m = 1;
+                        float t = quad.getTopEdge() - m * quad.getRightEdge();
+                        if (circle.getCenter().getY() >= m * circle.getCenter().getX() + t)
+                            edge = Edge.TOP;
+                        else
+                            edge = Edge.RIGHT;
+                    }
                 } else if (edge == Edge.BOTTOM) {
                     float m = -1;
                     float t = quad.getBottomEdge() - m * quad.getRightEdge();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3c424b6..14bc76d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -77,7 +77,7 @@
     <string name="tool_description_locked_format_d">You will unlock this mysterious tool at level %d</string>
     <string name="tool_description_ramp">Roll up the ramp to gain height</string>
     <string name="tool_description_spring">Shoots you in the air</string>
-    <string name="tool_description_magnet">Difficult to handle, but give it a try</string>
+    <string name="tool_description_magnet">You are pulled towards it. Just try it out!</string>
     <string name="tool_description_bomb">Blow up all obstacles near the bomb</string>
     <string name="tool_description_power_mushroom">This will give you super-powers for a few seconds</string>
     <string name="tool_description_stasis">Freezes a certain area which leads to longer in-air time</string>