From 8dea265a919f1caae76e3fe7ab21503cb34ae0fb Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 18 Jul 2019 12:44:59 +0100 Subject: [PATCH] Fixed indentation --- src/osgPlugins/obj/OBJWriterNodeVisitor.cpp | 11 ++++++----- src/osgPlugins/obj/OBJWriterNodeVisitor.h | 22 ++++++++++----------- src/osgPlugins/obj/ReaderWriterOBJ.cpp | 10 +++++----- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/osgPlugins/obj/OBJWriterNodeVisitor.cpp b/src/osgPlugins/obj/OBJWriterNodeVisitor.cpp index 7ba1d5547..30be4b164 100644 --- a/src/osgPlugins/obj/OBJWriterNodeVisitor.cpp +++ b/src/osgPlugins/obj/OBJWriterNodeVisitor.cpp @@ -443,11 +443,12 @@ OBJWriterNodeVisitor::OBJMaterial::OBJMaterial(osg::Material* mat, osg::Texture* if (tex) { osg::Image* img = tex->getImage(0); - if ((img) && (!img->getFileName().empty())) { - image = img->getFileName(); - if(outputTextureFiles) - osgDB::writeImageFile(*img, image, options); - } + if ((img) && (!img->getFileName().empty())) + { + image = img->getFileName(); + if(outputTextureFiles) + osgDB::writeImageFile(*img, image, options); + } } } diff --git a/src/osgPlugins/obj/OBJWriterNodeVisitor.h b/src/osgPlugins/obj/OBJWriterNodeVisitor.h index 243296f25..2d5c71b26 100644 --- a/src/osgPlugins/obj/OBJWriterNodeVisitor.h +++ b/src/osgPlugins/obj/OBJWriterNodeVisitor.h @@ -56,9 +56,9 @@ class OBJWriterNodeVisitor: public osg::NodeVisitor { _currentStateSet(new osg::StateSet()), _lastVertexIndex(1), _lastNormalIndex(1), - _lastTexIndex(1), - _outputTextureFiles(outputTextureFiles), - _options(options) + _lastTexIndex(1), + _outputTextureFiles(outputTextureFiles), + _options(options) { _fout << "# file written by OpenSceneGraph" << std::endl << std::endl; @@ -149,15 +149,15 @@ class OBJWriterNodeVisitor: public osg::NodeVisitor { typedef std::map< osg::ref_ptr, OBJMaterial, CompareStateSet> MaterialMap; - std::ostream& _fout; - std::list _nameStack; - StateSetStack _stateSetStack; - osg::ref_ptr _currentStateSet; - std::map _nameMap; + std::ostream& _fout; + std::list _nameStack; + StateSetStack _stateSetStack; + osg::ref_ptr _currentStateSet; + std::map _nameMap; unsigned int _lastVertexIndex, _lastNormalIndex, _lastTexIndex; - MaterialMap _materialMap; - bool _outputTextureFiles; - osg::ref_ptr _options; + MaterialMap _materialMap; + bool _outputTextureFiles; + osg::ref_ptr _options; }; diff --git a/src/osgPlugins/obj/ReaderWriterOBJ.cpp b/src/osgPlugins/obj/ReaderWriterOBJ.cpp index 773469d1f..4b452815d 100644 --- a/src/osgPlugins/obj/ReaderWriterOBJ.cpp +++ b/src/osgPlugins/obj/ReaderWriterOBJ.cpp @@ -75,7 +75,7 @@ public: supportsOption("NsIfNotPresent=", "set specular exponent if not present"); supportsOption("precision=","Set the floating point precision when writing out files"); - supportsOption("OutputTextureFiles", "Write out the texture images to file"); + supportsOption("OutputTextureFiles", "Write out the texture images to file"); } virtual const char* className() const { return "Wavefront OBJ Reader"; } @@ -884,10 +884,10 @@ ReaderWriterOBJ::ObjOptionsStruct ReaderWriterOBJ::parseOptions(const osgDB::Rea { localOptions.noReverseFaces = true; } - else if (pre_equals == "OutputTextureFiles") - { - localOptions.outputTextureFiles = true; - } + else if (pre_equals == "OutputTextureFiles") + { + localOptions.outputTextureFiles = true; + } else if (pre_equals == "precision") { int val = std::atoi(post_equals.c_str());