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

Attachment translations in world space.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-05-06 11:50:37 -07:00
parent 082ff760d6
commit 983a3af4b9
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/Avatar.cpp
View file

@ -369,7 +369,7 @@ void Avatar::simulateAttachments(float deltaTime) {
glm::quat jointRotation; glm::quat jointRotation;
if (_skeletonModel.getJointPosition(jointIndex, jointPosition) && if (_skeletonModel.getJointPosition(jointIndex, jointPosition) &&
_skeletonModel.getJointRotation(jointIndex, jointRotation)) { _skeletonModel.getJointRotation(jointIndex, jointRotation)) {
model->setTranslation(jointPosition + jointRotation * attachment.translation * _skeletonModel.getScale()); model->setTranslation(jointPosition + jointRotation * attachment.translation * _scale);
model->setRotation(jointRotation * attachment.rotation); model->setRotation(jointRotation * attachment.rotation);
model->setScale(_skeletonModel.getScale() * attachment.scale); model->setScale(_skeletonModel.getScale() * attachment.scale);
model->simulate(deltaTime); model->simulate(deltaTime);

1
interface/src/ui/AttachmentsDialog.cpp
View file

@ -78,6 +78,7 @@ void AttachmentsDialog::addAttachment(const AttachmentData& data) {
static QDoubleSpinBox* createTranslationBox(AttachmentsDialog* dialog, float value) { static QDoubleSpinBox* createTranslationBox(AttachmentsDialog* dialog, float value) {
QDoubleSpinBox* box = new QDoubleSpinBox(); QDoubleSpinBox* box = new QDoubleSpinBox();
box->setSingleStep(0.01);
box->setMinimum(-FLT_MAX); box->setMinimum(-FLT_MAX);
box->setMaximum(FLT_MAX); box->setMaximum(FLT_MAX);
box->setValue(value); box->setValue(value);