From ed3a54af1034d0cd00abecebf76738ba99c30d85 Mon Sep 17 00:00:00 2001 From: julian Date: Fri, 29 Jun 2018 16:24:39 +0200 Subject: [PATCH] Redid some collision-detection - no new features --- app/app.iml | 11 + .../mergeDebugResources/merger.xml | 30 +-- .../logs/manifest-merger-debug-report.txt | 208 +++++++++--------- app/src/main/assets/levelpacks/Grasslands.xml | 2 +- .../CircleTriangleCollisionDetector.java | 36 +-- .../entities/collision/CollisionDetector.java | 180 +++++++++------ .../entities/collision/CollisionManager.java | 2 +- .../entities/collision/geometry/Circle.java | 39 ++-- .../entities/collision/geometry/Geometry.java | 11 +- .../entities/collision/geometry/Quad.java | 22 +- .../entities/collision/geometry/Triangle.java | 50 +---- .../endlessroll/levels/worlds/World.java | 2 +- .../endlessroll/main/MyGlSurfaceView.java | 7 +- .../de/frajul/endlessroll/main/game/Game.java | 3 +- .../endlessroll/main/game/GameScene.java | 2 +- .../endlessroll/main/physics/Physics.java | 10 +- build.gradle | 2 +- 17 files changed, 321 insertions(+), 296 deletions(-) diff --git a/app/app.iml b/app/app.iml index 9e622aa..8b0fc7d 100644 --- a/app/app.iml +++ b/app/app.iml @@ -86,20 +86,31 @@ + + + + + + + + + + + diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 781b08d..82b73b6 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ -"999+"#ffffffff#ff9e9e9e#1f000000#8a000000 +"999+"#ffffffff#ff9e9e9e#1f000000#8a000000 @@ -16,13 +16,13 @@ ">999""999+""999+""999+"">999""999+""больш за 999""९९९+""999+""999+""999+"">999""999+""999+""999+""၉၉၉+""999+""999+"">999""999+""999+""999+""999+""999+""999+""˃999""999+""999+""+999""999+""۹۹۹+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""+999""999+""+999""999+""999+""999+""999+""৯৯৯+""999+""999+"4dp"999+"">999"false"999+"">999""999+""999+"">999""999+""999+""+999""999+""999+""999+""999+""999+""999+""999+""999+"">999""999+""‎999+‎""999+""999+""‎999+‎"#ff424242#ffffffff#b3ffffff127">999""999+""999+""999+"">999""999+""больш за 999""९९९+""999+""999+""999+"">999""999+""999+""999+""၉၉၉+""999+""999+"">999""999+""999+""999+""999+""999+""999+""˃999""999+""999+""+999""999+""۹۹۹+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""+999""999+""+999""999+""999+""999+""999+""৯৯৯+""999+""999+"4dp"999+"">999"false"999+"">999""999+""999+"">999""999+""999+""+999""999+""999+""999+""999+""999+""999+""999+""999+"">999""999+""‎999+‎""999+""999+""‎999+‎"#ff424242#ffffffff#b3ffffff127"Zur Startseite""%1$s: %2$s""%1$s, %2$s: %3$s""Nach oben""Weitere Optionen""Fertig""Alle ansehen""App auswählen""Aus""An""Suchen…""Suchanfrage löschen""Suchanfrage""Suchen""Suchanfrage senden""Sprachsuche""Freigeben für""Freigeben für %s""Minimieren""999+""Перейти на главный экран""%1$s, %2$s""%1$s, %2$s, %3$s""Перейти вверх""Другие параметры""Готово""Показать все""Выбрать приложение""ОТКЛ.""ВКЛ.""Поиск""Удалить запрос""Поисковый запрос""Поиск""Отправить запрос""Голосовой поиск""Открыть доступ""Открыть доступ пользователю %s""Свернуть"">999""Pārvietoties uz sākuma ekrānu""%1$s: %2$s""%1$s, %2$s: %3$s""Pārvietoties augšup""Vairāk opciju""Gatavs""Skatīt visu""Izvēlieties lietotni""IZSLĒGTS""IESLĒGTS""Meklējiet…""Notīrīt vaicājumu""Meklēšanas vaicājums""Meklēt""Iesniegt vaicājumu""Meklēšana ar balsi""Kopīgot ar:""Kopīgot ar %s""Sakļaut""999+"truetrue440dp60%90%60%90%55%80%192dip4"Zur Startseite""%1$s: %2$s""%1$s, %2$s: %3$s""Nach oben""Weitere Optionen""Fertig""Alle ansehen""App auswählen""Aus""An""Suchen…""Suchanfrage löschen""Suchanfrage""Suchen""Suchanfrage senden""Sprachsuche""Freigeben für""Freigeben für %s""Minimieren""999+""Перейти на главный экран""%1$s, %2$s""%1$s, %2$s, %3$s""Перейти вверх""Другие параметры""Готово""Показать все""Выбрать приложение""ОТКЛ.""ВКЛ.""Поиск""Удалить запрос""Поисковый запрос""Поиск""Отправить запрос""Голосовой поиск""Открыть доступ""Открыть доступ пользователю %s""Свернуть"">999""Pārvietoties uz sākuma ekrānu""%1$s: %2$s""%1$s, %2$s: %3$s""Pārvietoties augšup""Vairāk opciju""Gatavs""Skatīt visu""Izvēlieties lietotni""IZSLĒGTS""IESLĒGTS""Meklējiet…""Notīrīt vaicājumu""Meklēšanas vaicājums""Meklēt""Iesniegt vaicājumu""Meklēšana ar balsi""Kopīgot ar:""Kopīgot ar %s""Sakļaut""999+"truetrue440dp60%90%60%90%55%80%192dip4"ගෙදරට සංචාලනය කරන්න""%1$s, %2$s""%1$s, %2$s, %3$s""ඉහලට සංචාලනය කරන්න""තවත් විකල්ප""අවසාන වූ""සියල්ල බලන්න""යෙදුමක් තෝරන්න""ක්‍රියාවිරහිතයි""ක්‍රියාත්මකයි""සොයන්න...""විමසුම හිස් කරන්න""සෙවුම් විමසුම""සෙවීම""විමසුම යොමු කරන්න""හඬ සෙවීම""සමඟ බෙදාගන්න""%s සමඟ බෙදාගන්න""හකුළන්න""999+""Navigați la ecranul de pornire""%1$s, %2$s""%1$s, %2$s, %3$s""Navigați în sus""Mai multe opțiuni""Terminat""Afișați-le pe toate""Alegeți o aplicație""DEZACTIVAȚI""ACTIVAȚI""Căutați…""Ștergeți interogarea""Interogare de căutare""Căutați""Trimiteți interogarea""Căutare vocală""Trimiteți la""Trimiteți la %s""Restrângeți""˃999""ගෙදරට සංචාලනය කරන්න""%1$s, %2$s""%1$s, %2$s, %3$s""ඉහලට සංචාලනය කරන්න""තවත් විකල්ප""අවසාන වූ""සියල්ල බලන්න""යෙදුමක් තෝරන්න""ක්‍රියාවිරහිතයි""ක්‍රියාත්මකයි""සොයන්න...""විමසුම හිස් කරන්න""සෙවුම් විමසුම""සෙවීම""විමසුම යොමු කරන්න""හඬ සෙවීම""සමඟ බෙදාගන්න""%s සමඟ බෙදාගන්න""හකුළන්න""999+""Navigați la ecranul de pornire""%1$s, %2$s""%1$s, %2$s, %3$s""Navigați în sus""Mai multe opțiuni""Terminat""Afișați-le pe toate""Alegeți o aplicație""DEZACTIVAȚI""ACTIVAȚI""Căutați…""Ștergeți interogarea""Interogare de căutare""Căutați""Trimiteți interogarea""Căutare vocală""Trimiteți la""Trimiteți la %s""Restrângeți""˃999"