Changeset 296

Timestamp:

Jun 15, 2011, 10:26:23 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Files:

• experimental/TerrainTest/ReaderWriterTerrainMod.cpp (modified) (1 diff)
• osgVisual/trunk/bin/osgVisualConfig.xml (modified) (1 diff)
• osgVisual/trunk/src/sky_Silverlining/skySilverLining_skyDrawable.cpp (modified) (1 diff)
• osgVisual/trunk/src/sky_Silverlining/visual_skySilverLining.cpp (modified) (1 diff)

experimental/TerrainTest/ReaderWriterTerrainMod.cpp

@@ -5 +5 @@
 {
         supportsExtension( "terrainmod", "Terrain modification pseudo loader");
+        //supportsExtension( "*", "Terrain modification pseudo loader");
+
 
         extensionToAdd = ".terrainmod";

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -37 +37 @@
       <trackmodel id="2" updater_slot="TRACKING_ID"></trackmodel> 
     </models>
-    <datetime day="0" month="0" year="0" hour="20" minute="20"></datetime>
+    <datetime day="0" month="0" year="0" hour="12" minute="00"></datetime>
     <visibility range="50000" turbidity="2.2" ></visibility>
     <clouds>

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, lat, lon, height;
-//util::getWGS84ofCamera( _view->getCamera(), sceneRoot, lat, lon, height );
-//util::calculateXYZAtWGS84Coordinate(lat, lon, 0, sceneRoot, cx, cy, cz);
-//util::AddCylinderBetweenPoints(osg::Vec3d(cx,cy,cz), direction*-15000000 , 500.0, osg::Vec4d(1.0, 1.0, 0.0, 1 ), sceneRoot);
-//util::AddCylinderBetweenPoints(osg::Vec3d(0,0,0), direction*-15000000 , 500.0, osg::Vec4d(0.0, 1.0, 1.0, 1 ), sceneRoot);
+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);
 
 

osgVisual/trunk/src/sky_Silverlining/visual_skySilverLining.cpp

@@ -262 +262 @@
         double x,y,z;
     util::getXYZofCamera(sceneCamera, x, y, z);
-
     osg::Vec3d up(x, y, z);
-
     up.normalize();
+
     osg::Vec3d north(0, 0, 1);  // Z is north
     osg::Vec3d east = north ^ up;       // Cross product