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
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"