Some testgl work

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1812 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h

@@ -1,6 +1,7 @@
 #ifndef _GLWINDOW_H
 #define _GLWINDOW_H
 
+#include <vector>
 #include "Common.h"
 #include "EventHandler.h"
 #include "Globals.h"
@@ -21,28 +22,70 @@ enum OGL_Props {
     OGL_PROP_COUNT
 };
 
+struct res {
+    u32 x;
+    u32 y;
+};
+
 class GLWindow {
  private:
-    u32 width, height;
-    int yOffset, xOffset;
-    float xMax, yMax;
+    u32 xWin, yWin; // windows size
+    int xOffset, yOffset; // offset in window
+    float xMax, yMax; // ???
+    u32 xRender, yRender; // render area
+
     bool properties[OGL_PROP_COUNT];
+
+protected:
+
+    res origRes, currFullRes, currWinRes;
+    std::vector<res> fullResolutions;
+    std::vector<res> winResolutions;
+    virtual void SetRender(u32 x, u32 y) {
+	xRender = x;
+	yRender = y;
+    }
+	
 public:
  
     virtual void SwapBuffers() {};
     virtual void SetWindowText(const char *text) {};
     virtual bool PeekMessages() {return false;};
-    virtual void Update() {};;
+    virtual void Update() {};
     virtual bool MakeCurrent() {return false;};
 
-    bool getProperty(OGL_Props prop) {return properties[prop];}
-    virtual bool setProperty(OGL_Props prop, bool value) 
+    virtual void updateDim() {
+	if (GetProperty(OGL_FULLSCREEN)) 
+	    SetWinSize(currFullRes.x, currFullRes.y);
+	else
+	    SetWinSize(currWinRes.x, currWinRes.y);
+	
+	float FactorX = 640.0f / (float)GetXwin();
+	float FactorY = 480.0f / (float)GetYwin();
+	float Max = (FactorX < FactorY) ? FactorX : FactorY;
+	
+	if(GetProperty(OGL_STRETCHTOFIT)) {
+	    SetMax(1.0f / FactorX, 1.0f / FactorY);
+	    SetOffset(0,0);
+	} else {
+	    SetMax(1.0f / Max, 1.0f / Max);
+	    SetOffset((int)((GetXwin() - (640 * GetXmax())) / 2),
+		      (int)((GetYwin() - (480 * GetYmax())) / 2));
+	}
+    }
+    
+    bool GetProperty(OGL_Props prop) {return properties[prop];}
+    virtual bool SetProperty(OGL_Props prop, bool value) 
     {return properties[prop] = value;}
-    u32 GetWidth() {return width;}
-    u32 GetHeight() {return height;}
-    void SetSize(u32 newWidth, u32 newHeight) {
-	width = newWidth; 
-	height = newHeight; 
+
+    u32 GetXrender() {return xRender;}
+    u32 GetYrender() {return yRender;}
+
+    u32 GetXwin() {return xWin;}
+    u32 GetYwin() {return yWin;}
+    void SetWinSize(u32 x, u32 y) {
+	xWin = x; 
+	yWin = y; 
     }
 
     int GetYoff() {return yOffset;}
@@ -56,11 +99,28 @@ public:
 	yMax = y;
 	xMax = x;
     }
+
     float GetXmax() {return xMax;}
     float GetYmax() {return yMax;}
  
-    static bool valid() { return false; }
-    //   bool GLwindow(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight) {};
+    static bool valid() { return false;}
+
+    GLWindow() {
+	
+	// Load defaults
+	sscanf(g_Config.iFSResolution, "%dx%d", 
+	       &currFullRes.x, &currFullRes.y);  
+	
+	sscanf(g_Config.iWindowedRes, "%dx%d", 
+	       &currWinRes.x, &currWinRes.y);
+
+	SetProperty(OGL_FULLSCREEN, g_Config.bFullscreen);
+	SetProperty(OGL_STRETCHTOFIT, g_Config.bFullscreen);
+	SetProperty(OGL_KEEPRATIO, g_Config.bFullscreen);
+
+	updateDim();
+    }
+    
     // setResolution
     // resolution iter
 };