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

Fixes for IRIX build.

Browse Source
This commit is contained in:
Robert Osfield
2002-07-09 10:23:48 +00:00
parent 0c943945f7
commit aca7f7b216
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Demos/osgcluster/broadcaster.cpp
View File

@@ -20,16 +20,19 @@
#include <unistd.h>
#include <linux/sockios.h>
#elif defined(__FreeBSD__)
#include <unistd.h>
#include <sys/sockio.h>
#elif defined(__sgi)
#include <unistd.h>
#include <net/soioctl.h>
#elif defined(__CYGWIN__)
// nothing needed
#elif defined(__sun)
#include <unistd.h>
#include <sys/sockio.h>
#elif defined (__DARWIN_OSX__)
#include <sys/sockio.h>
#include <unistd.h>
#include <sys/sockio.h>
#elif defined (WIN32)
#include <winsock.h>
#include <stdio.h>

4
src/osgPlugins/osg/Geometry.cpp
View File

@@ -153,7 +153,7 @@ bool Geometry_readLocalData(Object& obj, Input& fr)
if (colors)
{
geom.setColorArray(colors);
iteratorAdvanced++;
iteratorAdvanced = true;
}
}
@@ -167,7 +167,7 @@ bool Geometry_readLocalData(Object& obj, Input& fr)
if (texcoords)
{
geom.setTexCoordArray(unit,texcoords);
iteratorAdvanced++;
iteratorAdvanced = true;
}
}

4
src/osgPlugins/pfb/ConvertFromPerformer.cpp
View File

@@ -718,7 +718,7 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
}
osg::StateSet* ConvertFromPerformer::visitGeoState(osg:Drawable* osgDrawable,pfGeoState* geostate)
osg::StateSet* ConvertFromPerformer::visitGeoState(osg::Drawable* osgDrawable,pfGeoState* geostate)
{
if (geostate==NULL) return NULL;
@@ -732,7 +732,7 @@ osg::StateSet* ConvertFromPerformer::visitGeoState(osg:Drawable* osgDrawable,pfG
osgStateSet = new osg::StateSet;
if (osgDrawable) osgDrawable->setStateSet(osgStateSet);
regisiterPfObjectForOsgObject(geostate,osgStateSet);
registerPfObjectForOsgObject(geostate,osgStateSet);
// Don could you fill in some of these blanks???
unsigned int inherit = geostate->getInherit();

2
src/osgPlugins/pfb/ConvertFromPerformer.h
View File

@@ -48,7 +48,7 @@ class ConvertFromPerformer {
int getNumVerts(pfGeoSet *gset);
osg::Drawable* visitGeoSet(osg::Geode* osgParent,pfGeoSet* geoset);
osg::StateSet* visitGeoState(osg::Drawable* osgGeoSet,pfGeoState* geostate);
osg::StateSet* visitGeoState(osg::Drawable* osgDrawble,pfGeoState* geostate);
osg::Material* visitMaterial(osg::StateSet* osgStateSet,pfMaterial* front_mat,pfMaterial* back_mat);
osg::Texture* visitTexture(osg::StateSet* osgStateSet,pfTexture* tex);