Update of /cvsroot/gcblue/gcb_wx/include/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11381/include/graphics
Modified Files:
tc3DModel.h tc3DWindow.h
Log Message:
Simple explosion effect using osgParticle::ExplosionEffect
Index: tc3DModel.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DModel.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tc3DModel.h 1 Jun 2005 00:13:26 -0000 1.17
--- tc3DModel.h 19 Nov 2005 19:27:47 -0000 1.18
***************
*** 111,114 ****
--- 111,115 ----
std::vector<tcAnimationInfo> animationInfo; ///< animation transforms to update at model level
void AddChild(tc3DModel *child);
+ void AddExplosion(const osg::Vec3& rel_pos);
tc3DModel* Clone();
void DetachFromParent();
***************
*** 154,157 ****
--- 155,159 ----
std::vector<osg::Vec3> engineSmokeSources;
std::vector<LauncherMountInfo> launcherInfo;
+ std::vector<osg::Vec3> explosionQueue;
int smokeMode;
***************
*** 189,192 ****
--- 191,195 ----
void LoadXmlSmokeInfo(TiXmlDocument* doc);
void ProcessAnimations();
+ void UpdateExplosions();
};
Index: tc3DWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DWindow.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tc3DWindow.h 14 Sep 2005 01:33:24 -0000 1.18
--- tc3DWindow.h 19 Nov 2005 19:27:47 -0000 1.19
***************
*** 54,62 ****
}
! namespace osgText
! {
! class Font;
! class Text;
! }
class tcGraphicsEngine;
--- 54,62 ----
}
! //namespace osgText
! //{
! // class Font;
! // class Text;
! //}
class tcGraphicsEngine;
***************
*** 65,72 ****
#define IMAGE_PATH "images\\"
! using osgText::Text::LEFT_BASE_LINE;
! using osgText::Text::LEFT_CENTER;
! using osgText::Text::RIGHT_CENTER;
! using osgText::Text::CENTER_CENTER;
/**
--- 65,74 ----
#define IMAGE_PATH "images\\"
!
! // using directives do not work on gcc, used #defines as workaround
! #define LEFT_BASE_LINE osgText::Text::LEFT_BASE_LINE
! #define LEFT_CENTER osgText::Text::LEFT_CENTER
! #define RIGHT_CENTER osgText::Text::RIGHT_CENTER
! #define CENTER_CENTER osgText::Text::CENTER_CENTER
/**
***************
*** 277,281 ****
virtual void OnSize(wxSizeEvent& event);
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);
--- 279,283 ----
virtual void OnSize(wxSizeEvent& event);
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);
***************
*** 327,328 ****
--- 329,331 ----
#endif
+
|
