[Gcblue-commits] gcb_wx/include/graphics tc3DViewer.h,1.4,1.5 tcMapView.h,1.4,1.5 tcParticleEffect.h
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-11-07 03:42:35
|
Update of /cvsroot/gcblue/gcb_wx/include/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4233/include/graphics Modified Files: tc3DViewer.h tcMapView.h tcParticleEffect.h tcParticlePlacer.h Log Message: Added optical sensor model, fixed generic model display for sensor tracks Index: tc3DViewer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DViewer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tc3DViewer.h 6 Nov 2004 15:13:40 -0000 1.4 --- tc3DViewer.h 7 Nov 2004 03:40:43 -0000 1.5 *************** *** 47,51 **** class wxGLCanvas; ! class tc3DViewer : public wxWindow { --- 47,53 ---- class wxGLCanvas; ! /** ! * Manages OSG 3D scenegraph and camera ! */ class tc3DViewer : public wxWindow { Index: tcParticlePlacer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcParticlePlacer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcParticlePlacer.h 1 Sep 2004 02:55:35 -0000 1.2 --- tcParticlePlacer.h 7 Nov 2004 03:40:43 -0000 1.3 *************** *** 49,52 **** --- 49,53 ---- protected: osg::Vec3 previousCenter; + osg::Vec3 previousCenter2; ///< center before previousCenter bool applyJitter_; ///< true to randomize placement of particle *************** *** 58,62 **** inline tcParticlePlacer::tcParticlePlacer() ! : CenteredPlacer(), previousCenter(0, 0, 0), applyJitter_(false) { } --- 59,66 ---- inline tcParticlePlacer::tcParticlePlacer() ! : CenteredPlacer(), ! previousCenter(0, 0, 0), ! previousCenter2(0, 0, 0), ! applyJitter_(false) { } *************** *** 82,90 **** osg::Vec3 cen = getCenter(); ! osg::Vec3 p(a*cen._v[0] + b*previousCenter._v[0], ! a*cen._v[1] + b*previousCenter._v[1], ! a*cen._v[2] + b*previousCenter._v[2]); P->setPosition(p); } --- 86,99 ---- osg::Vec3 cen = getCenter(); ! osg::Vec3 p(a*cen._v[0] + b*previousCenter2._v[0], ! a*cen._v[1] + b*previousCenter2._v[1], ! a*cen._v[2] + b*previousCenter2._v[2]); P->setPosition(p); + /* + osgParticle::rangef alphaRange = P->getAlphaRange(); + alphaRange.minimum = a; + P->setAlphaRange(alphaRange); + */ } *************** *** 128,131 **** --- 137,141 ---- if (absDiff < 0.01) return; + previousCenter2 = previousCenter; previousCenter = cen; CenteredPlacer::setCenter(x, y, z); Index: tcMapView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcMapView.h 1 Nov 2004 03:17:16 -0000 1.4 --- tcMapView.h 7 Nov 2004 03:40:43 -0000 1.5 *************** *** 153,156 **** --- 153,159 ---- #define N_PENS 10 + /** + * Base class for tactical map and world map views + */ class tcMapView : public tc3DWindow { *************** *** 240,243 **** --- 243,249 ---- #define GAMEMODE_EDIT 2 + /** + * Tactical (theater) map with color elevation map + */ class tcTacticalMapView : public tcMapView { Index: tcParticleEffect.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcParticleEffect.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcParticleEffect.h 1 Sep 2004 02:55:35 -0000 1.2 --- tcParticleEffect.h 7 Nov 2004 03:40:43 -0000 1.3 *************** *** 53,57 **** MISSILE = 1, AFTERBURNER = 2, ! DAMAGE = 4 }; --- 53,58 ---- MISSILE = 1, AFTERBURNER = 2, ! DAMAGE = 4, ! GUN = 8 }; *************** *** 78,81 **** --- 79,83 ---- void ConfigureForMode(); + void InitializeGunEffect(); }; |