[Csp-commits] svn:csp r1465 - in trunk/CSP/CSPSim: . Source

[<sv...@ww...>]

Author: mkrose
Date: 2005-02-05 11:25:19 -0800 (Sat, 05 Feb 2005)
New Revision: 1465

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/ObjectModel.cpp
Log:
Disable displaylist/stateset compiler visitor when creating
ObjectModels, since it segfaults for models loaded using the
CSP theater layout tool.  There isn't an obvious impact on
performance in the sim, but should still be sorted out at
some point.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1465

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-02-05 18:40:32 UTC (rev 1464)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-02-05 19:25:19 UTC (rev 1465)
@@ -1,6 +1,13 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-02-05: onsight
+ * Disable displaylist/stateset compiler visitor when creating
+   ObjectModels, since it segfaults for models loaded using the
+   CSP theater layout tool.  There isn't an obvious impact on
+   performance in the sim, but should still be sorted out at
+   some point.
+
 2005-01-30: onsight
  * Move IsoContour classes out of RandomBillboardModel.cpp and
    use them in RandomForestModel.cpp.

Modified: trunk/CSP/CSPSim/Source/ObjectModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ObjectModel.cpp	2005-02-05 18:40:32 UTC (rev 1464)
+++ trunk/CSP/CSPSim/Source/ObjectModel.cpp	2005-02-05 19:25:19 UTC (rev 1465)
@@ -414,14 +414,23 @@
 	CSP_LOG(APP, DEBUG, "LoadModel: add contact markers");
 	addContactMarkers();
 
+	/*
+	// FIXME Segfaults when creating objects using the CSP theater layout tool.
+	// Need to figure out why, but for now just disable.
+	
 	osg::ref_ptr<osg::State> state = new osg::State;
 
+	CSP_LOG(APP, DEBUG, "LoadModel: setting state");
 	osgUtil::GLObjectsVisitor ov;
 	ov.setState(state.get());
 	ov.setNodeMaskOverride(0xffffffff);
 	m_Model->accept(ov);
+	CSP_LOG(APP, DEBUG, "LoadModel: setting state for debug markers");
 	m_DebugMarkers->accept(ov);
+	*/
 
+	CSP_LOG(APP, DEBUG, "LoadModel: done");
+
 	// XXX: there is a really weird bug on vs with the optimizer:
 	// 1) it rarely appears in the release built (never when called from this exact line)
 	// 2) it appears in the debug built systematically on the second times the