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

Fixed bug with android 8.0 and opengl

Browse Source
This commit is contained in:
= 2018-05-05 12:36:34 +02:00
parent c4da4d96ac
commit 7363b7d5cc
13 changed files with 239 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/build/intermediates/assets/debug/levelpacks/Grasslands.xml
View File

@ -456,10 +456,10 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="11.981369" rightEdge="12.745369" height="0.79" y="-0.20500001">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="12.614697" rightEdge="13.098697" height="0.28" y="0.65333325">
<obstacleData floating="true" moving="false" deadly="false" leftEdge="12.614697" rightEdge="13.098697" height="0.28" y="0.65333325">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="13.493366" rightEdge="13.993366" height="0.5" y="0.24666663">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="13.446696" rightEdge="13.946696" height="0.5" y="0.39999992">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="14.03569" rightEdge="14.697691" height="0.127" y="-0.21999997">
@ -468,22 +468,22 @@
<obstacleData floating="true" moving="false" deadly="false" leftEdge="15.036036" rightEdge="15.4440365" height="0.573" y="-0.046666667">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="15.475212" rightEdge="16.418213" height="0.318" y="0.62666655">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="15.48188" rightEdge="16.424881" height="0.318" y="0.75999975">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="14.638042" rightEdge="14.842043" height="0.204" y="0.11333336">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="14.119547" rightEdge="14.9605465" height="0.153" y="0.65999985">
<obstacleData floating="true" moving="false" deadly="false" leftEdge="14.04621" rightEdge="14.88721" height="0.153" y="0.3800001">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="13.210184" rightEdge="13.363184" height="0.166" y="0.35333332">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="15.651374" rightEdge="15.855374" height="0.561" y="0.053333372">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="15.718043" rightEdge="15.922044" height="0.561" y="0.14000002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.041542" rightEdge="16.678543" height="0.242" y="0.08666674">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.088207" rightEdge="16.725208" height="0.242" y="0.12666674">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.26588" rightEdge="16.520882" height="0.204" y="-0.21333332">
@ -498,7 +498,7 @@
<obstacleData floating="true" moving="false" deadly="true" leftEdge="17.580055" rightEdge="17.860054" height="0.28" y="0.8266663">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.618046" rightEdge="16.822044" height="0.204" y="0.3799996">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.638046" rightEdge="16.842045" height="0.204" y="0.43999958">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="17.632498" rightEdge="19.7475" height="0.191" y="-0.29333332">

13
app/build/intermediates/assets/debug/shader/entityVertexShader.glsl
View File

@ -9,12 +9,15 @@ varying vec2 pass_TexCoords;
void main() {
vec2 scale = vec2(1.0, 1.0);
if(texCoordScaling.x != 0.0)
scale.x = texCoordScaling.x;
if(texCoordScaling.y != 0.0)
scale.y *= texCoordScaling.y;
vec4 transformatedPosition = transformationMatrix * position;
gl_Position = mvpMatrix * transformatedPosition;
pass_TexCoords = texCoords;
if(texCoordScaling.x != 0.0)
pass_TexCoords.x *= texCoordScaling.x;
if(texCoordScaling.y != 0.0)
pass_TexCoords.y *= texCoordScaling.y;
pass_TexCoords = scale * texCoords;
}

1
app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View File

@ -18,6 +18,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:testOnly="true"
android:theme="@style/AppTheme" >
<activity
android:name="de.frajul.endlessroll.main.GameActivity"

14
app/src/main/assets/levelpacks/Grasslands.xml
View File

