Update of /cvsroot/gcblue/gcb_wx/include/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21272/include/graphics
Modified Files:
tc3DWindow.h tcHookInfo.h tcMapView.h tcOOBView.h
Log Message:
Game windows use common window as parent
Index: tcHookInfo.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcHookInfo.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcHookInfo.h 1 Jun 2005 00:13:26 -0000 1.5
--- tcHookInfo.h 2 Jan 2006 15:40:52 -0000 1.6
***************
*** 68,72 ****
tcHookInfo(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
! const wxString& name = "HookInfo");
virtual ~tcHookInfo();
private:
--- 68,73 ----
tcHookInfo(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
! const wxString& name = "HookInfo",
! tc3DWindow* graphicsHost = 0);
virtual ~tcHookInfo();
private:
Index: tcOOBView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcOOBView.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcOOBView.h 28 Jun 2005 02:51:19 -0000 1.6
--- tcOOBView.h 2 Jan 2006 15:40:52 -0000 1.7
***************
*** 114,118 ****
tcOOBView(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
! const wxString& name = "OOBView");
~tcOOBView();
--- 114,119 ----
tcOOBView(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
! const wxString& name = "OOBView",
! tc3DWindow* graphicsHost = 0);
~tcOOBView();
Index: tc3DWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DWindow.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** tc3DWindow.h 18 Dec 2005 18:48:16 -0000 1.21
--- tc3DWindow.h 2 Jan 2006 15:40:52 -0000 1.22
***************
*** 243,246 ****
--- 243,247 ----
osg::ref_ptr<osg::Texture2D> backgroundTexture;
osg::ref_ptr<osg::Geometry> backgroundQuad;
+ osg::ref_ptr<osg::Geometry> border;
osg::ref_ptr<osg::Texture2D> defaultTexture;
osg::ref_ptr<osg::Texture2D> testSymbol;
***************
*** 283,287 ****
virtual void ReleaseMouse();
void SkipMouseEvent(wxMouseEvent& event); ///< adjusts position to parent frame
- //long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual void UpdatePositionAndSize(const wxPoint& pos, const wxSize& size);
--- 284,287 ----
***************
*** 316,320 ****
--- 316,322 ----
void CreateBackgroundQuad();
+ void CreateBackgroundShape();
void UpdateBackgroundQuadVertices();
+ void UpdateBackgroundShape();
osg::Geometry* GetImageQuadObject();
Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** tcMapView.h 24 Dec 2005 07:41:19 -0000 1.25
--- tcMapView.h 2 Jan 2006 15:40:52 -0000 1.26
***************
*** 193,203 ****
float GeoExtentToScreen(float afExtent_rad);
osg::Vec4 GetAffiliationColor(teAffiliation a);
- /*
- Gdiplus::Pen* GetPen() {return mpPen;}
- Gdiplus::Pen* GetPenThin() {return mpPenThin;}
- Gdiplus::SolidBrush* GetBrush() {return mpBrush;}
- Gdiplus::Font* GetFont() {return mpFont;}
- Gdiplus::Font* GetFontSmall() {return mpFontSmall;}
- */
int PointInView(tcPoint& p);
--- 193,196 ----
***************
*** 217,220 ****
--- 210,214 ----
tcMapView(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
+ tc3DWindow* graphicsHost,
const wxString& name = "MapView");
virtual ~tcMapView();
***************
*** 334,337 ****
--- 328,332 ----
tcTacticalMapView(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
+ tc3DWindow* graphicsHost,
const wxString& name = "TacticalMapView");
virtual ~tcTacticalMapView();
***************
*** 423,427 ****
tcWorldMapView(wxWindow *parent,
! const wxPoint& pos, const wxSize& size,
const wxString& name = "WorldMapView");
virtual ~tcWorldMapView();
--- 418,423 ----
tcWorldMapView(wxWindow *parent,
! const wxPoint& pos, const wxSize& size,
! tc3DWindow* graphicsHost,
const wxString& name = "WorldMapView");
virtual ~tcWorldMapView();
|
