Changeset 87 for osgVisual/src/core/visual_core.cpp
- Timestamp:
- Jul 28, 2010, 5:13:22 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
osgVisual/src/core/visual_core.cpp
r86 r87 28 28 visual_core::~visual_core(void) 29 29 { 30 // shut osgVisual down31 shutdown();32 33 30 OSG_NOTIFY( osg::ALWAYS ) << "visual_core destroyed." << std::endl; 34 35 31 } 36 32 … … 49 45 50 46 // Setup coordinate system node 51 rootNode = new osg::CoordinateSystemNode; 47 rootNode = new osg::CoordinateSystemNode; // todo memleakf 52 48 rootNode->setEllipsoidModel(new osg::EllipsoidModel()); 53 49 54 50 // Test memory leak (todo) 55 double* test = new double[1000];51 //double* test = new double[1000]; 56 52 57 53 #ifdef USE_SPACENAVIGATOR … … 130 126 OSG_NOTIFY( osg::ALWAYS ) << "Shutdown visual_core..." << std::endl; 131 127 128 // Shutdown Dbug HUD 129 if(hud.valid()) 130 hud->shutdown(); 132 131 // Unset scene data 133 132 viewer->setSceneData( NULL ); … … 144 143 distortion->shutdown(); 145 144 #endif 145 146 // Shutdown data 147 rootNode = NULL; 146 148 147 149 // Shutdown dataIO … … 295 297 //testObj->addUpdater( new object_updater(testObj) ); 296 298 297 osg::ref_ptr<visual_object> testObj2 = new visual_object( rootNode, "cessna" ); 299 osg::ref_ptr<visual_object> testObj2 = new visual_object( rootNode, "cessna" ); // todo memleak 298 300 //testObj2->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 600 ); 299 301 testObj2->setNewPosition( osg::DegreesToRadians(50.8123), osg::DegreesToRadians(8.94088), 600 ); 300 302 testObj2->loadGeometry( "../models/cessna.osg" ); 301 testObj2->addUpdater( new object_updater(testObj2) ); 302 303 osg::ref_ptr<visual_object> testObj3 = new visual_object( rootNode, "SAENGER1" ); 303 testObj2->addUpdater( new object_updater(testObj2) ); // todo memleak 304 305 osg::ref_ptr<visual_object> testObj3 = new visual_object( rootNode, "SAENGER1" ); // todo memleak 304 306 testObj3->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 600 ); 305 307 testObj3->loadGeometry( "../models/saenger1.flt" ); 306 testObj3->addUpdater( new object_updater(testObj3) ); 307 308 309 osg::ref_ptr<visual_object> testObj4 = new visual_object( rootNode, "SAENGER2" ); 308 testObj3->addUpdater( new object_updater(testObj3) ); // todo memleak 309 310 311 osg::ref_ptr<visual_object> testObj4 = new visual_object( rootNode, "SAENGER2" ); // todo memleak 310 312 testObj4->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 650 ); 311 313 testObj4->loadGeometry( "../models/saenger2.flt" ); 312 testObj4->addUpdater( new object_updater(testObj4) ); 314 testObj4->addUpdater( new object_updater(testObj4) ); // todo memleak 313 315 testObj4->addLabel("testLabel", "LabelTest!!\nnächste Zeile :)",osg::Vec4(1.0f,0.25f,1.0f,1.0f)); 314 316 315 osg::ref_ptr<visual_object> testObj5 = new visual_object( rootNode, "SAENGER" ); 317 osg::ref_ptr<visual_object> testObj5 = new visual_object( rootNode, "SAENGER" ); // todo memleak 316 318 testObj5->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 550 ); 317 319 testObj5->loadGeometry( "../models/saengerCombine.flt" ); 318 320 //testObj5->setScale( 2 ); 319 testObj5->addUpdater( new object_updater(testObj5) ); 321 testObj5->addUpdater( new object_updater(testObj5) ); // todo memleak 320 322 321 323 #ifdef USE_SPACENAVIGATOR … … 359 361 visual_draw2D::getInstance()->init( rootNode, viewer ); 360 362 //osg::ref_ptr<visual_hud> hud = new visual_hud(); 361 osg::ref_ptr<visual_debug_hud>hud = new visual_debug_hud();363 hud = new visual_debug_hud(); 362 364 hud->init( viewer, rootNode ); 363 365
Note: See TracChangeset
for help on using the changeset viewer.