TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-14 15:17:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Mod installer] Use a View to render

Browse Source
This commit is contained in:
khanhduytran0 2020-11-05 13:49:59 +07:00
parent cff326bb11
commit f908d88183
3 changed files with 77 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/java/net/kdt/pojavlaunch/AWTCanvasView.java Normal file
View File

@ -0,0 +1,53 @@
package net.kdt.pojavlaunch;
import android.content.*;
import android.graphics.*;
import android.text.*;
import android.util.*;
import android.view.*;
import java.util.*;
import net.kdt.pojavlaunch.*;
import org.lwjgl.glfw.*;
public class AWTCanvasView extends View {
private TextPaint fpsPaint = new TextPaint(Color.LTGRAY);
private boolean attached = false;
// Temporary count fps https://stackoverflow.com/a/13729241
private LinkedList<Long> times = new LinkedList<Long>(){{add(System.nanoTime());}};
private final int MAX_SIZE = 100;
private final double NANOS = 1000000000.0;
/** Calculates and returns frames per second */
private double fps() {
long lastTime = System.nanoTime();
double difference = (lastTime - times.getFirst()) / NANOS;
times.addLast(lastTime);
int size = times.size();
if (size > MAX_SIZE) {
times.removeFirst();
}
return difference > 0 ? times.size() / difference : 0.0;
}
public AWTCanvasView(Context ctx) {
this(ctx, null);
}
public AWTCanvasView(Context ctx, AttributeSet attrs) {
super(ctx, attrs);
}
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
if (!attached) {
attached = CallbackBridge.nativeAttachThreadToOther(true, MainActivity.isInputStackCall);
}
if (attached) {
JREUtils.renderAWTScreenFrame(canvas, getWidth(), getHeight());
}
canvas.drawText("FPS: " + fps(), 10, 10, fpsPaint);
}
}

112
app/src/main/java/net/kdt/pojavlaunch/InstallModActivity.java
View File

@ -16,7 +16,7 @@ import android.text.*;
public class InstallModActivity extends LoggableActivity { public class InstallModActivity extends LoggableActivity {
public static volatile boolean IS_JRE_RUNNING; public static volatile boolean IS_JRE_RUNNING;
private TextureView mTextureView; private AWTCanvasView mTextureView;
private LinearLayout contentLog; private LinearLayout contentLog;
private TextView textLog; private TextView textLog;
private ScrollView contentScroll; private ScrollView contentScroll;
@ -60,98 +60,32 @@ public class InstallModActivity extends LoggableActivity {
final String javaArgs = getIntent().getExtras().getString("javaArgs"); final String javaArgs = getIntent().getExtras().getString("javaArgs");
mTextureView = findViewById(R.id.installmod_surfaceview); mTextureView = findViewById(R.id.installmod_surfaceview);
mTextureView.setSurfaceTextureListener(new TextureView.SurfaceTextureListener(){
new Thread(new Runnable(){
private boolean isAvailableCalled = false;
@Override @Override
public void onSurfaceTextureAvailable(SurfaceTexture tex, final int w, final int h) { public void run() {
if (!isAvailableCalled) { final int exitCode = launchJavaRuntime(modFile, javaArgs);
isAvailableCalled = true; IS_JRE_RUNNING = false;
} else return;
// final Surface surface = new Surface(tex);
new Thread(new Runnable(){
private TextPaint fpsPaint = new TextPaint(Color.LTGRAY);
private boolean attached = false;
// Temporary count fps https://stackoverflow.com/a/13729241
private LinkedList<Long> times = new LinkedList<Long>(){{add(System.nanoTime());}};
private final int MAX_SIZE = 100;
private final double NANOS = 1000000000.0;
/** Calculates and returns frames per second */ appendlnToLog("Java Exit code: " + exitCode);
private double fps() {
long lastTime = System.nanoTime(); runOnUiThread(new Runnable(){
double difference = (lastTime - times.getFirst()) / NANOS; @Override
times.addLast(lastTime); public void run() {
int size = times.size(); AlertDialog.Builder dialog = new AlertDialog.Builder(InstallModActivity.this);
if (size > MAX_SIZE) { dialog.setMessage(getString(R.string.mcn_exit_title, exitCode));
times.removeFirst(); dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface p1, int p2){
MainActivity.fullyExit();
}
});
dialog.show();
} }
return difference > 0 ? times.size() / difference : 0.0; });
}
@Override
public void run() {
try {
while (IS_JRE_RUNNING) {
if (!attached) {
attached = CallbackBridge.nativeAttachThreadToOther(true, MainActivity.isInputStackCall);
Thread.sleep(100);
}
Canvas canvas = mTextureView.lockCanvas();
if (attached) {
JREUtils.renderAWTScreenFrame(canvas, w, h);
}
canvas.drawText("FPS: " + fps(), 10, 10, fpsPaint);
mTextureView.unlockCanvasAndPost(canvas);
}
} catch (InterruptedException e) {}
}
}, "AWTSurfaceUpdater").start();
new Thread(new Runnable(){
@Override
public void run() {
final int exitCode = launchJavaRuntime(modFile, javaArgs);
IS_JRE_RUNNING = false;
appendlnToLog("Java Exit code: " + exitCode);
runOnUiThread(new Runnable(){
@Override
public void run() {
AlertDialog.Builder dialog = new AlertDialog.Builder(InstallModActivity.this);
dialog.setMessage(getString(R.string.mcn_exit_title, exitCode));
dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface p1, int p2){
MainActivity.fullyExit();
}
});
dialog.show();
}
});
}
}, "JREMainThread").start();
} }
}, "JREMainThread").start();
@Override
public boolean onSurfaceTextureDestroyed(SurfaceTexture tex) {
return false;
}
@Override
public void onSurfaceTextureSizeChanged(SurfaceTexture tex, int w, int h) {
}
@Override
public void onSurfaceTextureUpdated(SurfaceTexture tex) {
}
});
} catch (Throwable th) { } catch (Throwable th) {
Tools.showError(this, th, true); Tools.showError(this, th, true);
} }

2
app/src/main/res/layout/install_mod.xml
View File

@ -8,7 +8,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent"> android:layout_width="match_parent">
<TextureView <net.kdt.pojavlaunch.AWTCanvasView
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/installmod_surfaceview"/> android:id="@+id/installmod_surfaceview"/>