FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to osgProducer for IRIX build.

Browse Source
This commit is contained in:
Don BURNS
2003-01-27 20:40:08 +00:00
parent 4ad36f0212
commit cf1ff34d38
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Make/makerules
View File

@@ -116,8 +116,8 @@ $(EXEC:=.opt) :
@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(EXEC) __link
$(LIB:=.opt) : $(PLUGIN:=.opt)
@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
$(LIB:=.opt) :
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
@cd $(OPTDIR);\
$(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
THISDIR=../$(THISDIR)\
@@ -125,7 +125,7 @@ $(LIB:=.opt) : $(PLUGIN:=.opt)
@$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
$(PLUGIN:=.opt) :
@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
@cd $(OPTDIR); \
$(MAKE) -f ../Makefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
THISDIR=../$(THISDIR)\

5
src/Demos/osgproducer/Makefile
View File

@@ -5,7 +5,7 @@ CXXFILES =\
osgproducer_viewer.cpp\
# osgproducer_cameragroup.cpp\
LIBS += -losgProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
LIBS += -losgProducer -lProducer $(OSG_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
INSTFILES = \
$(CXXFILES)\
@@ -13,5 +13,8 @@ INSTFILES = \
EXEC = osgproducer
CXXFLAGS += $(OSG_INCLUDE_DIR)
LDFLAGS += $(OSG_LIB_DIR)
include $(TOPDIR)/Make/makerules

12
src/Demos/osgproducer/threePipe.cfg
View File

@@ -1,4 +1,4 @@
#define SINGLE_PIPE
//#define SINGLE_PIPE
#define ASSYMETRICAL_FRUSTUM
Camera "Camera 1"
@@ -19,7 +19,7 @@ Camera "Camera 1"
};
Offset {
#ifdef ASSYMETRICAL_FRUSTUM
Shear 2.0 0.0;
Shear 1.5 0.0;
#else
Rotate -90.0 1 0 0;
Rotate -45.0 0 0 1;
@@ -62,7 +62,7 @@ Camera "Camera 3"
};
Offset {
#ifdef ASSYMETRICAL_FRUSTUM
Shear -2.0 0.0;
Shear -1.5 0.0;
#else
Rotate -90.0 1 0 0;
Rotate 45.0 0 0 1;
@@ -74,9 +74,9 @@ Camera "Camera 3"
InputArea
{
RenderSurface "Window 1" : -1.0 0.0 0.0 1.0;
RenderSurface "Window 2" : 0.0 1.0 0.0 1.0;
RenderSurface "Window 3" : 1.0 2.0 0.0 1.0;
RenderSurface "Window 1" : -2.5 -0.5 -1.0 1.0;
RenderSurface "Window 2" : -1.0 1.0 -1.0 1.0;
RenderSurface "Window 3" : 0.5 2.5 -1.0 1.0;
}

2
src/osgProducer/CameraGroup.cpp
View File

@@ -138,7 +138,7 @@ void CameraGroup::advance()
CameraGroup::advance();
}
void CameraGroup::realize( ThreadingModel thread_model= SingleThreaded )
void CameraGroup::realize( ThreadingModel thread_model)
{
if( _initialized ) return;

3
src/osgProducer/Makefile
View File

@@ -13,4 +13,7 @@ DEF += -DOSGPRODUCER_LIBRARY
TARGET_BASENAME = osgProducer
LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)
CXXFLAGS += $(OSG_INCLUDE_DIR)
LDFLAGS += $(OSG_LIB_DIR)
include $(TOPDIR)/Make/makerules

2
src/osgProducer/SceneHandler.cpp
View File

@@ -8,7 +8,7 @@
using namespace osgUtil;
using namespace osgProducer;
SceneHandler::SceneHandler( osg::DisplaySettings *ds = NULL) :
SceneHandler::SceneHandler( osg::DisplaySettings *ds) :
osgUtil::SceneView(ds)
{
mm = new osg::RefMatrix;