mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-07-07 03:52:48 +00:00
more Android fixes
This commit is contained in:
parent
c7109fe521
commit
3726a896e2
@ -21,7 +21,7 @@ android {
|
||||
// Provides a relative path to your CMake build script.
|
||||
// ldLibs "-lGLESv1_CM -llog"
|
||||
|
||||
cFlags "-no-integrated-as"
|
||||
cFlags "-integrated-as"
|
||||
|
||||
}
|
||||
}
|
||||
@ -88,10 +88,10 @@ dependencies {
|
||||
//
|
||||
// IDE setting pulls in the specific version of v4 support you have installed:
|
||||
//
|
||||
//compile 'com.android.support:support-v4:21.0.3'
|
||||
compile 'com.android.support:support-v4:21.0.3'
|
||||
|
||||
//
|
||||
// generic directive pulls in any available version of v4 support:
|
||||
//
|
||||
compile 'com.android.support:support-v4:+'
|
||||
// compile 'com.android.support:support-v4:+'
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.roguetemple.hyperroid"
|
||||
android:versionCode="10017" android:versionName="10.0g"
|
||||
android:versionCode="10041" android:versionName="10.4a"
|
||||
android:installLocation="auto">
|
||||
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
|
||||
<!-- <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="9" /> -->
|
||||
|
@ -7,12 +7,12 @@ import javax.microedition.khronos.opengles.GL10;
|
||||
// import android.graphics.Path;
|
||||
import android.content.Context;
|
||||
import android.graphics.Typeface;
|
||||
import android.opengl.GLES20;
|
||||
import android.opengl.GLSurfaceView;
|
||||
import android.os.Build;
|
||||
import android.os.PowerManager;
|
||||
// bimport android.widget.Toast;
|
||||
|
||||
import android.opengl.GLES20;
|
||||
import com.android.texample.GLText;
|
||||
import com.android.texample.Shader;
|
||||
|
||||
@ -50,25 +50,6 @@ public class HyperRenderer implements GLSurfaceView.Renderer {
|
||||
|
||||
if(graphdata == null) return;
|
||||
|
||||
// Set to ModelView mode
|
||||
gl.glMatrixMode( GL10.GL_MODELVIEW ); // Activate Model View Matrix
|
||||
gl.glLoadIdentity(); // Load Identity Matrix
|
||||
|
||||
// enable texture + alpha blending
|
||||
// NOTE: this is required for text rendering! we could incorporate it into
|
||||
// the GLText class, but then it would be called multiple times (which impacts performance).
|
||||
gl.glEnable( GL10.GL_TEXTURE_2D ); // Enable Texture Mapping
|
||||
gl.glEnable( GL10.GL_BLEND ); // Enable Alpha Blend
|
||||
gl.glBlendFunc( GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA ); // Set Alpha Blend Function
|
||||
|
||||
gl.glMatrixMode( GL10.GL_PROJECTION ); // Activate Projection Matrix
|
||||
gl.glLoadIdentity(); // Load Identity Matrix
|
||||
gl.glOrthof( // Set Ortho Projection (Left,Right,Bottom,Top,Front,Back)
|
||||
0, width,
|
||||
0, height,
|
||||
1.0f, -1.0f
|
||||
);
|
||||
|
||||
gdpos = 0;
|
||||
while(gdpos < graphdata.length) {
|
||||
switch(gdpop()) {
|
||||
|
@ -243,8 +243,6 @@ int textwidth(int siz, const string &str) {
|
||||
return res;
|
||||
}
|
||||
|
||||
void achievement_init() {}
|
||||
|
||||
bool achievementsConnected = false;
|
||||
string doViewLeaderboard;
|
||||
bool doViewAchievements;
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
mkdir app/src/main/assets/sounds
|
||||
mkdir -p app/src/main/assets/sounds
|
||||
cp ../sounds/* app/src/main/assets/sounds/
|
||||
mkdir app/src/main/res/raw/
|
||||
mkdir -p app/src/main/res/raw/
|
||||
#for x in caves crossroads desert graveyard hell icyland jungle laboratory mirror rlyeh
|
||||
#do cp ../music/hr3-$x.ogg app/src/main/res/raw/$x.ogg
|
||||
#done
|
||||
|
Loading…
x
Reference in New Issue
Block a user