GridPlot speedup and improvements

Added multithreaded plot data generation
Using glDrawArrays instead of gl lists
(up to 2x speedup)

Author: sintegrial

include/qwt3d_gridplot.h

@@ -1,7 +1,8 @@
-#pragma once
 #ifndef qwt3d_gridplot_h__2005_7_10_begin_guarded_code
 #define qwt3d_gridplot_h__2005_7_10_begin_guarded_code
 
+#include <QtCore/QThread>
+
 #include "qwt3d_surfaceplot.h"
 
 namespace Qwt3D
@@ -16,24 +17,41 @@ class QWT3D_EXPORT GridPlot : public SurfacePlot
     Q_OBJECT
 
 public:
-    GridPlot( QWidget * parent = 0, const QGLWidget * shareWidget = 0 );
+    GridPlot(QWidget* parent = 0, const QGLWidget* shareWidget = 0);
     virtual ~GridPlot() {}
+
     int	resolution() const {return resolution_p;} //!< Returns data resolution (1 means all data)
 
     int createDataset(Qwt3D::Triple** data, unsigned int columns, unsigned int rows,
                       bool uperiodic = false, bool vperiodic = false, bool append = false);
     int createDataset(double** data, unsigned int columns, unsigned int rows,
                       double minx, double maxx, double miny, double maxy, bool append = false);
 
+	/**		
+		Sets number of rendering threads using glDrawArrays to \a count (1..10, 8 by default).
+		If \a count = 0, the older (list based, slow) implementation will be used.
+		\since 0.3.2
+		\sa renderThreadsCount
+	*/
+	void setRenderThreadsCount(int count);
+	/**		
+		Returns number of rendering threads using glDrawArrays (8 by default).
+		If this value is 0, the older (list based, slow) implementation is used.
+		\since 0.3.2
+		\sa setRenderThreadsCount
+	*/
+	int renderThreadsCount() const { return m_threadsCount; }
+
 signals:
     void resolutionChanged(int);
 
 public slots:
-    void setResolution( int );
+    void setResolution(int);
 
 protected:  
-    void createOpenGlData(const Plotlet& pl);
-	void processVertex(const Triple& vert1, const Triple& norm1, const Plotlet& pl, bool hl, bool& stripStarted, RGBA& lastColor) const;
+    virtual void createOpenGlData(const Plotlet& pl);
+	virtual void drawOpenGlData();
+	void processVertex(const Triple& vert1, const Triple& norm1, const Color& colorData, bool hl, bool& stripStarted, RGBA& lastColor) const;
 	void processLineLoopVertex(const Triple& vert1, bool& stripStarted) const;
 	void processLineStripVertex(const Triple& vert1, bool& stripStarted) const;
 
@@ -68,10 +86,39 @@ public slots:
         void clear();
     };
 
+	// thread vector processor
+	class CVertexProcessor: public QThread
+	{
+	public:
+		CVertexProcessor();
+
+		void setup(int dataWidth, int dataLength, const GridData& data, int row, int step = 1, 
+			bool m_colorize = true, const Color* colorData = NULL);
+
+		virtual void run();
+
+		void paintGL();
+
+	private:
+		void processVertex(bool& stripStarted, int i, int j, int& index, int& size);
+		void endVertex(int& index, int& size);
+
+		int m_dataWidth, m_dataLength, m_row, m_step;
+		TripleVector m_draw_normals, m_draw_vertices;
+		ColorVector m_draw_colors;
+		std::vector< QPair<int,int> > m_drawList;
+		const GridData* m_data;
+		const Color* m_colorData;
+		bool m_colorize;
+	};
+
+	int m_threadsCount;
+	CVertexProcessor m_workers[10];
+
     void createNormals(const Plotlet& pl);
     void data2Floor(const Plotlet& pl);
     void isolines2Floor(const Plotlet& pl);
-    void setColorFromVertex(const Plotlet& pl, const Triple& vertex, RGBA& lastColor, bool skip = false) const;
+    void setColorFromVertex(const Color& colorData, const Triple& vertex, RGBA& lastColor, bool skip = false) const;
     void calcNormals(GridData& gdata);
     void sewPeriodic(GridData& gdata);
     void readIn(GridData& gdata, Triple** data, unsigned int columns, unsigned int rows);

