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

Changed build OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to ON and then fixed all the resulting build errors.

Browse Source
This commit is contained in:
Robert Osfield
2009-06-17 10:39:39 +00:00
parent 7c4225e574
commit ad8f2d8974
17 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/present3D/ReaderWriterPaths.cpp
View File

@@ -93,7 +93,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(const std::string&
std::ifstream input(fileName.c_str());
return readObject(input, local_opt);
return readObject(input, local_opt.get());
}
osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(std::istream& fin, const osgDB::Options* options) const
@@ -234,12 +234,12 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_rotation_path(std::istre
localValue.azim = currValue.azim *r + prevValue.azim * (1.0f-r);
localValue.elevation = currValue.elevation *r + prevValue.elevation * (1.0f-r);
localValue.addToPath(animation);
localValue.addToPath(animation.get());
}
}
else
{
currValue.addToPath(animation);
currValue.addToPath(animation.get());
}
prevValue = currValue;
first = false;