Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 01:10:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing the getLayer from the meshPArtPayload and check that it s working

Browse source
This commit is contained in:
Sam Gateau 2018-05-28 23:20:04 -07:00
parent 678effdb48
commit 2f94c43968
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/CauterizedModel.cpp
View file

@ -278,7 +278,7 @@ void CauterizedModel::updateRenderItems() {
data.setEnableCauterization(enableCauterization); data.setEnableCauterization(enableCauterization);
data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, render::ItemKey::TAG_BITS_ALL, isGroupCulled); data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, render::ItemKey::TAG_BITS_ALL, isGroupCulled);
data.setLayer(isLayeredInFront, isLayeredInHUD); // data.setLayer(isLayeredInFront, isLayeredInHUD);
data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning); data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning);
}); });
} }

10
libraries/render-utils/src/MeshPartPayload.cpp
View file

@ -215,12 +215,13 @@ template <> const Item::Bound payloadGetBound(const ModelMeshPartPayload::Pointe
} }
return Item::Bound(); return Item::Bound();
} }
/*
template <> int payloadGetLayer(const ModelMeshPartPayload::Pointer& payload) { template <> int payloadGetLayer(const ModelMeshPartPayload::Pointer& payload) {
if (payload) { if (payload) {
return payload->getLayer(); return payload->getLayer();
} }
return 0; return 0;
} }*/
template <> const ShapeKey shapeGetShapeKey(const ModelMeshPartPayload::Pointer& payload) { template <> const ShapeKey shapeGetShapeKey(const ModelMeshPartPayload::Pointer& payload) {
if (payload) { if (payload) {
@ -401,7 +402,7 @@ void ModelMeshPartPayload::updateKey(const render::ItemKey& key) {
_itemKey = builder.build(); _itemKey = builder.build();
} }
/*
void ModelMeshPartPayload::setLayer(bool isLayeredInFront, bool isLayeredInHUD) { void ModelMeshPartPayload::setLayer(bool isLayeredInFront, bool isLayeredInHUD) {
if (isLayeredInFront) { if (isLayeredInFront) {
_layer = Item::LAYER_3D_FRONT; _layer = Item::LAYER_3D_FRONT;
@ -411,10 +412,11 @@ void ModelMeshPartPayload::setLayer(bool isLayeredInFront, bool isLayeredInHUD)
_layer = Item::LAYER_3D; _layer = Item::LAYER_3D;
} }
} }
*/
/*
int ModelMeshPartPayload::getLayer() const { int ModelMeshPartPayload::getLayer() const {
return _layer; return _layer;
} }*/
void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe, bool useDualQuaternionSkinning) { void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe, bool useDualQuaternionSkinning) {
if (invalidateShapeKey) { if (invalidateShapeKey) {

8
libraries/render-utils/src/MeshPartPayload.h
View file

@ -107,11 +107,11 @@ public:
void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform); void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform);
// Render Item interface // Render Item interface
int getLayer() const; // int getLayer() const;
render::ShapeKey getShapeKey() const override; // shape interface render::ShapeKey getShapeKey() const override; // shape interface
void render(RenderArgs* args) override; void render(RenderArgs* args) override;
void setLayer(bool isLayeredInFront, bool isLayeredInHUD); // void setLayer(bool isLayeredInFront, bool isLayeredInHUD);
void setShapeKey(bool invalidateShapeKey, bool isWireframe, bool useDualQuaternionSkinning); void setShapeKey(bool invalidateShapeKey, bool isWireframe, bool useDualQuaternionSkinning);
// ModelMeshPartPayload functions to perform render // ModelMeshPartPayload functions to perform render
@ -141,13 +141,13 @@ private:
gpu::BufferPointer _blendedVertexBuffer; gpu::BufferPointer _blendedVertexBuffer;
render::ShapeKey _shapeKey { render::ShapeKey::Builder::invalid() }; render::ShapeKey _shapeKey { render::ShapeKey::Builder::invalid() };
int _layer { render::Item::LAYER_3D }; // int _layer { render::Item::LAYER_3D };
}; };
namespace render { namespace render {
template <> const ItemKey payloadGetKey(const ModelMeshPartPayload::Pointer& payload); template <> const ItemKey payloadGetKey(const ModelMeshPartPayload::Pointer& payload);
template <> const Item::Bound payloadGetBound(const ModelMeshPartPayload::Pointer& payload); template <> const Item::Bound payloadGetBound(const ModelMeshPartPayload::Pointer& payload);
template <> int payloadGetLayer(const ModelMeshPartPayload::Pointer& payload); // template <> int payloadGetLayer(const ModelMeshPartPayload::Pointer& payload);
template <> const ShapeKey shapeGetShapeKey(const ModelMeshPartPayload::Pointer& payload); template <> const ShapeKey shapeGetShapeKey(const ModelMeshPartPayload::Pointer& payload);
template <> void payloadRender(const ModelMeshPartPayload::Pointer& payload, RenderArgs* args); template <> void payloadRender(const ModelMeshPartPayload::Pointer& payload, RenderArgs* args);
} }

2
libraries/render-utils/src/Model.cpp
View file

@ -315,7 +315,7 @@ void Model::updateRenderItems() {
data.updateTransformForSkinnedMesh(renderTransform, modelTransform); data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled); data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
data.setLayer(isLayeredInFront, isLayeredInHUD); // data.setLayer(isLayeredInFront, isLayeredInHUD);
data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning); data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning);
}); });
} }