Changeset 295

Timestamp:

Jun 6, 2011, 11:16:54 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• include/util/visual_util.h (modified) (1 diff)
• src/sky_Silverlining/skySilverLining_skyDrawable.cpp (modified) (2 diffs)
• src/util/visual_util.cpp (modified) (2 diffs)

osgVisual/trunk/bin/osgVisualConfig.xml

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

osgVisual/trunk/include/util/visual_util.h

@@ -305 +305 @@
          * @param pAddToThisGroup 
          */ 
-        static void AddCylinderBetweenPoints(osg::Vec3d StartPoint, osg::Vec3d EndPoint, float radius, float length, osg::Vec4d CylinderColor, osg::Group *pAddToThisGroup);
+        static void AddCylinderBetweenPoints(osg::Vec3d StartPoint, osg::Vec3d EndPoint, float radius, osg::Vec4d CylinderColor, osg::Group *pAddToThisGroup);
 
         template<class T>

osgVisual/trunk/src/sky_Silverlining/skySilverLining_skyDrawable.cpp

@@ -67 +67 @@
         atmosphere->GetAmbientColor(&ra, &ga, &ba);
         atmosphere->GetSunOrMoonColor(&rd, &gd, &bd);
-        atmosphere->GetSunOrMoonPosition(&x, &y, &z);
+        //atmosphere->GetSunOrMoonPosition(&x, &y, &z);
+                atmosphere->GetSunOrMoonPositionGeographic(&x, &y, &z);
+                
 
         direction = osg::Vec3(x, y, z);
@@ -79 +81 @@
         direction.normalize();
                 
-//OSG_NOTIFY(osg::ALWAYS)       << "Light Vector: X:"<<direction.x()<<" Y:"<<direction.y()<<" Z:"<<direction.z() << std::endl;
-util::AddCylinderBetweenPoints(osg::Vec3d(0,0,0), direction , 10000.0, 15000000.0, osg::Vec4d(1.0, 1.0, 0.0, 1 ), sceneRoot);
+//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);
+
 
         light->setAmbient(ambient);
         light->setDiffuse(diffuse);
-        //light->setSpecular(osg::Vec4(0,0,0,1));
+        light->setSpecular(osg::Vec4(0,0,0,1));
                 //light->setSpecular(osg::Vec4(1.0,1.0,1.0,1)); // Test
         light->setPosition(osg::Vec4(direction.x(), direction.y(), direction.z(), 0));

osgVisual/trunk/src/util/visual_util.cpp

@@ -571 +571 @@
 }
 
-void util::AddCylinderBetweenPoints(osg::Vec3d StartPoint, osg::Vec3d EndPoint, float radius, float length, osg::Vec4d CylinderColor, osg::Group *pAddToThisGroup)
+void util::AddCylinderBetweenPoints(osg::Vec3d StartPoint, osg::Vec3d EndPoint, float radius, osg::Vec4d CylinderColor, osg::Group *pAddToThisGroup)
 {
         osg::ref_ptr<osg::Geode> geode = new osg::Geode;
@@ -580 +580 @@
         osg::ref_ptr<osg::Material> pMaterial;
 
-        //height = (StartPoint-EndPoint).length();
-        height  = length;
+        height = (StartPoint-EndPoint).length();
         center = osg::Vec3( (StartPoint.x() + EndPoint.x()) / 2, (StartPoint.y() + EndPoint.y()) / 2, (StartPoint.z() + EndPoint.z()) / 2);