include/qwt3d_plot3d.h

@@ -24,7 +24,7 @@ class QWT3D_EXPORT Plot3D : public ExtGLWidget
     Q_OBJECT
 
 public:
-    Plot3D ( QWidget * parent = 0, const QGLWidget * shareWidget = 0 );
+    Plot3D (QWidget * parent = 0, const QGLWidget * shareWidget = 0);
     virtual ~Plot3D();
 
     QPixmap renderPixmap (int w=0, int h=0, bool useContext=false);
@@ -71,28 +71,31 @@ class QWT3D_EXPORT Plot3D : public ExtGLWidget
 
     // Convenience/compatibility member for appearance(0) properties
 
-    void setPlotStyle( Qwt3D::PLOTSTYLE val ); //!< Set plotting style
-    Qwt3D::Enrichment* setPlotStyle( Qwt3D::Enrichment const& val );
+    void setPlotStyle(Qwt3D::PLOTSTYLE val); //!< Set plotting style
+    Qwt3D::Enrichment* setPlotStyle(Qwt3D::Enrichment const& val);
     Qwt3D::PLOTSTYLE plotStyle() const { return appearance(0).plotStyle(); }//!< Returns plotting style
     //! Returns current Enrichment object used for plotting styles (if set, zero else)
     Qwt3D::Enrichment* userStyle() const { return appearance(0).userStyle(); }
 
-    void setShading( Qwt3D::SHADINGSTYLE val  ); //!<Set shading style
+    void setShading(Qwt3D::SHADINGSTYLE val ); //!<Set shading style
     Qwt3D::SHADINGSTYLE shading() const { return appearance(0).shading(); }//!< Returns shading style
 
-    void setSmoothMesh(bool val ) {appearance(0).setSmoothMesh(val);} //!< Enables/disables smooth data mesh lines. Default is false
+    void setSmoothMesh(bool val) {appearance(0).setSmoothMesh(val);} //!< Enables/disables smooth data mesh lines. Default is false
     bool smoothDataMesh() const {return appearance(0).smoothDataMesh();} //!< True if mesh antialiasing is on
-    void setMeshColor(Qwt3D::RGBA rgba ); //!< Sets color for data mesh
+    void setMeshColor(Qwt3D::RGBA rgba); //!< Sets color for data mesh
     Qwt3D::RGBA meshColor() const {return appearance(0).meshColor();} //!< Returns color for data mesh
-    void setMeshLineWidth(double lw ); //!< Sets line width for data mesh
+    void setMeshLineWidth(double lw); //!< Sets line width for data mesh
     double meshLineWidth() const {return appearance(0).meshLineWidth();} //!< Returns line width for data mesh
-    void setDataColor(const Qwt3D::Color& col ); //!< Sets new data color object
+    void setDataColor(const Qwt3D::Color& col); //!< Sets new data color object
     const Qwt3D::ValuePtr<Qwt3D::Color>& dataColor() const {return appearance(0).dataColor();} //!< Returns data color object
 
     // tweaks
-    void setPolygonOffset(double d );
+    void setPolygonOffset(double d);
     double polygonOffset() const {return appearance(0).polygonOffset();} //!< Returns relative value for polygon offset [0..1]
 
+	//! \since 0.3.2
+	void enableFastNormals(bool on) { m_fastNormals = on; }
+
     //!< Add an Enrichment
     virtual Qwt3D::Enrichment* addEnrichment(Qwt3D::Enrichment const& val){return appearance(0).addEnrichment(val);}
     virtual bool degrade(Qwt3D::Enrichment* val){return appearance(0).degrade(val);} //!< Remove an Enrichment
