foo

dardok · Apr 28, 2014 · d4d4bf3 · d4d4bf3
1 parent c485baa
commit d4d4bf3
Show file tree

Hide file tree

Showing 17 changed files with 274 additions and 66 deletions.
diff --git a/Makefile b/Makefile
@@ -3,6 +3,8 @@ CC = g++
 #EXTRA_CFLAGS = `sdl-config --cflags`
 #EXTRA_LIBS = `sdl-config --libs`
 
+CC = gcc-4.5
+CXX = g++-4.5
 OPT = -O -DNDEBUG
 #OPT = -g -Wall
 
@@ -11,7 +13,9 @@ D =
 
 OBJS = channel.o config.o configEvent.o error.o frameData.o initData.o main.o node.o eqEarth.o pipe.o view.o window.o renderer.o sceneView.o viewer.o controls.o earthManipulator.o
 CFLAGS = -DEQ_IGNORE_GLEW ${OPT} -I/afs/cmf/project/dc/sys/boost/include -isystem /afs/cmf/project/dc/sys/include -I/afs/cmf/project/dc/sys/include -I/afs/cmf/project/gis/include ${EXTRA_CFLAGS} -I.
+#CFLAGS = -DEQ_IGNORE_GLEW ${OPT} -I/var/tmp/dkleiner/dev/Buildyard/Build/install/include -isystem /afs/cmf/project/dc/sys/include -I/afs/cmf/project/dc/sys/include -I/afs/cmf/project/gis/include ${EXTRA_CFLAGS} -I.
 LIBS = -Wl,-rpath -Wl,/afs/cmf/project/dc/sys/boost/lib -L/afs/cmf/project/dc/sys/boost/lib -lboost_serialization -lboost_system -lboost_date_time -L/afs/cmf/project/dc/sys/lib -losg${D} -losgViewer${D} -losgUtil${D} -lEqualizer -L/afs/cmf/project/gis/lib -losgEarth${D} -losgEarthUtil${D} ${EXTRA_LIBS}
+#LIBS = -Wl,-rpath -Wl,/var/tmp/dkleiner/dev/Buildyard/Build/install/lib -L/var/tmp/dkleiner/dev/Buildyard/Build/install/lib -L/afs/cmf/project/dc/sys/lib -losg${D} -losgViewer${D} -losgUtil${D} -lEqualizer -L/afs/cmf/project/gis/lib -losgEarth${D} -losgEarthUtil${D} ${EXTRA_LIBS}
 
 all: eqEarth
 

diff --git a/callbacks.h b/callbacks.h
@@ -2,7 +2,7 @@
 
 #include <osg/NodeCallback>
 
-#include <osgEarthUtil/SkyNode>
+#include <osgEarthUtil/Sky>
 
 #include "view.h"
 #include "controls.h"
@@ -27,8 +27,8 @@ void operator( )( osg::Node* node, osg::NodeVisitor* nv )
         if( _lastSec != now.tm_sec )
         {
             static_cast< osgEarth::Util::SkyNode* >( node )->setDateTime(
-                now.tm_year + 1900, now.tm_mon + 1, now.tm_mday,
-                now.tm_hour + ( now.tm_min / 60.0 ) + ( now.tm_sec / 3600.0 ));
+                osgEarth::Util::DateTime( now.tm_year + 1900, now.tm_mon + 1, now.tm_mday,
+                    now.tm_hour + ( now.tm_min / 60.0 ) + ( now.tm_sec / 3600.0 )));
             _lastSec = now.tm_sec;
         }
     }

diff --git a/channel.cpp b/channel.cpp
@@ -61,7 +61,8 @@ LBINFO << "-----> Channel::configInit(" << initID <<
         _camera->setReferenceFrame( osg::Transform::ABSOLUTE_RF );
         _camera->setAllowEventFocus( false );
 
-        if( false/*isDestination( )*/)
+        if( isDestination( ) &&
+                ( std::string::npos == getNode( )->getName( ).find( "strad" )))
         {
 #if 0
             const eq::PixelViewport& pvp = getPixelViewport( );
@@ -170,6 +171,7 @@ void Channel::frameClear( const eq::uint128_t& frameID )
 LBINFO << "-----> Channel<" << getName( ) << ">::frameClear("
     << frameID << ")" << std::endl;
 
+/*
     if( isDestination( ))
     {
         const unsigned int contextID =
@@ -178,7 +180,7 @@ LBINFO << "-----> Channel<" << getName( ) << ">::frameClear("
             osg::GL2Extensions::Get( contextID, true );
         gl2e->glUseProgram( 0 ); // Icky...
     }
-
+*/
     glEnable( GL_SCISSOR_TEST );
 
     eq::Channel::frameClear( frameID );