mirror of
https://github.com/overte-org/overte.git
synced 2025-06-18 19:00:35 +02:00
more fixes and create checkbox defaults to checked
This commit is contained in:
parent
a072010b02
commit
5dc45e895c
3 changed files with 3 additions and 2 deletions
|
@ -167,7 +167,6 @@ void RenderableModelEntityItem::updateModelBounds() {
|
||||||
model->setSnapModelToRegistrationPoint(!_useOriginalPivot, registrationPoint);
|
model->setSnapModelToRegistrationPoint(!_useOriginalPivot, registrationPoint);
|
||||||
updateRenderItems = true;
|
updateRenderItems = true;
|
||||||
needsSimulate = true;
|
needsSimulate = true;
|
||||||
locationChanged();
|
|
||||||
_needsToRescaleModel = false;
|
_needsToRescaleModel = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,6 +182,7 @@ void RenderableModelEntityItem::updateModelBounds() {
|
||||||
// NOTE: on isAnimatingSomething() we need to call Model::simulate() which calls Rig::updateRig()
|
// NOTE: on isAnimatingSomething() we need to call Model::simulate() which calls Rig::updateRig()
|
||||||
// TODO: there is opportunity to further optimize the isAnimatingSomething() case.
|
// TODO: there is opportunity to further optimize the isAnimatingSomething() case.
|
||||||
model->simulate(0.0f);
|
model->simulate(0.0f);
|
||||||
|
locationChanged();
|
||||||
_needsInitialSimulation = false;
|
_needsInitialSimulation = false;
|
||||||
_needsJointSimulation = false;
|
_needsJointSimulation = false;
|
||||||
updateRenderItems = true;
|
updateRenderItems = true;
|
||||||
|
|
|
@ -1637,7 +1637,7 @@ AACube EntityItem::getMaximumAACube(bool& success) const {
|
||||||
|
|
||||||
// put a cube around the sphere
|
// put a cube around the sphere
|
||||||
// TODO? replace _maxAACube with _boundingSphereRadius
|
// TODO? replace _maxAACube with _boundingSphereRadius
|
||||||
glm::vec3 minimumCorner = (centerOfRotation + getPivot()) - glm::vec3(radius, radius, radius);
|
glm::vec3 minimumCorner = (centerOfRotation + getWorldOrientation() * getPivot()) - glm::vec3(radius, radius, radius);
|
||||||
_maxAACube = AACube(minimumCorner, radius * 2.0f);
|
_maxAACube = AACube(minimumCorner, radius * 2.0f);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -123,6 +123,7 @@ Rectangle {
|
||||||
CheckBox {
|
CheckBox {
|
||||||
id: useOriginalPivot
|
id: useOriginalPivot
|
||||||
text: qsTr("Use Original Pivot")
|
text: qsTr("Use Original Pivot")
|
||||||
|
checked: true
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckBox {
|
CheckBox {
|
||||||
|
|
Loading…
Reference in a new issue