History

Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2

Seth Alves committed 9 years ago

Commit 048da6e2 parents d5ea69d b2abe5a34 files · +137 −3283Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 34 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−4
@@ -296,13 +296,11 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit · 295 unmodified lines
296296
297297 results = entity->getProperties(desiredProperties);
298298
299− // TODO: improve sitting points and naturalDimensions in the future,
300− // for now we've included the old sitting points model behavior for entity types that are models
301− // we've also added this hack for setting natural dimensions of models
299+ // TODO: improve naturalDimensions in the future,
300+ // for now we've added this hack for setting natural dimensions of models
302301 if (entity->getType() == EntityTypes::Model) {
303302 const FBXGeometry* geometry = _entityTree->getGeometryForEntity(entity);
304303 if (geometry) {
305− results.setSittingPoints(geometry->sittingPoints);
306304 Extents meshExtents = geometry->getUnscaledMeshExtents();
307305 results.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
308306 results.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t