summaryrefslogtreecommitdiffstats
path: root/modules/fbx/data/pivot_transform.h
diff options
context:
space:
mode:
authorMarcel Admiraal <madmiraal@users.noreply.github.com>2021-01-20 07:02:02 +0000
committerMarcel Admiraal <madmiraal@users.noreply.github.com>2021-06-04 18:14:32 +0100
commit8acd13a456050ded00f0f264ff0aa91a304f6c54 (patch)
tree1cfac709a27ff9e08302269dfaf41ae4edd5e142 /modules/fbx/data/pivot_transform.h
parent766c6dbb24c736eb1e24ca69eb15398eac654c2c (diff)
downloadredot-engine-8acd13a456050ded00f0f264ff0aa91a304f6c54.tar.gz
Rename Quat to Quaternion
Diffstat (limited to 'modules/fbx/data/pivot_transform.h')
-rw-r--r--modules/fbx/data/pivot_transform.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/fbx/data/pivot_transform.h b/modules/fbx/data/pivot_transform.h
index 8ed8358b70..29cf7a3d0e 100644
--- a/modules/fbx/data/pivot_transform.h
+++ b/modules/fbx/data/pivot_transform.h
@@ -58,10 +58,10 @@ enum TransformationComp {
struct PivotTransform : Reference, ModelAbstraction {
// at the end we want to keep geometric_ everything, post and pre rotation
// these are used during animation data processing / keyframe ingestion the rest can be simplified down / out.
- Quat pre_rotation = Quat();
- Quat post_rotation = Quat();
- Quat rotation = Quat();
- Quat geometric_rotation = Quat();
+ Quaternion pre_rotation = Quaternion();
+ Quaternion post_rotation = Quaternion();
+ Quaternion rotation = Quaternion();
+ Quaternion geometric_rotation = Quaternion();
Vector3 rotation_pivot = Vector3();
Vector3 rotation_offset = Vector3();
Vector3 scaling_offset = Vector3(1.0, 1.0, 1.0);
@@ -87,8 +87,8 @@ struct PivotTransform : Reference, ModelAbstraction {
Transform3D ComputeGlobalTransform(Transform3D t) const;
Transform3D ComputeLocalTransform(Transform3D t) const;
- Transform3D ComputeGlobalTransform(Vector3 p_translation, Quat p_rotation, Vector3 p_scaling) const;
- Transform3D ComputeLocalTransform(Vector3 p_translation, Quat p_rotation, Vector3 p_scaling) const;
+ Transform3D ComputeGlobalTransform(Vector3 p_translation, Quaternion p_rotation, Vector3 p_scaling) const;
+ Transform3D ComputeLocalTransform(Vector3 p_translation, Quaternion p_rotation, Vector3 p_scaling) const;
/* Extract into xforms and calculate once */
void ComputePivotTransform();