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

Merge pull request #174 from etlapale/obj_plugin_improvements

Browse Source 
Improvements for the OBJ writer plugin
This commit is contained in:
OpenSceneGraph git repository
2016-12-13 11:42:57 +00:00
committed by GitHub
parent d57a67e31c 34fb582074
commit ca6578026a
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/obj/OBJWriterNodeVisitor.h
View File

@@ -69,6 +69,7 @@ class OBJWriterNodeVisitor: public osg::NodeVisitor {
virtual void apply(osg::Group &node)
{
pushStateSet(node.getStateSet());
_nameStack.push_back( node.getName().empty() ? node.className() : node.getName() );
_fout << std::endl;
@@ -77,6 +78,7 @@ class OBJWriterNodeVisitor: public osg::NodeVisitor {
traverse( node );
_nameStack.pop_back();
popStateSet(node.getStateSet());
}
void traverse (osg::Node &node)

26
src/osgPlugins/obj/ReaderWriterOBJ.cpp
View File

@@ -21,6 +21,7 @@
#endif
#include <stdlib.h>
#include <limits>
#include <string>
#include <osg/Notify>
@@ -72,6 +73,7 @@ public:
supportsOption("DISPLACEMENT=<unit>", "Set texture unit for displacement texture");
supportsOption("REFLECTION=<unit>", "Set texture unit for reflection texture");
supportsOption("precision=<digits>","Set the floating point precision when writing out files");
}
virtual const char* className() const { return "Wavefront OBJ Reader"; }
@@ -89,12 +91,16 @@ public:
return WriteResult(WriteResult::FILE_NOT_HANDLED);
}
virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* /*options*/ =NULL) const
virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* options=NULL) const
{
if (!acceptsExtension(osgDB::getFileExtension(fileName)))
return WriteResult(WriteResult::FILE_NOT_HANDLED);
ObjOptionsStruct localOptions = parseOptions(options);
osgDB::ofstream f(fileName.c_str());
f.precision(localOptions.precision);
std::string materialFile = osgDB::getNameLessExtension(fileName) + ".mtl";
OBJWriterNodeVisitor nv(f, osgDB::getSimpleFileName(materialFile));
@@ -117,8 +123,11 @@ public:
return WriteResult(WriteResult::FILE_NOT_HANDLED);
}
virtual WriteResult writeNode(const osg::Node& node,std::ostream& fout,const Options* =NULL) const
virtual WriteResult writeNode(const osg::Node& node,std::ostream& fout,const Options* options=NULL) const
{
ObjOptionsStruct localOptions = parseOptions(options);
fout.precision(localOptions.precision);
// writing to a stream does not support materials
OBJWriterNodeVisitor nv(fout);
@@ -144,6 +153,8 @@ protected:
// otherwise overriden
typedef std::vector< std::pair<int,obj::Material::Map::TextureMapType> > TextureAllocationMap;
TextureAllocationMap textureUnitAllocation;
/// Coordinates precision.
int precision;
};
typedef std::map< std::string, osg::ref_ptr<osg::StateSet> > MaterialToStateSetMap;
@@ -826,6 +837,7 @@ ReaderWriterOBJ::ObjOptionsStruct ReaderWriterOBJ::parseOptions(const osgDB::Rea
localOptions.generateFacetNormals = false;
localOptions.fixBlackMaterials = true;
localOptions.noReverseFaces = false;
localOptions.precision = std::numeric_limits<double>::digits10 + 2;
if (options!=NULL)
{
@@ -868,6 +880,16 @@ ReaderWriterOBJ::ObjOptionsStruct ReaderWriterOBJ::parseOptions(const osgDB::Rea
{
localOptions.noReverseFaces = true;
}
else if (pre_equals == "precision")
{
int val = std::atoi(post_equals.c_str());
if (val <= 0) {
OSG_NOTICE << "Warning: invalid precision value: " << post_equals << std::endl;
}
else {
localOptions.precision = val;
}
}
else if (post_equals.length()>0)
{
obj::Material::Map::TextureMapType type = obj::Material::Map::UNKNOWN;