[Hgengine-cvs] SF.net SVN: hgengine:[52] Mercury2/src

[<axl...@us...>]

Revision: 52
          http://hgengine.svn.sourceforge.net/hgengine/?rev=52&view=rev
Author:   axlecrusher
Date:     2008-12-06 20:16:44 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
update

Modified Paths:
--------------
    Mercury2/src/MercuryWindow.h
    Mercury2/src/X11Window.h

Modified: Mercury2/src/MercuryWindow.h
===================================================================
--- Mercury2/src/MercuryWindow.h	2008-12-06 19:53:45 UTC (rev 51)
+++ Mercury2/src/MercuryWindow.h	2008-12-06 20:16:44 UTC (rev 52)
@@ -14,14 +14,25 @@
 	MercuryWindow(const string& title, int width, int height, int bits, int depthBits, bool fullscreen);
 	virtual ~MercuryWindow();
 
-	inline static MercuryWindow* MakeWindow() { return genWindowClbk(); }
+	inline static MercuryWindow* MakeWindow() {
+		MercuryWindow::m_windowInstance = genWindowClbk();
+		return GetCurrentWindow();
+	}
 
 	virtual bool SwapBuffers() = 0;
 	virtual bool PumpMessages() = 0;
+	
+	inline static MercuryWindow* GetCurrentWindow()
+	{
+		return MercuryWindow::m_windowInstance;
+	}
+	
+	virtual void* GetProcAddress(const string& x) = 0;
 
 protected:
 	static Callback0R< MercuryWindow* > genWindowClbk;
-
+	static MercuryWindow* m_windowInstance;
+	
 	string m_title;
 	int m_width, m_height, m_bits, m_depthBits;
 	bool m_fullscreen;

Modified: Mercury2/src/X11Window.h
===================================================================
--- Mercury2/src/X11Window.h	2008-12-06 19:53:45 UTC (rev 51)
+++ Mercury2/src/X11Window.h	2008-12-06 20:16:44 UTC (rev 52)
@@ -14,6 +14,8 @@
 		virtual bool SwapBuffers();
 		virtual bool PumpMessages();
 
+		virtual void* GetProcAddress(const string& x);
+
 	private:
 		Display* m_display;
 		GLXContext m_renderCtx;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.