Changeset 298 for osgVisual/trunk/src

Timestamp:

Jul 18, 2011, 8:48:00 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk/src

Files:

• draw2D/visual_debug_hud.cpp (modified) (2 diffs)
• sky_Silverlining/skySilverLining_skyDrawable.cpp (modified) (1 diff)
• util/TerrainQuery.cpp (added)

osgVisual/trunk/src/draw2D/visual_debug_hud.cpp

@@ -16 +16 @@
 
 #include <visual_debug_hud.h>
+#include <osgSim/HeightAboveTerrain>
 
 using namespace osgVisual;
@@ -141 +142 @@
 
         util::getWGS84ofCamera( sceneCamera, csn, lat, lon, alt ); 
-        util::queryHeightAboveTerrainInWGS84(hat, csn, lat, lon, alt);
-        util::queryHeightOfTerrain(hot, csn, lat, lon);
+        //util::queryHeightAboveTerrainInWGS84(hat, csn, lat, lon, alt);
+        //util::queryHeightOfTerrain(hot, csn, lat, lon);
+
+        double x = 0;
+        double y = 0;
+        double z = 0;
+
+        util::getXYZofCamera( sceneCamera, x, y, z ); 
+        hat = osgSim::HeightAboveTerrain::computeHeightAboveTerrain(csn, osg::Vec3d(x,y,z), false);
+        hot = osgSim::HeightAboveTerrain::computeHeightOfTerrain(csn, osg::Vec3d(x,y,z), false);
 
 

osgVisual/trunk/src/sky_Silverlining/skySilverLining_skyDrawable.cpp

@@ -80 +80 @@
         //direction = view * direction;
         direction.normalize();
-                OSG_NOTIFY( osg::ALWAYS) << "X: "<<direction.x()<<"  Y: "<<direction.y()<<"  Z:"<<direction.z()<< std::endl;
-                
-double cx,cy,cz;
-util::getXYZofCamera(_view->getCamera(), cx, cy, cz);
-osg::Vec3d up(cx, cy, cz);
-//up.normalize();
-//util::AddCylinderBetweenPoints(osg::Vec3d(cx,cy,cz), direction*15000000 , 5000.0, osg::Vec4d(1.0, 1.0, 0.0, 1 ), sceneRoot);
-util::AddCylinderBetweenPoints(osg::Vec3d(0,0,0), direction*15000000 , 5000.0, osg::Vec4d(0.0, 1.0, 1.0, 1 ), sceneRoot);
-
 
         light->setAmbient(ambient);