Commit 539b3531 authored by Michele Bosi's avatar Michele Bosi

vl_Vivid.outline.width is float

parent 186c9834
......@@ -61,7 +61,7 @@ struct OutlineParameters {
// <per-Shader>
// Outline width
int width;
float width;
// <automatic>
// Offset in camera space
......
......@@ -412,7 +412,6 @@ void VividRenderer::renderStencil(Camera* camera) {
//-------------------------------------------------------------------------------------------------
void VividRenderer::renderFrontToBackPeeling(const RenderQueue* render_queue, Camera* camera, real frame_clock)
{
// mShaderOutline2D->gocUniform("vl_Vivid.outline.width")->setUniformI( 5 );
mShaderOutline2D->gocUniform("vl_Vivid.alpha")->setUniform( mVividRendering->alpha() );
mShaderOutline3D->gocUniform("vl_Vivid.outline.eyeOffset")->setUniform( mVividRendering->outline3DEyeOffset() );
......@@ -832,7 +831,7 @@ void VividRenderer::renderQueue(const RenderQueue* render_queue, GLSLProgram* cu
cur_glsl->applyUniformSet( shader->getUniformSet() );
if ( outline_on ) {
if ( shader->getUniformSet()->getUniform("vl_Vivid.outline.width") ) {
glLineWidth( (float)shader->getUniformSet()->getUniform("vl_Vivid.outline.width")->getUniformI() );
glLineWidth( shader->getUniformSet()->getUniform("vl_Vivid.outline.width")->getUniformF() );
} else {
// this should never happen
glLineWidth( 1 );
......
......@@ -125,7 +125,7 @@ ref<Effect> VividRendering::makeVividEffect(Effect* effect) {
// Outline
fx->shader()->gocUniform("vl_Vivid.renderMode")->setUniformI( 0 ); // 0=Polys, 1=Outline3D, 2=Polys+Outline3D, 3=Slice, 4=Outline2D, 5=Polys+Outline2D
fx->shader()->gocUniform("vl_Vivid.outline.color")->setUniform( vl::white );
fx->shader()->gocUniform("vl_Vivid.outline.width")->setUniformI( 2 );
fx->shader()->gocUniform("vl_Vivid.outline.width")->setUniformF( 2.0f );
fx->shader()->gocUniform("vl_Vivid.outline.slicePlane")->setUniform( vl::vec4( 1, 0, 0, 0 ) );
// Smart Fog: all the other settings are taken from the standard Fog object
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment