Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 23:12:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

easy conversions of: InDomainUnits --> InMeters

Browse source
This commit is contained in:
Andrew Meadows 2015-02-25 14:48:06 -08:00
parent 2f749e3c51
commit 8d4ea143ce
8 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/ModelReferential.cpp
View file

@ -34,7 +34,7 @@ ModelReferential::ModelReferential(Referential* referential, EntityTree* tree, A
if (item != NULL) {
_refScale = item->getLargestDimensionInDomainUnits();
_refRotation = item->getRotation();
_refPosition = item->getPositionInDomainUnits() * (float)TREE_SCALE;
_refPosition = item->getPositionInMeters();
update();
}
}
@ -53,7 +53,7 @@ ModelReferential::ModelReferential(const QUuid& entityID, EntityTree* tree, Avat
_refScale = item->getLargestDimensionInDomainUnits();
_refRotation = item->getRotation();
_refPosition = item->getPositionInDomainUnits() * (float)TREE_SCALE;
_refPosition = item->getPositionInMeters();
glm::quat refInvRot = glm::inverse(_refRotation);
_scale = _avatar->getTargetScale() / _refScale;

6
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -501,9 +501,9 @@ void EntityTreeRenderer::renderProxies(const EntityItem* entity, RenderArgs* arg
glPopMatrix();
glm::vec3 position = entity->getPositionInDomainUnits() * (float) TREE_SCALE;
glm::vec3 center = entity->getCenterInDomainUnits() * (float) TREE_SCALE;
glm::vec3 dimensions = entity->getDimensionsInDomainUnits() * (float) TREE_SCALE;
glm::vec3 position = entity->getPositionInMeters();
glm::vec3 center = entity->getCenterInMeters();
glm::vec3 dimensions = entity->getDimensionsInMeters();
glm::quat rotation = entity->getRotation();
glPushMatrix();

4
libraries/entities-renderer/src/RenderableBoxEntityItem.cpp
View file

@ -26,8 +26,8 @@ void RenderableBoxEntityItem::render(RenderArgs* args) {
PerformanceTimer perfTimer("RenderableBoxEntityItem::render");
assert(getType() == EntityTypes::Box);
glm::vec3 position = getPositionInMeters();
glm::vec3 center = getCenterInDomainUnits() * (float)TREE_SCALE;
glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE;
glm::vec3 center = getCenterInMeters();
glm::vec3 dimensions = getDimensionsInMeters();
glm::quat rotation = getRotation();
const float MAX_COLOR = 255.0f;

2
libraries/entities-renderer/src/RenderableLightEntityItem.cpp
View file

@ -27,7 +27,7 @@ void RenderableLightEntityItem::render(RenderArgs* args) {
PerformanceTimer perfTimer("RenderableLightEntityItem::render");
assert(getType() == EntityTypes::Light);
glm::vec3 position = getPositionInMeters();
glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE;
glm::vec3 dimensions = getDimensionsInMeters();
glm::quat rotation = getRotation();
float largestDiameter = glm::max(dimensions.x, dimensions.y, dimensions.z);

4
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -114,9 +114,9 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
bool drawAsModel = hasModel();
glm::vec3 position = getPositionInDomainUnits() * (float)TREE_SCALE;
glm::vec3 position = getPositionInMeters();
float size = getSize() * (float)TREE_SCALE;
glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE;
glm::vec3 dimensions = getDimensionsInMeters();
if (drawAsModel) {
remapTextures();

2
libraries/entities-renderer/src/RenderableSphereEntityItem.cpp
View file

@ -28,7 +28,7 @@ void RenderableSphereEntityItem::render(RenderArgs* args) {
assert(getType() == EntityTypes::Sphere);
glm::vec3 position = getPositionInMeters();
glm::vec3 center = getCenterInMeters();
glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE;
glm::vec3 dimensions = getDimensionsInMeters();
glm::quat rotation = getRotation();
const float MAX_COLOR = 255.0f;

2
libraries/entities-renderer/src/RenderableTextEntityItem.cpp
View file

@ -31,7 +31,7 @@ void RenderableTextEntityItem::render(RenderArgs* args) {
PerformanceTimer perfTimer("RenderableTextEntityItem::render");
assert(getType() == EntityTypes::Text);
glm::vec3 position = getPositionInMeters();
glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE;
glm::vec3 dimensions = getDimensionsInMeters();
glm::vec3 halfDimensions = dimensions / 2.0f;
glm::quat rotation = getRotation();
float leftMargin = 0.1f;

4
libraries/entities/src/ModelEntityItem.cpp
View file

@ -255,8 +255,8 @@ void ModelEntityItem::update(const quint64& now) {
void ModelEntityItem::debugDump() const {
qDebug() << "ModelEntityItem id:" << getEntityItemID();
qDebug() << " edited ago:" << getEditedAgo();
qDebug() << " position:" << getPositionInDomainUnits() * (float)TREE_SCALE;
qDebug() << " dimensions:" << getDimensionsInDomainUnits() * (float)TREE_SCALE;
qDebug() << " position:" << getPositionInMeters();
qDebug() << " dimensions:" << getDimensionsInMeters();
qDebug() << " model URL:" << getModelURL();
}