@ -456,10 +456,10 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="11.981369" rightEdge="12.745369" height="0.79" y="-0.20500001">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="12.614697" rightEdge="13.098697" height="0.28" y="0.65333325">
<obstacleData floating="true" moving="false" deadly="false" leftEdge="12.614697" rightEdge="13.098697" height="0.28" y="0.65333325">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="13.493366" rightEdge="13.993366" height="0.5" y="0.24666663">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="13.446696" rightEdge="13.946696" height="0.5" y="0.39999992">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="14.03569" rightEdge="14.697691" height="0.127" y="-0.21999997">
@ -468,22 +468,22 @@
<obstacleData floating="true" moving="false" deadly="false" leftEdge="15.036036" rightEdge="15.4440365" height="0.573" y="-0.046666667">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="15.475212" rightEdge="16.418213" height="0.318" y="0.62666655">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="15.48188" rightEdge="16.424881" height="0.318" y="0.75999975">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="14.638042" rightEdge="14.842043" height="0.204" y="0.11333336">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="14.119547" rightEdge="14.9605465" height="0.153" y="0.65999985">
<obstacleData floating="true" moving="false" deadly="false" leftEdge="14.04621" rightEdge="14.88721" height="0.153" y="0.3800001">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="13.210184" rightEdge="13.363184" height="0.166" y="0.35333332">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="15.651374" rightEdge="15.855374" height="0.561" y="0.053333372">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="15.718043" rightEdge="15.922044" height="0.561" y="0.14000002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.041542" rightEdge="16.678543" height="0.242" y="0.08666674">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.088207" rightEdge="16.725208" height="0.242" y="0.12666674">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.26588" rightEdge="16.520882" height="0.204" y="-0.21333332">
@ -498,7 +498,7 @@
<obstacleData floating="true" moving="false" deadly="true" leftEdge="17.580055" rightEdge="17.860054" height="0.28" y="0.8266663">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.618046" rightEdge="16.822044" height="0.204" y="0.3799996">
<obstacleData floating="true" moving="false" deadly="true" leftEdge="16.638046" rightEdge="16.842045" height="0.204" y="0.43999958">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="0.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="17.632498" rightEdge="19.7475" height="0.191" y="-0.29333332">

187
app/src/main/assets/levelpacks/Icy Mountains.xml
View File

