Commit d8c2877a authored by loring's avatar loring
Browse files

fix a couple compiler warnings


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27516 18c085ea-50e0-402c-830e-de6fd14e8384
parent d896012e
......@@ -598,8 +598,13 @@ IceTNetworkManager::RenderGeometry()
// Burlen Loring, Thu Oct 8 16:02:32 PDT 2015
// fix a warning.
//
// Burlen Loring, Sat Oct 17 07:54:42 PDT 2015
// temporarily remove the unused methods because they are creating
// compiler warnings.
//
// ****************************************************************************
avtImage_p
/*avtImage_p
IceTNetworkManager::RenderTranslucent(int windowID, const avtImage_p& input)
{
(void) windowID;
......@@ -616,8 +621,8 @@ IceTNetworkManager::RenderTranslucent(int windowID, const avtImage_p& input)
viswin->ScreenRender(
renderState.viewportedMode,
/*need z=*/true, /*opaque on=*/false,
/*translucent on=*/true, /*disable bg=*/false,
/need z=/true, /opaque on=/false,
/translucent on=/true, /disable bg=/false,
input);
// Restore the background mode for next time
......@@ -628,7 +633,7 @@ IceTNetworkManager::RenderTranslucent(int windowID, const avtImage_p& input)
// In this implementation, the user should never use the return value --
// read it back from IceT instead!
return NULL;
}
}*/
// ****************************************************************************
// Method: Readback
......
......@@ -80,6 +80,10 @@ class Engine;
// Burlen Loring, Tue Sep 1 14:26:30 PDT 2015
// sync up with network manager(base class) order compositing refactor
//
// Burlen Loring, Sat Oct 17 07:57:42 PDT 2015
// temporarily remove the unused methods because they are
// creating compiler warnings.
//
// ****************************************************************************
class ENGINE_MAIN_API IceTNetworkManager: public NetworkManager
......@@ -101,9 +105,9 @@ class ENGINE_MAIN_API IceTNetworkManager: public NetworkManager
virtual
avtImage_p RenderGeometry();
virtual
/*virtual
avtImage_p RenderTranslucent(int windowID,
const avtImage_p& input);
const avtImage_p& input);*/
virtual avtImage_p Readback(VisWindow * const, bool) const;
......
......@@ -6658,6 +6658,9 @@ NetworkManager::RenderingStages()
// I refactored this method to add support for depth peeling and
// ordered compositing.
//
// Burlen Loring, Sat Oct 17 08:23:57 PDT 2015
// fix a compiler warning
//
// ****************************************************************************
avtImage_p
......@@ -6718,8 +6721,8 @@ NetworkManager::RenderGeometry()
//{
// configure for ordered composite. 1) enable alpha channel
// 2) use solid bg 3) set clear color to 0 0 0 0
double bgColor[3];
AnnotationAttributes::BackgroundMode bgMode;
double bgColor[3] = {0.0};
AnnotationAttributes::BackgroundMode bgMode = AnnotationAttributes::Solid;
if (renderState.orderComposite)
{
viswin->EnableAlphaChannel();
......
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