introduce simple skin-test +some findings.
parent
fadfaf88db
commit
206004c7d6
|
@ -1151,7 +1151,7 @@ namespace Assimp {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
size_t numAnimMeshes = animMeshes.size();
|
const size_t numAnimMeshes = animMeshes.size();
|
||||||
if (numAnimMeshes > 0) {
|
if (numAnimMeshes > 0) {
|
||||||
out_mesh->mNumAnimMeshes = static_cast<unsigned int>(numAnimMeshes);
|
out_mesh->mNumAnimMeshes = static_cast<unsigned int>(numAnimMeshes);
|
||||||
out_mesh->mAnimMeshes = new aiAnimMesh*[numAnimMeshes];
|
out_mesh->mAnimMeshes = new aiAnimMesh*[numAnimMeshes];
|
||||||
|
|
|
@ -69,8 +69,7 @@ LazyObject::LazyObject(uint64_t id, const Element& element, const Document& doc)
|
||||||
: doc(doc)
|
: doc(doc)
|
||||||
, element(element)
|
, element(element)
|
||||||
, id(id)
|
, id(id)
|
||||||
, flags()
|
, flags() {
|
||||||
{
|
|
||||||
// empty
|
// empty
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,7 +83,7 @@ LazyObject::~LazyObject()
|
||||||
const Object* LazyObject::Get(bool dieOnError)
|
const Object* LazyObject::Get(bool dieOnError)
|
||||||
{
|
{
|
||||||
if(IsBeingConstructed() || FailedToConstruct()) {
|
if(IsBeingConstructed() || FailedToConstruct()) {
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (object.get()) {
|
if (object.get()) {
|
||||||
|
@ -553,7 +552,7 @@ const std::vector<const AnimationStack*>& Document::AnimationStacks() const
|
||||||
LazyObject* Document::GetObject(uint64_t id) const
|
LazyObject* Document::GetObject(uint64_t id) const
|
||||||
{
|
{
|
||||||
ObjectMap::const_iterator it = objects.find(id);
|
ObjectMap::const_iterator it = objects.find(id);
|
||||||
return it == objects.end() ? NULL : (*it).second;
|
return it == objects.end() ? nullptr : (*it).second;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAX_CLASSNAMES 6
|
#define MAX_CLASSNAMES 6
|
||||||
|
@ -610,7 +609,7 @@ std::vector<const Connection*> Document::GetConnectionsSequenced(uint64_t id, bo
|
||||||
for (size_t i = 0; i < c; ++i) {
|
for (size_t i = 0; i < c; ++i) {
|
||||||
ai_assert(classnames[i]);
|
ai_assert(classnames[i]);
|
||||||
if(static_cast<size_t>(std::distance(key.begin(),key.end())) == lengths[i] && !strncmp(classnames[i],obtype,lengths[i])) {
|
if(static_cast<size_t>(std::distance(key.begin(),key.end())) == lengths[i] && !strncmp(classnames[i],obtype,lengths[i])) {
|
||||||
obtype = NULL;
|
obtype = nullptr;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,13 +85,11 @@ class Cluster;
|
||||||
/** Represents a delay-parsed FBX objects. Many objects in the scene
|
/** Represents a delay-parsed FBX objects. Many objects in the scene
|
||||||
* are not needed by assimp, so it makes no sense to parse them
|
* are not needed by assimp, so it makes no sense to parse them
|
||||||
* upfront. */
|
* upfront. */
|
||||||
class LazyObject
|
class LazyObject {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
LazyObject(uint64_t id, const Element& element, const Document& doc);
|
LazyObject(uint64_t id, const Element& element, const Document& doc);
|
||||||
~LazyObject();
|
|
||||||
|
|
||||||
public:
|
~LazyObject();
|
||||||
|
|
||||||
const Object* Get(bool dieOnError = false);
|
const Object* Get(bool dieOnError = false);
|
||||||
|
|
||||||
|
@ -136,11 +134,8 @@ private:
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** Base class for in-memory (DOM) representations of FBX objects */
|
/** Base class for in-memory (DOM) representations of FBX objects */
|
||||||
class Object
|
class Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Object(uint64_t id, const Element& element, const std::string& name);
|
Object(uint64_t id, const Element& element, const std::string& name);
|
||||||
|
|
||||||
|
@ -164,14 +159,12 @@ protected:
|
||||||
const uint64_t id;
|
const uint64_t id;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** DOM class for generic FBX NoteAttribute blocks. NoteAttribute's just hold a property table,
|
/** DOM class for generic FBX NoteAttribute blocks. NoteAttribute's just hold a property table,
|
||||||
* fixed members are added by deriving classes. */
|
* fixed members are added by deriving classes. */
|
||||||
class NodeAttribute : public Object
|
class NodeAttribute : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
NodeAttribute(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
NodeAttribute(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~NodeAttribute();
|
virtual ~NodeAttribute();
|
||||||
|
|
||||||
const PropertyTable& Props() const {
|
const PropertyTable& Props() const {
|
||||||
|
@ -183,12 +176,11 @@ private:
|
||||||
std::shared_ptr<const PropertyTable> props;
|
std::shared_ptr<const PropertyTable> props;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/** DOM base class for FBX camera settings attached to a node */
|
/** DOM base class for FBX camera settings attached to a node */
|
||||||
class CameraSwitcher : public NodeAttribute
|
class CameraSwitcher : public NodeAttribute {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
CameraSwitcher(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
CameraSwitcher(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~CameraSwitcher();
|
virtual ~CameraSwitcher();
|
||||||
|
|
||||||
int CameraID() const {
|
int CameraID() const {
|
||||||
|
@ -209,7 +201,6 @@ private:
|
||||||
std::string cameraIndexName;
|
std::string cameraIndexName;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define fbx_stringize(a) #a
|
#define fbx_stringize(a) #a
|
||||||
|
|
||||||
#define fbx_simple_property(name, type, default_value) \
|
#define fbx_simple_property(name, type, default_value) \
|
||||||
|
@ -230,13 +221,12 @@ private:
|
||||||
|
|
||||||
|
|
||||||
/** DOM base class for FBX cameras attached to a node */
|
/** DOM base class for FBX cameras attached to a node */
|
||||||
class Camera : public NodeAttribute
|
class Camera : public NodeAttribute {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Camera(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Camera(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~Camera();
|
virtual ~Camera();
|
||||||
|
|
||||||
public:
|
|
||||||
fbx_simple_property(Position, aiVector3D, aiVector3D(0,0,0))
|
fbx_simple_property(Position, aiVector3D, aiVector3D(0,0,0))
|
||||||
fbx_simple_property(UpVector, aiVector3D, aiVector3D(0,1,0))
|
fbx_simple_property(UpVector, aiVector3D, aiVector3D(0,1,0))
|
||||||
fbx_simple_property(InterestPosition, aiVector3D, aiVector3D(0,0,0))
|
fbx_simple_property(InterestPosition, aiVector3D, aiVector3D(0,0,0))
|
||||||
|
@ -256,33 +246,26 @@ public:
|
||||||
fbx_simple_property(FocalLength, float, 1.0f)
|
fbx_simple_property(FocalLength, float, 1.0f)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/** DOM base class for FBX null markers attached to a node */
|
/** DOM base class for FBX null markers attached to a node */
|
||||||
class Null : public NodeAttribute
|
class Null : public NodeAttribute {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Null(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Null(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
virtual ~Null();
|
virtual ~Null();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/** DOM base class for FBX limb node markers attached to a node */
|
/** DOM base class for FBX limb node markers attached to a node */
|
||||||
class LimbNode : public NodeAttribute
|
class LimbNode : public NodeAttribute {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
LimbNode(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
LimbNode(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
virtual ~LimbNode();
|
virtual ~LimbNode();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/** DOM base class for FBX lights attached to a node */
|
/** DOM base class for FBX lights attached to a node */
|
||||||
class Light : public NodeAttribute
|
class Light : public NodeAttribute {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Light(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Light(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
virtual ~Light();
|
virtual ~Light();
|
||||||
|
|
||||||
public:
|
|
||||||
enum Type
|
enum Type
|
||||||
{
|
{
|
||||||
Type_Point,
|
Type_Point,
|
||||||
|
@ -304,7 +287,6 @@ public:
|
||||||
Decay_MAX // end-of-enum sentinel
|
Decay_MAX // end-of-enum sentinel
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
|
||||||
fbx_simple_property(Color, aiVector3D, aiVector3D(1,1,1))
|
fbx_simple_property(Color, aiVector3D, aiVector3D(1,1,1))
|
||||||
fbx_simple_enum_property(LightType, Type, 0)
|
fbx_simple_enum_property(LightType, Type, 0)
|
||||||
fbx_simple_property(CastLightOnObject, bool, false)
|
fbx_simple_property(CastLightOnObject, bool, false)
|
||||||
|
@ -338,10 +320,8 @@ public:
|
||||||
fbx_simple_property(EnableBarnDoor, bool, true)
|
fbx_simple_property(EnableBarnDoor, bool, true)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/** DOM base class for FBX models (even though its semantics are more "node" than "model" */
|
/** DOM base class for FBX models (even though its semantics are more "node" than "model" */
|
||||||
class Model : public Object
|
class Model : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
enum RotOrder {
|
enum RotOrder {
|
||||||
RotOrder_EulerXYZ = 0,
|
RotOrder_EulerXYZ = 0,
|
||||||
|
@ -356,7 +336,6 @@ public:
|
||||||
RotOrder_MAX // end-of-enum sentinel
|
RotOrder_MAX // end-of-enum sentinel
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
enum TransformInheritance {
|
enum TransformInheritance {
|
||||||
TransformInheritance_RrSs = 0,
|
TransformInheritance_RrSs = 0,
|
||||||
TransformInheritance_RSrs,
|
TransformInheritance_RSrs,
|
||||||
|
@ -490,13 +469,12 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/** DOM class for generic FBX textures */
|
/** DOM class for generic FBX textures */
|
||||||
class Texture : public Object
|
class Texture : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Texture(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Texture(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~Texture();
|
virtual ~Texture();
|
||||||
|
|
||||||
public:
|
|
||||||
const std::string& Type() const {
|
const std::string& Type() const {
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
@ -551,8 +529,7 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/** DOM class for layered FBX textures */
|
/** DOM class for layered FBX textures */
|
||||||
class LayeredTexture : public Object
|
class LayeredTexture : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
LayeredTexture(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
LayeredTexture(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
virtual ~LayeredTexture();
|
virtual ~LayeredTexture();
|
||||||
|
@ -560,8 +537,7 @@ public:
|
||||||
// Can only be called after construction of the layered texture object due to construction flag.
|
// Can only be called after construction of the layered texture object due to construction flag.
|
||||||
void fillTexture(const Document& doc);
|
void fillTexture(const Document& doc);
|
||||||
|
|
||||||
enum BlendMode
|
enum BlendMode {
|
||||||
{
|
|
||||||
BlendMode_Translucent,
|
BlendMode_Translucent,
|
||||||
BlendMode_Additive,
|
BlendMode_Additive,
|
||||||
BlendMode_Modulate,
|
BlendMode_Modulate,
|
||||||
|
@ -623,13 +599,12 @@ typedef std::fbx_unordered_map<std::string, const LayeredTexture*> LayeredTextur
|
||||||
|
|
||||||
|
|
||||||
/** DOM class for generic FBX videos */
|
/** DOM class for generic FBX videos */
|
||||||
class Video : public Object
|
class Video : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Video(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Video(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~Video();
|
virtual ~Video();
|
||||||
|
|
||||||
public:
|
|
||||||
const std::string& Type() const {
|
const std::string& Type() const {
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
@ -673,10 +648,10 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/** DOM class for generic FBX materials */
|
/** DOM class for generic FBX materials */
|
||||||
class Material : public Object
|
class Material : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Material(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Material(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~Material();
|
virtual ~Material();
|
||||||
|
|
||||||
const std::string& GetShadingModel() const {
|
const std::string& GetShadingModel() const {
|
||||||
|
@ -713,8 +688,7 @@ typedef std::vector<int64_t> KeyTimeList;
|
||||||
typedef std::vector<float> KeyValueList;
|
typedef std::vector<float> KeyValueList;
|
||||||
|
|
||||||
/** Represents a FBX animation curve (i.e. a 1-dimensional set of keyframes and values therefor) */
|
/** Represents a FBX animation curve (i.e. a 1-dimensional set of keyframes and values therefor) */
|
||||||
class AnimationCurve : public Object
|
class AnimationCurve : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
AnimationCurve(uint64_t id, const Element& element, const std::string& name, const Document& doc);
|
AnimationCurve(uint64_t id, const Element& element, const std::string& name, const Document& doc);
|
||||||
virtual ~AnimationCurve();
|
virtual ~AnimationCurve();
|
||||||
|
@ -725,14 +699,12 @@ public:
|
||||||
return keys;
|
return keys;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** get list of keyframe values.
|
/** get list of keyframe values.
|
||||||
* Invariant: |GetKeys()| == |GetValues()| && |GetKeys()| > 0*/
|
* Invariant: |GetKeys()| == |GetValues()| && |GetKeys()| > 0*/
|
||||||
const KeyValueList& GetValues() const {
|
const KeyValueList& GetValues() const {
|
||||||
return values;
|
return values;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const std::vector<float>& GetAttributes() const {
|
const std::vector<float>& GetAttributes() const {
|
||||||
return attributes;
|
return attributes;
|
||||||
}
|
}
|
||||||
|
@ -751,10 +723,8 @@ private:
|
||||||
// property-name -> animation curve
|
// property-name -> animation curve
|
||||||
typedef std::map<std::string, const AnimationCurve*> AnimationCurveMap;
|
typedef std::map<std::string, const AnimationCurve*> AnimationCurveMap;
|
||||||
|
|
||||||
|
|
||||||
/** Represents a FBX animation curve (i.e. a mapping from single animation curves to nodes) */
|
/** Represents a FBX animation curve (i.e. a mapping from single animation curves to nodes) */
|
||||||
class AnimationCurveNode : public Object
|
class AnimationCurveNode : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
/* the optional white list specifies a list of property names for which the caller
|
/* the optional white list specifies a list of property names for which the caller
|
||||||
wants animations for. If the curve node does not match one of these, std::range_error
|
wants animations for. If the curve node does not match one of these, std::range_error
|
||||||
|
@ -804,8 +774,7 @@ private:
|
||||||
typedef std::vector<const AnimationCurveNode*> AnimationCurveNodeList;
|
typedef std::vector<const AnimationCurveNode*> AnimationCurveNodeList;
|
||||||
|
|
||||||
/** Represents a FBX animation layer (i.e. a list of node animations) */
|
/** Represents a FBX animation layer (i.e. a list of node animations) */
|
||||||
class AnimationLayer : public Object
|
class AnimationLayer : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
AnimationLayer(uint64_t id, const Element& element, const std::string& name, const Document& doc);
|
AnimationLayer(uint64_t id, const Element& element, const std::string& name, const Document& doc);
|
||||||
virtual ~AnimationLayer();
|
virtual ~AnimationLayer();
|
||||||
|
@ -818,7 +787,7 @@ public:
|
||||||
/* the optional white list specifies a list of property names for which the caller
|
/* the optional white list specifies a list of property names for which the caller
|
||||||
wants animations for. Curves not matching this list will not be added to the
|
wants animations for. Curves not matching this list will not be added to the
|
||||||
animation layer. */
|
animation layer. */
|
||||||
AnimationCurveNodeList Nodes(const char* const * target_prop_whitelist = NULL, size_t whitelist_size = 0) const;
|
AnimationCurveNodeList Nodes(const char* const * target_prop_whitelist = nullptr, size_t whitelist_size = 0) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::shared_ptr<const PropertyTable> props;
|
std::shared_ptr<const PropertyTable> props;
|
||||||
|
@ -828,8 +797,7 @@ private:
|
||||||
typedef std::vector<const AnimationLayer*> AnimationLayerList;
|
typedef std::vector<const AnimationLayer*> AnimationLayerList;
|
||||||
|
|
||||||
/** Represents a FBX animation stack (i.e. a list of animation layers) */
|
/** Represents a FBX animation stack (i.e. a list of animation layers) */
|
||||||
class AnimationStack : public Object
|
class AnimationStack : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
AnimationStack(uint64_t id, const Element& element, const std::string& name, const Document& doc);
|
AnimationStack(uint64_t id, const Element& element, const std::string& name, const Document& doc);
|
||||||
virtual ~AnimationStack();
|
virtual ~AnimationStack();
|
||||||
|
@ -855,8 +823,7 @@ private:
|
||||||
|
|
||||||
|
|
||||||
/** DOM class for deformers */
|
/** DOM class for deformers */
|
||||||
class Deformer : public Object
|
class Deformer : public Object {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Deformer(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Deformer(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
virtual ~Deformer();
|
virtual ~Deformer();
|
||||||
|
@ -875,10 +842,10 @@ typedef std::vector<unsigned int> WeightIndexArray;
|
||||||
|
|
||||||
|
|
||||||
/** DOM class for BlendShapeChannel deformers */
|
/** DOM class for BlendShapeChannel deformers */
|
||||||
class BlendShapeChannel : public Deformer
|
class BlendShapeChannel : public Deformer {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
BlendShapeChannel(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
BlendShapeChannel(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~BlendShapeChannel();
|
virtual ~BlendShapeChannel();
|
||||||
|
|
||||||
float DeformPercent() const {
|
float DeformPercent() const {
|
||||||
|
@ -892,6 +859,7 @@ public:
|
||||||
const std::vector<const ShapeGeometry*>& GetShapeGeometries() const {
|
const std::vector<const ShapeGeometry*>& GetShapeGeometries() const {
|
||||||
return shapeGeometries;
|
return shapeGeometries;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
float percent;
|
float percent;
|
||||||
WeightArray fullWeights;
|
WeightArray fullWeights;
|
||||||
|
@ -899,10 +867,10 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/** DOM class for BlendShape deformers */
|
/** DOM class for BlendShape deformers */
|
||||||
class BlendShape : public Deformer
|
class BlendShape : public Deformer {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
BlendShape(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
BlendShape(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~BlendShape();
|
virtual ~BlendShape();
|
||||||
|
|
||||||
const std::vector<const BlendShapeChannel*>& BlendShapeChannels() const {
|
const std::vector<const BlendShapeChannel*>& BlendShapeChannels() const {
|
||||||
|
@ -913,11 +881,11 @@ private:
|
||||||
std::vector<const BlendShapeChannel*> blendShapeChannels;
|
std::vector<const BlendShapeChannel*> blendShapeChannels;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** DOM class for skin deformer clusters (aka subdeformers) */
|
/** DOM class for skin deformer clusters (aka sub-deformers) */
|
||||||
class Cluster : public Deformer
|
class Cluster : public Deformer {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Cluster(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Cluster(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~Cluster();
|
virtual ~Cluster();
|
||||||
|
|
||||||
/** get the list of deformer weights associated with this cluster.
|
/** get the list of deformer weights associated with this cluster.
|
||||||
|
@ -958,10 +926,10 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/** DOM class for skin deformers */
|
/** DOM class for skin deformers */
|
||||||
class Skin : public Deformer
|
class Skin : public Deformer {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Skin(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
Skin(uint64_t id, const Element& element, const Document& doc, const std::string& name);
|
||||||
|
|
||||||
virtual ~Skin();
|
virtual ~Skin();
|
||||||
|
|
||||||
float DeformAccuracy() const {
|
float DeformAccuracy() const {
|
||||||
|
@ -978,10 +946,10 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Represents a link between two FBX objects. */
|
/** Represents a link between two FBX objects. */
|
||||||
class Connection
|
class Connection {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Connection(uint64_t insertionOrder, uint64_t src, uint64_t dest, const std::string& prop, const Document& doc);
|
Connection(uint64_t insertionOrder, uint64_t src, uint64_t dest, const std::string& prop, const Document& doc);
|
||||||
|
|
||||||
~Connection();
|
~Connection();
|
||||||
|
|
||||||
// note: a connection ensures that the source and dest objects exist, but
|
// note: a connection ensures that the source and dest objects exist, but
|
||||||
|
@ -1006,7 +974,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
int CompareTo(const Connection* c) const {
|
int CompareTo(const Connection* c) const {
|
||||||
ai_assert( NULL != c );
|
ai_assert( nullptr != c );
|
||||||
|
|
||||||
// note: can't subtract because this would overflow uint64_t
|
// note: can't subtract because this would overflow uint64_t
|
||||||
if(InsertionOrder() > c->InsertionOrder()) {
|
if(InsertionOrder() > c->InsertionOrder()) {
|
||||||
|
@ -1019,7 +987,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Compare(const Connection* c) const {
|
bool Compare(const Connection* c) const {
|
||||||
ai_assert( NULL != c );
|
ai_assert( nullptr != c );
|
||||||
|
|
||||||
return InsertionOrder() < c->InsertionOrder();
|
return InsertionOrder() < c->InsertionOrder();
|
||||||
}
|
}
|
||||||
|
@ -1047,6 +1015,7 @@ typedef std::multimap<uint64_t, const Connection*> ConnectionMap;
|
||||||
class FileGlobalSettings {
|
class FileGlobalSettings {
|
||||||
public:
|
public:
|
||||||
FileGlobalSettings(const Document& doc, std::shared_ptr<const PropertyTable> props);
|
FileGlobalSettings(const Document& doc, std::shared_ptr<const PropertyTable> props);
|
||||||
|
|
||||||
~FileGlobalSettings();
|
~FileGlobalSettings();
|
||||||
|
|
||||||
const PropertyTable& Props() const {
|
const PropertyTable& Props() const {
|
||||||
|
@ -1103,10 +1072,10 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/** DOM root for a FBX file */
|
/** DOM root for a FBX file */
|
||||||
class Document
|
class Document {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Document(const Parser& parser, const ImportSettings& settings);
|
Document(const Parser& parser, const ImportSettings& settings);
|
||||||
|
|
||||||
~Document();
|
~Document();
|
||||||
|
|
||||||
LazyObject* GetObject(uint64_t id) const;
|
LazyObject* GetObject(uint64_t id) const;
|
||||||
|
|
|
@ -56,7 +56,6 @@ namespace Assimp {
|
||||||
namespace FBX {
|
namespace FBX {
|
||||||
namespace Util {
|
namespace Util {
|
||||||
|
|
||||||
|
|
||||||
/* DOM/Parse error reporting - does not return */
|
/* DOM/Parse error reporting - does not return */
|
||||||
AI_WONT_RETURN void DOMError(const std::string& message, const Token& token) AI_WONT_RETURN_SUFFIX;
|
AI_WONT_RETURN void DOMError(const std::string& message, const Token& token) AI_WONT_RETURN_SUFFIX;
|
||||||
AI_WONT_RETURN void DOMError(const std::string& message, const Element* element = NULL) AI_WONT_RETURN_SUFFIX;
|
AI_WONT_RETURN void DOMError(const std::string& message, const Element* element = NULL) AI_WONT_RETURN_SUFFIX;
|
||||||
|
@ -73,28 +72,28 @@ std::shared_ptr<const PropertyTable> GetPropertyTable(const Document& doc,
|
||||||
const Scope& sc,
|
const Scope& sc,
|
||||||
bool no_warn = false);
|
bool no_warn = false);
|
||||||
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
template <typename T>
|
template <typename T>
|
||||||
inline const T* ProcessSimpleConnection(const Connection& con,
|
inline
|
||||||
|
const T* ProcessSimpleConnection(const Connection& con,
|
||||||
bool is_object_property_conn,
|
bool is_object_property_conn,
|
||||||
const char* name,
|
const char* name,
|
||||||
const Element& element,
|
const Element& element,
|
||||||
const char** propNameOut = NULL)
|
const char** propNameOut = nullptr)
|
||||||
{
|
{
|
||||||
if (is_object_property_conn && !con.PropertyName().length()) {
|
if (is_object_property_conn && !con.PropertyName().length()) {
|
||||||
DOMWarning("expected incoming " + std::string(name) +
|
DOMWarning("expected incoming " + std::string(name) +
|
||||||
" link to be an object-object connection, ignoring",
|
" link to be an object-object connection, ignoring",
|
||||||
&element
|
&element
|
||||||
);
|
);
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
else if (!is_object_property_conn && con.PropertyName().length()) {
|
else if (!is_object_property_conn && con.PropertyName().length()) {
|
||||||
DOMWarning("expected incoming " + std::string(name) +
|
DOMWarning("expected incoming " + std::string(name) +
|
||||||
" link to be an object-property connection, ignoring",
|
" link to be an object-property connection, ignoring",
|
||||||
&element
|
&element
|
||||||
);
|
);
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_object_property_conn && propNameOut) {
|
if(is_object_property_conn && propNameOut) {
|
||||||
|
@ -108,13 +107,12 @@ inline const T* ProcessSimpleConnection(const Connection& con,
|
||||||
DOMWarning("failed to read source object for incoming " + std::string(name) +
|
DOMWarning("failed to read source object for incoming " + std::string(name) +
|
||||||
" link, ignoring",
|
" link, ignoring",
|
||||||
&element);
|
&element);
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
return dynamic_cast<const T*>(ob);
|
return dynamic_cast<const T*>(ob);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
} //!Util
|
} //!Util
|
||||||
} //!FBX
|
} //!FBX
|
||||||
} //!Assimp
|
} //!Assimp
|
||||||
|
|
|
@ -282,9 +282,11 @@ void FindInvalidDataProcess::ProcessAnimation (aiAnimation* anim) {
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
void FindInvalidDataProcess::ProcessAnimationChannel (aiNodeAnim* anim) {
|
void FindInvalidDataProcess::ProcessAnimationChannel (aiNodeAnim* anim) {
|
||||||
ai_assert( 0 != anim->mPositionKeys );
|
ai_assert( nullptr != anim );
|
||||||
ai_assert( 0 != anim->mRotationKeys );
|
if (anim->mNumPositionKeys == 0 && anim->mNumRotationKeys == 0 && anim->mNumScalingKeys == 0) {
|
||||||
ai_assert( 0 != anim->mScalingKeys );
|
ai_assert_entry();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Check whether all values in a tracks are identical - in this case
|
// Check whether all values in a tracks are identical - in this case
|
||||||
// we can remove al keys except one.
|
// we can remove al keys except one.
|
||||||
|
|
|
@ -47,8 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#ifdef ASSIMP_BUILD_DEBUG
|
#ifdef ASSIMP_BUILD_DEBUG
|
||||||
# include <assert.h>
|
# include <assert.h>
|
||||||
# define ai_assert(expression) assert( expression )
|
# define ai_assert(expression) assert( expression )
|
||||||
|
# define ai_assert_entry() assert( false )
|
||||||
#else
|
#else
|
||||||
# define ai_assert(expression)
|
# define ai_assert(expression)
|
||||||
#endif //
|
# define ai_assert_entry()
|
||||||
|
#endif // ASSIMP_BUILD_DEBUG
|
||||||
|
|
||||||
#endif // AI_ASSERT_H_INC
|
#endif // AI_ASSERT_H_INC
|
||||||
|
|
||||||
|
|
|
@ -469,10 +469,10 @@ struct aiAnimMesh
|
||||||
{
|
{
|
||||||
// fixme consider moving this to the ctor initializer list as well
|
// fixme consider moving this to the ctor initializer list as well
|
||||||
for( unsigned int a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; a++){
|
for( unsigned int a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; a++){
|
||||||
mTextureCoords[a] = NULL;
|
mTextureCoords[a] = nullptr;
|
||||||
}
|
}
|
||||||
for( unsigned int a = 0; a < AI_MAX_NUMBER_OF_COLOR_SETS; a++) {
|
for( unsigned int a = 0; a < AI_MAX_NUMBER_OF_COLOR_SETS; a++) {
|
||||||
mColors[a] = NULL;
|
mColors[a] = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -493,34 +493,34 @@ struct aiAnimMesh
|
||||||
/** Check whether the anim mesh overrides the vertex positions
|
/** Check whether the anim mesh overrides the vertex positions
|
||||||
* of its host mesh*/
|
* of its host mesh*/
|
||||||
bool HasPositions() const {
|
bool HasPositions() const {
|
||||||
return mVertices != NULL;
|
return mVertices != nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Check whether the anim mesh overrides the vertex normals
|
/** Check whether the anim mesh overrides the vertex normals
|
||||||
* of its host mesh*/
|
* of its host mesh*/
|
||||||
bool HasNormals() const {
|
bool HasNormals() const {
|
||||||
return mNormals != NULL;
|
return mNormals != nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Check whether the anim mesh overrides the vertex tangents
|
/** Check whether the anim mesh overrides the vertex tangents
|
||||||
* and bitangents of its host mesh. As for aiMesh,
|
* and bitangents of its host mesh. As for aiMesh,
|
||||||
* tangents and bitangents always go together. */
|
* tangents and bitangents always go together. */
|
||||||
bool HasTangentsAndBitangents() const {
|
bool HasTangentsAndBitangents() const {
|
||||||
return mTangents != NULL;
|
return mTangents != nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Check whether the anim mesh overrides a particular
|
/** Check whether the anim mesh overrides a particular
|
||||||
* set of vertex colors on his host mesh.
|
* set of vertex colors on his host mesh.
|
||||||
* @param pIndex 0<index<AI_MAX_NUMBER_OF_COLOR_SETS */
|
* @param pIndex 0<index<AI_MAX_NUMBER_OF_COLOR_SETS */
|
||||||
bool HasVertexColors( unsigned int pIndex) const {
|
bool HasVertexColors( unsigned int pIndex) const {
|
||||||
return pIndex >= AI_MAX_NUMBER_OF_COLOR_SETS ? false : mColors[pIndex] != NULL;
|
return pIndex >= AI_MAX_NUMBER_OF_COLOR_SETS ? false : mColors[pIndex] != nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Check whether the anim mesh overrides a particular
|
/** Check whether the anim mesh overrides a particular
|
||||||
* set of texture coordinates on his host mesh.
|
* set of texture coordinates on his host mesh.
|
||||||
* @param pIndex 0<index<AI_MAX_NUMBER_OF_TEXTURECOORDS */
|
* @param pIndex 0<index<AI_MAX_NUMBER_OF_TEXTURECOORDS */
|
||||||
bool HasTextureCoords( unsigned int pIndex) const {
|
bool HasTextureCoords( unsigned int pIndex) const {
|
||||||
return pIndex >= AI_MAX_NUMBER_OF_TEXTURECOORDS ? false : mTextureCoords[pIndex] != NULL;
|
return pIndex >= AI_MAX_NUMBER_OF_TEXTURECOORDS ? false : mTextureCoords[pIndex] != nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
ply
|
||||||
|
format ascii 1.0
|
||||||
|
comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.4208963464)
|
||||||
|
element vertex 8
|
||||||
|
property float x
|
||||||
|
property float y
|
||||||
|
property float z
|
||||||
|
element face 6
|
||||||
|
property list uchar int vertex_index
|
||||||
|
end_header
|
||||||
|
0 0 0
|
||||||
|
0 0 1
|
||||||
|
0 1 1
|
||||||
|
0 1 0
|
||||||
|
1 0 0
|
||||||
|
1 0 1
|
||||||
|
1 1 1
|
||||||
|
1 1 0
|
||||||
|
4 0 1 2 3
|
||||||
|
4 7 6 5 4
|
||||||
|
4 0 4 5 1
|
||||||
|
4 1 5 6 2
|
||||||
|
4 2 6 7 3
|
||||||
|
4 3 7 4 0
|
|
@ -0,0 +1,148 @@
|
||||||
|
{
|
||||||
|
"scenes" : [ {
|
||||||
|
"nodes" : [ 0 ]
|
||||||
|
} ],
|
||||||
|
|
||||||
|
"nodes" : [ {
|
||||||
|
"skin" : 0,
|
||||||
|
"mesh" : 0,
|
||||||
|
"children" : [ 1 ]
|
||||||
|
}, {
|
||||||
|
"children" : [ 2 ],
|
||||||
|
"translation" : [ 0.0, 1.0, 0.0 ]
|
||||||
|
}, {
|
||||||
|
"rotation" : [ 0.0, 0.0, 0.0, 1.0 ]
|
||||||
|
} ],
|
||||||
|
|
||||||
|
"meshes" : [ {
|
||||||
|
"primitives" : [ {
|
||||||
|
"attributes" : {
|
||||||
|
"POSITION" : 1,
|
||||||
|
"JOINTS_0" : 2,
|
||||||
|
"WEIGHTS_0" : 3
|
||||||
|
},
|
||||||
|
"indices" : 0
|
||||||
|
} ]
|
||||||
|
} ],
|
||||||
|
|
||||||
|
"skins" : [ {
|
||||||
|
"inverseBindMatrices" : 4,
|
||||||
|
"joints" : [ 1, 2 ]
|
||||||
|
} ],
|
||||||
|
|
||||||
|
"animations" : [ {
|
||||||
|
"channels" : [ {
|
||||||
|
"sampler" : 0,
|
||||||
|
"target" : {
|
||||||
|
"node" : 2,
|
||||||
|
"path" : "rotation"
|
||||||
|
}
|
||||||
|
} ],
|
||||||
|
"samplers" : [ {
|
||||||
|
"input" : 5,
|
||||||
|
"interpolation" : "LINEAR",
|
||||||
|
"output" : 6
|
||||||
|
} ]
|
||||||
|
} ],
|
||||||
|
|
||||||
|
"buffers" : [ {
|
||||||
|
"uri" : "data:application/gltf-buffer;base64,AAABAAMAAAADAAIAAgADAAUAAgAFAAQABAAFAAcABAAHAAYABgAHAAkABgAJAAgAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAD8AAAAAAACAPwAAAD8AAAAAAAAAAAAAgD8AAAAAAACAPwAAgD8AAAAAAAAAAAAAwD8AAAAAAACAPwAAwD8AAAAAAAAAAAAAAEAAAAAAAACAPwAAAEAAAAAA",
|
||||||
|
"byteLength" : 168
|
||||||
|
}, {
|
||||||
|
"uri" : "data:application/gltf-buffer;base64,AAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAABAPwAAgD4AAAAAAAAAAAAAQD8AAIA+AAAAAAAAAAAAAAA/AAAAPwAAAAAAAAAAAAAAPwAAAD8AAAAAAAAAAAAAgD4AAEA/AAAAAAAAAAAAAIA+AABAPwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAA=",
|
||||||
|
"byteLength" : 320
|
||||||
|
}, {
|
||||||
|
"uri" : "data:application/gltf-buffer;base64,AACAPwAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAvwAAgL8AAAAAAACAPwAAgD8AAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAL8AAIC/AAAAAAAAgD8=",
|
||||||
|
"byteLength" : 128
|
||||||
|
}, {
|
||||||
|
"uri" : "data:application/gltf-buffer;base64,AAAAAAAAAD8AAIA/AADAPwAAAEAAACBAAABAQAAAYEAAAIBAAACQQAAAoEAAALBAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAkxjEPkSLbD8AAAAAAAAAAPT9ND/0/TQ/AAAAAAAAAAD0/TQ/9P00PwAAAAAAAAAAkxjEPkSLbD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAkxjEvkSLbD8AAAAAAAAAAPT9NL/0/TQ/AAAAAAAAAAD0/TS/9P00PwAAAAAAAAAAkxjEvkSLbD8AAAAAAAAAAAAAAAAAAIA/",
|
||||||
|
"byteLength" : 240
|
||||||
|
} ],
|
||||||
|
|
||||||
|
"bufferViews" : [ {
|
||||||
|
"buffer" : 0,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"byteLength" : 48,
|
||||||
|
"target" : 34963
|
||||||
|
}, {
|
||||||
|
"buffer" : 0,
|
||||||
|
"byteOffset" : 48,
|
||||||
|
"byteLength" : 120,
|
||||||
|
"target" : 34962
|
||||||
|
}, {
|
||||||
|
"buffer" : 1,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"byteLength" : 320,
|
||||||
|
"byteStride" : 16
|
||||||
|
}, {
|
||||||
|
"buffer" : 2,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"byteLength" : 128
|
||||||
|
}, {
|
||||||
|
"buffer" : 3,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"byteLength" : 240
|
||||||
|
} ],
|
||||||
|
|
||||||
|
"accessors" : [ {
|
||||||
|
"bufferView" : 0,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"componentType" : 5123,
|
||||||
|
"count" : 24,
|
||||||
|
"type" : "SCALAR",
|
||||||
|
"max" : [ 9 ],
|
||||||
|
"min" : [ 0 ]
|
||||||
|
}, {
|
||||||
|
"bufferView" : 1,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"componentType" : 5126,
|
||||||
|
"count" : 10,
|
||||||
|
"type" : "VEC3",
|
||||||
|
"max" : [ 1.0, 2.0, 0.0 ],
|
||||||
|
"min" : [ 0.0, 0.0, 0.0 ]
|
||||||
|
}, {
|
||||||
|
"bufferView" : 2,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"componentType" : 5123,
|
||||||
|
"count" : 10,
|
||||||
|
"type" : "VEC4",
|
||||||
|
"max" : [ 0, 1, 0, 0 ],
|
||||||
|
"min" : [ 0, 1, 0, 0 ]
|
||||||
|
}, {
|
||||||
|
"bufferView" : 2,
|
||||||
|
"byteOffset" : 160,
|
||||||
|
"componentType" : 5126,
|
||||||
|
"count" : 10,
|
||||||
|
"type" : "VEC4",
|
||||||
|
"max" : [ 1.0, 1.0, 0.0, 0.0 ],
|
||||||
|
"min" : [ 0.0, 0.0, 0.0, 0.0 ]
|
||||||
|
}, {
|
||||||
|
"bufferView" : 3,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"componentType" : 5126,
|
||||||
|
"count" : 2,
|
||||||
|
"type" : "MAT4",
|
||||||
|
"max" : [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -0.5, -1.0, 0.0, 1.0 ],
|
||||||
|
"min" : [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -0.5, -1.0, 0.0, 1.0 ]
|
||||||
|
}, {
|
||||||
|
"bufferView" : 4,
|
||||||
|
"byteOffset" : 0,
|
||||||
|
"componentType" : 5126,
|
||||||
|
"count" : 12,
|
||||||
|
"type" : "SCALAR",
|
||||||
|
"max" : [ 5.5 ],
|
||||||
|
"min" : [ 0.0 ]
|
||||||
|
}, {
|
||||||
|
"bufferView" : 4,
|
||||||
|
"byteOffset" : 48,
|
||||||
|
"componentType" : 5126,
|
||||||
|
"count" : 12,
|
||||||
|
"type" : "VEC4",
|
||||||
|
"max" : [ 0.0, 0.0, 0.707, 1.0 ],
|
||||||
|
"min" : [ 0.0, 0.0, -0.707, 0.707 ]
|
||||||
|
} ],
|
||||||
|
|
||||||
|
"asset" : {
|
||||||
|
"version" : "2.0"
|
||||||
|
}
|
||||||
|
}
|
|
@ -376,6 +376,11 @@ TEST_F(utglTF2ImportExport, importglTF2FromMemory) {
|
||||||
EXPECT_EQ( nullptr, Scene );*/
|
EXPECT_EQ( nullptr, Scene );*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_F( utglTF2ImportExport, bug_import_simple_skin ) {
|
||||||
|
Assimp::Importer importer;
|
||||||
|
const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/glTF2/simple_skin/simple_skin.gltf", aiProcess_ValidateDataStructure );
|
||||||
|
|
||||||
|
}
|
||||||
#ifndef ASSIMP_BUILD_NO_EXPORT
|
#ifndef ASSIMP_BUILD_NO_EXPORT
|
||||||
TEST_F( utglTF2ImportExport, exportglTF2FromFileTest ) {
|
TEST_F( utglTF2ImportExport, exportglTF2FromFileTest ) {
|
||||||
EXPECT_TRUE( exporterTest() );
|
EXPECT_TRUE( exporterTest() );
|
||||||
|
|
Loading…
Reference in New Issue