@ -1011,5 +1011,192 @@
</stars>
<energy x="26.693165" y="0.54666674"/>
</level>
<level packId="2" id="13" goalX="32.48001" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-0.81150174" width="4.3769965"/>
<tileData x="5.6620893" width="4.478185"/>
<tileData x="12.578604" width="4.3328466"/>
<tileData x="20.680819" width="3.8115768"/>
<tileData x="23.71959" width="1.0659695"/>
<tileData x="25.760231" width="1.1593075"/>
<tileData x="29.869602" width="3.2194405"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="14.7400055" width="35.48001"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="5.046663" rightEdge="6.6266627" height="0.318" y="-0.44100004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="6.686515" rightEdge="8.113515" height="0.242" y="-0.17283335">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="11.665853" rightEdge="12.480853" height="1.261" y="0.32000008">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="12.534695" rightEdge="13.018694" height="0.637" y="-0.08000001">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="13.980203" rightEdge="14.693202" height="0.382" y="-0.40900004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="14.087208" rightEdge="14.546207" height="0.701" y="0.5199999">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="16.18953" rightEdge="17.310528" height="0.306" y="-0.5533334">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="20.45365" rightEdge="20.75965" height="0.306" y="-0.44700003">
<moveComponent length="1.211" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.51" hasPlayerXSpeed="false" triggerDistance="0.388"/>
</obstacleData>
<obstacleData floating="false" moving="true" deadly="true" leftEdge="20.798788" rightEdge="21.027788" height="0.268" y="-0.46600002">
<moveComponent length="1.546" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.904" hasPlayerXSpeed="false" triggerDistance="0.612"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="true" leftEdge="22.721111" rightEdge="23.052113" height="0.306" y="-0.5936666">
<moveComponent length="1.572" rotation="0.0" startOffset="0.199" direction="1.0" speed="0.5" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="24.314898" rightEdge="25.104898" height="0.217" y="-0.5399997">
<moveComponent length="1.701" rotation="0.0" startOffset="0.217" direction="1.0" speed="0.707" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="26.056698" rightEdge="28.6297" height="0.153" y="-0.5235">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="28.645681" rightEdge="29.46068" height="0.306" y="-0.44700003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="29.524326" rightEdge="29.855328" height="0.178" y="-0.51100004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="29.91916" rightEdge="30.327162" height="0.293" y="-0.45350003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="30.360662" rightEdge="31.40566" height="0.51" y="-0.34500003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="7.260015" y="-0.46"/>
<positionData x="21.733267" y="0.30000004"/>
<positionData x="27.24986" y="-0.7600001"/>
</stars>
<energy x="12.763356" y="0.43999994"/>
</level>
<level packId="2" id="14" goalX="31.86002" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.4728346" width="6.945669"/>
<tileData x="4.4919186" width="0.2484994"/>
<tileData x="5.8852577" width="1.7361789"/>
<tileData x="7.6318464" width="0.5570016"/>
<tileData x="18.38909" width="3.0254707"/>
<tileData x="26.691662" width="8.093676"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="14.43001" width="34.86002"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="1.5323324" rightEdge="2.1943324" height="0.866" y="-0.16700003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="2.218999" rightEdge="2.880999" height="1.172" y="-0.013999999">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="2.909165" rightEdge="3.164165" height="1.057" y="-0.0715">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="3.207998" rightEdge="3.411998" height="0.943" y="-0.12850001">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="3.461334" rightEdge="3.665334" height="0.815" y="-0.19250003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="3.7146685" rightEdge="3.9186685" height="0.713" y="-0.24350002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="4.3946686" rightEdge="4.598668" height="0.484" y="-0.35800004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="5.0366683" rightEdge="5.316668" height="0.777" y="-0.21150002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="5.4110055" rightEdge="5.589006" height="0.662" y="-0.26900002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="5.6855054" rightEdge="5.9145055" height="0.522" y="-0.33900002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="5.993676" rightEdge="6.299676" height="0.369" y="-0.41550004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="6.387845" rightEdge="6.7188454" height="0.255" y="-0.47250003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="7.3833475" rightEdge="7.8833475" height="0.204" y="-0.49800003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="6.2150116" rightEdge="7.2850113" height="0.242" y="0.34333315">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="7.9856877" rightEdge="8.647688" height="0.382" y="0.14999996">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="8.709686" rightEdge="10.543686" height="0.331" y="0.060000002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="12.069031" rightEdge="14.031031" height="0.331" y="0.053333335">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="9.580188" rightEdge="10.293187" height="0.446" y="0.8999999">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="10.737022" rightEdge="11.883022" height="0.675" y="0.8533331">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="10.694859" rightEdge="11.331858" height="0.318" y="-0.5866666">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="11.677198" rightEdge="12.136198" height="0.586" y="-0.5266666">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="14.246534" rightEdge="15.673534" height="0.344" y="-0.14666666">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="12.703201" rightEdge="14.130201" height="0.433" y="0.8866666">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="14.595043" rightEdge="15.385044" height="0.382" y="0.55333334">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="20.580023" rightEdge="21.080023" height="1.569" y="0.18449998">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="19.961805" rightEdge="21.744806" height="0.5" y="-1.16">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="25.138582" rightEdge="26.234583" height="0.318" y="-0.44100004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="26.278217" rightEdge="27.348217" height="0.586" y="-0.307">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="27.380367" rightEdge="28.679367" height="0.713" y="-0.24350002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="28.724693" rightEdge="29.361694" height="0.624" y="-0.28800002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="29.413185" rightEdge="29.913185" height="0.535" y="-0.3325">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="29.963339" rightEdge="30.67634" height="0.42" y="-0.39000005">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="7.0633464" y="-0.47333318"/>
<positionData x="11.28002" y="0.33333325"/>
<positionData x="27.993254" y="0.7733332"/>
</stars>
<energy x="1.3733332" y="-0.45333335"/>
</level>
</levels>
</levelPack>

13
app/src/main/assets/shader/entityVertexShader.glsl
View File

@ -9,12 +9,15 @@ varying vec2 pass_TexCoords;
void main() {
vec2 scale = vec2(1.0, 1.0);
if(texCoordScaling.x != 0.0)
scale.x = texCoordScaling.x;
if(texCoordScaling.y != 0.0)
scale.y *= texCoordScaling.y;
vec4 transformatedPosition = transformationMatrix * position;
gl_Position = mvpMatrix * transformatedPosition;
pass_TexCoords = texCoords;
if(texCoordScaling.x != 0.0)
pass_TexCoords.x *= texCoordScaling.x;
if(texCoordScaling.y != 0.0)
pass_TexCoords.y *= texCoordScaling.y;
pass_TexCoords = scale * texCoords;
}

8
app/src/main/java/de/frajul/endlessroll/entities/Entity.java
View File

@ -103,6 +103,14 @@ public class Entity extends Quad {
return maxTexSize;
}
public float calcTexScaleX() {
return getMaxTexSize().x == 0 ? 1 : getWidth() / getMaxTexSize().x;
}
public float calcTexScaleY() {
return getMaxTexSize().y == 0 ? 1 : getHeight() / getMaxTexSize().y;
}
public void setVisible(boolean visible) {
this.visible = visible;
}

