Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 05:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed merge markers

Browse source 
(cherry picked from commit 4286142daac70269de155c99c9bbdb1f951eaff6)
This commit is contained in:
amantley 2019-02-22 11:50:38 -08:00 committed by Anthony Thibault
parent 87d98e5b85
commit 9b73c83ebc
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -236,7 +236,6 @@ public:
virtual bool setAbsoluteJointRotationInObjectFrame(int index, const glm::quat& rotation) override { return false; } virtual bool setAbsoluteJointRotationInObjectFrame(int index, const glm::quat& rotation) override { return false; }
virtual bool setAbsoluteJointTranslationInObjectFrame(int index, const glm::vec3& translation) override { return false; } virtual bool setAbsoluteJointTranslationInObjectFrame(int index, const glm::vec3& translation) override { return false; }
<<<<<<< HEAD
// world-space to avatar-space rigconversion functions // world-space to avatar-space rigconversion functions
/**jsdoc /**jsdoc
* @function MyAvatar.worldToJointPoint * @function MyAvatar.worldToJointPoint
@ -286,10 +285,8 @@ public:
* @returns {Quat} * @returns {Quat}
*/ */
Q_INVOKABLE glm::quat jointToWorldRotation(const glm::quat& rotation, const int jointIndex = -1) const; Q_INVOKABLE glm::quat jointToWorldRotation(const glm::quat& rotation, const int jointIndex = -1) const;
=======
virtual glm::vec3 getSpine2SplineOffset() const { return _spine2SplineOffset; } virtual glm::vec3 getSpine2SplineOffset() const { return _spine2SplineOffset; }
virtual float getSpine2SplineRatio() const { return _spine2SplineRatio; } virtual float getSpine2SplineRatio() const { return _spine2SplineRatio; }
>>>>>>> cache the spine2 spline default offset and ratio
virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override; virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData) override; virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData) override;

14
libraries/fbx/src/FBXSerializer.cpp
View file

@ -1288,20 +1288,6 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
} }
joint.inverseBindRotation = joint.inverseDefaultRotation; joint.inverseBindRotation = joint.inverseDefaultRotation;
joint.name = fbxModel.name; joint.name = fbxModel.name;
<<<<<<< HEAD
=======
if (hfmModel.hfmToHifiJointNameMapping.contains(hfmModel.hfmToHifiJointNameMapping.key(joint.name))) {
joint.name = hfmModel.hfmToHifiJointNameMapping.key(fbxModel.name);
}
foreach (const QString& childID, _connectionChildMap.values(modelID)) {
QString type = typeFlags.value(childID);
if (!type.isEmpty()) {
hfmModel.hasSkeletonJoints |= (joint.isSkeletonJoint = type.toLower().contains("Skeleton"));
break;
}
}
>>>>>>> implemented the splineIK in animSplineIK.cpp, todo: disable animinversekinematic.cpp
joint.bindTransformFoundInCluster = false; joint.bindTransformFoundInCluster = false;