Commit 38df8801 authored by Matt Clarkson's avatar Matt Clarkson

Fixed warnings

parent ecc686e5
......@@ -78,7 +78,7 @@ void ActorTreeAbstract::extractActors(ActorCollection& list)
void ActorTreeAbstract::extractVisibleActors(ActorCollection& list, const Camera* camera, unsigned enable_mask)
{
// If enabled try and cull the whole node
if ( ! isEnabled() || camera && camera->frustum().cull( aabb() ) ) {
if ( ! isEnabled() || ( camera && camera->frustum().cull( aabb() ) ) ) {
return;
}
......
......@@ -246,7 +246,7 @@ void Rendering::render()
// --- RENDER THE QUEUE: loop through the renderers, feeding the output of one as input for the next ---
const RenderQueue* render_queue = renderQueue();
for(size_t i=0; i<renderers().size(); ++i)
for(int i=0; i<renderers().size(); ++i)
{
if (renderers()[i])
{
......
......@@ -379,8 +379,6 @@ void VividRenderer::renderStencil(Camera* camera) {
// Clear color buffer
vec4 bgcolor = camera->viewport()->clearColor(); VL_CHECK_OGL();
glClearColor( 0, 0, 0, 1 ); VL_CHECK_OGL();
glClear( GL_COLOR_BUFFER_BIT ); VL_CHECK_OGL();
......@@ -852,6 +850,8 @@ int VividRenderer::renderQueue(const RenderQueue* render_queue, GLSLProgram* cur
case vl::TD_TEXTURE_1D: const_cast<Shader*>(shader)->getUniform("vl_Vivid.textureDimension")->setUniformI( 1 ); break;
case vl::TD_TEXTURE_2D: const_cast<Shader*>(shader)->getUniform("vl_Vivid.textureDimension")->setUniformI( 2 ); break;
case vl::TD_TEXTURE_3D: const_cast<Shader*>(shader)->getUniform("vl_Vivid.textureDimension")->setUniformI( 3 ); break;
// error
default: const_cast<Shader*>(shader)->getUniform("vl_Vivid.textureDimension")->setUniformI( 0 ); break;
}
VL_CHECK_OGL();
......
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