ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This is as close as it'll get to toggling from the menu for now

This commit is contained in:
TwistedUmbrella 2014-02-13 21:39:05 -05:00
parent 6b5c041725
commit ecc122f0c4
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
View File

@ -2,7 +2,6 @@ package com.reicast.emulator.emu;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Vector;
import tv.ouya.console.api.OuyaController;
import android.annotation.TargetApi;
@ -10,7 +9,6 @@ import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@ -22,7 +20,6 @@ import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.ViewGroup.LayoutParams;
import android.view.Window;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.Toast;
@ -30,7 +27,6 @@ import com.reicast.emulator.R;
import com.reicast.emulator.config.ConfigureFragment;
import com.reicast.emulator.periph.MOGAInput;
import com.reicast.emulator.periph.SipEmulator;
import com.reicast.emulator.periph.VmuLcd;
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
public class GL2JNIActivity extends Activity {

6
shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
View File

@ -54,7 +54,8 @@ public class OnScreenMenu {
}
public PopupWindow generateVMU() {
vmuLcd = new VmuLcd(mContext, true);
vmuLcd = new VmuLcd(mContext);
vmuLcd.configureScale(80);
PopupWindow vmuPop = new PopupWindow(mContext);
int pX = OnScreenMenu.getPixelsFromDp(80, mContext);
int pY = OnScreenMenu.getPixelsFromDp(56, mContext);
@ -70,7 +71,6 @@ public class OnScreenMenu {
});
vlay.addView(vmuLcd, vparams);
vmuPop.setContentView(vlay);
JNIdc.setupVmu(vmuLcd);
return vmuPop;
}
@ -84,7 +84,7 @@ public class OnScreenMenu {
hlay.setOrientation(LinearLayout.HORIZONTAL);
vmuLcdMenu = new VmuLcd(mContext, false);
vmuLcdMenu = new VmuLcd(mContext);
vmuLcdMenu.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
mContext.toggleVMU(true);

18
shell/android/src/com/reicast/emulator/periph/VmuLcd.java
View File

@ -1,7 +1,5 @@
package com.reicast.emulator.periph;
import com.reicast.emulator.emu.OnScreenMenu;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
@ -10,6 +8,8 @@ import android.graphics.Paint;
import android.util.Log;
import android.view.View;
import com.reicast.emulator.emu.OnScreenMenu;
public class VmuLcd extends View {
public final static int w = 48;
@ -20,19 +20,17 @@ public class VmuLcd extends View {
private float scale;
private Paint paint;
public VmuLcd(Context context, boolean popOut) {
public VmuLcd(Context context) {
super(context);
paint = new Paint();
if (popOut) {
scale = (float)OnScreenMenu.getPixelsFromDp(80, getContext()) / w;
} else {
scale = (float)OnScreenMenu.getPixelsFromDp(60, getContext()) / w;
}
scale = (float)OnScreenMenu.getPixelsFromDp(60, getContext()) / w;
Log.d("VmuLcd", "scale: "+scale);
}
public void configureScale(int dp) {
scale = (float)OnScreenMenu.getPixelsFromDp(dp, getContext()) / w;
}
public void updateBytes(byte[] data){
for(int i=0; i<h; i++){
for(int j=0; j<w; j++){