Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Some improvements, comments and polishing.

Browse Source
This commit is contained in:
LunaMoo 2015-12-21 06:32:05 +01:00 committed by Luna
parent e4271fe1bc
commit 6061ad7579
13 changed files with 76 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/Config.cpp
View File

@ -384,6 +384,14 @@ static int DefaultInternalResolution() {
#endif #endif
} }
static int DefaultZoomType() {
if (pixel_xres < 1.3 * pixel_yres) {
return 1;
} else {
return 2;
}
}
static bool DefaultTimerHack() { static bool DefaultTimerHack() {
// Has been in use on Symbian since v0.7. Preferred option. // Has been in use on Symbian since v0.7. Preferred option.
#ifdef __SYMBIAN32__ #ifdef __SYMBIAN32__
@ -457,10 +465,10 @@ static ConfigSetting graphicsSettings[] = {
#endif #endif
// TODO: Replace these settings with a list of options // TODO: Replace these settings with a list of options
ConfigSetting("SmallDisplayZoom", &g_Config.iSmallDisplayZoom, 2, true, true), ConfigSetting("SmallDisplayZoomType", &g_Config.iSmallDisplayZoomType, &DefaultZoomType, true, true),
ConfigSetting("SmallDisplayOffsetX", &g_Config.fSmallDisplayOffsetX, 0.5f, true, true), ConfigSetting("SmallDisplayOffsetX", &g_Config.fSmallDisplayOffsetX, 0.5f, true, true),
ConfigSetting("SmallDisplayOffsetY", &g_Config.fSmallDisplayOffsetY, 0.5f, true, true), ConfigSetting("SmallDisplayOffsetY", &g_Config.fSmallDisplayOffsetY, 0.5f, true, true),
ConfigSetting("SmallDisplayCustomZoom", &g_Config.fSmallDisplayCustomZoom, 8.0f, true, true), ConfigSetting("SmallDisplayZoomLevel", &g_Config.fSmallDisplayZoomLevel, 1.0f, true, true),
ConfigSetting("ImmersiveMode", &g_Config.bImmersiveMode, false, true, true), ConfigSetting("ImmersiveMode", &g_Config.bImmersiveMode, false, true, true),
ReportedConfigSetting("TrueColor", &g_Config.bTrueColor, true, true, true), ReportedConfigSetting("TrueColor", &g_Config.bTrueColor, true, true, true),

4
Core/Config.h
View File

@ -144,10 +144,10 @@ public:
int iRenderingMode; // 0 = non-buffered rendering 1 = buffered rendering 2 = Read Framebuffer to memory (CPU) 3 = Read Framebuffer to memory (GPU) int iRenderingMode; // 0 = non-buffered rendering 1 = buffered rendering 2 = Read Framebuffer to memory (CPU) 3 = Read Framebuffer to memory (GPU)
int iTexFiltering; // 1 = off , 2 = nearest , 3 = linear , 4 = linear(CG) int iTexFiltering; // 1 = off , 2 = nearest , 3 = linear , 4 = linear(CG)
int iBufFilter; // 1 = linear, 2 = nearest int iBufFilter; // 1 = linear, 2 = nearest
int iSmallDisplayZoom; // Used to fit display into screen 0 = stretch, 1 = partial stretch, 2 = auto, anything higher is used to set's integer zoom of psp resolution and allows manual editing int iSmallDisplayZoomType; // Used to fit display into screen 0 = stretch, 1 = partial stretch, 2 = auto scaling, 3 = manual scaling.
float fSmallDisplayOffsetX; // Along with Y it goes from 0.0 to 1.0, XY (0.5, 0.5) = center of the screen float fSmallDisplayOffsetX; // Along with Y it goes from 0.0 to 1.0, XY (0.5, 0.5) = center of the screen
float fSmallDisplayOffsetY; float fSmallDisplayOffsetY;
float fSmallDisplayCustomZoom; //This is actually used for zoom, both in and out. float fSmallDisplayZoomLevel; //This is used for zoom values, both in and out.
bool bImmersiveMode; // Mode on Android Kitkat 4.4 that hides the back button etc. bool bImmersiveMode; // Mode on Android Kitkat 4.4 that hides the back button etc.
bool bVSync; bool bVSync;
int iFrameSkip; int iFrameSkip;

12
GPU/Common/FramebufferCommon.cpp
View File

@ -36,18 +36,18 @@ void CenterDisplayOutputRect(float *x, float *y, float *w, float *h, float origW
bool rotated = rotation == ROTATION_LOCKED_VERTICAL || rotation == ROTATION_LOCKED_VERTICAL180; bool rotated = rotation == ROTATION_LOCKED_VERTICAL || rotation == ROTATION_LOCKED_VERTICAL180;
if (g_Config.iSmallDisplayZoom == 0) { if (g_Config.iSmallDisplayZoomType == 0) { // Stretching
outW = frameW; outW = frameW;
outH = frameH; outH = frameH;
} else { } else {
if (g_Config.iSmallDisplayZoom > 2) { if (g_Config.iSmallDisplayZoomType == 3) { // Manual Scaling
float offsetX = (g_Config.fSmallDisplayOffsetX - 0.5f) * 2.0f * frameW; float offsetX = (g_Config.fSmallDisplayOffsetX - 0.5f) * 2.0f * frameW;
float offsetY = (g_Config.fSmallDisplayOffsetY - 0.5f) * 2.0f * frameH; float offsetY = (g_Config.fSmallDisplayOffsetY - 0.5f) * 2.0f * frameH;
// Have to invert Y for GL // Have to invert Y for GL
if (GetGPUBackend() == GPUBackend::OPENGL) { if (GetGPUBackend() == GPUBackend::OPENGL) {
offsetY = offsetY * -1.0f; offsetY = offsetY * -1.0f;
} }
float customZoom = g_Config.fSmallDisplayCustomZoom / 8.0f; float customZoom = g_Config.fSmallDisplayZoomLevel;
float smallDisplayW = origW * customZoom; float smallDisplayW = origW * customZoom;
float smallDisplayH = origH * customZoom; float smallDisplayH = origH * customZoom;
if (!rotated) { if (!rotated) {
@ -63,7 +63,7 @@ void CenterDisplayOutputRect(float *x, float *y, float *w, float *h, float origW
*h = floorf(smallDisplayW); *h = floorf(smallDisplayW);
return; return;
} }
} else { } else if (g_Config.iSmallDisplayZoomType == 2) { // Auto Scaling
float pixelCrop = frameH / 270.0f; float pixelCrop = frameH / 270.0f;
float resCommonWidescreen = pixelCrop - floor(pixelCrop); float resCommonWidescreen = pixelCrop - floor(pixelCrop);
if (!rotated && resCommonWidescreen == 0.0f) { if (!rotated && resCommonWidescreen == 0.0f) {
@ -83,13 +83,13 @@ void CenterDisplayOutputRect(float *x, float *y, float *w, float *h, float origW
outW = frameW; outW = frameW;
outH = frameW / origRatio; outH = frameW / origRatio;
// Stretch a little bit // Stretch a little bit
if (!rotated && g_Config.iSmallDisplayZoom == 1) if (!rotated && g_Config.iSmallDisplayZoomType == 1) // Partial Stretch
outH = (frameH + outH) / 2.0f; // (408 + 720) / 2 = 564 outH = (frameH + outH) / 2.0f; // (408 + 720) / 2 = 564
} else { } else {
// Image is taller than frame. Center horizontally. // Image is taller than frame. Center horizontally.
outW = frameH * origRatio; outW = frameH * origRatio;
outH = frameH; outH = frameH;
if (rotated && g_Config.iSmallDisplayZoom == 1) if (rotated && g_Config.iSmallDisplayZoomType == 1) // Partial Stretch
outW = (frameH + outH) / 2.0f; // (408 + 720) / 2 = 564 outW = (frameH + outH) / 2.0f; // (408 + 720) / 2 = 564
} }
} }

9
Qt/mainwindow.cpp
View File

@ -90,10 +90,7 @@ void MainWindow::updateMenus()
} }
foreach(QAction * action, displayLayoutGroup->actions()) { foreach(QAction * action, displayLayoutGroup->actions()) {
if (g_Config.iSmallDisplayZoom == action->data().toInt()) { if (g_Config.iSmallDisplayZoomType == action->data().toInt()) {
if (g_Config.iSmallDisplayZoom > 2) {
g_Config.fSmallDisplayCustomZoom = (float)((g_Config.iSmallDisplayZoom - 2) * 8);
}
if (gpu) if (gpu)
gpu->Resized(); gpu->Resized();
@ -548,8 +545,8 @@ void MainWindow::createMenus()
MenuTree* displayLayoutMenu = new MenuTree(this, videoMenu, QT_TR_NOOP("&Display Layout Options")); MenuTree* displayLayoutMenu = new MenuTree(this, videoMenu, QT_TR_NOOP("&Display Layout Options"));
displayLayoutGroup = new MenuActionGroup(this, displayLayoutMenu, SLOT(displayLayoutGroup_triggered(QAction *)), displayLayoutGroup = new MenuActionGroup(this, displayLayoutMenu, SLOT(displayLayoutGroup_triggered(QAction *)),
QStringList() << "Stretched" << "Partialy stretched" << "Auto Scaling" << "1x" << "2x" << "3x" << "4x" << "5x" << "6x" << "7x" << "8x" << "9x" << "10x", QStringList() << "Stretched" << "Partialy stretched" << "Auto Scaling" << "Manual Scaling",
QList<int>() << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12); QList<int>() << 0 << 1 << 2 << 3);
videoMenu->addSeparator(); videoMenu->addSeparator();
videoMenu->add(new MenuAction(this, SLOT(transformAct()), QT_TR_NOOP("&Hardware Transform"), Qt::Key_F6)) videoMenu->add(new MenuAction(this, SLOT(transformAct()), QT_TR_NOOP("&Hardware Transform"), Qt::Key_F6))
->addEventChecked(&g_Config.bHardwareTransform); ->addEventChecked(&g_Config.bHardwareTransform);

2
Qt/mainwindow.h
View File

@ -100,7 +100,7 @@ private slots:
void screenGroup_triggered(QAction *action) { SetZoom(action->data().toInt()); } void screenGroup_triggered(QAction *action) { SetZoom(action->data().toInt()); }
void displayLayoutGroup_triggered(QAction *action) { g_Config.iSmallDisplayZoom = action->data().toInt(); } void displayLayoutGroup_triggered(QAction *action) { g_Config.iSmallDisplayZoomType = action->data().toInt(); }
void transformAct() { g_Config.bHardwareTransform = !g_Config.bHardwareTransform; } void transformAct() { g_Config.bHardwareTransform = !g_Config.bHardwareTransform; }
void vertexCacheAct() { g_Config.bVertexCache = !g_Config.bVertexCache; } void vertexCacheAct() { g_Config.bVertexCache = !g_Config.bVertexCache; }
void frameskipAct() { g_Config.iFrameSkip = !g_Config.iFrameSkip; } void frameskipAct() { g_Config.iFrameSkip = !g_Config.iFrameSkip; }

52
UI/DisplayLayoutScreen.cpp
View File

@ -71,7 +71,7 @@ bool DisplayLayoutScreen::touch(const TouchInput &touch) {
using namespace UI; using namespace UI;
int mode = mode_->GetSelection(); int mode = mode_->GetSelection();
if (g_Config.iSmallDisplayZoom == 2) { mode = -1; } if (g_Config.iSmallDisplayZoomType == 2) { mode = -1; }
const Bounds &screen_bounds = screenManager()->getUIContext()->GetBounds(); const Bounds &screen_bounds = screenManager()->getUIContext()->GetBounds();
@ -126,6 +126,7 @@ bool DisplayLayoutScreen::touch(const TouchInput &touch) {
picked_->SaveDisplayPosition(); picked_->SaveDisplayPosition();
picked_ = 0; picked_ = 0;
} }
g_Config.fSmallDisplayZoomLevel = startScale_ / 8.0f;
return true; return true;
}; };
@ -140,13 +141,12 @@ UI::EventReturn DisplayLayoutScreen::OnCenter(UI::EventParams &e) {
return UI::EVENT_DONE; return UI::EVENT_DONE;
}; };
UI::EventReturn DisplayLayoutScreen::OnZoomChange(UI::EventParams &e) { UI::EventReturn DisplayLayoutScreen::OnZoomTypeChange(UI::EventParams &e) {
if (g_Config.iSmallDisplayZoom > 2) { if (g_Config.iSmallDisplayZoomType < 3) {
g_Config.fSmallDisplayCustomZoom = (float)((g_Config.iSmallDisplayZoom - 2) * 8);
} else {
const Bounds &bounds = screenManager()->getUIContext()->GetBounds(); const Bounds &bounds = screenManager()->getUIContext()->GetBounds();
float autoBound = bounds.w / 480.0f * 8.0f; float autoBound = bounds.w / 480.0f;
g_Config.fSmallDisplayCustomZoom = autoBound; g_Config.fSmallDisplayZoomLevel = autoBound;
displayRepresentationScale_ = g_Config.fSmallDisplayZoomLevel * 8.0f;
g_Config.fSmallDisplayOffsetX = 0.5f; g_Config.fSmallDisplayOffsetX = 0.5f;
g_Config.fSmallDisplayOffsetY = 0.5f; g_Config.fSmallDisplayOffsetY = 0.5f;
} }
@ -191,9 +191,9 @@ void DisplayLayoutScreen::CreateViews() {
horizontalBoundaryR->AddTab("", bottomBoundary); horizontalBoundaryR->AddTab("", bottomBoundary);
Choice *back = new Choice(di->T("Back"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 10)); Choice *back = new Choice(di->T("Back"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 10));
static const char *zoomLevels[] = { "Full Stretch", "Partial Stretch", "Auto Scaling", "1x", "2x", "3x", "4x", "5x", "6x", "7x", "8x", "9x", "10x" }; static const char *zoomLevels[] = { "Stretching", "Partial Stretch", "Auto Scaling", "Manual Scaling" };
zoom_ = new PopupMultiChoice(&g_Config.iSmallDisplayZoom, cw->T("Options"), zoomLevels, 0, ARRAY_SIZE(zoomLevels), gr->GetName(), screenManager(), new AnchorLayoutParams(400, WRAP_CONTENT, local_dp_xres / 2 - 200, NONE, NONE, 10)); zoom_ = new PopupMultiChoice(&g_Config.iSmallDisplayZoomType, cw->T("Options"), zoomLevels, 0, ARRAY_SIZE(zoomLevels), gr->GetName(), screenManager(), new AnchorLayoutParams(400, WRAP_CONTENT, local_dp_xres / 2 - 200, NONE, NONE, 10));
zoom_->OnChoice.Handle(this, &DisplayLayoutScreen::OnZoomChange); zoom_->OnChoice.Handle(this, &DisplayLayoutScreen::OnZoomTypeChange);
static const char *displayRotation[] = { "Landscape", "Portrait", "Landscape Reversed", "Portrait Reversed" }; static const char *displayRotation[] = { "Landscape", "Portrait", "Landscape Reversed", "Portrait Reversed" };
rotation_ = new PopupMultiChoice(&g_Config.iInternalScreenRotation, gr->T("Rotation"), displayRotation, 1, ARRAY_SIZE(displayRotation), gr->GetName(), screenManager(), new AnchorLayoutParams(400, WRAP_CONTENT, local_dp_xres / 2 - 200, NONE, NONE, local_dp_yres - 64)); rotation_ = new PopupMultiChoice(&g_Config.iInternalScreenRotation, gr->T("Rotation"), displayRotation, 1, ARRAY_SIZE(displayRotation), gr->GetName(), screenManager(), new AnchorLayoutParams(400, WRAP_CONTENT, local_dp_xres / 2 - 200, NONE, NONE, local_dp_yres - 64));
@ -202,48 +202,52 @@ void DisplayLayoutScreen::CreateViews() {
bool bRotated = false; bool bRotated = false;
if (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE && (g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL || g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL180)) { bRotated = true; } if (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE && (g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL || g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL180)) { bRotated = true; }
mode_ = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158 + 64 + 10)); mode_ = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158 + 64 + 10));
if (g_Config.iSmallDisplayZoom > 1) { displayRepresentationScale_ = g_Config.fSmallDisplayZoomLevel * 8.0f; // Visual representation image is just icon size and have to be scaled 8 times to match PSP native resolution which is used as 1.0 for zoom
if (g_Config.iSmallDisplayZoom == 2) { if (g_Config.iSmallDisplayZoomType > 1) { // Scaling
if (g_Config.iSmallDisplayZoomType == 2) { // Auto Scaling
mode_->AddChoice(gr->T("Auto Scaling")); mode_->AddChoice(gr->T("Auto Scaling"));
mode_->ReplaceLayoutParams(new AnchorLayoutParams(0, 0, local_dp_xres / 2.0f - 70.0f, NONE, NONE, local_dp_yres / 2.0f + 32.0f)); mode_->ReplaceLayoutParams(new AnchorLayoutParams(0, 0, local_dp_xres / 2.0f - 70.0f, NONE, NONE, local_dp_yres / 2.0f + 32.0f));
float autoBound = local_dp_yres / 270.0f * 8.0f; float autoBound = local_dp_yres / 270.0f;
// Case of screen rotated ~ only works with buffered rendering // Case of screen rotated ~ only works with buffered rendering
if (bRotated) { if (bRotated) {
autoBound = local_dp_yres / 480.0f * 8.0f; autoBound = local_dp_yres / 480.0f;
} }
else { // Without rotation in common cases like 1080p we cut off 2 pixels of height, this reflects other cases else { // Without rotation in common cases like 1080p we cut off 2 pixels of height, this reflects other cases
float resCommonWidescreen = autoBound - floor(autoBound); float resCommonWidescreen = autoBound - floor(autoBound);
if (resCommonWidescreen != 0.0f) { if (resCommonWidescreen != 0.0f) {
float ratio = local_dp_xres / local_dp_yres; float ratio = local_dp_xres / local_dp_yres;
if (ratio < orgRatio) { if (ratio < orgRatio) {
autoBound = local_dp_xres / 480.0f * 8.0f; autoBound = local_dp_xres / 480.0f;
} }
else { else {
autoBound = local_dp_yres / 272.0f * 8.0f; autoBound = local_dp_yres / 272.0f;
} }
} }
} }
g_Config.fSmallDisplayCustomZoom = autoBound; g_Config.fSmallDisplayZoomLevel = autoBound;
displayRepresentationScale_ = g_Config.fSmallDisplayZoomLevel * 8.0f;
g_Config.fSmallDisplayOffsetX = 0.5f; g_Config.fSmallDisplayOffsetX = 0.5f;
g_Config.fSmallDisplayOffsetY = 0.5f; g_Config.fSmallDisplayOffsetY = 0.5f;
} else { } else { // Manual Scaling
Choice *center = new Choice(di->T("Center"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 74)); Choice *center = new Choice(di->T("Center"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 74));
center->OnClick.Handle(this, &DisplayLayoutScreen::OnCenter); center->OnClick.Handle(this, &DisplayLayoutScreen::OnCenter);
root_->Add(center); root_->Add(center);
PopupSliderChoiceFloat *zoomlvl_ = new PopupSliderChoiceFloat(&g_Config.fSmallDisplayZoomLevel, 1.0f, 10.0f, di->T("Zoom"), 1.0f, screenManager(), "* PSP res", new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 134));
root_->Add(zoomlvl_);
mode_->AddChoice(di->T("Move")); mode_->AddChoice(di->T("Move"));
mode_->AddChoice(di->T("Resize")); mode_->AddChoice(di->T("Resize"));
mode_->SetSelection(0); mode_->SetSelection(0);
} }
displayRepresentation_ = new DragDropDisplay(g_Config.fSmallDisplayOffsetX, g_Config.fSmallDisplayOffsetY, I_PSP_DISPLAY, g_Config.fSmallDisplayCustomZoom); displayRepresentation_ = new DragDropDisplay(g_Config.fSmallDisplayOffsetX, g_Config.fSmallDisplayOffsetY, I_PSP_DISPLAY, displayRepresentationScale_);
displayRepresentation_->SetVisibility(V_VISIBLE); displayRepresentation_->SetVisibility(V_VISIBLE);
} else { } else { // Stretching
mode_->AddChoice(gr->T("Stretching")); mode_->AddChoice(gr->T("Stretching"));
mode_->ReplaceLayoutParams(new AnchorLayoutParams(0, 0, local_dp_xres / 2.0f - 70.0f, NONE, NONE, local_dp_yres / 2.0f + 32.0f)); mode_->ReplaceLayoutParams(new AnchorLayoutParams(0, 0, local_dp_xres / 2.0f - 70.0f, NONE, NONE, local_dp_yres / 2.0f + 32.0f));
displayRepresentation_ = new DragDropDisplay(g_Config.fSmallDisplayOffsetX, g_Config.fSmallDisplayOffsetY, I_PSP_DISPLAY, g_Config.fSmallDisplayCustomZoom); displayRepresentation_ = new DragDropDisplay(g_Config.fSmallDisplayOffsetX, g_Config.fSmallDisplayOffsetY, I_PSP_DISPLAY, displayRepresentationScale_);
displayRepresentation_->SetVisibility(V_INVISIBLE); displayRepresentation_->SetVisibility(V_INVISIBLE);
float width = local_dp_xres / 2.0f; float width = local_dp_xres / 2.0f;
float height = local_dp_yres / 2.0f; float height = local_dp_yres / 2.0f;
if (g_Config.iSmallDisplayZoom == 0) { // Stretched if (g_Config.iSmallDisplayZoomType == 0) { // Stretched
Choice *stretched = new Choice("", "", false, new AnchorLayoutParams(width, height, width - width / 2.0f, NONE, NONE, height - height / 2.0f)); Choice *stretched = new Choice("", "", false, new AnchorLayoutParams(width, height, width - width / 2.0f, NONE, NONE, height - height / 2.0f));
root_->Add(stretched); root_->Add(stretched);
} else { // Partially stretched } else { // Partially stretched
@ -251,10 +255,10 @@ void DisplayLayoutScreen::CreateViews() {
float frameRatio = width / height; float frameRatio = width / height;
if (origRatio > frameRatio) { if (origRatio > frameRatio) {
height = width / origRatio; height = width / origRatio;
if (!bRotated && g_Config.iSmallDisplayZoom == 1) { height = (272.0f + height) / 2.0f; } if (!bRotated && g_Config.iSmallDisplayZoomType == 1) { height = (272.0f + height) / 2.0f; }
} else { } else {
width = height * origRatio; width = height * origRatio;
if (bRotated && g_Config.iSmallDisplayZoom == 1) { width = (272.0f + height) / 2.0f; } if (bRotated && g_Config.iSmallDisplayZoomType == 1) { width = (272.0f + height) / 2.0f; }
} }
Choice *stretched = new Choice("", "", false, new AnchorLayoutParams(width, height, local_dp_xres / 2.0f - width / 2.0f, NONE, NONE, local_dp_yres / 2.0f - height / 2.0f)); Choice *stretched = new Choice("", "", false, new AnchorLayoutParams(width, height, local_dp_xres / 2.0f - width / 2.0f, NONE, NONE, local_dp_yres / 2.0f - height / 2.0f));
root_->Add(stretched); root_->Add(stretched);

4
UI/DisplayLayoutScreen.h
View File

@ -34,7 +34,7 @@ public:
protected: protected:
virtual UI::EventReturn OnCenter(UI::EventParams &e); virtual UI::EventReturn OnCenter(UI::EventParams &e);
virtual UI::EventReturn OnZoomChange(UI::EventParams &e); virtual UI::EventReturn OnZoomTypeChange(UI::EventParams &e);
private: private:
DragDropDisplay *picked_; DragDropDisplay *picked_;
@ -42,10 +42,12 @@ private:
UI::ChoiceStrip *mode_; UI::ChoiceStrip *mode_;
UI::PopupMultiChoice *zoom_; UI::PopupMultiChoice *zoom_;
UI::PopupMultiChoice *rotation_; UI::PopupMultiChoice *rotation_;
UI::PopupSliderChoiceFloat *zoomlvl_;
bool displayRotEnable_; bool displayRotEnable_;
// Touch down state for drag to resize etc // Touch down state for drag to resize etc
float startX_; float startX_;
float startY_; float startY_;
float startScale_; float startScale_;
float displayRepresentationScale_;
}; };

5
UI/EmuScreen.cpp
View File

@ -61,6 +61,7 @@
#include "UI/GameInfoCache.h" #include "UI/GameInfoCache.h"
#include "UI/MiscScreens.h" #include "UI/MiscScreens.h"
#include "UI/ControlMappingScreen.h" #include "UI/ControlMappingScreen.h"
#include "UI/DisplayLayoutScreen.h"
#include "UI/GameSettingsScreen.h" #include "UI/GameSettingsScreen.h"
#include "UI/InstallZipScreen.h" #include "UI/InstallZipScreen.h"
#include "UI/ProfilerDraw.h" #include "UI/ProfilerDraw.h"
@ -231,6 +232,10 @@ void EmuScreen::sendMessage(const char *message, const char *value) {
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
releaseButtons(); releaseButtons();
screenManager()->push(new ControlMappingScreen()); screenManager()->push(new ControlMappingScreen());
} else if (!strcmp(message, "display layout editor")) {
UpdateUIState(UISTATE_MENU);
releaseButtons();
screenManager()->push(new DisplayLayoutScreen());
} else if (!strcmp(message, "settings")) { } else if (!strcmp(message, "settings")) {
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
releaseButtons(); releaseButtons();

4
UI/GameSettingsScreen.cpp
View File

@ -828,6 +828,10 @@ void GameSettingsScreen::sendMessage(const char *message, const char *value) {
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
screenManager()->push(new ControlMappingScreen()); screenManager()->push(new ControlMappingScreen());
} }
if (!strcmp(message, "display layout editor")) {
UpdateUIState(UISTATE_MENU);
screenManager()->push(new DisplayLayoutScreen());
}
} }
void GameSettingsScreen::onFinish(DialogResult result) { void GameSettingsScreen::onFinish(DialogResult result) {

5
UI/MainScreen.cpp
View File

@ -42,6 +42,7 @@
#include "UI/GameSettingsScreen.h" #include "UI/GameSettingsScreen.h"
#include "UI/MiscScreens.h" #include "UI/MiscScreens.h"
#include "UI/ControlMappingScreen.h" #include "UI/ControlMappingScreen.h"
#include "UI/DisplayLayoutScreen.h"
#include "UI/SavedataScreen.h" #include "UI/SavedataScreen.h"
#include "UI/Store.h" #include "UI/Store.h"
#include "UI/ui_atlas.h" #include "UI/ui_atlas.h"
@ -887,6 +888,10 @@ void MainScreen::sendMessage(const char *message, const char *value) {
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
screenManager()->push(new ControlMappingScreen()); screenManager()->push(new ControlMappingScreen());
} }
if (!strcmp(message, "display layout editor")) {
UpdateUIState(UISTATE_MENU);
screenManager()->push(new DisplayLayoutScreen());
}
if (!strcmp(message, "settings")) { if (!strcmp(message, "settings")) {
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
screenManager()->push(new GameSettingsScreen("")); screenManager()->push(new GameSettingsScreen(""));

52
Windows/MainWindowMenu.cpp
View File

@ -269,10 +269,8 @@ namespace MainWindow {
TranslateMenuItem(menu, ID_OPTIONS_IGNOREWINKEY); TranslateMenuItem(menu, ID_OPTIONS_IGNOREWINKEY);
TranslateMenuItem(menu, ID_OPTIONS_MORE_SETTINGS); TranslateMenuItem(menu, ID_OPTIONS_MORE_SETTINGS);
TranslateMenuItem(menu, ID_OPTIONS_CONTROLS); TranslateMenuItem(menu, ID_OPTIONS_CONTROLS);
TranslateSubMenu(menu, "Display Layout Options", MENU_OPTIONS, SUBMENU_DISPLAY_LAYOUT); TranslateMenuItem(menu, ID_OPTIONS_DISPLAY_LAYOUT);
TranslateMenuItem(menu, ID_OPTIONS_STRETCH);
TranslateMenuItem(menu, ID_OPTIONS_PARTIAL_STRETCH);
TranslateMenuItem(menu, ID_OPTIONS_DISPLAY_AUTO);
// Skip display multipliers x1-x10 // Skip display multipliers x1-x10
TranslateMenuItem(menu, ID_OPTIONS_FULLSCREEN, L"\tAlt+Return, F11"); TranslateMenuItem(menu, ID_OPTIONS_FULLSCREEN, L"\tAlt+Return, F11");
TranslateMenuItem(menu, ID_OPTIONS_VSYNC); TranslateMenuItem(menu, ID_OPTIONS_VSYNC);
@ -487,10 +485,7 @@ namespace MainWindow {
} }
static void setDisplayOptions(int options) { static void setDisplayOptions(int options) {
g_Config.iSmallDisplayZoom = options; g_Config.iSmallDisplayZoomType = options;
if (g_Config.iSmallDisplayZoom > 2) {
g_Config.fSmallDisplayCustomZoom = (float)((g_Config.iSmallDisplayZoom - 2) * 8);
}
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu resized", "");
} }
@ -723,19 +718,9 @@ namespace MainWindow {
osm.ShowOnOff(gr->T("Hardware Transform"), g_Config.bHardwareTransform); osm.ShowOnOff(gr->T("Hardware Transform"), g_Config.bHardwareTransform);
break; break;
case ID_OPTIONS_STRETCH: setDisplayOptions(0); break; case ID_OPTIONS_DISPLAY_LAYOUT:
case ID_OPTIONS_PARTIAL_STRETCH: setDisplayOptions(1); break; NativeMessageReceived("display layout editor", "");
case ID_OPTIONS_DISPLAY_AUTO: setDisplayOptions(2); break; break;
case ID_OPTIONS_DISPLAY_1: setDisplayOptions(3); break;
case ID_OPTIONS_DISPLAY_2: setDisplayOptions(4); break;
case ID_OPTIONS_DISPLAY_3: setDisplayOptions(5); break;
case ID_OPTIONS_DISPLAY_4: setDisplayOptions(6); break;
case ID_OPTIONS_DISPLAY_5: setDisplayOptions(7); break;
case ID_OPTIONS_DISPLAY_6: setDisplayOptions(8); break;
case ID_OPTIONS_DISPLAY_7: setDisplayOptions(9); break;
case ID_OPTIONS_DISPLAY_8: setDisplayOptions(10); break;
case ID_OPTIONS_DISPLAY_9: setDisplayOptions(11); break;
case ID_OPTIONS_DISPLAY_10: setDisplayOptions(12); break;
case ID_OPTIONS_FRAMESKIP_0: setFrameSkipping(FRAMESKIP_OFF); break; case ID_OPTIONS_FRAMESKIP_0: setFrameSkipping(FRAMESKIP_OFF); break;
@ -987,31 +972,6 @@ namespace MainWindow {
CheckMenuItem(menu, displayrotationitems[i], MF_BYCOMMAND | ((i + 1) == g_Config.iInternalScreenRotation ? MF_CHECKED : MF_UNCHECKED)); CheckMenuItem(menu, displayrotationitems[i], MF_BYCOMMAND | ((i + 1) == g_Config.iInternalScreenRotation ? MF_CHECKED : MF_UNCHECKED));
} }
static const int displaylayoutitems[] = {
ID_OPTIONS_STRETCH,
ID_OPTIONS_PARTIAL_STRETCH,
ID_OPTIONS_DISPLAY_AUTO,
ID_OPTIONS_DISPLAY_1,
ID_OPTIONS_DISPLAY_2,
ID_OPTIONS_DISPLAY_3,
ID_OPTIONS_DISPLAY_4,
ID_OPTIONS_DISPLAY_5,
ID_OPTIONS_DISPLAY_6,
ID_OPTIONS_DISPLAY_7,
ID_OPTIONS_DISPLAY_8,
ID_OPTIONS_DISPLAY_9,
ID_OPTIONS_DISPLAY_10
};
if (g_Config.iSmallDisplayZoom < 0)
g_Config.iSmallDisplayZoom = 0;
else if (g_Config.iSmallDisplayZoom > 12)
g_Config.iSmallDisplayZoom = 12;
for (int i = 0; i < ARRAY_SIZE(displaylayoutitems); i++) {
CheckMenuItem(menu, displaylayoutitems[i], MF_BYCOMMAND | (i == g_Config.iSmallDisplayZoom ? MF_CHECKED : MF_UNCHECKED));
}
// Disable Vertex Cache when HW T&L is disabled. // Disable Vertex Cache when HW T&L is disabled.
if (!g_Config.bHardwareTransform) { if (!g_Config.bHardwareTransform) {
EnableMenuItem(menu, ID_OPTIONS_VERTEXCACHE, MF_GRAYED); EnableMenuItem(menu, ID_OPTIONS_VERTEXCACHE, MF_GRAYED);

17
Windows/ppsspp.rc
View File

@ -451,22 +451,7 @@ BEGIN
MENUITEM "Control Mapping...", ID_OPTIONS_CONTROLS MENUITEM "Control Mapping...", ID_OPTIONS_CONTROLS
MENUITEM "Language...", ID_OPTIONS_LANGUAGE MENUITEM "Language...", ID_OPTIONS_LANGUAGE
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "Display Layout Options" MENUITEM "Display Layout Editor" ID_OPTIONS_DISPLAY_LAYOUT
BEGIN
MENUITEM "Full stretch", ID_OPTIONS_STRETCH
MENUITEM "Partial stretch", ID_OPTIONS_PARTIAL_STRETCH
MENUITEM "Auto scaling", ID_OPTIONS_DISPLAY_AUTO
MENUITEM "1x", ID_OPTIONS_DISPLAY_1
MENUITEM "2x", ID_OPTIONS_DISPLAY_2
MENUITEM "3x", ID_OPTIONS_DISPLAY_3
MENUITEM "4x", ID_OPTIONS_DISPLAY_4
MENUITEM "5x", ID_OPTIONS_DISPLAY_5
MENUITEM "6x", ID_OPTIONS_DISPLAY_6
MENUITEM "7x", ID_OPTIONS_DISPLAY_7
MENUITEM "8x", ID_OPTIONS_DISPLAY_8
MENUITEM "9x", ID_OPTIONS_DISPLAY_9
MENUITEM "10x", ID_OPTIONS_DISPLAY_10
END
MENUITEM "Fullscreen", ID_OPTIONS_FULLSCREEN MENUITEM "Fullscreen", ID_OPTIONS_FULLSCREEN
MENUITEM "VSync", ID_OPTIONS_VSYNC MENUITEM "VSync", ID_OPTIONS_VSYNC
MENUITEM "Postprocessing Shader", ID_OPTIONS_FXAA MENUITEM "Postprocessing Shader", ID_OPTIONS_FXAA

14
Windows/resource.h
View File

@ -322,19 +322,7 @@
#define ID_EMULATION_ROTATION_V 40157 #define ID_EMULATION_ROTATION_V 40157
#define ID_EMULATION_ROTATION_H_R 40158 #define ID_EMULATION_ROTATION_H_R 40158
#define ID_EMULATION_ROTATION_V_R 40159 #define ID_EMULATION_ROTATION_V_R 40159
#define ID_OPTIONS_STRETCH 40160 #define ID_OPTIONS_DISPLAY_LAYOUT 40160
#define ID_OPTIONS_PARTIAL_STRETCH 40161
#define ID_OPTIONS_DISPLAY_AUTO 40162
#define ID_OPTIONS_DISPLAY_1 40163
#define ID_OPTIONS_DISPLAY_2 40164
#define ID_OPTIONS_DISPLAY_3 40165
#define ID_OPTIONS_DISPLAY_4 40166
#define ID_OPTIONS_DISPLAY_5 40167
#define ID_OPTIONS_DISPLAY_6 40168
#define ID_OPTIONS_DISPLAY_7 40169
#define ID_OPTIONS_DISPLAY_8 40170
#define ID_OPTIONS_DISPLAY_9 40171
#define ID_OPTIONS_DISPLAY_10 40172
// Dummy option to let the buffered rendering hotkey cycle through all the options. // Dummy option to let the buffered rendering hotkey cycle through all the options.
#define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500 #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500