Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 18:05:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

attempt to give polyvox its own rendering bung

Browse source
This commit is contained in:
Seth Alves 2015-08-01 05:58:22 -07:00
parent 443b9e1e78
commit dbca3fe2fb
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -42,7 +42,7 @@
#include "polyvox_frag.h"
#include "RenderablePolyVoxEntityItem.h"
// gpu::PipelinePointer RenderablePolyVoxEntityItem::_pipeline = nullptr;
gpu::PipelinePointer RenderablePolyVoxEntityItem::_pipeline = nullptr;
EntityItemPointer RenderablePolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
return std::make_shared<RenderablePolyVoxEntityItem>(entityID, properties);
@ -54,7 +54,6 @@ RenderablePolyVoxEntityItem::RenderablePolyVoxEntityItem(const EntityItemID& ent
_xTexture(nullptr),
_yTexture(nullptr),
_zTexture(nullptr) {
model::Mesh* mesh = new model::Mesh();
model::MeshPointer meshPtr(mesh);
_modelGeometry.setMesh(meshPtr);
@ -706,7 +705,12 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) {
gpu::ShaderPointer pixelShader = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(polyvox_frag)));
gpu::Shader::BindingSet slotBindings;
// slotBindings.insert(gpu::Shader::Binding(std::string("materialBuffer"), MATERIAL_GPU_SLOT));
slotBindings.insert(gpu::Shader::Binding(std::string("materialBuffer"), MATERIAL_GPU_SLOT));
// slotBindings.insert(gpu::Shader::Binding(std::string("diffuseMap"), 0));
// slotBindings.insert(gpu::Shader::Binding(std::string("normalMap"), 1));
// slotBindings.insert(gpu::Shader::Binding(std::string("specularMap"), 2));
// slotBindings.insert(gpu::Shader::Binding(std::string("emissiveMap"), 3));
// slotBindings.insert(gpu::Shader::Binding(std::string("lightBuffer"), 4));
gpu::ShaderPointer program = gpu::ShaderPointer(gpu::Shader::createProgram(vertexShader, pixelShader));
gpu::Shader::makeProgram(*program, slotBindings);
@ -747,7 +751,7 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) {
_zTexture = DependencyManager::get<TextureCache>()->getTexture(_zTextureURL);
}
// batch._glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
batch._glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
if (_xTexture) {
batch.setResourceTexture(0, _xTexture->getGPUTexture());
@ -782,14 +786,15 @@ namespace render {
}
template <> const Item::Bound payloadGetBound(const PolyVoxPayload::Pointer& payload) {
if (payload) {
return payload->_bounds;
}
// if (payload && payload->_owner) {
// auto polyVoxEntity = std::dynamic_pointer_cast<RenderablePolyVoxEntityItem>(payload->_owner);
// return polyVoxEntity->getBoundingBox();
// }
return render::Item::Bound();
}
template <> void payloadRender(const PolyVoxPayload::Pointer& payload, RenderArgs* args) {
if (args) {
if (args && payload && payload->_owner) {
payload->_owner->render(args);
}
}

2
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
View file

@ -126,7 +126,7 @@ private:
const int MATERIAL_GPU_SLOT = 3;
render::ItemID _myItem;
/*static*/ gpu::PipelinePointer _pipeline;
static gpu::PipelinePointer _pipeline;
};