Updates to docs and fixes to a few warnings.
This commit is contained in:
parent
f5560936a4
commit
c999dfb154
41
INSTALL
41
INSTALL
@ -378,3 +378,44 @@ STLport under IRIX with MipsPro7.2
|
||||
of using STLport own iostreams is required, which is in contrast to
|
||||
the situation under Windows as outlined above. Let us know how you
|
||||
get on.
|
||||
|
||||
|
||||
RedHat 7.1 & GLU1.3
|
||||
-------------------
|
||||
|
||||
I have posted a simple fix for those of us who have been unable to
|
||||
correctly build OSG 0.8.43 on Redhat 7.2. You can download it
|
||||
at www.terrainengine.com/fixosg.tar.gz.
|
||||
|
||||
To install it, follow these steps:
|
||||
|
||||
English
|
||||
-----------
|
||||
1) Untar the tarball. It will create a directory called fixosg/
|
||||
2) Change to the fixosg/ directory
|
||||
3) Become root
|
||||
4) Run the script called fixosg
|
||||
|
||||
Cmd line
|
||||
-------------
|
||||
tar xvzf fixosg.tar.gz
|
||||
cd fixosg/
|
||||
su
|
||||
(your root password)
|
||||
./fixosg
|
||||
exit
|
||||
|
||||
You should then be able to do a "make" in your OSG directory and
|
||||
everything will build as it should. Let me know if this doesn't
|
||||
work and I will try to improve it. Email me directly for help instead of
|
||||
posting here.
|
||||
|
||||
There's a README in the tarball with some info on what the script
|
||||
actually does. There's nothing wrong with OSG itself; the
|
||||
problem with Redhat 7.2 is that it doesn't have GLU 1.3 by default,
|
||||
which OSG is now dependent on (for osgText.)
|
||||
|
||||
Good luck everyone.
|
||||
|
||||
- Clay
|
||||
<clayfowler@earthlink.net>
|
||||
|
@ -115,7 +115,7 @@ class OSGTEXT_EXPORT RasterFont:public Font
|
||||
RasterFont():Font(){}
|
||||
RasterFont(const RasterFont& font,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
|
||||
Font(font,copyop) {}
|
||||
RasterFont(const std::string& font):Font() {}
|
||||
RasterFont(const std::string& /*font*/):Font() {}
|
||||
|
||||
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const RasterFont *>(obj)!=NULL; }
|
||||
virtual const char* className() const { return "RasterFont"; }
|
||||
@ -132,7 +132,7 @@ class OSGTEXT_EXPORT VectorFont:public Font
|
||||
VectorFont():Font(){}
|
||||
VectorFont(const VectorFont& font,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
|
||||
Font(font,copyop) {}
|
||||
VectorFont(const std::string& font):Font(){}
|
||||
VectorFont(const std::string& /*font*/):Font(){}
|
||||
|
||||
virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const VectorFont *>(obj)!=NULL; }
|
||||
virtual const char* className() const { return "VectorFont"; }
|
||||
|
@ -264,8 +264,8 @@ const double Camera::left() const
|
||||
{
|
||||
case(FRUSTUM):
|
||||
case(PERSPECTIVE): return _left * _zNear;
|
||||
default: return _left;
|
||||
}
|
||||
return _left;
|
||||
}
|
||||
const double Camera::right() const
|
||||
{
|
||||
@ -273,8 +273,8 @@ const double Camera::right() const
|
||||
{
|
||||
case(FRUSTUM):
|
||||
case(PERSPECTIVE): return _right * _zNear;
|
||||
default: return _right;
|
||||
}
|
||||
return _right;
|
||||
}
|
||||
|
||||
const double Camera::top() const
|
||||
@ -283,8 +283,8 @@ const double Camera::top() const
|
||||
{
|
||||
case(FRUSTUM):
|
||||
case(PERSPECTIVE): return _top * _zNear;
|
||||
default: return _top;
|
||||
}
|
||||
return _top;
|
||||
}
|
||||
|
||||
const double Camera::bottom() const
|
||||
@ -293,8 +293,8 @@ const double Camera::bottom() const
|
||||
{
|
||||
case(FRUSTUM):
|
||||
case(PERSPECTIVE): return _bottom * _zNear;
|
||||
default: return _bottom;
|
||||
}
|
||||
return _bottom;
|
||||
}
|
||||
|
||||
const double Camera::zNear() const
|
||||
@ -502,6 +502,8 @@ void Camera::dirtyTransform()
|
||||
notify(WARN)<<"Warning: Camera::dirtyTransform() failed to invert _eyeToModelTransform"<<std::endl;
|
||||
}
|
||||
break;
|
||||
default: // NO_ATTACHED_TRANSFORM
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -44,12 +44,12 @@ void NodeVisitor::setTraversalVisitor(NodeVisitor* nv)
|
||||
else _traversalMode = TRAVERSE_NONE;
|
||||
}
|
||||
|
||||
const bool getLocalToWorldMatrix(Matrix& matrix, MatrixMode mode)
|
||||
const bool NodeVisitor::getLocalToWorldMatrix(Matrix& /*matrix*/, MatrixMode /*mode*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
const bool getWorldToLocalMatrix(Matrix& matrix, MatrixMode mode)
|
||||
const bool NodeVisitor::getWorldToLocalMatrix(Matrix& /*matrix*/, MatrixMode /*mode*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@ -650,10 +650,8 @@ ReaderWriter::ReadResult Registry::readObject(const std::string& fileName)
|
||||
{
|
||||
return ReaderWriter::ReadResult("Warning: Could not find plugin to read objects from file \""+fileName+"\".");
|
||||
}
|
||||
else
|
||||
{
|
||||
return results.front();
|
||||
}
|
||||
|
||||
return results.front();
|
||||
}
|
||||
|
||||
|
||||
@ -698,10 +696,8 @@ ReaderWriter::WriteResult Registry::writeObject(const Object& obj,const std::str
|
||||
{
|
||||
return ReaderWriter::WriteResult("Warning: Could not find plugin to write objects to file \""+fileName+"\".");
|
||||
}
|
||||
else
|
||||
{
|
||||
return results.front();
|
||||
}
|
||||
|
||||
return results.front();
|
||||
}
|
||||
|
||||
|
||||
@ -750,10 +746,8 @@ ReaderWriter::ReadResult Registry::readImage(const std::string& fileName)
|
||||
{
|
||||
return ReaderWriter::ReadResult("Warning: Could not find plugin to read image from file \""+fileName+"\".");
|
||||
}
|
||||
else
|
||||
{
|
||||
return results.front();
|
||||
}
|
||||
|
||||
return results.front();
|
||||
}
|
||||
|
||||
|
||||
@ -798,10 +792,8 @@ ReaderWriter::WriteResult Registry::writeImage(const Image& image,const std::str
|
||||
{
|
||||
return ReaderWriter::WriteResult("Warning: Could not find plugin to write image to file \""+fileName+"\".");
|
||||
}
|
||||
else
|
||||
{
|
||||
return results.front();
|
||||
}
|
||||
|
||||
return results.front();
|
||||
}
|
||||
|
||||
|
||||
@ -859,10 +851,8 @@ ReaderWriter::ReadResult Registry::readNode(const std::string& fileName)
|
||||
{
|
||||
return ReaderWriter::ReadResult("Warning: Could not find plugin to read nodes from file \""+fileName+"\".");
|
||||
}
|
||||
else
|
||||
{
|
||||
return results.front();
|
||||
}
|
||||
|
||||
return results.front();
|
||||
}
|
||||
|
||||
|
||||
@ -907,8 +897,6 @@ ReaderWriter::WriteResult Registry::writeNode(const Node& node,const std::string
|
||||
{
|
||||
return ReaderWriter::WriteResult("Warning: Could not find plugin to write nodes to file \""+fileName+"\".");
|
||||
}
|
||||
else
|
||||
{
|
||||
return results.front();
|
||||
}
|
||||
|
||||
return results.front();
|
||||
}
|
||||
|
@ -52,7 +52,7 @@ FTGLTextureFont::~FTGLTextureFont()
|
||||
// mrn@changes
|
||||
bool FTGLTextureFont::MakeGlyphList(unsigned int renderContext)
|
||||
{
|
||||
FTGlyphContainer* glyphList=_contextGlyphList[renderContext];
|
||||
// FTGlyphContainer* glyphList=_contextGlyphList[renderContext];
|
||||
|
||||
// check the context
|
||||
while (glContextTextureID.size() <= renderContext)
|
||||
|
@ -7,7 +7,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
void CALLBACK ftglError( GLenum errCode)
|
||||
void CALLBACK ftglError( GLenum /*errCode*/)
|
||||
{
|
||||
// const GLubyte* estring;
|
||||
// estring = gluErrorString( errCode);
|
||||
|
Loading…
Reference in New Issue
Block a user