preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-19 01:10:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change to ERROR_LOG , add True Color/Anisotropic Filtering

Browse Source
This commit is contained in:
raven02 authored and Jacky TSUI committed 2013-04-28 09:46:18 +08:00
1 parent c4670e13b5
commit 1405b43b2d
5 files changed
+48 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Config.cpp
+3 -3
View File
@@ -100,9 +100,9 @@ void Config::Load(const char *iniFileName)
graphics->Get("FrameSkip", &bFrameSkip, 0);
graphics->Get("UseMediaEngine", &bUseMediaEngine, true);
#ifdef USING_GLES2
graphics->Get("AnisotropyLevel", &iAnisotropyLevel, 0);
graphics->Get("AnisotropicFiltering", &bAnisotropicFiltering, true);
#else
graphics->Get("AnisotropyLevel", &iAnisotropyLevel, 8);
graphics->Get("AnisotropicFiltering", &bAnisotropicFiltering, false);
#endif
graphics->Get("VertexCache", &bVertexCache, true);
graphics->Get("FullScreen", &bFullScreen, false);
@@ -186,7 +186,7 @@ void Config::Save()
graphics->Set("VBO", bUseVBO);
graphics->Set("FrameSkip", bFrameSkip);
graphics->Set("UseMediaEngine", bUseMediaEngine);
graphics->Set("AnisotropyLevel", iAnisotropyLevel);
graphics->Set("AnisotropicFiltering", bAnisotropicFiltering);
graphics->Set("VertexCache", bVertexCache);
graphics->Set("FullScreen", bFullScreen);
graphics->Set("StretchToDisplay", bStretchToDisplay);
Core/Config.h
+1
View File
@@ -70,6 +70,7 @@ public:
int iAnisotropyLevel;
bool bTrueColor;
bool bMipMap;
bool bAnisotropicFiltering;
// Sound
bool bEnableSound;
Core/HLE/sceMp4.cpp
+20 -20
View File
@@ -20,115 +20,115 @@
u32 sceMp4Init()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4Init()");
return 0;
ERROR_LOG(HLE, "UNIMPL sceMp4Init()");
return 0;
}
u32 sceMp4Finish()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4Finish()");
ERROR_LOG(HLE, "UNIMPL sceMp4Finish()");
return 0;
}
u32 sceMp4Create()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4Create()");
ERROR_LOG(HLE, "UNIMPL sceMp4Create()");
return 0;
}
u32 sceMp4GetNumberOfSpecificTrack()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4GetNumberOfSpecificTrack()");
ERROR_LOG(HLE, "UNIMPL sceMp4GetNumberOfSpecificTrack()");
return 1;
}
u32 sceMp4GetMovieInfo()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4GetMovieInfo()");
ERROR_LOG(HLE, "UNIMPL sceMp4GetMovieInfo()");
return 0;
}
u32 sceMp4CreatesceMp4GetNumberOfMetaData()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4GetNumberOfMetaData()");
ERROR_LOG(HLE, "UNIMPL sceMp4GetNumberOfMetaData()");
return 0;
}
u32 sceMp4Delete()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4Delete()");
ERROR_LOG(HLE, "UNIMPL sceMp4Delete()");
return 0;
}
u32 sceMp4AacDecodeInitResource()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4AacDecodeInitResource()");
ERROR_LOG(HLE, "UNIMPL sceMp4AacDecodeInitResource()");
return 0;
}
u32 sceMp4GetAvcTrackInfoData()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4GetAvcTrackInfoData()");
ERROR_LOG(HLE, "UNIMPL sceMp4GetAvcTrackInfoData()");
return 0;
}
u32 sceMp4TrackSampleBufConstruct()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4TrackSampleBufConstruct()");
ERROR_LOG(HLE, "UNIMPL sceMp4TrackSampleBufConstruct()");
return 0;
}
u32 sceMp4TrackSampleBufQueryMemSize()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4TrackSampleBufQueryMemSize()");
ERROR_LOG(HLE, "UNIMPL sceMp4TrackSampleBufQueryMemSize()");
return 0;
}
u32 sceMp4GetSampleInfo()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4GetSampleInfo()");
ERROR_LOG(HLE, "UNIMPL sceMp4GetSampleInfo()");
return 0;
}
u32 sceMp4GetSampleNumWithTimeStamp()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4GetSampleNumWithTimeStamp()");
ERROR_LOG(HLE, "UNIMPL sceMp4GetSampleNumWithTimeStamp()");
return 0;
}
u32 sceMp4TrackSampleBufFlush()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4TrackSampleBufFlush()");
ERROR_LOG(HLE, "UNIMPL sceMp4TrackSampleBufFlush()");
return 0;
}
u32 sceMp4AacDecodeInit()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4AacDecodeInit()");
ERROR_LOG(HLE, "UNIMPL sceMp4AacDecodeInit()");
return 0;
}
u32 sceMp4GetAacTrackInfoData()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4GetAacTrackInfoData()");
ERROR_LOG(HLE, "UNIMPL sceMp4GetAacTrackInfoData()");
return 0;
}
u32 sceMp4GetNumberOfMetaData()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4GetNumberOfMetaData()");
ERROR_LOG(HLE, "UNIMPL sceMp4GetNumberOfMetaData()");
return 0;
}
u32 sceMp4RegistTrack()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4RegistTrack()");
ERROR_LOG(HLE, "UNIMPL sceMp4RegistTrack()");
return 0;
}
u32 sceMp4SearchSyncSampleNum()
{
DEBUG_LOG(HLE, "UNIMPL sceMp4SearchSyncSampleNum()");
ERROR_LOG(HLE, "UNIMPL sceMp4SearchSyncSampleNum()");
return 0;
}
UI/MenuScreens.cpp
+22 -7
View File
@@ -496,7 +496,7 @@ void SettingsScreen::render() {
ui_draw2d.DrawText(UBUNTU24, ms->T("AudioDesc", "Adjust Audio Settings"), s, 110, 0xFFFFFFFF, ALIGN_LEFT);
if (UIButton(GEN_ID, vlinear, w, 0, ms->T("Graphics"), ALIGN_BOTTOMLEFT)) {
screenManager()->push(new GraphicsScreen());
screenManager()->push(new GraphicsScreenP1());
}
ui_draw2d.DrawText(UBUNTU24, ms->T("GraphicsDesc", "Change graphics options"), s, 180, 0xFFFFFFFF, ALIGN_LEFT);
@@ -531,14 +531,14 @@ void AudioScreen::update(InputState &input) {
}
}
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 GraphicsScreenP1::update(InputState &input) {
void GraphicsScreenP2::update(InputState &input) {
if (input.pad_buttons_down & PAD_BUTTON_BACK) {
g_Config.Save();
screenManager()->finishDialog(this, DR_OK);
@@ -636,7 +636,7 @@ void AudioScreen::render() {
UIEnd();
}
void GraphicsScreen::render() {
void GraphicsScreenP1::render() {
UIShader_Prepare();
UIBegin(UIShader_Get());
DrawBackground(1.0f);
@@ -653,7 +653,7 @@ void GraphicsScreen::render() {
}
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());
screenManager()->push(new GraphicsScreenP2());
}
int x = 30;
@@ -682,11 +682,10 @@ 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() {
void GraphicsScreenP2::render() {
UIShader_Prepare();
UIBegin(UIShader_Get());
DrawBackground(1.0f);
@@ -709,6 +708,22 @@ void GraphicsScreenP1::render() {
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);
UICheckBox(GEN_ID, x, y += stride, gs->T("True Color"), ALIGN_TOPLEFT, &g_Config.bTrueColor);
UICheckBox(GEN_ID, x, y += stride, gs->T("Anisotropic Filtering"), ALIGN_TOPLEFT, &g_Config.bAnisotropicFiltering);
if (g_Config.bAnisotropicFiltering) {
ui_draw2d.DrawText(UBUNTU24, gs->T("Level :"), x + 60, y += stride + 10, 0xFFFFFFFF, ALIGN_LEFT);
HLinear hlinear1(x + 160 , y + 5, 20);
if (UIButton(GEN_ID, hlinear1, 45, 0, "2x", ALIGN_LEFT))
g_Config.iAnisotropyLevel = 2;
if (UIButton(GEN_ID, hlinear1, 45, 0, "4x", ALIGN_LEFT))
g_Config.iAnisotropyLevel = 4;
if (UIButton(GEN_ID, hlinear1, 45, 0, "8x", ALIGN_LEFT))
g_Config.iAnisotropyLevel = 8;
if (UIButton(GEN_ID, hlinear1, 60, 0, "16x", ALIGN_LEFT))
g_Config.iAnisotropyLevel = 16;
} else
g_Config.iAnisotropyLevel = 0;
UIEnd();
}
UI/MenuScreens.h
+2 -2
View File
@@ -84,14 +84,14 @@ public:
void render();
};
class GraphicsScreen : public Screen
class GraphicsScreenP1 : public Screen
{
public:
void update(InputState &input);
void render();
};
class GraphicsScreenP1 : public Screen
class GraphicsScreenP2 : public Screen
{
public:
void update(InputState &input);