Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fbx: add ImportSettings to keep track of fbx-specific import settings. The settings are generated by the importer instance and injected into parser and DOM.

Browse Source
This commit is contained in:
Alexander Gessler
2012-06-28 19:16:14 +02:00
parent 6c985b9960
commit 05bc8ab684
6 changed files with 101 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/FBXDocument.cpp
View File

@@ -49,6 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "FBXDocument.h"
#include "FBXUtil.h"
#include "FBXImporter.h"
#include "FBXImportSettings.h"
namespace Assimp {
namespace FBX {
@@ -307,8 +308,9 @@ void ReadVectorDataArray(std::vector<unsigned int>& out, const Element& el)
// ------------------------------------------------------------------------------------------------
LazyObject::LazyObject(const Element& element)
: element(element)
LazyObject::LazyObject(const Element& element, const ImportSettings& settings)
: settings(settings)
, element(element)
{
}
@@ -350,7 +352,7 @@ const Object* LazyObject::Get()
if (!strncmp(obtype,"Geometry",static_cast<size_t>(key.end()-key.begin()))) {
if (!strcmp(classtag.c_str(),"Mesh")) {
object = new MeshGeometry(element,name);
object = new MeshGeometry(element,name,settings);
}
}
@@ -389,7 +391,7 @@ Geometry::~Geometry()
}
// ------------------------------------------------------------------------------------------------
MeshGeometry::MeshGeometry(const Element& element, const std::string& name)
MeshGeometry::MeshGeometry(const Element& element, const std::string& name, const ImportSettings& settings)
: Geometry(element,name)
{
const Scope* sc = element.Compound();
@@ -456,6 +458,8 @@ MeshGeometry::MeshGeometry(const Element& element, const std::string& name)
mappings[mapping_offsets[absi] + mapping_counts[absi]++] = cursor;
}
if(settings.readAllLayers)
// ignore all but the first layer, but warn about any further layers
for (ElementMap::const_iterator it = Layer.first; it != Layer.second; ++it) {
const TokenList& tokens = (*it).second->Tokens();
@@ -784,8 +788,9 @@ void MeshGeometry::ReadVertexDataMaterials(std::vector<unsigned int>& materials_
// ------------------------------------------------------------------------------------------------
Document::Document(const Parser& parser)
Document::Document(const Parser& parser, const ImportSettings& settings)
: parser(parser)
, settings(settings)
{
const Scope& sc = parser.GetRootScope();
@@ -811,7 +816,7 @@ Document::Document(const Parser& parser)
DOMError(err,el.second);
}
objects[id] = new LazyObject(*el.second);
objects[id] = new LazyObject(*el.second, settings);
// DEBUG - evaluate all objects
const Object* o = objects[id]->Get();
}