History

Threaded rendering & entity rendering refactor

Brad Davis committed 9 years ago

Commit e817d3c1 parent eb9436b81 files · +5147 −5162Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+0−10
@@ -1692,16 +1692,6 @@ void EntityScriptingInterface::setCostMultiplier(float value) { · 1691 unmodified lines
1692 costMultiplier = value;1692 costMultiplier = value;
1693}1693}
1694 1694
1695QObject* EntityScriptingInterface::getWebViewRoot(const QUuid& entityID) {
1696 if (auto entity = checkForTreeEntityAndTypeMatch(entityID, EntityTypes::Web)) {
1697 auto webEntity = std::dynamic_pointer_cast<WebEntityItem>(entity);
1698 QObject* root = webEntity->getRootItem();
1699 return root;
1700 } else {
1701 return nullptr;
1702 }
1703}
1704
1705// TODO move this someplace that makes more sense...1695// TODO move this someplace that makes more sense...
1706bool EntityScriptingInterface::AABoxIntersectsCapsule(const glm::vec3& low, const glm::vec3& dimensions,1696bool EntityScriptingInterface::AABoxIntersectsCapsule(const glm::vec3& low, const glm::vec3& dimensions,
1707 const glm::vec3& start, const glm::vec3& end, float radius) {1697 const glm::vec3& start, const glm::vec3& end, float radius) {