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

Slight improvement on self-rendering, still a bit broken

Browse source
This commit is contained in:
Ada 2025-04-03 21:56:16 +10:00
parent 14323101e2
commit bc8bc289f8
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities-renderer/src/RenderableCanvasEntityItem.cpp
View file

@ -20,6 +20,7 @@ using namespace render::entities;
CanvasEntityRenderer::CanvasEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
_geometryId = DependencyManager::get<GeometryCache>()->allocateID();
_material->setCullFaceMode(graphics::MaterialKey::CullFaceMode::CULL_NONE);
_material->setUnlit(true);
addMaterial(graphics::MaterialLayer(_material, 0), "0");
updateMaterials(true);
}
@ -60,6 +61,9 @@ void CanvasEntityRenderer::doRender(RenderArgs* args) {
}
Transform transform;
withReadLock([&] {
transform = _renderTransform;
});
gpu::Batch* batch = args->_batch;
@ -85,7 +89,7 @@ void CanvasEntityRenderer::doRender(RenderArgs* args) {
}
DependencyManager::get<GeometryCache>()->renderQuad(
*batch, glm::vec2(-0.5f), glm::vec2(0.5f), glm::vec2(0.0f), glm::vec2(1.0f),
*batch, glm::vec2(-0.5f), glm::vec2(0.5f), glm::vec2(0.0f, 1.0f), glm::vec2(1.0f, 0.0f),
glm::vec4(1.0f), _geometryId
);
@ -93,6 +97,4 @@ void CanvasEntityRenderer::doRender(RenderArgs* args) {
// we have to reset this to white for other simple shapes
batch->setResourceTexture(graphics::slot::texture::Texture::MaterialAlbedo, DependencyManager::get<TextureCache>()->getWhiteTexture());
}
qCritical("Canvas rendered");
}

4
libraries/entities/src/CanvasEntityItem.cpp.in
View file

@ -24,7 +24,6 @@ EntityItemPointer CanvasEntityItem::factory(const EntityItemID& entityID, const
CanvasEntityItem::CanvasEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
_type = EntityTypes::Canvas;
_texture = gpu::Texture::createStrict(gpu::Element::COLOR_SRGBA_32, _width, _height, 1, gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR));
}
CanvasEntityItem::~CanvasEntityItem() {}
@ -251,9 +250,6 @@ void CanvasEntityItem::commit() {
}
auto texture = gpu::Texture::createStrict(gpu::Element::COLOR_SRGBA_32, getWidth(), getHeight(), 1, gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR));
//texture->setSize(getWidth(), getHeight());
texture->setStoredMipFormat(gpu::Element::COLOR_SRGBA_32);
texture->setAutoGenerateMips(false);
texture->assignStoredMip(0, _imageData.length(), reinterpret_cast<const uint8_t*>(_imageData.constData()));
texture->setSource("CanvasEntityRenderer");
_texture = texture;

2
libraries/entities/src/CanvasEntityItem.h.in
View file

@ -44,7 +44,7 @@ protected:
QByteArray _imageData;
QVector<CanvasCommand> _commandQueue;
gpu::TexturePointer _texture;
gpu::TexturePointer _texture { nullptr };
};
#endif // hifi_CanvasEntityItem_h