2
app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
View File

@ -31,7 +31,7 @@ public enum ToolType {
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 5000, 3000),
new ToolUpgrade(ToolUpgradeType.FORCE, 100, 500)),
POWER_MUSHROOM(R.string.tool_name_power_mushroom, R.string.tool_description_power_mushroom,
R.drawable.tools_power_mushroom, R.drawable.tools_power_mushroom_button, 5,
R.drawable.tools_power_mushroom, R.drawable.tools_power_mushroom_button, 50,
5, 7, new ToolUpgrade(ToolUpgradeType.COOLDOWN, 15000, 11000),
new ToolUpgrade(ToolUpgradeType.DURATION, 5000, 10000)),
STASIS(R.string.tool_name_stasis, R.string.tool_description_stasis, R.drawable.tools_stasis,

2
app/src/main/java/de/frajul/endlessroll/main/game/Game.java
View File

@ -168,7 +168,7 @@ public class Game extends Rendering<GameScene> {
if (gameState == GameState.RUNNING) {
ToolButtonBar bar = viewManager.toolButtonBar;
ToolButton button = bar.getByToolType(currentTool);
if (button != null && button.finishedLoading()) {
if (button != null && button.finishedLoading() && button.getToolType() != null) {
if (event.getAction() == MotionEvent.ACTION_DOWN) {
if (currentTool == ToolType.BOMB) {
try {

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

@ -1,5 +1,7 @@
package de.frajul.endlessroll.main.game;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.Entity;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.shapes.PlayerShape;
import de.frajul.endlessroll.entities.textures.TexturePack;
@ -10,10 +12,11 @@ public class TestScreenScene extends Scene {
public TestScreenScene(GameActivity gameActivity, TexturePack texturePack, ParticleSystem particleSystem) {
super(gameActivity, texturePack, particleSystem);
terrain.createEndless(World.GRASSLANDS, 0.6f);
background.changeTexture(World.ICY_MOUNTAINS.getBackgroundTexture());
player.init(PlayerShape.BALL, 0.6f, 0.5f, 0.5f, particleSystem);
uncategorizedEntities.add(player);
// terrain.createEndless(World.GRASSLANDS, 0.6f);
// background.changeTexture(World.ICY_MOUNTAINS.getBackgroundTexture());
//
// player.init(PlayerShape.BALL, 0.6f, 0.5f, 0.5f, particleSystem);
// uncategorizedEntities.add(player);
uncategorizedEntities.add(new Entity(World.GRASSLANDS.getBackgroundTexture(), new Vector(), 1, 1));
}
}

6
app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java
View File

@ -180,11 +180,7 @@ public class GameRenderer implements GLSurfaceView.Renderer {
entityShader.loadTransformationMatrix(matrixCreator, entity);
entityShader.loadAlpha(entity.getAlpha());
entityShader.loadTextureAtlasInfos(entity.getTexture(), entity.getTextureAtlasIndex());
float texScaleX = entity.getMaxTexSize().x == 0 ? 1 : entity.getWidth() / entity
.getMaxTexSize().x;
float texScaleY = entity.getMaxTexSize().y == 0 ? 1 : entity.getHeight() / entity
.getMaxTexSize().y;
entityShader.loadTexCoordScaling(texScaleX, texScaleY);
entityShader.loadTexCoordScaling(entity.calcTexScaleX(), entity.calcTexScaleY());
quad.draw();
}

2
app/src/main/java/de/frajul/endlessroll/views/ToolButtonBar.java
View File

@ -108,7 +108,7 @@ public class ToolButtonBar implements View.OnClickListener{
} else if (v.equals(button4) && !buttons.get(3).isLocked()) {
clickedButton = buttons.get(3);
}
if (clickedButton != null) {
if (clickedButton != null && clickedButton.getToolType() != null) {
game.setCurrentTool(clickedButton.getToolType(), clickedButton.finishedLoading());
setActive(clickedButton.getToolType());
}

1
particlelab/src/main/java/de/frajul/particlelab/rendering/GameRenderer.java
View File

@ -8,6 +8,7 @@ import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
import de.frajul.particlelab.data.Color;
import de.frajul.particlelab.data.Vector;
import de.frajul.particlelab.entities.Entity;
import de.frajul.particlelab.entities.particles.ParticleEffect;
import de.frajul.particlelab.entities.particles.ParticleSource;