Showing the changes to libraries/render-utils/src/Model.cpp (1 of 498 files). Show all
Unified · Split
| @@ -273,8 +273,10 @@ void Model::updateRenderItems() { · 272 unmodified lines | ||
| 273 | 273 | |
| 274 | 274 | bool isWireframe = self->isWireframe(); |
| 275 | 275 | bool isVisible = self->isVisible(); |
| 276 | + uint8_t viewTagBits = self->getViewTagBits(); | |
| 276 | 277 | bool isLayeredInFront = self->isLayeredInFront(); |
| 277 | 278 | bool isLayeredInHUD = self->isLayeredInHUD(); |
| 279 | + bool isGroupCulled = self->isGroupCulled(); | |
| 278 | 280 | |
| 279 | 281 | render::Transaction transaction; |
| 280 | 282 | for (int i = 0; i < (int) self->_modelMeshRenderItemIDs.size(); i++) { |
| @@ -285,8 +287,10 @@ void Model::updateRenderItems() { · 4 unmodified lines | ||
| 285 | 287 | |
| 286 | 288 | bool invalidatePayloadShapeKey = self->shouldInvalidatePayloadShapeKey(meshIndex); |
| 287 | 289 | |
| 288 | − transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, clusterTransforms, invalidatePayloadShapeKey, | |
| 289 | − isWireframe, isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) { | |
| 290 | + transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, clusterTransforms, | |
| 291 | + invalidatePayloadShapeKey, isWireframe, isVisible, | |
| 292 | + viewTagBits, isLayeredInFront, | |
| 293 | + isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) { | |
| 290 | 294 | data.updateClusterBuffer(clusterTransforms); |
| 291 | 295 | |
| 292 | 296 | Transform renderTransform = modelTransform; |
| @@ -302,7 +306,7 @@ void Model::updateRenderItems() { · 9 unmodified lines | ||
| 302 | 306 | } |
| 303 | 307 | data.updateTransformForSkinnedMesh(renderTransform, modelTransform); |
| 304 | 308 | |
| 305 | − data.setKey(isVisible, isLayeredInFront || isLayeredInHUD); | |
| 309 | + data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled); | |
| 306 | 310 | data.setLayer(isLayeredInFront, isLayeredInHUD); |
| 307 | 311 | data.setShapeKey(invalidatePayloadShapeKey, isWireframe); |
| 308 | 312 | }); |
| @@ -694,22 +698,26 @@ void Model::calculateTriangleSets() { · 385 unmodified lines | ||
| 694 | 698 | } |
| 695 | 699 | } |
| 696 | 700 | |
| 697 | −void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene) { | |
| 698 | − if (_isVisible != isVisible) { | |
| 701 | +void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled) { | |
| 702 | + if (_isVisible != isVisible || _viewTagBits != viewTagBits || _isGroupCulled != isGroupCulled) { | |
| 699 | 703 | _isVisible = isVisible; |
| 704 | + _viewTagBits = viewTagBits; | |
| 705 | + _isGroupCulled = isGroupCulled; | |
| 700 | 706 | |
| 701 | 707 | bool isLayeredInFront = _isLayeredInFront; |
| 702 | 708 | bool isLayeredInHUD = _isLayeredInHUD; |
| 703 | 709 | |
| 704 | 710 | render::Transaction transaction; |
| 705 | 711 | foreach (auto item, _modelMeshRenderItemsMap.keys()) { |
| 706 | − transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) { | |
| 707 | − data.setKey(isVisible, isLayeredInFront || isLayeredInHUD); | |
| 712 | + transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, | |
| 713 | + isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) { | |
| 714 | + data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled); | |
| 708 | 715 | }); |
| 709 | 716 | } |
| 710 | 717 | foreach(auto item, _collisionRenderItemsMap.keys()) { |
| 711 | − transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) { | |
| 712 | − data.setKey(isVisible, isLayeredInFront || isLayeredInHUD); | |
| 718 | + transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, | |
| 719 | + isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) { | |
| 720 | + data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled); | |
| 713 | 721 | }); |
| 714 | 722 | } |
| 715 | 723 | scene->enqueueTransaction(transaction); |
| @@ -722,18 +730,22 @@ void Model::setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& · 6 unmodified lines | ||
| 722 | 730 | _isLayeredInFront = isLayeredInFront; |
| 723 | 731 | |
| 724 | 732 | bool isVisible = _isVisible; |
| 733 | + uint8_t viewTagBits = _viewTagBits; | |
| 725 | 734 | bool isLayeredInHUD = _isLayeredInHUD; |
| 735 | + bool isGroupCulled = _isGroupCulled; | |
| 726 | 736 | |
| 727 | 737 | render::Transaction transaction; |
| 728 | 738 | foreach(auto item, _modelMeshRenderItemsMap.keys()) { |
| 729 | − transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) { | |
| 730 | − data.setKey(isVisible, isLayeredInFront || isLayeredInHUD); | |
| 739 | + transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, | |
| 740 | + isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) { | |
| 741 | + data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled); | |
| 731 | 742 | data.setLayer(isLayeredInFront, isLayeredInHUD); |
| 732 | 743 | }); |
| 733 | 744 | } |
| 734 | 745 | foreach(auto item, _collisionRenderItemsMap.keys()) { |
| 735 | − transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) { | |
| 736 | − data.setKey(isVisible, isLayeredInFront || isLayeredInHUD); | |
| 746 | + transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, | |
| 747 | + isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) { | |
| 748 | + data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled); | |
| 737 | 749 | data.setLayer(isLayeredInFront, isLayeredInHUD); |
| 738 | 750 | }); |
| 739 | 751 | } |
| @@ -746,18 +758,22 @@ void Model::setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& sce · 6 unmodified lines | ||
| 746 | 758 | _isLayeredInHUD = isLayeredInHUD; |
| 747 | 759 | |
| 748 | 760 | bool isVisible = _isVisible; |
| 761 | + uint8_t viewTagBits = _viewTagBits; | |
| 749 | 762 | bool isLayeredInFront = _isLayeredInFront; |
| 763 | + bool isGroupCulled = _isGroupCulled; | |
| 750 | 764 | |
| 751 | 765 | render::Transaction transaction; |
| 752 | 766 | foreach(auto item, _modelMeshRenderItemsMap.keys()) { |
| 753 | − transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) { | |
| 754 | − data.setKey(isVisible, isLayeredInFront || isLayeredInHUD); | |
| 767 | + transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, | |
| 768 | + isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) { | |
| 769 | + data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled); | |
| 755 | 770 | data.setLayer(isLayeredInFront, isLayeredInHUD); |
| 756 | 771 | }); |
| 757 | 772 | } |
| 758 | 773 | foreach(auto item, _collisionRenderItemsMap.keys()) { |
| 759 | − transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) { | |
| 760 | − data.setKey(isVisible, isLayeredInFront || isLayeredInHUD); | |
| 774 | + transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, | |
| 775 | + isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) { | |
| 776 | + data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled); | |
| 761 | 777 | data.setLayer(isLayeredInFront, isLayeredInHUD); |
| 762 | 778 | }); |
| 763 | 779 | } |
| @@ -829,6 +845,7 @@ void Model::removeFromScene(const render::ScenePointer& scene, render::Transacti · 65 unmodified lines | ||
| 829 | 845 | _modelMeshRenderItemIDs.clear(); |
| 830 | 846 | _modelMeshRenderItemsMap.clear(); |
| 831 | 847 | _modelMeshRenderItems.clear(); |
| 848 | + _modelMeshMaterialNames.clear(); | |
| 832 | 849 | _modelMeshRenderItemShapes.clear(); |
| 833 | 850 | |
| 834 | 851 | foreach(auto item, _collisionRenderItemsMap.keys()) { |
| @@ -1457,6 +1474,7 @@ void Model::createVisibleRenderItemSet() { · 622 unmodified lines | ||
| 1457 | 1474 | Q_ASSERT(_modelMeshRenderItems.isEmpty()); |
| 1458 | 1475 | |
| 1459 | 1476 | _modelMeshRenderItems.clear(); |
| 1477 | + _modelMeshMaterialNames.clear(); | |
| 1460 | 1478 | _modelMeshRenderItemShapes.clear(); |
| 1461 | 1479 | |
| 1462 | 1480 | Transform transform; |
| @@ -1480,6 +1498,7 @@ void Model::createVisibleRenderItemSet() { · 17 unmodified lines | ||
| 1480 | 1498 | int numParts = (int)mesh->getNumParts(); |
| 1481 | 1499 | for (int partIndex = 0; partIndex < numParts; partIndex++) { |
| 1482 | 1500 | _modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset); |
| 1501 | + _modelMeshMaterialNames.push_back(getGeometry()->getShapeMaterial(shapeID)->getName()); | |
| 1483 | 1502 | _modelMeshRenderItemShapes.emplace_back(ShapeInfo{ (int)i }); |
| 1484 | 1503 | shapeID++; |
| 1485 | 1504 | } |
| @@ -1525,6 +1544,77 @@ bool Model::isRenderable() const { · 39 unmodified lines | ||
| 1525 | 1544 | return !_meshStates.empty() || (isLoaded() && _renderGeometry->getMeshes().empty()); |
| 1526 | 1545 | } |
| 1527 | 1546 | |
| 1547 | +std::vector<unsigned int> Model::getMeshIDsFromMaterialID(QString parentMaterialName) { | |
| 1548 | + // try to find all meshes with materials that match parentMaterialName as a string | |
| 1549 | + // if none, return parentMaterialName as a uint | |
| 1550 | + std::vector<unsigned int> toReturn; | |
| 1551 | + const QString MATERIAL_NAME_PREFIX = "mat::"; | |
| 1552 | + if (parentMaterialName.startsWith(MATERIAL_NAME_PREFIX)) { | |
| 1553 | + parentMaterialName.replace(0, MATERIAL_NAME_PREFIX.size(), QString("")); | |
| 1554 | + for (unsigned int i = 0; i < (unsigned int)_modelMeshMaterialNames.size(); i++) { | |
| 1555 | + if (_modelMeshMaterialNames[i] == parentMaterialName.toStdString()) { | |
| 1556 | + toReturn.push_back(i); | |
| 1557 | + } | |
| 1558 | + } | |
| 1559 | + } | |
| 1560 | + | |
| 1561 | + if (toReturn.empty()) { | |
| 1562 | + toReturn.push_back(parentMaterialName.toUInt()); | |
| 1563 | + } | |
| 1564 | + | |
| 1565 | + return toReturn; | |
| 1566 | +} | |
| 1567 | + | |
| 1568 | +void Model::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) { | |
| 1569 | + std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(parentMaterialName.c_str())); | |
| 1570 | + render::Transaction transaction; | |
| 1571 | + for (auto shapeID : shapeIDs) { | |
| 1572 | + if (shapeID < _modelMeshRenderItemIDs.size()) { | |
| 1573 | + auto itemID = _modelMeshRenderItemIDs[shapeID]; | |
| 1574 | + bool visible = isVisible(); | |
| 1575 | + uint8_t viewTagBits = getViewTagBits(); | |
| 1576 | + bool layeredInFront = isLayeredInFront(); | |
| 1577 | + bool layeredInHUD = isLayeredInHUD(); | |
| 1578 | + bool wireframe = isWireframe(); | |
| 1579 | + auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex; | |
| 1580 | + bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex); | |
| 1581 | + transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits, | |
| 1582 | + invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) { | |
| 1583 | + data.addMaterial(material); | |
| 1584 | + // if the material changed, we might need to update our item key or shape key | |
| 1585 | + data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits); | |
| 1586 | + data.setShapeKey(invalidatePayloadShapeKey, wireframe); | |
| 1587 | + }); | |
| 1588 | + } | |
| 1589 | + } | |
| 1590 | + AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction); | |
| 1591 | +} | |
| 1592 | + | |
| 1593 | +void Model::removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) { | |
| 1594 | + std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(parentMaterialName.c_str())); | |
| 1595 | + render::Transaction transaction; | |
| 1596 | + for (auto shapeID : shapeIDs) { | |
| 1597 | + if (shapeID < _modelMeshRenderItemIDs.size()) { | |
| 1598 | + auto itemID = _modelMeshRenderItemIDs[shapeID]; | |
| 1599 | + bool visible = isVisible(); | |
| 1600 | + uint8_t viewTagBits = getViewTagBits(); | |
| 1601 | + bool layeredInFront = isLayeredInFront(); | |
| 1602 | + bool layeredInHUD = isLayeredInHUD(); | |
| 1603 | + bool wireframe = isWireframe(); | |
| 1604 | + auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex; | |
| 1605 | + bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex); | |
| 1606 | + transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits, | |
| 1607 | + invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) { | |
| 1608 | + data.removeMaterial(material); | |
| 1609 | + // if the material changed, we might need to update our item key or shape key | |
| 1610 | + data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits); | |
| 1611 | + data.setShapeKey(invalidatePayloadShapeKey, wireframe); | |
| 1612 | + }); | |
| 1613 | + } | |
| 1614 | + } | |
| 1615 | + AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction); | |
| 1616 | +} | |
| 1617 | + | |
| 1528 | 1618 | class CollisionRenderGeometry : public Geometry { |
| 1529 | 1619 | public: |
| 1530 | 1620 | CollisionRenderGeometry(graphics::MeshPointer mesh) { |