CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-13 13:28:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(PS3) Implemented Resize mode

Browse Source
This commit is contained in:
TwinAphex51224 2012-03-01 16:55:19 +01:00
parent 051c82daed
commit c6fa39fde0
3 changed files with 151 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
ps3/menu.c
View File

@ -1102,7 +1102,7 @@ static void ssnes_filename_input_and_save (unsigned filename_type)
{
glClear(GL_COLOR_BUFFER_BIT);
gl_frame_menu();
psglSwap();
video_gl.swap(NULL);
cell_console_poll();
cellSysutilCheckCallback();
}
@ -1137,7 +1137,7 @@ static void ssnes_filename_input_and_save (unsigned filename_type)
/* OSK Util gets updated */
glClear(GL_COLOR_BUFFER_BIT);
ps3graphics_draw_menu();
psglSwap();
video_gl.swap(NULL);
cell_console_poll();
cellSysutilCheckCallback();
}
@ -1966,10 +1966,17 @@ static void ingame_menu(uint32_t menu_id)
uint64_t state, stuck_in_loop;
static uint64_t blocking;
float x_position = 0.3f;
float font_size = 1.1f;
float ypos = 0.19f;
float ypos_increment = 0.04f;
for(int i = 0; i < MENU_ITEM_LAST; i++)
menuitem_colors[i] = GREEN;
menuitem_colors[g_console.ingame_menu_item] = RED;
gl_t * gl = g_gl;
state = cell_pad_input_poll_device(0);
stuck_in_loop = 1;
@ -2158,6 +2165,126 @@ static void ingame_menu(uint32_t menu_id)
case MENU_ITEM_RESIZE_MODE:
if(CTRL_CROSS(state))
{
g_console.aspect_ratio_index = ASPECT_RATIO_CUSTOM;
ps3graphics_set_aspect_ratio(g_console.aspect_ratio_index);
while(stuck_in_loop && g_console.ingame_menu_enable)
{
state = cell_pad_input_poll_device(0);
if(CTRL_SQUARE(~state))
{
glClear(GL_COLOR_BUFFER_BIT);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
}
ssnes_render_cached_frame();
if(CTRL_SQUARE(~state))
{
gl_frame_menu();
}
if(CTRL_LSTICK_LEFT(state) || CTRL_LEFT(state))
gl->custom_viewport_x -= 1;
else if (CTRL_LSTICK_RIGHT(state) || CTRL_RIGHT(state))
gl->custom_viewport_x += 1;
if (CTRL_LSTICK_UP(state) || CTRL_UP(state))
gl->custom_viewport_y += 1;
else if (CTRL_LSTICK_DOWN(state) || CTRL_DOWN(state))
gl->custom_viewport_y -= 1;
if (CTRL_RSTICK_LEFT(state) || CTRL_L1(state))
gl->custom_viewport_width -= 1;
else if (CTRL_RSTICK_RIGHT(state) || CTRL_R1(state))
gl->custom_viewport_width += 1;
if (CTRL_RSTICK_UP(state) || CTRL_L2(state))
gl->custom_viewport_height += 1;
else if (CTRL_RSTICK_DOWN(state) || CTRL_R2(state))
gl->custom_viewport_height -= 1;
if (CTRL_TRIANGLE(state))
{
gl->custom_viewport_x = 0;
gl->custom_viewport_y = 0;
gl->custom_viewport_width = gl->win_width;
gl->custom_viewport_height = gl->win_height;
}
if(CTRL_CIRCLE(state))
{
set_delay = DELAY_MEDIUM;
stuck_in_loop = 0;
}
if(CTRL_SQUARE(~state))
{
cellDbgFontPuts (0.09f, 0.05f, Emulator_GetFontSize(), RED, "QUICK MENU");
cellDbgFontPrintf (0.3f, 0.05f, 0.82f, WHITE, "Libsnes core: %s", snes_library_id());
cellDbgFontPrintf (0.7f, 0.05f, 0.82f, WHITE, "%s v%s", EMULATOR_NAME, EMULATOR_VERSION);
cellDbgFontPrintf(x_position, 0.14f, 1.4f, WHITE, "Resize Mode");
cellDbgFontPrintf (x_position, ypos, font_size, GREEN, "Viewport X: #%d", gl->custom_viewport_x);
cellDbgFontPrintf (x_position, ypos+(ypos_increment*1), font_size, GREEN, "Viewport Y: #%d", gl->custom_viewport_y);
cellDbgFontPrintf (x_position, ypos+(ypos_increment*2), font_size, GREEN, "Viewport Width: #%d", gl->custom_viewport_width);
cellDbgFontPrintf (x_position, ypos+(ypos_increment*3), font_size, GREEN, "Viewport Height: #%d", gl->custom_viewport_height);
cellDbgFontPrintf (0.09f, 0.40f, font_size, LIGHTBLUE, "CONTROLS:");
cellDbgFontPrintf (0.09f, 0.46f, font_size, LIGHTBLUE, "LEFT or LSTICK UP");
cellDbgFontPrintf (0.5f, 0.46f, font_size, LIGHTBLUE, "- Decrease Viewport X");
cellDbgFontDraw();
cellDbgFontPrintf (0.09f, 0.48f, font_size, LIGHTBLUE, "RIGHT or LSTICK RIGHT");
cellDbgFontPrintf (0.5f, 0.48f, font_size, LIGHTBLUE, "- Increase Viewport X");
cellDbgFontPrintf (0.09f, 0.50f, font_size, LIGHTBLUE, "UP or LSTICK UP");
cellDbgFontPrintf (0.5f, 0.50f, font_size, LIGHTBLUE, "- Increase Viewport Y");
cellDbgFontDraw();
cellDbgFontPrintf (0.09f, 0.52f, font_size, LIGHTBLUE, "DOWN or LSTICK DOWN");
cellDbgFontPrintf (0.5f, 0.52f, font_size, LIGHTBLUE, "- Decrease Viewport Y");
cellDbgFontPrintf (0.09f, 0.54f, font_size, LIGHTBLUE, "L1 or RSTICK LEFT");
cellDbgFontPrintf (0.5f, 0.54f, font_size, LIGHTBLUE, "- Decrease Viewport Width");
cellDbgFontDraw();
cellDbgFontPrintf (0.09f, 0.56f, font_size, LIGHTBLUE, "R1 or RSTICK RIGHT");
cellDbgFontPrintf (0.5f, 0.56f, font_size, LIGHTBLUE, "- Increase Viewport Width");
cellDbgFontPrintf (0.09f, 0.58f, font_size, LIGHTBLUE, "L2 or RSTICK UP");
cellDbgFontPrintf (0.5f, 0.58f, font_size, LIGHTBLUE, "- Increase Viewport Height");
cellDbgFontDraw();
cellDbgFontPrintf (0.09f, 0.60f, font_size, LIGHTBLUE, "R2 or RSTICK DOWN");
cellDbgFontPrintf (0.5f, 0.60f, font_size, LIGHTBLUE, "- Decrease Viewport Height");
cellDbgFontPrintf (0.09f, 0.66f, font_size, LIGHTBLUE, "TRIANGLE");
cellDbgFontPrintf (0.5f, 0.66f, font_size, LIGHTBLUE, "- Reset To Defaults");
cellDbgFontPrintf (0.09f, 0.68f, font_size, LIGHTBLUE, "SQUARE");
cellDbgFontPrintf (0.5f, 0.68f, font_size, LIGHTBLUE, "- Show Game Screen");
cellDbgFontPrintf (0.09f, 0.70f, font_size, LIGHTBLUE, "CIRCLE");
cellDbgFontPrintf (0.5f, 0.70f, font_size, LIGHTBLUE, "- Return to Ingame Menu");
cellDbgFontDraw();
cellDbgFontPrintf (0.09f, 0.83f, 0.91f, LIGHTBLUE, "Allows you to resize the screen by moving around the two analog sticks.\nPress TRIANGLE to reset to default values, and CIRCLE to go back to the menu.");
cellDbgFontDraw();
}
video_gl.swap(NULL);
if(CTRL_SQUARE(~state))
{
glDisable(GL_BLEND);
}
}
}
strcpy(comment, "Allows you to resize the screen by moving around the two analog sticks.\nPress TRIANGLE to reset to default values, and CIRCLE to go back.");
break;
@ -2262,10 +2389,6 @@ static void ingame_menu(uint32_t menu_id)
}
}
float x_position = 0.3f;
float font_size = 1.1f;
float ypos = 0.19f;
float ypos_increment = 0.04f;
switch(g_console.screen_orientation)
{

16
ps3/ps3_video_psgl.c
View File

@ -416,6 +416,7 @@ static inline void gl_compute_fbo_geometry(gl_t *gl, unsigned width, unsigned he
static void set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_full)
{
uint32_t m_viewport_x_temp, m_viewport_y_temp, m_viewport_width_temp, m_viewport_height_temp;
GLfloat m_left, m_right, m_bottom, m_top, m_zNear, m_zFar;
@ -441,7 +442,14 @@ static void set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_f
float delta = (desired_aspect / device_aspect - 1.0) / 2.0 + 0.5;
// If the aspect ratios of screen and desired aspect ratio are sufficiently equal (floating point stuff),
if (device_aspect > desired_aspect)
if(g_console.aspect_ratio_index == ASPECT_RATIO_CUSTOM)
{
m_viewport_x_temp = gl->custom_viewport_x;
m_viewport_y_temp = gl->custom_viewport_y;
m_viewport_width_temp = gl->custom_viewport_width;
m_viewport_height_temp = gl->custom_viewport_height;
}
else if (device_aspect > desired_aspect)
{
m_viewport_x_temp = (GLint)(width * (0.5 - delta));
m_viewport_width_temp = (GLint)(2.0 * width * delta);
@ -807,6 +815,12 @@ static bool psgl_init_device(gl_t *gl, const video_info_t *video, uint32_t resol
gl->gl_device = psglCreateDeviceExtended(&params);
psglGetDeviceDimensions(gl->gl_device, &gl->win_width, &gl->win_height);
if(gl->custom_viewport_width == 0)
gl->custom_viewport_width = gl->win_width;
if(gl->custom_viewport_height == 0)
gl->custom_viewport_height = gl->win_height;
gl->gl_context = psglCreateContext();
psglMakeCurrent(gl->gl_context, gl->gl_device);
psglResetCurrentContext();

9
ps3/ps3_video_psgl.h
View File

@ -55,10 +55,11 @@ enum
ASPECT_RATIO_3_4,
ASPECT_RATIO_1_1,
ASPECT_RATIO_AUTO,
ASPECT_RATIO_CUSTOM,
LAST_ASPECT_RATIO
ASPECT_RATIO_CUSTOM
};
#define LAST_ASPECT_RATIO ASPECT_RATIO_CUSTOM
typedef struct gl
{
bool block_swap;
@ -70,6 +71,10 @@ typedef struct gl
bool overscan_enable;
int fbo_pass;
unsigned base_size; /* 2 or 4*/
unsigned custom_viewport_x;
unsigned custom_viewport_y;
unsigned custom_viewport_width;
unsigned custom_viewport_height;
unsigned last_width[TEXTURES];
unsigned last_height[TEXTURES];
unsigned tex_index; /* For use with PREV. */