LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

import fbx with different rotation orders

Browse source
This commit is contained in:
Mikulas Florek 2017-09-05 10:28:38 +02:00
parent 88732be4c5
commit 47131233d6
2 changed files with 53 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/renderer/editor/ofbx.cpp
View file

@ -165,13 +165,29 @@ static Matrix rotationZ(double angle)
}
static Matrix getRotationMatrix(const Vec3& euler)
static Matrix getRotationMatrix(const Vec3& euler, RotationOrder order)
{
const double TO_RAD = 3.1415926535897932384626433832795028 / 180.0;
Matrix rx = rotationX(euler.x * TO_RAD);
Matrix ry = rotationY(euler.y * TO_RAD);
Matrix rz = rotationZ(euler.z * TO_RAD);
return rz * ry * rx;
switch (order) {
default:
case RotationOrder::SPHERIC_XYZ:
printf("Warning: Unsupported rotation order: %d\n", order);
case RotationOrder::EULER_XYZ:
return rz * ry * rx;
case RotationOrder::EULER_XZY:
return ry * rz * rx;
case RotationOrder::EULER_YXZ:
return rz * rx * ry;
case RotationOrder::EULER_YZX:
return rx * rz * ry;
case RotationOrder::EULER_ZXY:
return ry * rx * rz;
case RotationOrder::EULER_ZYX:
return rx * ry * rz;
}
}
@ -377,6 +393,17 @@ static IElement* resolveProperty(const Object& obj, const char* name)
}
static int resolveEnumProperty(const Object& object, const char* name, int default_value)
{
Element* element = (Element*)resolveProperty(object, name);
if (!element) return default_value;
Property* x = (Property*)element->getProperty(4);
if (!x) return default_value;
return x->value.toInt();
}
static Vec3 resolveVec3Property(const Object& object, const char* name, const Vec3& default_value)
{
Element* element = (Element*)resolveProperty(object, name);
@ -953,7 +980,7 @@ struct MeshImpl : Mesh
scale_mtx.m[0] = (float)scale.x;
scale_mtx.m[5] = (float)scale.y;
scale_mtx.m[10] = (float)scale.z;
Matrix mtx = getRotationMatrix(rotation);
Matrix mtx = getRotationMatrix(rotation, RotationOrder::EULER_XYZ);
setTranslation(translation, &mtx);
return scale_mtx * mtx;
@ -2527,6 +2554,13 @@ static bool parseObjects(const Element& root, Scene* scene)
}
RotationOrder Object::getRotationOrder() const
{
// This assumes that the default rotation order is EULER_XYZ.
return (RotationOrder) resolveEnumProperty(*this, "RotationOrder", (int) RotationOrder::EULER_XYZ);
}
Vec3 Object::getRotationOffset() const
{
return resolveVec3Property(*this, "RotationOffset", {0, 0, 0});
@ -2562,6 +2596,7 @@ Matrix Object::evalLocal(const Vec3& translation, const Vec3& rotation) const
Vec3 scaling = getLocalScaling();
Vec3 rotation_pivot = getRotationPivot();
Vec3 scaling_pivot = getScalingPivot();
RotationOrder rotation_order = getRotationOrder();
Matrix s = makeIdentity();
s.m[0] = scaling.x;
@ -2571,9 +2606,9 @@ Matrix Object::evalLocal(const Vec3& translation, const Vec3& rotation) const
Matrix t = makeIdentity();
setTranslation(translation, &t);
Matrix r = getRotationMatrix(rotation);
Matrix r_pre = getRotationMatrix(getPreRotation());
Matrix r_post_inv = getRotationMatrix(getPostRotation());
Matrix r = getRotationMatrix(rotation, rotation_order);
Matrix r_pre = getRotationMatrix(getPreRotation(), RotationOrder::EULER_XYZ);
Matrix r_post_inv = getRotationMatrix(getPostRotation(), RotationOrder::EULER_XYZ);
Matrix r_off = makeIdentity();
setTranslation(getRotationOffset(), &r_off);

12
src/renderer/editor/ofbx.h
View file

@ -111,6 +111,17 @@ struct IElement
};
enum class RotationOrder {
EULER_XYZ,
EULER_XZY,
EULER_YZX,
EULER_YXZ,
EULER_ZXY,
EULER_ZYX,
SPHERIC_XYZ // Currently unsupported. Treated as EULER_XYZ.
};
struct AnimationCurveNode;
struct AnimationLayer;
struct Scene;
@ -148,6 +159,7 @@ struct Object
Object* resolveObjectLinkReverse(Type type) const;
Object* getParent() const;
RotationOrder getRotationOrder() const;
Vec3 getRotationOffset() const;
Vec3 getRotationPivot() const;
Vec3 getPostRotation() const;