mirror of
https://github.com/libretro/ppsspp.git
synced 2024-11-29 03:10:28 +00:00
Merge pull request #1546 from raven02/patch-5
Add Display Raw FrameBuffer for Android
This commit is contained in:
commit
7012efee1f
@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012- PPSSPP Project.
|
||||
// Copyright (c) 2012- PPSSPP Project.
|
||||
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
@ -538,6 +538,13 @@ void GraphicsScreen::update(InputState &input) {
|
||||
}
|
||||
}
|
||||
|
||||
void GraphicsScreenP1::update(InputState &input) {
|
||||
if (input.pad_buttons_down & PAD_BUTTON_BACK) {
|
||||
g_Config.Save();
|
||||
screenManager()->finishDialog(this, DR_OK);
|
||||
}
|
||||
}
|
||||
|
||||
void SystemScreen::update(InputState &input) {
|
||||
if (input.pad_buttons_down & PAD_BUTTON_BACK) {
|
||||
g_Config.Save();
|
||||
@ -641,10 +648,14 @@ void GraphicsScreen::render() {
|
||||
ui_draw2d.DrawText(UBUNTU24, gs->T("Graphics Settings"), dp_xres / 2, 20, 0xFFFFFFFF, ALIGN_HCENTER);
|
||||
ui_draw2d.SetFontScale(1.0f, 1.0f);
|
||||
|
||||
if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres-10), LARGE_BUTTON_WIDTH, 0, g->T("Back"), ALIGN_RIGHT | ALIGN_BOTTOM)) {
|
||||
if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres - 10), LARGE_BUTTON_WIDTH, 0, g->T("Back"), ALIGN_RIGHT | ALIGN_BOTTOM)) {
|
||||
screenManager()->finishDialog(this, DR_OK);
|
||||
}
|
||||
|
||||
if (UIButton(GEN_ID, Pos( 220 , dp_yres - 10), LARGE_BUTTON_WIDTH, 0, g->T("Next Page"), ALIGN_RIGHT | ALIGN_BOTTOM)) {
|
||||
screenManager()->push(new GraphicsScreenP1());
|
||||
}
|
||||
|
||||
int x = 30;
|
||||
int y = 30;
|
||||
int stride = 40;
|
||||
@ -671,7 +682,33 @@ void GraphicsScreen::render() {
|
||||
}
|
||||
g_Config.iWindowZoom = doubleRes ? 2 : 1;
|
||||
}
|
||||
//UICheckBox(GEN_ID, x, y += stride, gs->T("Draw Wireframe"), ALIGN_TOPLEFT, &g_Config.bDrawWireframe);
|
||||
UIEnd();
|
||||
}
|
||||
|
||||
void GraphicsScreenP1::render() {
|
||||
UIShader_Prepare();
|
||||
UIBegin(UIShader_Get());
|
||||
DrawBackground(1.0f);
|
||||
|
||||
I18NCategory *g = GetI18NCategory("General");
|
||||
I18NCategory *gs = GetI18NCategory("Graphics");
|
||||
|
||||
ui_draw2d.SetFontScale(1.5f, 1.5f);
|
||||
ui_draw2d.DrawText(UBUNTU24, gs->T("Graphics Settings"), dp_xres / 2, 20, 0xFFFFFFFF, ALIGN_HCENTER);
|
||||
ui_draw2d.SetFontScale(1.0f, 1.0f);
|
||||
|
||||
if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres - 10), LARGE_BUTTON_WIDTH, 0, g->T("Back"), ALIGN_RIGHT | ALIGN_BOTTOM)) {
|
||||
screenManager()->finishDialog(this, DR_OK);
|
||||
}
|
||||
|
||||
int x = 30;
|
||||
int y = 30;
|
||||
int stride = 40;
|
||||
int columnw = 400;
|
||||
|
||||
UICheckBox(GEN_ID, x, y += stride, gs->T("Draw Wireframe"), ALIGN_TOPLEFT, &g_Config.bDrawWireframe);
|
||||
UICheckBox(GEN_ID, x, y += stride, gs->T("Display Raw Framebuffer"), ALIGN_TOPLEFT, &g_Config.bDisplayFramebuffer);
|
||||
UIEnd();
|
||||
}
|
||||
|
||||
|
@ -91,6 +91,13 @@ public:
|
||||
void render();
|
||||
};
|
||||
|
||||
class GraphicsScreenP1 : public Screen
|
||||
{
|
||||
public:
|
||||
void update(InputState &input);
|
||||
void render();
|
||||
};
|
||||
|
||||
class SystemScreen : public Screen
|
||||
{
|
||||
public:
|
||||
|
Loading…
Reference in New Issue
Block a user