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

less obfuscation

Browse source
This commit is contained in:
Andrew Meadows 2017-05-19 15:58:54 -07:00
parent d3956b47d0
commit f80e7a3743
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
View file

@ -82,22 +82,18 @@ int RenderableZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned ch
return bytesRead; return bytesRead;
} }
void RenderableZoneEntityItem::initialSimulation() {
_model->setScaleToFit(true, getDimensions());
_model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
_model->setRotation(getRotation());
_model->setTranslation(getPosition());
_model->simulate(0.0f);
_needsInitialSimulation = false;
}
void RenderableZoneEntityItem::updateGeometry() { void RenderableZoneEntityItem::updateGeometry() {
if (_model && !_model->isActive() && hasCompoundShapeURL()) { if (_model && !_model->isActive() && hasCompoundShapeURL()) {
// Since we have a delayload, we need to update the geometry if it has been downloaded // Since we have a delayload, we need to update the geometry if it has been downloaded
_model->setURL(getCompoundShapeURL()); _model->setURL(getCompoundShapeURL());
} }
if (_model && _model->isActive() && _needsInitialSimulation) { if (_model && _model->isActive() && _needsInitialSimulation) {
initialSimulation(); _model->setScaleToFit(true, getDimensions());
_model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
_model->setRotation(getRotation());
_model->setTranslation(getPosition());
_model->simulate(0.0f);
_needsInitialSimulation = false;
} }
} }

1
libraries/entities-renderer/src/RenderableZoneEntityItem.h
View file

@ -48,7 +48,6 @@ private:
virtual void dimensionsChanged() override { EntityItem::dimensionsChanged(); notifyBoundChanged(); } virtual void dimensionsChanged() override { EntityItem::dimensionsChanged(); notifyBoundChanged(); }
void notifyBoundChanged(); void notifyBoundChanged();
void initialSimulation();
void updateGeometry(); void updateGeometry();
template<typename Lambda> template<typename Lambda>