History

Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge

humbletim committed 8 years ago

Commit 72fca7e2 parents be8d79f 4c6169e498 files · +18323 −41125Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 498 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+107−17
@@ -273,8 +273,10 @@ void Model::updateRenderItems() { · 272 unmodified lines
273 273
274 bool isWireframe = self->isWireframe();274 bool isWireframe = self->isWireframe();
275 bool isVisible = self->isVisible();275 bool isVisible = self->isVisible();
276 uint8_t viewTagBits = self->getViewTagBits();
276 bool isLayeredInFront = self->isLayeredInFront();277 bool isLayeredInFront = self->isLayeredInFront();
277 bool isLayeredInHUD = self->isLayeredInHUD();278 bool isLayeredInHUD = self->isLayeredInHUD();
279 bool isGroupCulled = self->isGroupCulled();
278 280
279 render::Transaction transaction;281 render::Transaction transaction;
280 for (int i = 0; i < (int) self->_modelMeshRenderItemIDs.size(); i++) {282 for (int i = 0; i < (int) self->_modelMeshRenderItemIDs.size(); i++) {
@@ -285,8 +287,10 @@ void Model::updateRenderItems() { · 4 unmodified lines
285 287
286 bool invalidatePayloadShapeKey = self->shouldInvalidatePayloadShapeKey(meshIndex);288 bool invalidatePayloadShapeKey = self->shouldInvalidatePayloadShapeKey(meshIndex);
287 289
288 transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, clusterTransforms, invalidatePayloadShapeKey,290 transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, clusterTransforms,
289 isWireframe, isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {291 invalidatePayloadShapeKey, isWireframe, isVisible,
292 viewTagBits, isLayeredInFront,
293 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
290 data.updateClusterBuffer(clusterTransforms);294 data.updateClusterBuffer(clusterTransforms);
291 295
292 Transform renderTransform = modelTransform;296 Transform renderTransform = modelTransform;
@@ -302,7 +306,7 @@ void Model::updateRenderItems() { · 9 unmodified lines
302 }306 }
303 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);307 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
304 308
305 data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);309 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
306 data.setLayer(isLayeredInFront, isLayeredInHUD);310 data.setLayer(isLayeredInFront, isLayeredInHUD);
307 data.setShapeKey(invalidatePayloadShapeKey, isWireframe);311 data.setShapeKey(invalidatePayloadShapeKey, isWireframe);
308 });312 });
@@ -694,22 +698,26 @@ void Model::calculateTriangleSets() { · 385 unmodified lines
694 }698 }
695}699}
696 700
697void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene) {701void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled) {
698 if (_isVisible != isVisible) {702 if (_isVisible != isVisible || _viewTagBits != viewTagBits || _isGroupCulled != isGroupCulled) {
699 _isVisible = isVisible;703 _isVisible = isVisible;
704 _viewTagBits = viewTagBits;
705 _isGroupCulled = isGroupCulled;
700 706
701 bool isLayeredInFront = _isLayeredInFront;707 bool isLayeredInFront = _isLayeredInFront;
702 bool isLayeredInHUD = _isLayeredInHUD;708 bool isLayeredInHUD = _isLayeredInHUD;
703 709
704 render::Transaction transaction;710 render::Transaction transaction;
705 foreach (auto item, _modelMeshRenderItemsMap.keys()) {711 foreach (auto item, _modelMeshRenderItemsMap.keys()) {
706 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {712 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
707 data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);713 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
714 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
708 });715 });
709 }716 }
710 foreach(auto item, _collisionRenderItemsMap.keys()) {717 foreach(auto item, _collisionRenderItemsMap.keys()) {
711 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {718 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
712 data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);719 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
720 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
713 });721 });
714 }722 }
715 scene->enqueueTransaction(transaction);723 scene->enqueueTransaction(transaction);
@@ -722,18 +730,22 @@ void Model::setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& · 6 unmodified lines
722 _isLayeredInFront = isLayeredInFront;730 _isLayeredInFront = isLayeredInFront;
723 731
724 bool isVisible = _isVisible;732 bool isVisible = _isVisible;
733 uint8_t viewTagBits = _viewTagBits;
725 bool isLayeredInHUD = _isLayeredInHUD;734 bool isLayeredInHUD = _isLayeredInHUD;
735 bool isGroupCulled = _isGroupCulled;
726 736
727 render::Transaction transaction;737 render::Transaction transaction;
728 foreach(auto item, _modelMeshRenderItemsMap.keys()) {738 foreach(auto item, _modelMeshRenderItemsMap.keys()) {
729 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {739 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
730 data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);740 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
741 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
731 data.setLayer(isLayeredInFront, isLayeredInHUD);742 data.setLayer(isLayeredInFront, isLayeredInHUD);
732 });743 });
733 }744 }
734 foreach(auto item, _collisionRenderItemsMap.keys()) {745 foreach(auto item, _collisionRenderItemsMap.keys()) {
735 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {746 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
736 data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);747 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
748 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
737 data.setLayer(isLayeredInFront, isLayeredInHUD);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 _isLayeredInHUD = isLayeredInHUD;758 _isLayeredInHUD = isLayeredInHUD;
747 759
748 bool isVisible = _isVisible;760 bool isVisible = _isVisible;
761 uint8_t viewTagBits = _viewTagBits;
749 bool isLayeredInFront = _isLayeredInFront;762 bool isLayeredInFront = _isLayeredInFront;
763 bool isGroupCulled = _isGroupCulled;
750 764
751 render::Transaction transaction;765 render::Transaction transaction;
752 foreach(auto item, _modelMeshRenderItemsMap.keys()) {766 foreach(auto item, _modelMeshRenderItemsMap.keys()) {
753 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {767 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
754 data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);768 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
769 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
755 data.setLayer(isLayeredInFront, isLayeredInHUD);770 data.setLayer(isLayeredInFront, isLayeredInHUD);
756 });771 });
757 }772 }
758 foreach(auto item, _collisionRenderItemsMap.keys()) {773 foreach(auto item, _collisionRenderItemsMap.keys()) {
759 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, isLayeredInFront, isLayeredInHUD](ModelMeshPartPayload& data) {774 transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
760 data.setKey(isVisible, isLayeredInFront || isLayeredInHUD);775 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
776 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
761 data.setLayer(isLayeredInFront, isLayeredInHUD);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 _modelMeshRenderItemIDs.clear();845 _modelMeshRenderItemIDs.clear();
830 _modelMeshRenderItemsMap.clear();846 _modelMeshRenderItemsMap.clear();
831 _modelMeshRenderItems.clear();847 _modelMeshRenderItems.clear();
848 _modelMeshMaterialNames.clear();
832 _modelMeshRenderItemShapes.clear();849 _modelMeshRenderItemShapes.clear();
833 850
834 foreach(auto item, _collisionRenderItemsMap.keys()) {851 foreach(auto item, _collisionRenderItemsMap.keys()) {
@@ -1457,6 +1474,7 @@ void Model::createVisibleRenderItemSet() { · 622 unmodified lines
1457 Q_ASSERT(_modelMeshRenderItems.isEmpty());1474 Q_ASSERT(_modelMeshRenderItems.isEmpty());
1458 1475
1459 _modelMeshRenderItems.clear();1476 _modelMeshRenderItems.clear();
1477 _modelMeshMaterialNames.clear();
1460 _modelMeshRenderItemShapes.clear();1478 _modelMeshRenderItemShapes.clear();
1461 1479
1462 Transform transform;1480 Transform transform;
@@ -1480,6 +1498,7 @@ void Model::createVisibleRenderItemSet() { · 17 unmodified lines
1480 int numParts = (int)mesh->getNumParts();1498 int numParts = (int)mesh->getNumParts();
1481 for (int partIndex = 0; partIndex < numParts; partIndex++) {1499 for (int partIndex = 0; partIndex < numParts; partIndex++) {
1482 _modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);1500 _modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
1501 _modelMeshMaterialNames.push_back(getGeometry()->getShapeMaterial(shapeID)->getName());
1483 _modelMeshRenderItemShapes.emplace_back(ShapeInfo{ (int)i });1502 _modelMeshRenderItemShapes.emplace_back(ShapeInfo{ (int)i });
1484 shapeID++;1503 shapeID++;
1485 }1504 }
@@ -1525,6 +1544,77 @@ bool Model::isRenderable() const { · 39 unmodified lines
1525 return !_meshStates.empty() || (isLoaded() && _renderGeometry->getMeshes().empty());1544 return !_meshStates.empty() || (isLoaded() && _renderGeometry->getMeshes().empty());
1526}1545}
1527 1546
1547std::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
1568void 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
1593void 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
1528class CollisionRenderGeometry : public Geometry {1618class CollisionRenderGeometry : public Geometry {
1529public:1619public:
1530 CollisionRenderGeometry(graphics::MeshPointer mesh) {1620 CollisionRenderGeometry(graphics::MeshPointer mesh) {

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