Updates to docs and fixes to a few warnings.
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user