@@ -111,10 +114,10 @@ public slots:
 
     //! Combines data with their visual appearance
     /**
-  A Plotlet describes the plot's part related to a single dataset. In this respect, it has
-  no own coordinate system (but a hull) and other plot-wide properties. A single
-  data- and the associated Appearance object form a Plotlet.
-  */
+	  A Plotlet describes the plot's part related to a single dataset. In this respect, it has
+	  no own coordinate system (but a hull) and other plot-wide properties. A single
+	  data- and the associated Appearance object form a Plotlet.
+    */
     struct Plotlet
     {
     public:
@@ -125,17 +128,18 @@ public slots:
 
     void initializeGL();
     void paintGL();
-    void resizeGL( int w, int h );
+    void resizeGL(int w, int h);
 
     Qwt3D::CoordinateSystem coordinates_p;
 
     virtual	void calculateHull();
     virtual void updateAppearances();
     virtual void createOpenGlData();
     virtual void createOpenGlData(const Plotlet& pl) = 0;
+	virtual void drawOpenGlData();
 
     void createCoordinateSystem();
-    void setHull(Qwt3D::ParallelEpiped const& h) {hull_ = h;}
+    void setHull(Qwt3D::ParallelEpiped const& h) { hull_ = h; }
 
     std::vector<Plotlet> plotlets_p;
 
@@ -144,6 +148,8 @@ public slots:
     std::vector<double> isolinesZ_p;
     bool delayisolinecalculation_p;
 
+	bool m_fastNormals;
+
     // debug
     quint64 m_createTime;
 
@@ -201,7 +207,7 @@ The function returns the Appearance object for the Plotlet at idx.
 For invalid arguments the return value contains the standard appearance 
 (equivalent to idx==0) is returned
 */
-Appearance& Plot3D::appearance( unsigned idx )
+Appearance& Plot3D::appearance(unsigned idx)
 {
     assert(!plotlets_p.empty());
     if (idx >= plotlets_p.size())
@@ -214,7 +220,7 @@ The function returns the Appearance object for the Plotlet at idx.
 For invalid arguments the return value contains the standard appearance 
 (equivalent to idx==0) is returned
 */
-const Appearance& Plot3D::appearance( unsigned idx ) const
+const Appearance& Plot3D::appearance(unsigned idx) const
 {
     assert(!plotlets_p.empty());
     if (idx >= plotlets_p.size())

src/qwt3d_drawable.cpp

@@ -4,7 +4,7 @@ using namespace Qwt3D;
 
 Drawable::~Drawable()
 {
-  detachAll();
+	detachAll();
 }
 
 void Drawable::saveGLState()
@@ -30,7 +30,7 @@ void Drawable::restoreGLState()
 {
 	Enable(GL_LINE_SMOOTH, ls);
 	Enable(GL_POLYGON_SMOOTH, pols);
-	
+
 	setLineWidth(lw);
 	glBlendFunc(blsrc, bldst);
 	glColor4dv(col);
@@ -50,7 +50,7 @@ void Drawable::Enable(GLenum what, GLboolean val)
 {
 	if (val)
 		glEnable(what);
-  else
+	else
 		glDisable(what);
 }
 
@@ -66,12 +66,13 @@ void Drawable::attach(Drawable* dr)
 void Drawable::detach(Drawable* dr)
 {
 	std::list<Drawable*>::iterator it = std::find(dlist.begin(), dlist.end(), dr);
-	
+
 	if ( it != dlist.end() )
 	{
 		dlist.erase(it);
 	}
 }
+
 void Drawable::detachAll()
 {
 	dlist.clear();
@@ -84,8 +85,8 @@ void Drawable::detachAll()
 */
 Triple Drawable::ViewPort2World(Triple win, bool* err)
 {
-  Triple obj;
-	
+	Triple obj;
+
 	getMatrices(modelMatrix, projMatrix, viewport);
 	int res = gluUnProject(win.x, win.y, win.z, modelMatrix, projMatrix, viewport, &obj.x, &obj.y, &obj.z);
 
@@ -100,8 +101,8 @@ Triple Drawable::ViewPort2World(Triple win, bool* err)
 */
 Triple Drawable::World2ViewPort(Triple obj,	bool* err)
 {
-  Triple win;
-	
+	Triple win;
+
 	getMatrices(modelMatrix, projMatrix, viewport);
 	int res = gluProject(obj.x, obj.y, obj.z, modelMatrix, projMatrix, viewport, &win.x, &win.y, &win.z);