diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp index 4f21fec4d3..748ca29770 100644 --- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp @@ -706,8 +706,8 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) { gpu::Shader::BindingSet slotBindings; 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("xMap"), 0)); + slotBindings.insert(gpu::Shader::Binding(std::string("yMap"), 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)); @@ -739,7 +739,6 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) { sizeof(float) * 3, mesh->getVertexBuffer()._stride); batch.setIndexBuffer(gpu::UINT32, mesh->getIndexBuffer()._buffer, 0); - batch.drawIndexed(gpu::TRIANGLES, mesh->getNumIndices(), 0); if (!_xTextureURL.isEmpty() && !_xTexture) { _xTexture = DependencyManager::get()->getTexture(_xTextureURL); @@ -756,6 +755,11 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) { if (_xTexture) { batch.setResourceTexture(0, _xTexture->getGPUTexture()); } + if (_yTexture) { + batch.setResourceTexture(1, _yTexture->getGPUTexture()); + } + + batch.drawIndexed(gpu::TRIANGLES, mesh->getNumIndices(), 0); RenderableDebugableEntityItem::render(this, args); } diff --git a/libraries/entities-renderer/src/polyvox.slf b/libraries/entities-renderer/src/polyvox.slf index 28433a70ca..2d67149bf8 100644 --- a/libraries/entities-renderer/src/polyvox.slf +++ b/libraries/entities-renderer/src/polyvox.slf @@ -49,8 +49,8 @@ void main(void) { packDeferredFragment( normalize(interpolatedNormal.xyz), - evalOpaqueFinalAlpha(getMaterialOpacity(mat), diffuse.a), - getMaterialDiffuse(mat) * diffuse.rgb * color, - getMaterialSpecular(mat), - getMaterialShininess(mat)); + 0.0, + /*getMaterialDiffuse(mat)*/ /*diffuse.rgb * color*/ vec3(1.0, 1.0, 1.0), + /*getMaterialSpecular(mat)*/ vec3(0.02, 0.02, 0.02), + /*getMaterialShininess(mat)*/ 10.0); }