Moved osgProducer and osgproducerviewer out into their own repository.
Clean up the source for remaining references to osgProducer/Producer.
This commit is contained in:
@@ -8,7 +8,4 @@ LIBS += -losgViewer -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $
|
||||
|
||||
EXEC = osganimate
|
||||
|
||||
INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
|
||||
LDFLAGS += $(PRODUCER_LIB_DIR)
|
||||
|
||||
include $(TOPDIR)/Make/makerules
|
||||
|
||||
@@ -8,7 +8,4 @@ LIBS += -losgViewer -losgText -losgDB -losgText -losgUtil -losg $(GL_LIBS) $
|
||||
|
||||
EXEC = osgautotransform
|
||||
|
||||
INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
|
||||
LDFLAGS += $(PRODUCER_LIB_DIR)
|
||||
|
||||
include $(TOPDIR)/Make/makerules
|
||||
|
||||
@@ -9,7 +9,4 @@ LIBS += -losgViewer -losgText -losgDB -losgText -losgUtil -losg -losgFX $(GL
|
||||
|
||||
EXEC = osgfxbrowser
|
||||
|
||||
INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
|
||||
LDFLAGS += $(PRODUCER_LIB_DIR)
|
||||
|
||||
include $(TOPDIR)/Make/makerules
|
||||
|
||||
@@ -16,7 +16,4 @@ LIBS += -losgViewer -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $
|
||||
|
||||
EXEC = osghangglide
|
||||
|
||||
INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
|
||||
LDFLAGS += $(PRODUCER_LIB_DIR)
|
||||
|
||||
include $(TOPDIR)/Make/makerules
|
||||
|
||||
@@ -102,59 +102,6 @@ osg::Node* createHUD()
|
||||
return camera;
|
||||
}
|
||||
|
||||
#if 0
|
||||
bool computePixelCoords(osgProducer::Viewer* viewer,float x,float y,unsigned int cameraNum,float& pixel_x,float& pixel_y)
|
||||
{
|
||||
Producer::KeyboardMouse* km = viewer->getKeyboardMouse();
|
||||
if (!km) return false;
|
||||
|
||||
if (cameraNum>=viewer->getNumberOfCameras()) return false;
|
||||
|
||||
Producer::Camera* camera=viewer->getCamera(cameraNum);
|
||||
Producer::RenderSurface* rs = camera->getRenderSurface();
|
||||
|
||||
Producer::InputArea* inputArea = km->getInputArea();
|
||||
if( inputArea != NULL )
|
||||
{
|
||||
// first locate which InputRectange is appropriate for specified RenderSurface.
|
||||
unsigned int i;
|
||||
for(i=0;i<inputArea->getNumRenderSurfaces();++i)
|
||||
{
|
||||
if (inputArea->getRenderSurface(i)==rs) break;
|
||||
}
|
||||
|
||||
// the RenderSurface isn't in the InputArea list.. therefore cannot make mouse coords to it.
|
||||
if (i==inputArea->getNumRenderSurfaces()) return false;
|
||||
|
||||
// we have a valid InputRectangle
|
||||
Producer::RenderSurface::InputRectangle ir = inputArea->getRenderSurface(i)->getInputRectangle();
|
||||
|
||||
float rx = (x-ir.left())/ir.width();
|
||||
float ry = (y-ir.bottom())/ir.height();
|
||||
|
||||
int wx, wy;
|
||||
unsigned int w, h;
|
||||
rs->getWindowRectangle( wx, wy, w, h );
|
||||
|
||||
pixel_x = ((float)w)* rx;
|
||||
pixel_y = ((float)h)* ry;
|
||||
}
|
||||
else
|
||||
{
|
||||
float rx = (x+1.0f)*0.5f;
|
||||
float ry = (y+1.0f)*0.5f;
|
||||
|
||||
int wx, wy;
|
||||
unsigned int w, h;
|
||||
rs->getWindowRectangle( wx, wy, w, h );
|
||||
|
||||
pixel_x = ((float)w)* rx;
|
||||
pixel_y = ((float)h)* ry;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
osg::Node* addDraggerToScene(osg::Node* scene, osgManipulator::CommandManager* cmdMgr, const std::string& name)
|
||||
{
|
||||
scene->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
|
||||
|
||||
@@ -11,8 +11,4 @@ LIBS += -losgText -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
|
||||
|
||||
EXEC = osgunittests
|
||||
|
||||
|
||||
INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
|
||||
LDFLAGS += $(PRODUCER_LIB_DIR)
|
||||
|
||||
include $(TOPDIR)/Make/makerules
|
||||
|
||||
Reference in New Issue
Block a user