Changeset 107 for osgVisual

Timestamp:

Jul 30, 2010, 8:56:43 AM (14 years ago)

Author:

Torben Dannhauer

Message:

Removed two memory leaks!

Location:

osgVisual

Files:

• include/sky_Silverlining/skySilverLining_ProjectionMatrixCallback.h (modified) (7 diffs)
• src/cluster/dataIO_clusterENet_implementation.cpp (modified) (1 diff)

osgVisual/include/sky_Silverlining/skySilverLining_ProjectionMatrixCallback.h

@@ -99 +99 @@
            //OSG_NOTIFY( osg::ALWAYS ) << "znear: " << znear << ", zfar: " << zfar << std::endl;
 
-           if (skyDrawable)
+           if (skyDrawable.valid())
            {
                skyDrawable->setSkyboxSize(((zfar - znear) * 0.5 + znear) * 2.0);
@@ -124 +124 @@
            //OSG_NOTIFY( osg::ALWAYS ) << "znear: " << znear << ", zfar: " << zfar << std::endl;
 
-           if (skyDrawable)
+           if (skyDrawable.valid())
            {
                skyDrawable->setSkyboxSize(((zfar - znear) * 0.5 + znear) * 2.0);
@@ -222 +222 @@
                 //clamp the near plane if low above ground.
             double x,y,z,hat;
-            util::getXYZofCamera( camera, x, y, z );
-                if( util::queryHeightAboveTerrainInWorld( hat, csn, x, y, z ) )
+                util::getXYZofCamera( camera.get(), x, y, z );
+                if( util::queryHeightAboveTerrainInWorld( hat, csn.get(), x, y, z ) )
                 {
                         if (hat < 80 )  
@@ -238 +238 @@
                 near_ = 2;
                 far_ = 125000;
-            util::getXYZofCamera( camera, x, y, z );
-                if( util::queryHeightAboveTerrainInWorld( hat, csn, x, y, z ) )
+            util::getXYZofCamera( camera.get(), x, y, z );
+                if( util::queryHeightAboveTerrainInWorld( hat, csn.get(), x, y, z ) )
                 {
                         osg::Vec2 planesNearFar;
@@ -259 +259 @@
          * Pointer to the Cullvisitor which applies the projection matrix.
          */ 
-        osgUtil::CullVisitor *stockCullVisitor;
+        osg::ref_ptr<osgUtil::CullVisitor> stockCullVisitor;
 
         /**
          * Pointer to silverlinings atmosphere instance.
+         * It has to be a pure C++ Pointer, because SilverLining::athmosphere is not derived from osg/Referenced
          */ 
     SilverLining::Atmosphere *atmosphere;
@@ -269 +270 @@
          * Pointer to the camera on which the callback is installed
          */ 
-    osg::Camera *camera;
+        osg::observer_ptr<osg::Camera> camera;
 
         /**
          * Pointer to the skyDrawable
          */ 
-        skySilverLining_skyDrawable *skyDrawable;
+        osg::observer_ptr<skySilverLining_skyDrawable> skyDrawable;
 
         /**
@@ -280 +281 @@
          * @todo: wofür ist diese variable nötig?
          */ 
-        osg::CoordinateSystemNode *csn;
+        osg::observer_ptr<osg::CoordinateSystemNode> csn;
 
 

osgVisual/src/cluster/dataIO_clusterENet_implementation.cpp

@@ -262 +262 @@
 void dataIO_clusterENet_implementation::onReceivePacket(ENetEvent* event_)
 {
-                receivedTransportContainer.assign((char*)(event_->packet->data), event_->packet->dataLength);   
-                //std::cout << "A packet of length "<<event_->packet->dataLength<<" containing "<<receivedTransportContainer<<" was received from "<<receivedTransportContainer<<" on channel "<<(int)(event_->channelID)<<std::endl;
+                receivedTransportContainer.assign((char*)(event_->packet->data), event_->packet->dataLength);
+                enet_packet_destroy(event_->packet);   
+                //std::cout << "A packet of length "<<receivedTransportContainer.size()<<" containing "<<receivedTransportContainer<<" was received from "<<receivedTransportContainer<<" on channel "<<(int)(event_->channelID)<<std::endl;
 }