Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Made Sam's graphics patches work with 86 K2.

Browse source
This commit is contained in:
Kasen IO 2019-12-13 02:38:14 -05:00
parent 0bd5e15b47
commit 9839b23061
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,6 +579,7 @@ public:
signals: signals:
void spaceUpdate(std::pair<int32_t, glm::vec4> data); void spaceUpdate(std::pair<int32_t, glm::vec4> data);
void requestRenderUpdate();
protected: protected:
QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers; QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers;
@ -766,6 +767,8 @@ protected:
QHash<QUuid, EntityDynamicPointer> _grabActions; QHash<QUuid, EntityDynamicPointer> _grabActions;
bool _cullWithParent { false }; bool _cullWithParent { false };
mutable bool _needsRenderUpdate { false };
private: private:
static std::function<glm::quat(const glm::vec3&, const glm::quat&, BillboardMode, const glm::vec3&)> _getBillboardRotationOperator; static std::function<glm::quat(const glm::vec3&, const glm::quat&, BillboardMode, const glm::vec3&)> _getBillboardRotationOperator;

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

@ -189,7 +189,7 @@ void MeshPartPayload::render(RenderArgs* args) {
if (!_drawMaterials.empty() && _drawMaterials.top().material && _drawMaterials.top().material->isProcedural() && if (!_drawMaterials.empty() && _drawMaterials.top().material && _drawMaterials.top().material->isProcedural() &&
_drawMaterials.top().material->isReady()) { _drawMaterials.top().material->isReady()) {
if (!(enableMaterialProceduralShaders && ENABLE_MATERIAL_PROCEDURAL_SHADERS)) { if (!enableMaterialProceduralShaders) {
return; return;
} }
auto procedural = std::static_pointer_cast<graphics::ProceduralMaterial>(_drawMaterials.top().material); auto procedural = std::static_pointer_cast<graphics::ProceduralMaterial>(_drawMaterials.top().material);

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

@ -75,9 +75,12 @@ public:
void setCullWithParent(bool value) { _cullWithParent = value; } void setCullWithParent(bool value) { _cullWithParent = value; }
static bool enableMaterialProceduralShaders;
protected: protected:
render::ItemKey _itemKey{ render::ItemKey::Builder::opaqueShape().build() }; render::ItemKey _itemKey{ render::ItemKey::Builder::opaqueShape().build() };
bool _cullWithParent { false }; bool _cullWithParent { false };
uint64_t _created;
}; };
namespace render { namespace render {

2
libraries/render/src/render/Item.h
View file

@ -614,7 +614,7 @@ public:
virtual ShapeKey getShapeKey() = 0; virtual ShapeKey getShapeKey() = 0;
virtual Item::Bound getBound() = 0; virtual Item::Bound getBound() = 0;
virtual void render(RenderArgs* args) = 0; virtual void render(RenderArgs* args) = 0;
virtual uint32_t metaFetchMetaSubItems(ItemIDs& subItems) = 0; virtual uint32_t metaFetchMetaSubItems(ItemIDs& subItems) const = 0;
}; };
template <> const ItemKey payloadGetKey(const PayloadProxyInterface::Pointer& payload); template <> const ItemKey payloadGetKey(const PayloadProxyInterface::Pointer& payload);