Merge pull request #2461 from assimp/issue_2459
closes https://github.com/assimp/assimp/issues/2459: fix duplicated f…pull/2427/head^2
commit
5bee5307e4
|
@ -59,12 +59,11 @@ namespace FBX {
|
|||
class Node;
|
||||
}
|
||||
|
||||
class FBX::Node
|
||||
{
|
||||
public: // public data members
|
||||
class FBX::Node {
|
||||
public:
|
||||
// TODO: accessors
|
||||
std::string name; // node name
|
||||
std::vector<FBX::Property> properties; // node properties
|
||||
std::vector<FBX::FBXExportProperty> properties; // node properties
|
||||
std::vector<FBX::Node> children; // child nodes
|
||||
|
||||
// some nodes always pretend they have children...
|
||||
|
@ -215,7 +214,7 @@ public: // static member functions
|
|||
Assimp::StreamWriterLE& s,
|
||||
bool binary, int indent
|
||||
) {
|
||||
FBX::Property p(value);
|
||||
FBX::FBXExportProperty p(value);
|
||||
FBX::Node node(name, p);
|
||||
node.Dump(s, binary, indent);
|
||||
}
|
||||
|
|
|
@ -53,121 +53,145 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
#include <sstream> // ostringstream
|
||||
|
||||
namespace Assimp {
|
||||
namespace FBX {
|
||||
|
||||
// constructors for single element properties
|
||||
|
||||
FBX::Property::Property(bool v)
|
||||
: type('C'), data(1)
|
||||
{
|
||||
data = {uint8_t(v)};
|
||||
FBXExportProperty::FBXExportProperty(bool v)
|
||||
: type('C')
|
||||
, data(1) {
|
||||
data = {
|
||||
uint8_t(v)
|
||||
};
|
||||
}
|
||||
|
||||
FBX::Property::Property(int16_t v) : type('Y'), data(2)
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(int16_t v)
|
||||
: type('Y')
|
||||
, data(2) {
|
||||
uint8_t* d = data.data();
|
||||
(reinterpret_cast<int16_t*>(d))[0] = v;
|
||||
}
|
||||
|
||||
FBX::Property::Property(int32_t v) : type('I'), data(4)
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(int32_t v)
|
||||
: type('I')
|
||||
, data(4) {
|
||||
uint8_t* d = data.data();
|
||||
(reinterpret_cast<int32_t*>(d))[0] = v;
|
||||
}
|
||||
|
||||
FBX::Property::Property(float v) : type('F'), data(4)
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(float v)
|
||||
: type('F')
|
||||
, data(4) {
|
||||
uint8_t* d = data.data();
|
||||
(reinterpret_cast<float*>(d))[0] = v;
|
||||
}
|
||||
|
||||
FBX::Property::Property(double v) : type('D'), data(8)
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(double v)
|
||||
: type('D')
|
||||
, data(8) {
|
||||
uint8_t* d = data.data();
|
||||
(reinterpret_cast<double*>(d))[0] = v;
|
||||
}
|
||||
|
||||
FBX::Property::Property(int64_t v) : type('L'), data(8)
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(int64_t v)
|
||||
: type('L')
|
||||
, data(8) {
|
||||
uint8_t* d = data.data();
|
||||
(reinterpret_cast<int64_t*>(d))[0] = v;
|
||||
}
|
||||
|
||||
|
||||
// constructors for array-type properties
|
||||
|
||||
FBX::Property::Property(const char* c, bool raw)
|
||||
: Property(std::string(c), raw)
|
||||
{}
|
||||
FBXExportProperty::FBXExportProperty(const char* c, bool raw)
|
||||
: FBXExportProperty(std::string(c), raw) {
|
||||
// empty
|
||||
}
|
||||
|
||||
// strings can either be saved as "raw" (R) data, or "string" (S) data
|
||||
FBX::Property::Property(const std::string& s, bool raw)
|
||||
: type(raw ? 'R' : 'S'), data(s.size())
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(const std::string& s, bool raw)
|
||||
: type(raw ? 'R' : 'S')
|
||||
, data(s.size()) {
|
||||
for (size_t i = 0; i < s.size(); ++i) {
|
||||
data[i] = uint8_t(s[i]);
|
||||
}
|
||||
}
|
||||
|
||||
FBX::Property::Property(const std::vector<uint8_t>& r)
|
||||
: type('R'), data(r)
|
||||
{}
|
||||
FBXExportProperty::FBXExportProperty(const std::vector<uint8_t>& r)
|
||||
: type('R')
|
||||
, data(r) {
|
||||
// empty
|
||||
}
|
||||
|
||||
FBX::Property::Property(const std::vector<int32_t>& va)
|
||||
: type('i'), data(4*va.size())
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(const std::vector<int32_t>& va)
|
||||
: type('i')
|
||||
, data(4 * va.size() ) {
|
||||
int32_t* d = reinterpret_cast<int32_t*>(data.data());
|
||||
for (size_t i = 0; i < va.size(); ++i) { d[i] = va[i]; }
|
||||
for (size_t i = 0; i < va.size(); ++i) {
|
||||
d[i] = va[i];
|
||||
}
|
||||
}
|
||||
|
||||
FBX::Property::Property(const std::vector<int64_t>& va)
|
||||
: type('l'), data(8*va.size())
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(const std::vector<int64_t>& va)
|
||||
: type('l')
|
||||
, data(8 * va.size()) {
|
||||
int64_t* d = reinterpret_cast<int64_t*>(data.data());
|
||||
for (size_t i = 0; i < va.size(); ++i) { d[i] = va[i]; }
|
||||
for (size_t i = 0; i < va.size(); ++i) {
|
||||
d[i] = va[i];
|
||||
}
|
||||
}
|
||||
|
||||
FBX::Property::Property(const std::vector<float>& va)
|
||||
: type('f'), data(4*va.size())
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(const std::vector<float>& va)
|
||||
: type('f')
|
||||
, data(4 * va.size()) {
|
||||
float* d = reinterpret_cast<float*>(data.data());
|
||||
for (size_t i = 0; i < va.size(); ++i) { d[i] = va[i]; }
|
||||
for (size_t i = 0; i < va.size(); ++i) {
|
||||
d[i] = va[i];
|
||||
}
|
||||
}
|
||||
|
||||
FBX::Property::Property(const std::vector<double>& va)
|
||||
: type('d'), data(8*va.size())
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(const std::vector<double>& va)
|
||||
: type('d')
|
||||
, data(8 * va.size()) {
|
||||
double* d = reinterpret_cast<double*>(data.data());
|
||||
for (size_t i = 0; i < va.size(); ++i) { d[i] = va[i]; }
|
||||
for (size_t i = 0; i < va.size(); ++i) {
|
||||
d[i] = va[i];
|
||||
}
|
||||
}
|
||||
|
||||
FBX::Property::Property(const aiMatrix4x4& vm)
|
||||
: type('d'), data(8*16)
|
||||
{
|
||||
FBXExportProperty::FBXExportProperty(const aiMatrix4x4& vm)
|
||||
: type('d')
|
||||
, data(8 * 16) {
|
||||
double* d = reinterpret_cast<double*>(data.data());
|
||||
for (unsigned int c = 0; c < 4; ++c) {
|
||||
for (unsigned int r = 0; r < 4; ++r) {
|
||||
d[4*c+r] = vm[r][c];
|
||||
d[4 * c + r] = vm[r][c];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// public member functions
|
||||
|
||||
size_t FBX::Property::size()
|
||||
{
|
||||
size_t FBXExportProperty::size() {
|
||||
switch (type) {
|
||||
case 'C': case 'Y': case 'I': case 'F': case 'D': case 'L':
|
||||
case 'C':
|
||||
case 'Y':
|
||||
case 'I':
|
||||
case 'F':
|
||||
case 'D':
|
||||
case 'L':
|
||||
return data.size() + 1;
|
||||
case 'S': case 'R':
|
||||
case 'S':
|
||||
case 'R':
|
||||
return data.size() + 5;
|
||||
case 'i': case 'd':
|
||||
case 'i':
|
||||
case 'd':
|
||||
return data.size() + 13;
|
||||
default:
|
||||
throw DeadlyExportError("Requested size on property of unknown type");
|
||||
}
|
||||
}
|
||||
|
||||
void FBX::Property::DumpBinary(Assimp::StreamWriterLE &s)
|
||||
{
|
||||
void FBXExportProperty::DumpBinary(Assimp::StreamWriterLE& s) {
|
||||
s.PutU1(type);
|
||||
uint8_t* d = data.data();
|
||||
size_t N;
|
||||
|
@ -231,8 +255,7 @@ void FBX::Property::DumpBinary(Assimp::StreamWriterLE &s)
|
|||
}
|
||||
}
|
||||
|
||||
void FBX::Property::DumpAscii(Assimp::StreamWriterLE &outstream, int indent)
|
||||
{
|
||||
void FBXExportProperty::DumpAscii(Assimp::StreamWriterLE& outstream, int indent) {
|
||||
std::ostringstream ss;
|
||||
ss.imbue(std::locale::classic());
|
||||
ss.precision(15); // this seems to match official FBX SDK exports
|
||||
|
@ -240,8 +263,7 @@ void FBX::Property::DumpAscii(Assimp::StreamWriterLE &outstream, int indent)
|
|||
outstream.PutString(ss.str());
|
||||
}
|
||||
|
||||
void FBX::Property::DumpAscii(std::ostream& s, int indent)
|
||||
{
|
||||
void FBXExportProperty::DumpAscii(std::ostream& s, int indent) {
|
||||
// no writing type... or anything. just shove it into the stream.
|
||||
uint8_t* d = data.data();
|
||||
size_t N;
|
||||
|
@ -359,6 +381,9 @@ void FBX::Property::DumpAscii(std::ostream& s, int indent)
|
|||
throw runtime_error(err.str());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // Namespace FBX
|
||||
} // Namespace Assimp
|
||||
|
||||
#endif // ASSIMP_BUILD_NO_FBX_EXPORTER
|
||||
#endif // ASSIMP_BUILD_NO_EXPORT
|
||||
|
|
|
@ -47,7 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
#ifndef ASSIMP_BUILD_NO_FBX_EXPORTER
|
||||
|
||||
|
||||
#include <assimp/types.h> // aiMatrix4x4
|
||||
#include <assimp/StreamWriter.h> // StreamWriterLE
|
||||
|
||||
|
@ -58,10 +57,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
namespace Assimp {
|
||||
namespace FBX {
|
||||
class Property;
|
||||
}
|
||||
|
||||
/** FBX::Property
|
||||
/** @brief FBX::Property
|
||||
*
|
||||
* Holds a value of any of FBX's recognized types,
|
||||
* each represented by a particular one-character code.
|
||||
|
@ -79,35 +76,34 @@ namespace FBX {
|
|||
* S : string (array of 1-byte char)
|
||||
* R : raw data (array of bytes)
|
||||
*/
|
||||
class FBX::Property
|
||||
{
|
||||
class FBXExportProperty {
|
||||
public:
|
||||
// constructors for basic types.
|
||||
// all explicit to avoid accidental typecasting
|
||||
explicit Property(bool v);
|
||||
explicit FBXExportProperty(bool v);
|
||||
// TODO: determine if there is actually a byte type,
|
||||
// or if this always means <bool>. 'C' seems to imply <char>,
|
||||
// so possibly the above was intended to represent both.
|
||||
explicit Property(int16_t v);
|
||||
explicit Property(int32_t v);
|
||||
explicit Property(float v);
|
||||
explicit Property(double v);
|
||||
explicit Property(int64_t v);
|
||||
explicit FBXExportProperty(int16_t v);
|
||||
explicit FBXExportProperty(int32_t v);
|
||||
explicit FBXExportProperty(float v);
|
||||
explicit FBXExportProperty(double v);
|
||||
explicit FBXExportProperty(int64_t v);
|
||||
// strings can either be stored as 'R' (raw) or 'S' (string) type
|
||||
explicit Property(const char* c, bool raw=false);
|
||||
explicit Property(const std::string& s, bool raw=false);
|
||||
explicit Property(const std::vector<uint8_t>& r);
|
||||
explicit Property(const std::vector<int32_t>& va);
|
||||
explicit Property(const std::vector<int64_t>& va);
|
||||
explicit Property(const std::vector<double>& va);
|
||||
explicit Property(const std::vector<float>& va);
|
||||
explicit Property(const aiMatrix4x4& vm);
|
||||
explicit FBXExportProperty(const char* c, bool raw = false);
|
||||
explicit FBXExportProperty(const std::string& s, bool raw = false);
|
||||
explicit FBXExportProperty(const std::vector<uint8_t>& r);
|
||||
explicit FBXExportProperty(const std::vector<int32_t>& va);
|
||||
explicit FBXExportProperty(const std::vector<int64_t>& va);
|
||||
explicit FBXExportProperty(const std::vector<double>& va);
|
||||
explicit FBXExportProperty(const std::vector<float>& va);
|
||||
explicit FBXExportProperty(const aiMatrix4x4& vm);
|
||||
|
||||
// this will catch any type not defined above,
|
||||
// so that we don't accidentally convert something we don't want.
|
||||
// for example (const char*) --> (bool)... seriously wtf C++
|
||||
template <class T>
|
||||
explicit Property(T v) : type('X') {
|
||||
explicit FBXExportProperty(T v) : type('X') {
|
||||
static_assert(std::is_void<T>::value, "TRIED TO CREATE FBX PROPERTY WITH UNSUPPORTED TYPE, CHECK YOUR PROPERTY INSTANTIATION");
|
||||
} // note: no line wrap so it appears verbatim on the compiler error
|
||||
|
||||
|
@ -115,16 +111,19 @@ public:
|
|||
size_t size();
|
||||
|
||||
// write this property node as binary data to the given stream
|
||||
void DumpBinary(Assimp::StreamWriterLE &s);
|
||||
void DumpAscii(Assimp::StreamWriterLE &s, int indent=0);
|
||||
void DumpAscii(std::ostream &s, int indent=0);
|
||||
void DumpBinary(Assimp::StreamWriterLE& s);
|
||||
void DumpAscii(Assimp::StreamWriterLE& s, int indent = 0);
|
||||
void DumpAscii(std::ostream& s, int indent = 0);
|
||||
// note: make sure the ostream is in classic "C" locale
|
||||
|
||||
private:
|
||||
char type;
|
||||
std::vector<uint8_t> data;
|
||||
};
|
||||
}
|
||||
|
||||
} // Namespace FBX
|
||||
} // Namespace Assimp
|
||||
|
||||
#endif // ASSIMP_BUILD_NO_FBX_EXPORTER
|
||||
|
||||
#endif // AI_FBXEXPORTPROPERTY_H_INC
|
||||
|
|
|
@ -2271,8 +2271,8 @@ void FBXExporter::WriteModelNode(
|
|||
|
||||
// not sure what these are for,
|
||||
// but they seem to be omnipresent
|
||||
m.AddChild("Shading", Property(true));
|
||||
m.AddChild("Culling", Property("CullingOff"));
|
||||
m.AddChild("Shading", FBXExportProperty(true));
|
||||
m.AddChild("Culling", FBXExportProperty("CullingOff"));
|
||||
|
||||
m.Dump(outstream, binary, 1);
|
||||
}
|
||||
|
@ -2385,7 +2385,7 @@ void FBXExporter::WriteModelNodes(
|
|||
na.AddProperties(
|
||||
node_attribute_uid, FBX::SEPARATOR + "NodeAttribute", "LimbNode"
|
||||
);
|
||||
na.AddChild("TypeFlags", Property("Skeleton"));
|
||||
na.AddChild("TypeFlags", FBXExportProperty("Skeleton"));
|
||||
na.Dump(outstream, binary, 1);
|
||||
// and connect them
|
||||
connections.emplace_back("C", "OO", node_attribute_uid, node_uid);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.412856994)
|
||||
comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.3297435427)
|
||||
element vertex 8
|
||||
property float x
|
||||
property float y
|
||||
|
|
Loading…
Reference in New Issue