Changeset 298


Ignore:
Timestamp:
Jul 18, 2011, 8:48:00 PM (13 years ago)
Author:
Torben Dannhauer
Message:
 
Location:
osgVisual/trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • osgVisual/trunk/CMakeLists.txt

    r244 r298  
    1818#################################################################################################
    1919
    20 cmake_minimum_required(VERSION 2.8)
     20cmake_minimum_required(VERSION 3.0)
    2121
    2222
     
    305305        include/util/visual_util.h
    306306        src/util/visual_util.cpp
     307        include/util/terrainQuery.h
     308        src/util/terrainQuery.cpp
    307309        # Draw 2D
    308310        include/draw2D/visual_draw2D.h
  • osgVisual/trunk/bin/osgVisualConfig.xml

    r296 r298  
    22<osgvisualconfiguration>
    33  <module name="distortion" enabled="no">
    4     <distortion channelname="center" renderimplementation="fbo" width="2048" height="2048" useshader="yes" hdr="yes" usetexturerectangle="no"></distortion>
     4    <distortion channelname="right" renderimplementation="fbo" width="1920" height="1200" useshader="yes" hdr="no" usetexturerectangle="no"></distortion>
    55  </module>
    66  <module name="sky_silverlining" enabled="yes"></module>
     
    1515 
    1616  <scenery>
    17     <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>
     17    <!-- <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>-->
     18    <terrain filename="D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive.terrainmod" filename2="H:\BRD1m_MUC0.25m_srtmEU_BM\terrain.ive"></terrain>
    1819    <animationpath filename="airport_muc.path"></animationpath>
    1920    <models>
  • osgVisual/trunk/resources/distortion/shader.frag

    r147 r298  
    1212    blendColor = texture2D(textureBlend, gl_TexCoord[0].st);
    1313
    14     texCoord.s = (distortColor.b + mod(floor(distortColor.r * 255.5), 16.0)) / 16.0;
    15     texCoord.t = 1.0 - (distortColor.g + floor(distortColor.r * 255.5 / 16.0)) / 16.0;
     14// modified
     15//    texCoord.s = (distortColor.b / 255.0 + mod(distortColor.r , 16.0)) / 16.0;
     16//    texCoord.t = 1.0 - (distortColor.g / 255.0 + (distortColor.r / 16.0)) / 16.0;
     17
     18// Original
     19texCoord.s = (distortColor.b + mod(floor(distortColor.r * 255.5), 16.0)) / 16.0;
     20texCoord.t = 1.0 - (distortColor.g + floor(distortColor.r * 255.5 / 16.0)) / 16.0;
    1621
    1722    gl_FragColor = texture2D(textureImage, texCoord.st) * blendColor;
    1823}
     24
     25
  • osgVisual/trunk/src/draw2D/visual_debug_hud.cpp

    r221 r298  
    1616
    1717#include <visual_debug_hud.h>
     18#include <osgSim/HeightAboveTerrain>
    1819
    1920using namespace osgVisual;
     
    141142
    142143        util::getWGS84ofCamera( sceneCamera, csn, lat, lon, alt );
    143         util::queryHeightAboveTerrainInWGS84(hat, csn, lat, lon, alt);
    144         util::queryHeightOfTerrain(hot, csn, lat, lon);
     144        //util::queryHeightAboveTerrainInWGS84(hat, csn, lat, lon, alt);
     145        //util::queryHeightOfTerrain(hot, csn, lat, lon);
     146
     147        double x = 0;
     148        double y = 0;
     149        double z = 0;
     150
     151        util::getXYZofCamera( sceneCamera, x, y, z );
     152        hat = osgSim::HeightAboveTerrain::computeHeightAboveTerrain(csn, osg::Vec3d(x,y,z), false);
     153        hot = osgSim::HeightAboveTerrain::computeHeightOfTerrain(csn, osg::Vec3d(x,y,z), false);
    145154
    146155
  • osgVisual/trunk/src/sky_Silverlining/skySilverLining_skyDrawable.cpp

    r296 r298  
    8080        //direction = view * direction;
    8181        direction.normalize();
    82                 OSG_NOTIFY( osg::ALWAYS) << "X: "<<direction.x()<<"  Y: "<<direction.y()<<"  Z:"<<direction.z()<< std::endl;
    83                
    84 double cx,cy,cz;
    85 util::getXYZofCamera(_view->getCamera(), cx, cy, cz);
    86 osg::Vec3d up(cx, cy, cz);
    87 //up.normalize();
    88 //util::AddCylinderBetweenPoints(osg::Vec3d(cx,cy,cz), direction*15000000 , 5000.0, osg::Vec4d(1.0, 1.0, 0.0, 1 ), sceneRoot);
    89 util::AddCylinderBetweenPoints(osg::Vec3d(0,0,0), direction*15000000 , 5000.0, osg::Vec4d(0.0, 1.0, 1.0, 1 ), sceneRoot);
    90 
    9182
    9283        light->setAmbient(ambient);
Note: See TracChangeset for help on using the changeset viewer.