Changeset 298

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• bin/osgVisualConfig.xml (modified) (2 diffs)
• include/util/TerrainQuery.h (added)
• resources/distortion/shader.frag (modified) (1 diff)
• src/draw2D/visual_debug_hud.cpp (modified) (2 diffs)
• src/sky_Silverlining/skySilverLining_skyDrawable.cpp (modified) (1 diff)
• src/util/TerrainQuery.cpp (added)

osgVisual/trunk/CMakeLists.txt

@@ -18 +18 @@
 #################################################################################################
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 
 
@@ -305 +305 @@
         include/util/visual_util.h
         src/util/visual_util.cpp
+        include/util/terrainQuery.h
+        src/util/terrainQuery.cpp
         # Draw 2D
         include/draw2D/visual_draw2D.h

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -2 +2 @@
 <osgvisualconfiguration>
   <module name="distortion" enabled="no">
-    <distortion channelname="center" renderimplementation="fbo" width="2048" height="2048" useshader="yes" hdr="yes" usetexturerectangle="no"></distortion>
+    <distortion channelname="right" renderimplementation="fbo" width="1920" height="1200" useshader="yes" hdr="no" usetexturerectangle="no"></distortion>
   </module>
   <module name="sky_silverlining" enabled="yes"></module>
@@ -15 +15 @@
   
   <scenery>
-    <terrain filename="D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive.terrainmod" filename2="J:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive.terrainmod" filename3="axes.osg.10000000.scale"></terrain>
+    <!-- <terrain filename="D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive.terrainmod" filename2="H:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive" filename3="axes.osg.10000000.scale"></terrain>-->
+    <terrain filename="D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive.terrainmod" filename2="H:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive"></terrain>
     <animationpath filename="airport_muc.path"></animationpath>
     <models>

osgVisual/trunk/resources/distortion/shader.frag

@@ -12 +12 @@
     blendColor = texture2D(textureBlend, gl_TexCoord[0].st);
 
-    texCoord.s = (distortColor.b + mod(floor(distortColor.r * 255.5), 16.0)) / 16.0;
-    texCoord.t = 1.0 - (distortColor.g + floor(distortColor.r * 255.5 / 16.0)) / 16.0;
+// modified 
+//    texCoord.s = (distortColor.b / 255.0 + mod(distortColor.r , 16.0)) / 16.0;
+//    texCoord.t = 1.0 - (distortColor.g / 255.0 + (distortColor.r / 16.0)) / 16.0;
+
+// Original
+texCoord.s = (distortColor.b + mod(floor(distortColor.r * 255.5), 16.0)) / 16.0;
+texCoord.t = 1.0 - (distortColor.g + floor(distortColor.r * 255.5 / 16.0)) / 16.0;
 
     gl_FragColor = texture2D(textureImage, texCoord.st) * blendColor;
 }
+
+

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);