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

- fbx: Objects now carry their ID.

Browse Source
This commit is contained in:
Alexander Gessler
2012-07-03 19:36:38 +02:00
parent 8a12b179a6
commit effcaf066a
4 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/FBXMaterial.cpp
View File

@@ -58,8 +58,8 @@ namespace FBX {
using namespace Util;
// ------------------------------------------------------------------------------------------------
Material::Material(const Element& element, const Document& doc, const std::string& name)
: Object(element,name)
Material::Material(uint64_t id, const Element& element, const Document& doc, const std::string& name)
: Object(id,element,name)
{
const Scope& sc = GetRequiredScope(element);
@@ -92,6 +92,9 @@ Material::Material(const Element& element, const Document& doc, const std::strin
}
props = GetPropertyTable(doc,templateName,element,sc);
// resolve texture links
doc.GetConnectionsByDestinationSequenced(ID());
}
@@ -102,8 +105,8 @@ Material::~Material()
// ------------------------------------------------------------------------------------------------
Texture::Texture(const Element& element, const Document& doc, const std::string& name)
: Object(element,name)
Texture::Texture(uint64_t id, const Element& element, const Document& doc, const std::string& name)
: Object(id,element,name)
, uvScaling(1.0f,1.0f)
{
const Scope& sc = GetRequiredScope(element);