Commit 1f3d0624 authored by hrchilds's avatar hrchilds

Update from May 10, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@239 18c085ea-50e0-402c-830e-de6fd14e8384
parent ab52cada
This diff is collapsed.
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:27 PDT 2003
// Creation: Sun May 9 16:06:31 PST 2004
//
// Modifications:
//
......@@ -35,6 +35,12 @@ public:
Interlaced,
CrystalEyes
};
enum DisplayListMode
{
Never,
Always,
Auto
};
static const int DEFAULT_SCALABLE_THRESHOLD;
RenderingAttributes();
......@@ -57,7 +63,7 @@ public:
// Property setting methods
void SetAntialiasing(bool antialiasing_);
void SetGeometryRepresentation(GeometryRepresentation geometryRepresentation_);
void SetDisplayLists(bool displayLists_);
void SetDisplayListMode(DisplayListMode displayListMode_);
void SetStereoRendering(bool stereoRendering_);
void SetStereoType(StereoTypes stereoType_);
void SetNotifyForEachRender(bool notifyForEachRender_);
......@@ -71,7 +77,7 @@ public:
// Property getting methods
bool GetAntialiasing() const;
GeometryRepresentation GetGeometryRepresentation() const;
bool GetDisplayLists() const;
DisplayListMode GetDisplayListMode() const;
bool GetStereoRendering() const;
StereoTypes GetStereoType() const;
bool GetNotifyForEachRender() const;
......@@ -98,6 +104,11 @@ public:
protected:
static std::string StereoTypes_ToString(int);
public:
static std::string DisplayListMode_ToString(DisplayListMode);
static bool DisplayListMode_FromString(const std::string &, DisplayListMode &);
protected:
static std::string DisplayListMode_ToString(int);
public:
// Keyframing methods
virtual std::string GetFieldName(int index) const;
......@@ -108,7 +119,7 @@ public:
private:
bool antialiasing;
int geometryRepresentation;
bool displayLists;
int displayListMode;
bool stereoRendering;
int stereoType;
bool notifyForEachRender;
......
<?xml version="1.0"?>
<Attribute name="RenderingAttributes" purpose="This class contains special rendering attributes like antialiasing and stero settings." exportAPI="STATE_API" exportInclude="state_exports.h" codefile="RenderingAttributes.code">
<Constant name="DEFAULT_SCALABLE_THRESHOLD" member="false"></Constant>
<Attribute name="RenderingAttributes" purpose="This class contains special rendering attributes like antialiasing and stero settings." persistent="true" exportAPI="STATE_API" exportInclude="state_exports.h" codefile="RenderingAttributes.code">
<Enum name="GeometryRepresentation">
Surfaces
Wireframe
Points
Surfaces
Wireframe
Points
</Enum>
<Enum name="StereoTypes">
RedBlue
Interlaced
CrystalEyes
RedBlue
Interlaced
CrystalEyes
</Enum>
<Field name="antialiasing" type="bool">false</Field>
<Field name="geometryRepresentation" type="enum" subtype="GeometryRepresentation">Surfaces</Field>
<Field name="displayLists" type="bool">true</Field>
<Field name="stereoRendering" type="bool">false</Field>
<Field name="stereoType" type="enum" subtype="StereoTypes">CrystalEyes</Field>
<Field name="notifyForEachRender" type="bool">false</Field>
<Field name="scalableRendering" type="bool">false</Field>
<Field name="scalableThreshold" type="int">2000000</Field>
<Field name="specularFlag" type="bool">false</Field>
<Field name="specularCoeff" type="float">0.6</Field>
<Field name="specularPower" type="float">10.0</Field>
<Field name="specularColor" type="color">255 255 255 255</Field>
<Enum name="DisplayListMode">
Never
Always
Auto
</Enum>
<Field name="antialiasing" label="antialiasing" type="bool">
false
</Field>
<Field name="geometryRepresentation" label="geometryRepresentation" type="enum" subtype="GeometryRepresentation">
Surfaces
</Field>
<Field name="displayListMode" label="displayListMode" type="enum" subtype="DisplayListMode">
Auto
</Field>
<Field name="stereoRendering" label="stereoRendering" type="bool">
false
</Field>
<Field name="stereoType" label="stereoType" type="enum" subtype="StereoTypes">
CrystalEyes
</Field>
<Field name="notifyForEachRender" label="notifyForEachRender" type="bool">
false
</Field>
<Field name="scalableRendering" label="scalableRendering" type="bool">
false
</Field>
<Field name="scalableThreshold" label="scalableThreshold" type="int">
2000000
</Field>
<Field name="specularFlag" label="specularFlag" type="bool">
false
</Field>
<Field name="specularCoeff" label="specularCoeff" type="float">
0.600000
</Field>
<Field name="specularPower" label="specularPower" type="float">
10.000000
</Field>
<Field name="specularColor" label="specularColor" type="color">
255
255
255
255
</Field>
<Constant name="DEFAULT_SCALABLE_THRESHOLD" member="false">
</Constant>
</Attribute>
......@@ -210,6 +210,9 @@ VisWinPlots::~VisWinPlots()
// Jeremy Meredith, Fri Nov 14 17:56:24 PST 2003
// Added specular properties.
//
// Hank Childs, Mon May 10 08:42:32 PDT 2004
// Get the immediate morde rendering info from a different source.
//
// ****************************************************************************
void
......@@ -306,7 +309,8 @@ VisWinPlots::AddPlot(avtActor_p &p)
//
// Ensure that the new plot has the right immediate mode rendering flag.
//
p->SetImmediateModeRendering(mediator.GetImmediateModeRendering());
VisWindow *vw = mediator;
p->SetImmediateModeRendering(vw->GetImmediateModeRendering());
mediator.UpdatePlotList(plots);
......
......@@ -81,6 +81,9 @@ bool VisWinRendering::stereoEnabled = false;
// Jeremy Meredith, Fri Nov 14 11:29:05 PST 2003
// Added specular properties.
//
// Hank Childs, Mon May 10 08:27:32 PDT 2004
// Initialize displayListMode.
//
// ****************************************************************************
VisWinRendering::VisWinRendering(VisWindowColleagueProxy &p)
......@@ -95,7 +98,7 @@ VisWinRendering::VisWinRendering(VisWindowColleagueProxy &p)
minRenderTime = 1.e6;
stereo = false;
stereoType = 2;
immediateMode = false;
displayListMode = 2; // Auto
surfaceRepresentation = 0;
specularFlag = false;
specularCoeff = .6;
......@@ -834,6 +837,24 @@ VisWinRendering::SetSize(int w, int h)
}
}
// ****************************************************************************
// Method: VisWinRendering::IsDirect
//
// Purpose:
// Determines if the vis window is direct connection to the GPU or if it
// goes through the X-server.
//
// Programmer: Hank Childs
// Creation: May 9, 2004
//
// ****************************************************************************
bool
VisWinRendering::IsDirect(void)
{
return (GetRenderWindow()->IsDirect() ? true : false);
}
// ****************************************************************************
// Method: VisWinRendering::GetSize
//
......@@ -1257,26 +1278,23 @@ VisWinRendering::SetStereoRendering(bool enabled, int type)
}
// ****************************************************************************
// Method: VisWinRendering::SetImmediateModeRendering
// Method: VisWinRendering::SetDisplayListMode
//
// Purpose:
// Sets the immediate rendering mode for all of the actors in the canvas
// renderer.
// Sets the display list mode.
//
// Arguments:
// mode : The new immediate rendering mode.
// mode : The new display list mode.
//
// Programmer: Brad Whitlock
// Creation: Mon Sep 23 14:26:10 PST 2002
// Programmer: Hank Childs
// Creation: May 10, 2004
//
// Modifications:
//
// ****************************************************************************
void
VisWinRendering::SetImmediateModeRendering(bool mode)
VisWinRendering::SetDisplayListMode(int mode)
{
immediateMode = mode;
displayListMode = mode;
}
// ****************************************************************************
......
......@@ -112,6 +112,9 @@ class VisWindowColleagueProxy;
// Mark C. Miller, Wed Mar 31 17:47:20 PST 2004
// Added doViewportOnly bool argument to ScreenCapture method
//
// Hank Childs, Sun May 9 16:25:27 PDT 2004
// Added IsDirect. Also add support for display list mode.
//
// ****************************************************************************
class VISWINDOW_API VisWinRendering : public VisWinColleague
......@@ -160,6 +163,7 @@ class VISWINDOW_API VisWinRendering : public VisWinColleague
bool GetRealized() {return realized;};
bool IsDirect(void);
vtkRenderer *GetFirstRenderer(void);
virtual void SetResizeEvent(void(*callback)(void *), void *) = 0;
......@@ -178,9 +182,9 @@ class VISWINDOW_API VisWinRendering : public VisWinColleague
{ return stereo; };
int GetStereoType() const
{ return stereoType; };
void SetImmediateModeRendering(bool mode);
bool GetImmediateModeRendering() const
{ return immediateMode; };
void SetDisplayListMode(int mode);
int GetDisplayListMode() const
{ return displayListMode; };
virtual void SetSurfaceRepresentation(int rep);
int GetSurfaceRepresentation() const
{ return surfaceRepresentation; };
......@@ -223,7 +227,7 @@ class VISWINDOW_API VisWinRendering : public VisWinColleague
bool antialiasing;
bool stereo;
int stereoType;
bool immediateMode;
int displayListMode;
int surfaceRepresentation;
bool specularFlag;
float specularCoeff;
......@@ -248,7 +252,6 @@ class VISWINDOW_API VisWinRendering : public VisWinColleague
int scalableThreshold;
void InitializeRenderWindow(vtkRenderWindow *);
void UpdateImmediateMode(bool mode);
void ResetCounters();
virtual vtkRenderWindow *GetRenderWindow(void) = 0;
......
......@@ -71,6 +71,8 @@
// Kathleen Bonnell, Wed Dec 3 16:49:14 PST 2003
// Added 'ReAddtoolsToRenderWindow'.
//
// Hank Childs, Mon May 10 08:31:01 PDT 2004
// Removed ImmediateMode rendering method.
// ****************************************************************************
class VISWINDOW_API VisWindowColleagueProxy : public VisWindowProtectionProxy
......@@ -137,9 +139,6 @@ class VISWINDOW_API VisWindowColleagueProxy : public VisWindowProtectionProxy
int GetSurfaceRepresentation()
{ return ProxiedGetSurfaceRepresentation(); };
bool GetImmediateModeRendering()
{ return ProxiedGetImmediateModeRendering(); };
bool DisableExternalRenderRequests()
{ return ProxiedDisableExternalRenderRequests(); };
......
......@@ -669,25 +669,6 @@ VisWindowProtectionProxy::ProxiedGetSurfaceRepresentation()
return viswin->GetSurfaceRepresentation();
}
// ****************************************************************************
// Method: VisWindowProtectionProxy::ProxiedGetImmediateModeRendering
//
// Purpose:
// Returns the immediate rendering mode.
//
// Programmer: Brad Whitlock
// Creation: Mon Sep 23 16:32:43 PST 2002
//
// Modifications:
//
// ****************************************************************************
bool
VisWindowProtectionProxy::ProxiedGetImmediateModeRendering()
{
return viswin->GetImmediateModeRendering();
}
// ****************************************************************************
// Method: VisWindowProtectionProxy::ProxiedDisableExternalRenderRequests
//
......
......@@ -86,6 +86,9 @@ class VisitInteractor;
// Kathleen Bonnell, Wed Dec 3 16:49:14 PST 2003
// Added methods TransparenciesExist, ReAddToolsToRenderWindow.
//
// Hank Childs, Mon May 10 08:31:01 PDT 2004
// Removed immediate mode rendering method.
//
// ****************************************************************************
class VISWINDOW_API VisWindowProtectionProxy
......@@ -138,7 +141,6 @@ class VISWINDOW_API VisWindowProtectionProxy
bool ProxiedGetLighting();
void ProxiedUpdateLightPositions();
int ProxiedGetSurfaceRepresentation();
bool ProxiedGetImmediateModeRendering();
bool ProxiedDisableExternalRenderRequests();
bool ProxiedEnableExternalRenderRequests();
void ProxiedGetScaleFactorAndType(double &s, int &t);
......
......@@ -4502,48 +4502,89 @@ VisWindow::GetStereoType() const
}
// ****************************************************************************
// Method: VisWindow::SetImmediateModeRendering
// Method: VisWindow::GetImmediateModeRendering
//
// Purpose:
// Tells the window whether or not it should use immediate mode rendering.
// Declares whether or not we should do immediate mode rendering.
//
// Programmer: Hank Childs
// Creation: May 9, 2004
//
// ****************************************************************************
bool
VisWindow::GetImmediateModeRendering(void)
{
int mode = GetDisplayListMode();
if (mode == 0)
return true;
if (mode == 1)
return false;
return IsDirect();
}
// ****************************************************************************
// Method: VisWindow::SetDisplayListMode
//
// Purpose:
// Tells the window what mode to use for display lists.
//
// Arguments:
// mode : The new rendering mode. True = use immediate mode.
// mode : The new display list mode
//
// Programmer: Brad Whitlock
// Creation: Mon Sep 23 14:10:07 PST 2002
// Programmer: Hank Childs
// Creation: May 9, 2004
//
// Modifications:
//
// ****************************************************************************
void
VisWindow::SetImmediateModeRendering(bool mode)
VisWindow::SetDisplayListMode(int mode)
{
rendering->SetDisplayListMode(mode);
bool immediateMode = GetImmediateModeRendering();
std::vector< VisWinColleague * >::iterator it;
for (it = colleagues.begin() ; it != colleagues.end() ; it++)
{
(*it)->SetImmediateModeRendering(mode);
(*it)->SetImmediateModeRendering(immediateMode);
}
}
// ****************************************************************************
// Method: VisWindow::GetImmediateModeRendering
// Method: VisWindow::GetDisplayListMode
//
// Purpose:
// Returns whether or not the window uses immediate mode rendering.
// Returns the display list mode for the window.
//
// Programmer: Brad Whitlock
// Creation: Mon Sep 23 14:10:58 PST 2002
// Programmer: Hank Childs
// Creation: May 10, 2004
//
// ****************************************************************************
int
VisWindow::GetDisplayListMode(void) const
{
return rendering->GetDisplayListMode();
}
// ****************************************************************************
// Method: VisWindow::IsDirect
//
// Purpose:
// Returns whether or not the window is rendering directly to a GPU or
// whether it is going through an X-Server.
//
// Programmer: Hank Childs
// Creation: May 9, 2004
//
// Modifications:
//
// ****************************************************************************
bool
VisWindow::GetImmediateModeRendering() const
VisWindow::IsDirect(void)
{
return rendering->GetImmediateModeRendering();
return rendering->IsDirect();
}
// ****************************************************************************
......
......@@ -251,6 +251,9 @@ class VisitInteractor;
// Mark C. Miller, Wed Mar 31 18:00:23 PST 2004
// Added doViewportOnly arg to ScreenCapture method
//
// Hank Childs, Sun May 9 16:21:36 PDT 2004
// Added IsDirect. Replaced immediate mode rendering with display list mode.
//
// ****************************************************************************
class VISWINDOW_API VisWindow
......@@ -405,8 +408,10 @@ public:
void SetStereoRendering(bool enabled, int type);
bool GetStereo() const;
int GetStereoType() const;
void SetImmediateModeRendering(bool mode);
bool GetImmediateModeRendering() const;
void SetDisplayListMode(int mode);
int GetDisplayListMode(void) const;
bool GetImmediateModeRendering(void);
bool IsDirect(void);
void SetSurfaceRepresentation(int rep);
int GetSurfaceRepresentation() const;
int GetNumTriangles() const;
......
......@@ -1561,6 +1561,10 @@ NetworkManager::Render(intVector plotIds, bool getZBuffer, bool do3DAnnotsOnly)
// Added argument for extents type string and code to set extents type
// on the VisWindow
//
// Hank Childs, Sun May 9 16:16:59 PDT 2004
// Do not turn on display lists on the engine, since they will just eat up
// extra memory.
//
// ****************************************************************************
void
NetworkManager::SetWindowAttributes(const WindowAttributes &atts,
......@@ -1640,8 +1644,7 @@ NetworkManager::SetWindowAttributes(const WindowAttributes &atts,
viswin->SetAntialiasing(atts.GetRenderAtts().GetAntialiasing());
if (viswin->GetSurfaceRepresentation() != atts.GetRenderAtts().GetGeometryRepresentation())
viswin->SetSurfaceRepresentation(atts.GetRenderAtts().GetGeometryRepresentation());
if (viswin->GetImmediateModeRendering() != !atts.GetRenderAtts().GetDisplayLists())
viswin->SetImmediateModeRendering(!atts.GetRenderAtts().GetDisplayLists());
viswin->SetDisplayListMode(0); // never
windowAttributes = atts;
extentTypeString = extstr;
......
This diff is collapsed.
......@@ -39,6 +39,9 @@ class QvisOpacitySlider;
// Mark C. Miller, Tue Apr 27 14:41:35 PDT 2004
// Added stuff to deal with adjusting scalable threshold with a spinbox
//
// Hank Childs, Sun May 9 15:54:29 PDT 2004
// Add support for multiple display list modes.
//
// ****************************************************************************
class GUI_API QvisRenderingWindow : public QvisPostableWindowSimpleObserver
......@@ -64,7 +67,7 @@ protected:
private slots:
void antialiasingToggled(bool);
void objectRepresentationChanged(int);
void displayListToggled(bool);
void displayListModeChanged(int);
void stereoToggled(bool);
void stereoTypeChanged(int);
void renderNotifyToggled(bool);
......@@ -80,7 +83,7 @@ private:
// Controls
QCheckBox *antialiasingToggle;
QButtonGroup *objectRepresentation;
QCheckBox *dislayListToggle;
QButtonGroup *dlMode;
QCheckBox *stereoToggle;
QButtonGroup *stereoType;
QRadioButton *redblue;
......
......@@ -2006,6 +2006,9 @@ ViewerWindow::InvertBackgroundColor()
// Eric Brugger, Mon Mar 29 15:34:50 PST 2004
// I added maintainData.
//
// Hank Childs, Mon May 10 08:04:48 PDT 2004
// Use "display list mode" instead of immediate rendering mode.
//
// ****************************************************************************
void
......@@ -2016,7 +2019,7 @@ ViewerWindow::CopyGeneralAttributes(const ViewerWindow *source)
//
SetAntialiasing(source->GetAntialiasing());
SetStereoRendering(source->GetStereo(), source->GetStereoType());
SetImmediateModeRendering(source->GetImmediateModeRendering());
SetDisplayListMode(source->GetDisplayListMode());
SetSurfaceRepresentation(source->GetSurfaceRepresentation());
SetNotifyForEachRender(source->GetNotifyForEachRender());
SetScalableThreshold(source->GetScalableThreshold());
......@@ -4808,6 +4811,9 @@ ViewerWindow::SetLargeIcons(bool val)
// Jeremy Meredith, Fri Nov 14 11:33:24 PST 2003
// Added specular properties.
//
// Hank Childs, Mon May 10 08:04:48 PDT 2004
// Use "display list mode" instead of immediate rendering mode.
//
// ****************************************************************************
WindowAttributes
......@@ -4873,7 +4879,7 @@ ViewerWindow::GetWindowAttributes() const
RenderingAttributes renderAtts;
renderAtts.SetScalableThreshold(GetScalableThreshold());
renderAtts.SetScalableRendering(GetScalableRendering());
renderAtts.SetDisplayLists(!GetImmediateModeRendering());
renderAtts.SetDisplayListMode((RenderingAttributes::DisplayListMode) GetDisplayListMode());
renderAtts.SetAntialiasing(GetAntialiasing());
renderAtts.SetGeometryRepresentation(
(RenderingAttributes::GeometryRepresentation) GetSurfaceRepresentation());
......@@ -5517,41 +5523,37 @@ ViewerWindow::GetStereoType() const
}
// ****************************************************************************
// Method: ViewerWindow::SetImmediateModeRendering
// Method: ViewerWindow::SetDisplayListMode
//
// Purpose:
// Tells the window whether or not to use immediate mode rendering.
// Sets the display list mode -- never, always, or auto.
//
// Programmer: Brad Whitlock
// Creation: Mon Sep 23 14:41:00 PST 2002
// Programmer: Hank Childs
// Creation: May 10, 2004
//
// Modifications:
//
// ****************************************************************************
void
ViewerWindow::SetImmediateModeRendering(bool mode)
ViewerWindow::SetDisplayListMode(int mode)
{
visWindow->SetImmediateModeRendering(mode);
visWindow->SetDisplayListMode(mode);
}
// ****************************************************************************
// Method: ViewerWindow::GetImmediateModeRendering
// Method: ViewerWindow::GetDisplayListMode
//
// Purpose:
// Returns the window's immediate mode rendering flag.
// Gets the display list mode.
//
// Programmer: Brad Whitlock
// Creation: Mon Sep 23 14:41:21 PST 2002
// Programmer: Hank Childs
// Creation: May 10, 2004
//
// Modifications:
//
// ****************************************************************************
bool
ViewerWindow::GetImmediateModeRendering() const
int
ViewerWindow::GetDisplayListMode() const
{
return visWindow->GetImmediateModeRendering();
return visWindow->GetDisplayListMode();
}
// ****************************************************************************
......@@ -5994,6 +5996,9 @@ ViewerWindow::SetPopupEnabled(bool val)
// Eric Brugger, Mon Mar 29 15:34:50 PST 2004
// I added maintainData.
//
// Hank Childs, Mon May 10 08:04:48 PDT 2004
// Use "display list mode" instead of immediate rendering mode.
//
// ****************************************************************************
void
......@@ -6065,7 +6070,7 @@ ViewerWindow::CreateNode(DataNode *parentNode, bool detailed)
windowNode->AddNode(new DataNode("scalableThreshold", GetScalableThreshold()));
windowNode->AddNode(new DataNode("notifyForEachRender", GetNotifyForEachRender()));
windowNode->AddNode(new DataNode("surfaceRepresentation", GetSurfaceRepresentation()));
windowNode->AddNode(new DataNode("immediateModeRendering", GetImmediateModeRendering()));
windowNode->AddNode(new DataNode("displayListMode", GetDisplayListMode()));
windowNode->AddNode(new DataNode("stereoRendering", GetStereo()));
windowNode->AddNode(new DataNode("stereoType", GetStereoType()));
windowNode->AddNode(new DataNode("antialiasing", GetAntialiasing()));
......@@ -6391,8 +6396,8 @@ ViewerWindow::SetFromNode(DataNode *parentNode)
SetNotifyForEachRender(node->AsBool());
if((node = windowNode->GetNode("surfaceRepresentation")) != 0)
SetSurfaceRepresentation(node->AsInt());
if((node = windowNode->GetNode("immediateModeRendering")) != 0)
SetImmediateModeRendering(node->AsBool());
if((node = windowNode->GetNode("displayListMode")) != 0)
SetDisplayListMode(node->AsInt());
int stereoType = 0;
if((node = windowNode->GetNode("stereoType")) != 0)
stereoType = node->AsInt();
......
......@@ -302,6 +302,9 @@ struct ExternalRenderRequestInfo
// Mark C. Miller, Tue Apr 27 14:41:35 PDT 2004
// Removed preparingToChangeScalableRenderingMode
//
// Hank Childs, Mon May 10 08:03:22 PDT 2004
// Replaced "immediate mode" bool with "display list" enum.
//
// ****************************************************************************
class VIEWER_API ViewerWindow
......@@ -487,8 +490,8 @@ public:
void SetStereoRendering(bool enabled, int type);
bool GetStereo() const;
int GetStereoType() const;
void SetImmediateModeRendering(bool mode);
bool GetImmediateModeRendering() const;
void SetDisplayListMode(int);
int GetDisplayListMode(void) const;
void SetSurfaceRepresentation(int rep);
int GetSurfaceRepresentation() const;
int GetNumTriangles() const;
......
......@@ -2247,6 +2247,9 @@ ViewerWindowManager::SetViewExtentsType(avtExtentType viewType,
// Brad Whitlock, Tue Feb 3 16:03:47 PST 2004
// I made it use window information.
//
// Hank Childs, Mon May 10 08:10:40 PDT 2004
// Replace references to immediate mode rendering with display list mode.
//
// ****************************************************************************
void
......@@ -2266,9 +2269,9 @@ ViewerWindowManager::SetRenderingAttributes(int windowIndex)
windows[index]->SetSurfaceRepresentation((int)
renderAtts->GetGeometryRepresentation());
if (windows[index]->GetImmediateModeRendering() !=
!renderAtts->GetDisplayLists())
windows[index]->SetImmediateModeRendering(!renderAtts->GetDisplayLists());
if (windows[index]->GetDisplayListMode() !=
renderAtts->GetDisplayListMode())
windows[index]->SetDisplayListMode(renderAtts->GetDisplayListMode());
if ((windows[index]->GetStereo() != renderAtts->GetStereoRendering()) ||
(windows[index]->GetStereoType() != (int) renderAtts->GetStereoType()))
......@@ -3769,6 +3772,9 @@ ViewerWindowManager::UpdateLightListAtts()
// Jeremy Meredith, Fri Nov 14 17:44:22 PST 2003
// Added updates for specular.
//
// Hank Childs, Mon May 10 08:10:40 PDT 2004
// Replace references to immediate mode rendering with display list mode.
//
// ****************************************************************************
void
......@@ -3786,7 +3792,8 @@ ViewerWindowManager::UpdateRenderingAtts(int windowIndex)
renderAtts->SetAntialiasing(win->GetAntialiasing());
renderAtts->SetGeometryRepresentation(
(RenderingAttributes::GeometryRepresentation)win->GetSurfaceRepresentation());
renderAtts->SetDisplayLists(!win->GetImmediateModeRendering());
renderAtts->SetDisplayListMode((RenderingAttributes::DisplayListMode)
win->GetDisplayListMode());
renderAtts->SetStereoRendering(win->GetStereo());
renderAtts->SetStereoType((RenderingAttributes::StereoTypes)
win->GetStereoType());
......@@ -6372,6 +6379,9 @@ ViewerWindowManager::CreateVisWindow(const int windowIndex,