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

Compile fixes.

Browse Source
This commit is contained in:
Robert Osfield 2002-02-06 08:57:06 +00:00
parent a703130aa0
commit 95fb921953
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgDB/FileUtils.cpp
View File

@ -357,14 +357,14 @@ osgDB::DirectoryContents osgDB::getDirectoryContents(const std::string& dirName)
osgDB::DirectoryContents contents;
struct _finddata_t data;
long handle = _findfirst((dirName + "\\*").c_str(), &data);
long handle = FindFirstFile((dirName + "\\*").c_str(), &data);
if (handle != -1)
{
do
{
contents.push_back(data.name);
}
while (_findnext(handle, &data) != -1);
while (FindNextFile(handle, &data) != -1);
_findclose(handle);
}

12
src/osgUtil/Optimizer.cpp
View File

@ -328,14 +328,14 @@ void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Transform& transform)
}
else
{
if (_matrixStack.empty())
osg::ref_ptr<osg::Matrix> matrix = new osg::Matrix;
transform.getLocalToWorldMatrix(*matrix,this);
if (!_matrixStack.empty())
{
_matrixStack.push_back(transform.getLocalToWorldMatrix());
}
else
{
_matrixStack.push_back(transform.getLocalToWorldMatrix()*_matrixStack.back());
matrix->postMult(_matrixStack.back());
}
_matrixStack.push_back(*matrix);
_transformStack.push_back(&transform);