Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed patch issues

Browse source
This commit is contained in:
Kasen IO 2019-12-13 12:29:08 -05:00
parent 9839b23061
commit 1f01beba70
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/entities-renderer/src/RenderableEntityItem.cpp
View file

@ -168,12 +168,12 @@ render::hifi::Layer EntityRenderer::getHifiRenderLayer() const {
}
ItemKey EntityRenderer::getKey() {
auto builder = ItemKey::Builder().withTypeShape().withTypeMeta().withTagBits(getTagMask()).withLayer(getHifiRenderLayer());
ItemKey::Builder builder =
ItemKey::Builder().withTypeShape().withTypeMeta().withTagBits(getTagMask()).withLayer(getHifiRenderLayer());
if (isTransparent()) {
builder.withTransparent();
}
if (_canCastShadow) {
} else if (_canCastShadow) {
builder.withShadowCaster();
}
@ -181,7 +181,11 @@ ItemKey EntityRenderer::getKey() {
builder.withSubMetaCulled();
}
return builder.build();
if (!_visible) {
builder.withInvisible();
}
return builder;
}
uint32_t EntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) const {

6
libraries/entities/src/EntityItem.cpp
View file

@ -3030,10 +3030,10 @@ bool EntityItem::getCullWithParent() const {
}
void EntityItem::setCullWithParent(bool value) {
if (_cullWithParent != value) {
withWriteLock([&] {
_needsRenderUpdate |= _cullWithParent != value;
_cullWithParent = value;
emit requestRenderUpdate();
}
});
}
bool EntityItem::isChildOfMyAvatar() const {

1
libraries/entities/src/EntityItem.h
View file

@ -579,7 +579,6 @@ public:
signals:
void spaceUpdate(std::pair<int32_t, glm::vec4> data);
void requestRenderUpdate();
protected:
QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers;