Changeset 112

Timestamp:

Jul 30, 2010, 10:08:44 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• include/sky_Silverlining/skySilverLining_ProjectionMatrixCallback.h (modified) (7 diffs)
• src/core/visual_core.cpp (modified) (2 diffs)

osgVisual/include/sky_Silverlining/skySilverLining_ProjectionMatrixCallback.h

@@ -99 +99 @@
            //OSG_NOTIFY( osg::ALWAYS ) << "znear: " << znear << ", zfar: " << zfar << std::endl;
 
-           if (skyDrawable.valid())
+           if (skyDrawable)
            {
                skyDrawable->setSkyboxSize(((zfar - znear) * 0.5 + znear) * 2.0);
@@ -124 +124 @@
            //OSG_NOTIFY( osg::ALWAYS ) << "znear: " << znear << ", zfar: " << zfar << std::endl;
 
-           if (skyDrawable.valid())
+           if (skyDrawable)
            {
                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.get(), x, y, z );
-                if( util::queryHeightAboveTerrainInWorld( hat, csn.get(), x, y, z ) )
+            util::getXYZofCamera( camera, x, y, z );
+                if( util::queryHeightAboveTerrainInWorld( hat, csn, x, y, z ) )
                 {
                         if (hat < 80 )  
@@ -238 +238 @@
                 near_ = 2;
                 far_ = 125000;
-            util::getXYZofCamera( camera.get(), x, y, z );
-                if( util::queryHeightAboveTerrainInWorld( hat, csn.get(), x, y, z ) )
+            util::getXYZofCamera( camera, x, y, z );
+                if( util::queryHeightAboveTerrainInWorld( hat, csn, x, y, z ) )
                 {
                         osg::Vec2 planesNearFar;
@@ -263 +263 @@
         /**
          * 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;
@@ -270 +269 @@
          * Pointer to the camera on which the callback is installed
          */ 
-        osg::observer_ptr<osg::Camera> camera;
+    osg::Camera *camera;
 
         /**
          * Pointer to the skyDrawable
          */ 
-        osg::observer_ptr<skySilverLining_skyDrawable> skyDrawable;
+        skySilverLining_skyDrawable *skyDrawable;
 
         /**
@@ -281 +280 @@
          * @todo: wofür ist diese variable nötig?
          */ 
-        osg::observer_ptr<osg::CoordinateSystemNode> csn;
+        osg::CoordinateSystemNode *csn;
 
 

osgVisual/src/core/visual_core.cpp

@@ -296 +296 @@
         //testObj->addUpdater( new object_updater(testObj) );
 
-        osg::ref_ptr<visual_object> testObj2 = new visual_object( rootNode, "cessna" ); // todo memleak
+        osg::ref_ptr<visual_object> testObj2 = new visual_object( rootNode, "neuschwanstein" ); // todo memleak
         //testObj2->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 600 );
-        testObj2->setNewPosition( osg::DegreesToRadians(50.8123), osg::DegreesToRadians(8.94088), 600 );
-        testObj2->loadGeometry( "../models/cessna.osg" );
-        testObj2->addUpdater( new object_updater(testObj2) );   // todo memleak
+        testObj2->setNewPosition( osg::DegreesToRadians(47.557523564234), osg::DegreesToRadians(10.749646398595), 950 );
+        testObj2->loadGeometry( "../models/neuschwanstein.osgb" );
+        //testObj2->addUpdater( new object_updater(testObj2) ); // todo memleak
 
         osg::ref_ptr<visual_object> testObj3 = new visual_object( rootNode, "SAENGER1" );       // todo memleak
@@ -323 +323 @@
         // Manipulatoren auf dieses Objekt binden (Primärobjekt)
         if (objectMountedCameraManip.valid())
-                objectMountedCameraManip->setAttachedObject( testObj4 );
+                objectMountedCameraManip->setAttachedObject( testObj2 );
         if (mouseTrackerManip.valid())
         {
-                mouseTrackerManip->setTrackNode( testObj4->getGeometry() );
+                mouseTrackerManip->setTrackNode( testObj2->getGeometry() );
                 mouseTrackerManip->setMinimumDistance( 100 );
         }