diff --git a/VisualStudio/OpenSceneGraph.dsw b/VisualStudio/OpenSceneGraph.dsw index 94d30de23..af907c27f 100644 --- a/VisualStudio/OpenSceneGraph.dsw +++ b/VisualStudio/OpenSceneGraph.dsw @@ -780,7 +780,7 @@ Package=<4> Project_Dep_Name Core osgGA End Project Dependency Begin Project Dependency - Project_Dep_Name Core osgProducer + Project_Dep_Name Core osgViewer End Project Dependency Begin Project Dependency Project_Dep_Name Core osgUtil @@ -1512,7 +1512,7 @@ Package=<4> Project_Dep_Name Core osgParticle End Project Dependency Begin Project Dependency - Project_Dep_Name Core osgViewer + Project_Dep_Name Core osgProducer End Project Dependency Begin Project Dependency Project_Dep_Name Core osgUtil diff --git a/examples/osgparticleeffects/GNUmakefile b/examples/osgparticleeffects/GNUmakefile index 861a991ca..60bc6e5ec 100644 --- a/examples/osgparticleeffects/GNUmakefile +++ b/examples/osgparticleeffects/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgparticleeffects.cpp\ -LIBS += -losgViewer -losgProducer -lProducer -losgParticle -losgSim -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgParticle -losgSim -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp index adb036819..5ceb5c1fd 100644 --- a/src/osgViewer/CompositeViewer.cpp +++ b/src/osgViewer/CompositeViewer.cpp @@ -28,6 +28,11 @@ void CompositeViewer::init() { } +void CompositeViewer::addView(osgViewer::View* view) +{ + osg::notify(osg::NOTICE)<<"CompositeViewer::addView(View*) not implemented yet."<setFrameStamp(_frameStamp.get()); - - _eventQueue = new osgGA::EventQueue; - - _eventVisitor = new osgGA::EventVisitor; setDatabasePager(new osgDB::DatabasePager); } @@ -36,6 +32,12 @@ Scene::~Scene() { } +void Scene::init() +{ + osg::notify(osg::NOTICE)<<"Scene::init() not implementated yet."<getReferenceTime();