From Eric Wing, change osgGA::SimpleViewer to osgViewer::Viewer.

From Robert Osfield, added -losgViewer & -losgGA to makefiles.
This commit is contained in:
Robert Osfield
2006-11-08 09:50:27 +00:00
parent 530e9e08d4
commit a1f20f1a00
6 changed files with 10 additions and 10 deletions

View File

@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
CXXFILES =\
osgGLUTkeyboardmouse.cpp\
LIBS += -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
INSTFILES = \
$(CXXFILES)\

View File

@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
CXXFILES =\
osgGLUTkeyboardmouse.cpp\
LIBS += -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
EXEC = osgGLUTkeyboardmouse

View File

@@ -13,11 +13,11 @@
# include <GL/glut.h>
#endif
#include <osgGA/SimpleViewer>
#include <osgViewer/SimpleViewer>
#include <osgGA/TrackballManipulator>
#include <osgDB/ReadFile>
osg::ref_ptr<osgGA::SimpleViewer> viewer;
osg::ref_ptr<osgViewer::SimpleViewer> viewer;
void display(void)
{
@@ -89,7 +89,7 @@ int main( int argc, char **argv )
glutKeyboardFunc( keyboard );
// create the view of the scene.
viewer = new osgGA::SimpleViewer;
viewer = new osgViewer::SimpleViewer;
viewer->setSceneData(loadedModel.get());
viewer->setCameraManipulator(new osgGA::TrackballManipulator);

View File

@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
CXXFILES =\
osgGLUTsimple.cpp\
LIBS += -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
INSTFILES = \
$(CXXFILES)\

View File

@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
CXXFILES =\
osgGLUTsimple.cpp\
LIBS += -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
EXEC = osgGLUTsimple

View File

@@ -13,10 +13,10 @@
# include <GL/glut.h>
#endif
#include <osgGA/SimpleViewer>
#include <osgViewer/SimpleViewer>
#include <osgDB/ReadFile>
osg::ref_ptr<osgGA::SimpleViewer> viewer;
osg::ref_ptr<osgViewer::SimpleViewer> viewer;
void display(void)
{
@@ -60,7 +60,7 @@ int main( int argc, char **argv )
glutReshapeFunc( reshape );
// create the view of the scene.
viewer = new osgGA::SimpleViewer;
viewer = new osgViewer::SimpleViewer;
viewer->setSceneData(loadedModel.get());
// initialize the view to look at the center of the scene graph