Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR feedback

Browse source
This commit is contained in:
Brad Davis 2017-06-27 19:22:07 -07:00
parent 8130a91b8c
commit 28d727153b
4 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -580,21 +580,16 @@ EntityItemProperties RenderableModelEntityItem::getProperties(EntityPropertyFlag
}
const FBXGeometry* geometry = NULL;
const_cast<RenderableModelEntityItem*>(this)->getModel();
if (_model && _model->isLoaded()) {
geometry = &_model->getFBXGeometry();
}
// TODO: improve naturalDimensions in the future,
// for now we've added this hack for setting natural dimensions of models
if (geometry) {
Extents meshExtents = geometry->getUnscaledMeshExtents();
// TODO: improve naturalDimensions in the future,
// for now we've added this hack for setting natural dimensions of models
Extents meshExtents = _model->getFBXGeometry().getUnscaledMeshExtents();
properties.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
properties.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
}
return properties;
}

4
libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
View file

@ -1,6 +1,6 @@
//
// MeshProxy.cpp
// libraries/model/src/model/
// SimpleMeshProxy.cpp
// libraries/model-networking/src/model-networking/
//
// Created by Seth Alves on 2017-3-22.
// Copyright 2017 High Fidelity, Inc.

4
libraries/model-networking/src/model-networking/SimpleMeshProxy.h
View file

@ -1,6 +1,6 @@
//
// MeshProxy.h
// libraries/model/src/model/
// SimpleMeshProxy.h
// libraries/model-networking/src/model-networking/
//
// Created by Seth Alves on 2017-1-27.
// Copyright 2017 High Fidelity, Inc.

6
libraries/model/src/model/Forward.h
View file

@ -1,9 +1,9 @@
//
// Geometry.h
// Forward.h
// libraries/model/src/model
//
// Created by Sam Gateau on 12/5/2014.
// Copyright 2014 High Fidelity, Inc.
// Created by Bradley Austin Davis on 2017/06/21
// Copyright 2013-2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html