History

Don't make downloaded Clara.io models dynamic

David Rowe committed 9 years ago

Commit d02e2171 parent c60a78d1 file · +0 −3Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+0−3
@@ -5763,7 +5763,6 @@ void Application::addAssetToWorldAddEntity(QString mapping) { · 5762 unmodified lines
5763 properties.setShapeType(SHAPE_TYPE_SIMPLE_COMPOUND);5763 properties.setShapeType(SHAPE_TYPE_SIMPLE_COMPOUND);
5764 properties.setCollisionless(true); // Temporarily set so that doesn't collide with avatar.5764 properties.setCollisionless(true); // Temporarily set so that doesn't collide with avatar.
5765 properties.setVisible(false); // Temporarily set so that don't see at large unresized dimensions.5765 properties.setVisible(false); // Temporarily set so that don't see at large unresized dimensions.
5766 properties.setDynamic(false);
5767 properties.setPosition(getMyAvatar()->getPosition() + getMyAvatar()->getOrientation() * glm::vec3(0.0f, 0.0f, -2.0f));5766 properties.setPosition(getMyAvatar()->getPosition() + getMyAvatar()->getOrientation() * glm::vec3(0.0f, 0.0f, -2.0f));
5768 properties.setGravity(glm::vec3(0.0f, 0.0f, 0.0f));5767 properties.setGravity(glm::vec3(0.0f, 0.0f, 0.0f));
5769 auto entityID = DependencyManager::get<EntityScriptingInterface>()->addEntity(properties);5768 auto entityID = DependencyManager::get<EntityScriptingInterface>()->addEntity(properties);
@@ -5821,7 +5820,6 @@ void Application::addAssetToWorldCheckModelSize() { · 51 unmodified lines
5821 }5820 }
5822 properties.setVisible(true);5821 properties.setVisible(true);
5823 properties.setCollisionless(false);5822 properties.setCollisionless(false);
5824 properties.setDynamic(true);
5825 properties.setUserData(GRABBABLE_USER_DATA);5823 properties.setUserData(GRABBABLE_USER_DATA);
5826 properties.setLastEdited(usecTimestampNow());5824 properties.setLastEdited(usecTimestampNow());
5827 entityScriptingInterface->editEntity(entityID, properties);5825 entityScriptingInterface->editEntity(entityID, properties);
@@ -5839,7 +5837,6 @@ void Application::addAssetToWorldCheckModelSize() { · 11 unmodified lines
5839 EntityItemProperties properties;5837 EntityItemProperties properties;
5840 properties.setVisible(true);5838 properties.setVisible(true);
5841 properties.setCollisionless(false);5839 properties.setCollisionless(false);
5842 properties.setDynamic(true);
5843 properties.setUserData(GRABBABLE_USER_DATA);5840 properties.setUserData(GRABBABLE_USER_DATA);
5844 properties.setLastEdited(usecTimestampNow());5841 properties.setLastEdited(usecTimestampNow());
5845 entityScriptingInterface->editEntity(entityID, properties);5842 entityScriptingInterface->editEntity(entityID, properties);