[Gcblue-commits] gcb_wx/src/graphics ObjectUpdater.cpp,1.9,1.10 SmokeTrailEmitter.cpp,1.1,1.2 cspCol
Status: Alpha
Brought to you by:
ddcforge
Update of /cvsroot/gcblue/gcb_wx/src/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8917/src/graphics Modified Files: ObjectUpdater.cpp SmokeTrailEmitter.cpp cspColorspace.cpp cspSky.cpp tc2DGraphicsSurface.cpp tc3DWindow.cpp tcButton.cpp tcConsoleBox.cpp tcCreditView.cpp tcDisplayModes.cpp tcDisplaySettingsView.cpp tcEditBox.cpp tcFIFO.cpp tcGameView.cpp tcHookInfo.cpp tcMapObject.cpp tcMapView.cpp tcOOBView.cpp tcPanel.cpp tcParticleEffect.cpp tcPopupControl.cpp tcRadioButton.cpp tcScenarioSelectView.cpp tcStartView.cpp tcTerrainView.cpp tcXmlWindow.cpp Log Message: A few more changes related to GDI+ replacement Index: tcStartView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcStartView.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcStartView.cpp 1 Nov 2004 03:17:18 -0000 1.4 --- tcStartView.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 37,40 **** --- 37,43 ---- #include "wxcommands.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif bool tcStartView::Init() Index: tcPanel.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcPanel.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcPanel.cpp 1 Nov 2004 03:17:18 -0000 1.4 --- tcPanel.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 28,32 **** #include "tcPanel.h" ! tc3DWindow* tcPanel::parentWindow = 0; --- 28,34 ---- #include "tcPanel.h" ! #ifdef _DEBUG ! #define new DEBUG_NEW ! #endif tc3DWindow* tcPanel::parentWindow = 0; Index: cspColorspace.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/cspColorspace.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cspColorspace.cpp 4 Dec 2003 22:31:52 -0000 1.1 --- cspColorspace.cpp 2 Nov 2004 04:23:56 -0000 1.2 *************** *** 38,41 **** --- 38,45 ---- #include <cstdio> + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + float const PI = 3.14159265358979323846264338327950288419716939937510f; Index: tcRadioButton.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcRadioButton.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcRadioButton.cpp 7 Oct 2004 22:01:46 -0000 1.7 --- tcRadioButton.cpp 2 Nov 2004 04:23:56 -0000 1.8 *************** *** 35,38 **** --- 35,41 ---- #include <iostream> + #ifdef _DEBUG + #define new DEBUG_NEW + #endif BEGIN_EVENT_TABLE(tcRadioButton, tc3DWindow) Index: tcHookInfo.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcHookInfo.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcHookInfo.cpp 29 Oct 2004 02:50:53 -0000 1.3 --- tcHookInfo.cpp 2 Nov 2004 04:23:56 -0000 1.4 *************** *** 37,40 **** --- 37,43 ---- #include "simmath.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif Index: tcScenarioSelectView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcScenarioSelectView.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcScenarioSelectView.cpp 21 Oct 2004 04:10:59 -0000 1.5 --- tcScenarioSelectView.cpp 2 Nov 2004 04:23:56 -0000 1.6 *************** *** 38,42 **** #include "common/tinyxml.h" ! --- 38,44 ---- #include "common/tinyxml.h" ! #ifdef _DEBUG ! #define new DEBUG_NEW ! #endif Index: tcXmlWindow.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcXmlWindow.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcXmlWindow.cpp 21 Oct 2004 04:10:59 -0000 1.4 --- tcXmlWindow.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 32,35 **** --- 32,38 ---- #include <iostream> + #ifdef _DEBUG + #define new DEBUG_NEW + #endif unsigned tcXmlWindow::ref_count = 0; Index: tcOOBView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcOOBView.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcOOBView.cpp 1 Nov 2004 03:17:18 -0000 1.3 --- tcOOBView.cpp 2 Nov 2004 04:23:56 -0000 1.4 *************** *** 32,35 **** --- 32,39 ---- #include "tcSound.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace MapView; *************** *** 324,328 **** if (info.mbRadiating) { ! color.set(0.4f, 1, 0.4f, 0.5f); //graphics->FillEllipse(mpBrush, info.remcon); DrawRectangleR(info.remcon, color, FILL_ON); --- 328,332 ---- if (info.mbRadiating) { ! color.set(0.4f, 1.0f, 0.4f, 0.5f); //graphics->FillEllipse(mpBrush, info.remcon); DrawRectangleR(info.remcon, color, FILL_ON); Index: tcGameView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcGameView.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcGameView.cpp 1 Nov 2004 03:17:18 -0000 1.2 --- tcGameView.cpp 2 Nov 2004 04:23:56 -0000 1.3 *************** *** 38,41 **** --- 38,44 ---- #include "tcMissileObject.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif //* #include "tc3DScene.h" Index: tcMapView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcMapView.cpp 1 Nov 2004 03:17:18 -0000 1.4 --- tcMapView.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 50,53 **** --- 50,56 ---- using namespace MapView; + #ifdef _DEBUG + #define new DEBUG_NEW + #endif *************** *** 1524,1553 **** else if (type == SYMBOL_PIE) { float width,height; width = GeoExtentToScreen(pMO->mfLonExtent); height = GeoExtentToScreen(pMO->mfLatExtent); ! ! if (mpOptions->mbFillRangeCircles) { ! // graphics->FillPie(mpBrush,pscreen.x-0.5f*width,pscreen.y-0.5f*height, ! // width,height,h-0.5f*pMO->mfArc_deg-90.0f,pMO->mfArc_deg); // h is in degrees (fix this) ! //DrawRectangleR(pscreen.x-0.5f*width, pscreen.y-0.5f*height, width, height, symbolColor); ! } ! else { ! if (pMO->mfArc_deg >= 360.0f) ! { ! //graphics->DrawEllipse(mpPen,pscreen.x-0.5f*width,pscreen.y-0.5f*height, ! // width,height); ! //DrawRectangleR(pscreen.x-0.5f*width, pscreen.y-0.5f*height, width, height, symbolColor); ! } ! else ! { ! //graphics->DrawPie(mpPen,pscreen.x-0.5f*width,pscreen.y-0.5f*height, ! // width,height,h-0.5f*pMO->mfArc_deg-90.0f,pMO->mfArc_deg); // h is in degrees (fix this) ! //DrawRectangleR(pscreen.x-0.5f*width, pscreen.y-0.5f*height, width, height, symbolColor); ! } ! } } else --- 1527,1552 ---- else if (type == SYMBOL_PIE) { + symbolColor._v[3] = 0.35f; + float width,height; width = GeoExtentToScreen(pMO->mfLonExtent); height = GeoExtentToScreen(pMO->mfLatExtent); ! int fillMode = (mpOptions->mbFillRangeCircles) ? FILL_ON : FILL_OFF; ! ! osg::Geometry* rangeCircle; ! if (pMO->mfArc_deg >= 360.0f) { ! rangeCircle = CreatePieGeometry(width, height, -180, 180, ! symbolColor, fillMode); ! } ! else { ! float halfArc = 0.5f*pMO->mfArc_deg; ! rangeCircle = CreatePieGeometry(width, height, h-halfArc, h+halfArc, ! symbolColor, fillMode); ! } ! DrawGeometryR(rangeCircle, pscreen.x, pscreen.y); ! } else Index: tcPopupControl.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcPopupControl.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcPopupControl.cpp 1 Nov 2004 03:17:18 -0000 1.4 --- tcPopupControl.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 30,33 **** --- 30,37 ---- #include "tcSimPythonInterface.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace ScriptInterface; Index: tcParticleEffect.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcParticleEffect.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcParticleEffect.cpp 7 Oct 2004 22:01:46 -0000 1.3 --- tcParticleEffect.cpp 2 Nov 2004 04:23:56 -0000 1.4 *************** *** 49,52 **** --- 49,56 ---- #include "tcParticlePlacer.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + ////////////////////////////////////////////////////////////////////////////// // CUSTOM OPERATOR CLASS Index: ObjectUpdater.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/ObjectUpdater.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ObjectUpdater.cpp 14 Sep 2004 02:01:46 -0000 1.9 --- ObjectUpdater.cpp 2 Nov 2004 04:23:56 -0000 1.10 *************** *** 6,9 **** --- 6,13 ---- #include "tcParticleEffect.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace osg; Index: tc3DWindow.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DWindow.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tc3DWindow.cpp 1 Nov 2004 03:17:18 -0000 1.8 --- tc3DWindow.cpp 2 Nov 2004 04:23:56 -0000 1.9 *************** *** 49,52 **** --- 49,56 ---- #include "tc3DViewer.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + BEGIN_EVENT_TABLE(tc3DWindow, wxWindow) *************** *** 72,75 **** --- 76,80 ---- tc3DViewer* tc3DWindow::viewer = 0; + /** * This override along with use of Freeze() Thaw() prevents *************** *** 419,423 **** --- 424,515 ---- + /** + * Creates default osg::Geometry object + */ + osg::Geometry* tc3DWindow::CreateDefaultGeometry() + { + osg::Geometry* symbol = new osg::Geometry; + + symbol->setUseDisplayList(true); + + // set state + osg::StateSet* stateSet = symbol->getOrCreateStateSet(); + stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF); + stateSet->setMode(GL_DEPTH_WRITEMASK, osg::StateAttribute::OFF); + stateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF); + stateSet->setMode(GL_BLEND, osg::StateAttribute::ON); + stateSet->setRenderBinDetails(baseRenderBin + rectRenderBin, "RenderBin"); + + return symbol; + } + + /** + * Angle of zero is up, angle increases in clockwise direction + * startAngle must be less than stopAngle (can use negative angles) + * @param startAngle in degrees + * @param stopAngle in degrees + */ + osg::Geometry* tc3DWindow::CreatePieGeometry(float width, float height, float startAngle, float stopAngle, + osg::Vec4& color, int fillMode) + { + unsigned int nArcPoints = 48; + + wxASSERT(startAngle < stopAngle); + wxASSERT(nArcPoints > 1); + + osg::Geometry* symbol = CreateDefaultGeometry(); + + // set color + osg::Vec4Array* colors = new osg::Vec4Array; + colors->push_back(color); + symbol->setColorArray(colors); + symbol->setColorBinding(osg::Geometry::BIND_OVERALL); + + // create vertex array + osg::Vec3Array* vertices = new osg::Vec3Array; + symbol->setVertexArray(vertices); + + bool fullCircle = ((stopAngle - startAngle) >= 359.9f); + + startAngle *= C_PIOVER180; + stopAngle *= C_PIOVER180; + + float deltaAngle = (stopAngle - startAngle) / float(nArcPoints-1); + float half_width = 0.5f * width; + float half_height = 0.5f * height; + float xc = 0; + float yc = 0; + + float angle = stopAngle; + + // add center point if not full circle + if (!fullCircle) + { + vertices->push_back(osg::Vec3(xc, yc, 0)); + } + for (unsigned int n = 0; n < nArcPoints; n++) + { + float x = xc + half_width * sinf(angle); + float y = yc + half_height * cosf(angle); + + vertices->push_back(osg::Vec3(x, y, 0)); + angle -= deltaAngle; + } + + unsigned int nPoints = vertices->size(); + + + if (fillMode == FILL_OFF) + { + symbol->addPrimitiveSet(new osg::DrawArrays(GL_LINE_LOOP, 0, nPoints)); + } + else + { + symbol->addPrimitiveSet(new osg::DrawArrays(GL_TRIANGLE_FAN, 0, nPoints)); + } + + return symbol; + } /** * *************** *** 863,866 **** --- 955,960 ---- } + + /** * There wasn't a direct replacement for the GDI+ version of this. Index: tcConsoleBox.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcConsoleBox.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcConsoleBox.cpp 1 Nov 2004 03:17:18 -0000 1.10 --- tcConsoleBox.cpp 2 Nov 2004 04:23:56 -0000 1.11 *************** *** 29,32 **** --- 29,35 ---- #include <iostream> + #ifdef _DEBUG + #define new DEBUG_NEW + #endif void tcConsoleBox::OnSize(wxSizeEvent& event) Index: tcTerrainView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcTerrainView.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcTerrainView.cpp 2 Oct 2004 22:41:33 -0000 1.1 --- tcTerrainView.cpp 2 Nov 2004 04:23:56 -0000 1.2 *************** *** 34,37 **** --- 34,41 ---- #include "tcOptions.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace Gdiplus; Index: tcFIFO.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcFIFO.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcFIFO.cpp 8 Aug 2004 00:31:34 -0000 1.4 --- tcFIFO.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 18,24 **** --- 18,32 ---- */ + #include "stdwx.h" // precompiled header file + + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif #include "tcFIFO.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif bool tcFIFO::GetIndex(UINT16& rnNewIndex) { Index: tcMapObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapObject.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcMapObject.cpp 21 Oct 2004 04:10:59 -0000 1.5 --- tcMapObject.cpp 2 Nov 2004 04:23:56 -0000 1.6 *************** *** 33,36 **** --- 33,40 ---- #include "simmath.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using MapView::tcMapView; Index: tcCreditView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcCreditView.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcCreditView.cpp 1 Nov 2004 03:17:18 -0000 1.7 --- tcCreditView.cpp 2 Nov 2004 04:23:56 -0000 1.8 *************** *** 36,40 **** #include "tcTime.h" ! void tcCreditView::AddCredit(tcString& s, float afTrailSpace, int effect) --- 36,42 ---- #include "tcTime.h" ! #ifdef _DEBUG ! #define new DEBUG_NEW ! #endif void tcCreditView::AddCredit(tcString& s, float afTrailSpace, int effect) Index: tcEditBox.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcEditBox.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcEditBox.cpp 7 Oct 2004 22:01:46 -0000 1.8 --- tcEditBox.cpp 2 Nov 2004 04:23:56 -0000 1.9 *************** *** 33,36 **** --- 33,39 ---- #include <iostream> + #ifdef _DEBUG + #define new DEBUG_NEW + #endif /* BEGIN_EVENT_TABLE(tcEditBox, tcWindow) Index: cspSky.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/cspSky.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cspSky.cpp 26 Jul 2004 01:44:40 -0000 1.11 --- cspSky.cpp 2 Nov 2004 04:23:56 -0000 1.12 *************** *** 72,75 **** --- 72,79 ---- + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace osg; using UnitConversions::toRadians; *************** *** 1112,1117 **** } ! Sky::~Sky() { delete[] m_lev; } --- 1116,1125 ---- } ! Sky::~Sky() ! { delete[] m_lev; + + m_HorizonColors->clear(); // can't delete, still leaks + } Index: tcDisplaySettingsView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcDisplaySettingsView.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcDisplaySettingsView.cpp 1 Nov 2004 03:17:18 -0000 1.6 --- tcDisplaySettingsView.cpp 2 Nov 2004 04:23:56 -0000 1.7 *************** *** 28,32 **** #include "wxcommands.h" ! /*******************************************************************************/ --- 28,34 ---- #include "wxcommands.h" ! #ifdef _DEBUG ! #define new DEBUG_NEW ! #endif /*******************************************************************************/ Index: tcButton.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcButton.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcButton.cpp 21 Oct 2004 04:10:59 -0000 1.13 --- tcButton.cpp 2 Nov 2004 04:23:56 -0000 1.14 *************** *** 37,45 **** #include <iostream> ! /* ! Gdiplus::Pen* tcButton::pen = NULL; ! Gdiplus::SolidBrush* tcButton::brush = NULL; ! Gdiplus::Font* tcButton::font = NULL; ! */ unsigned tcButton::ref_count = 0; --- 37,45 ---- #include <iostream> ! #ifdef _DEBUG ! #define new DEBUG_NEW ! #endif ! ! unsigned tcButton::ref_count = 0; Index: tc2DGraphicsSurface.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc2DGraphicsSurface.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tc2DGraphicsSurface.cpp 8 Aug 2004 00:31:34 -0000 1.10 --- tc2DGraphicsSurface.cpp 2 Nov 2004 04:23:56 -0000 1.11 *************** *** 32,35 **** --- 32,36 ---- #include "tcString.h" + using namespace Gdiplus; Index: tcDisplayModes.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcDisplayModes.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcDisplayModes.cpp 10 Jul 2004 01:51:16 -0000 1.2 --- tcDisplayModes.cpp 2 Nov 2004 04:23:56 -0000 1.3 *************** *** 28,32 **** #include "tcOptions.h" ! /** --- 28,34 ---- #include "tcOptions.h" ! #ifdef _DEBUG ! #define new DEBUG_NEW ! #endif /** Index: SmokeTrailEmitter.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/SmokeTrailEmitter.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SmokeTrailEmitter.cpp 1 Sep 2004 02:55:36 -0000 1.1 --- SmokeTrailEmitter.cpp 2 Nov 2004 04:23:56 -0000 1.2 *************** *** 1,5 **** --- 1,36 ---- + /** + ** @file SmokeTrailEmitter.cpp + */ + /* Copyright (C) 2004 Dewitt Colclough (de...@tw...) + ** All rights reserved. + + ** This file is part of the Global Conflict Blue (GCB) program. + ** GCB is free software; you can redistribute it and/or modify + ** it under the terms of version 2 of the GNU General Public License as + ** published by the Free Software Foundation. + + ** GCB is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + + ** You should have received a copy of the GNU General Public License + ** along with GCB; if not, write to the Free Software + ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + #include "stdwx.h" // precompiled header file + + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif + #include <graphics/SmokeTrailEmitter.h> #include <osgParticle/Emitter> + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + //#pragma warning (disable: 4273) // inconsistent dll linkage |