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

fixed padsimple event some glwindow cleanup 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1940 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-01-19 21:39:53 +00:00
parent c53797dc5b
commit 0b267948cc
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp
View File

@ -408,7 +408,8 @@ void LoadConfig()
file.Get(SectionName, controlNames[x], file.Get(SectionName, controlNames[x],
&key, (i==0)?defaultKeyForControl[x]:0); &key, (i==0)?defaultKeyForControl[x]:0);
registerKey(i, x, (sf::Key::Code)key); if (i == g_PADInitialize.padNumber && pad[i].bAttached)
registerKey(i, x, (sf::Key::Code)key);
} }
} }
} }

27
Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
View File

@ -21,8 +21,8 @@
#endif #endif
enum OGL_Props { enum OGL_Props {
OGL_FULLSCREEN, OGL_FULLSCREEN,
OGL_STRETCHTOFIT,
OGL_KEEPRATIO, OGL_KEEPRATIO,
OGL_HIDECURSOR,
OGL_PROP_COUNT OGL_PROP_COUNT
}; };
@ -33,6 +33,8 @@ struct res {
class GLWindow { class GLWindow {
private: private:
// TODO: what is xmax and ymax? do we need [xy]render?
u32 xWin, yWin; // windows size u32 xWin, yWin; // windows size
int xOffset, yOffset; // offset in window int xOffset, yOffset; // offset in window
float xMax, yMax; // ??? float xMax, yMax; // ???
@ -43,9 +45,8 @@ class GLWindow {
protected: protected:
EventHandler* eventHandler; EventHandler* eventHandler;
res origRes, currFullRes, currWinRes; res origRes, currFullRes, currWinRes;
std::vector<res> fullResolutions; std::vector<res> fullResolutions;
std::vector<res> winResolutions;
virtual void SetRender(u32 x, u32 y) { virtual void SetRender(u32 x, u32 y) {
xRender = x; xRender = x;
yRender = y; yRender = y;
@ -64,23 +65,17 @@ public:
SetWinSize(currFullRes.x, currFullRes.y); SetWinSize(currFullRes.x, currFullRes.y);
else else
SetWinSize(currWinRes.x, currWinRes.y); SetWinSize(currWinRes.x, currWinRes.y);
float FactorX = 640.0f / (float)GetXwin(); float FactorX = 640.0f / (float)GetXwin();
float FactorY = 480.0f / (float)GetYwin(); float FactorY = 480.0f / (float)GetYwin();
float Max = (FactorX < FactorY) ? FactorX : FactorY; // float Max = (FactorX < FactorY) ? FactorX : FactorY;
if(GetProperty(OGL_STRETCHTOFIT)) { SetMax(1.0f / FactorX, 1.0f / FactorY);
SetMax(1.0f / FactorX, 1.0f / FactorY); SetOffset(0,0);
SetOffset(0,0);
} else {
SetMax(1.0f / Max, 1.0f / Max);
SetOffset((int)((GetXwin() - (640 * GetXmax())) / 2),
(int)((GetYwin() - (480 * GetYmax())) / 2));
}
} }
void SetEventHandler(EventHandler *eh) { eventHandler = eh;} void SetEventHandler(EventHandler *eh) { eventHandler = eh;}
bool GetProperty(OGL_Props prop) {return properties[prop];} bool GetProperty(OGL_Props prop) {return properties[prop];}
virtual bool SetProperty(OGL_Props prop, bool value) virtual bool SetProperty(OGL_Props prop, bool value)
{return properties[prop] = value;} {return properties[prop] = value;}
@ -121,8 +116,8 @@ public:
&currWinRes.x, &currWinRes.y); &currWinRes.x, &currWinRes.y);
SetProperty(OGL_FULLSCREEN, g_Config.bFullscreen); SetProperty(OGL_FULLSCREEN, g_Config.bFullscreen);
SetProperty(OGL_STRETCHTOFIT, g_Config.bFullscreen); SetProperty(OGL_KEEPRATIO, g_Config.bKeepAR);
SetProperty(OGL_KEEPRATIO, g_Config.bFullscreen); SetProperty(OGL_HIDECURSOR, g_Config.bHideCursor);
updateDim(); updateDim();
} }