git-svn-id: svn://db.shs.com.ru/libs@44 a8b55f48-bf90-11e4-a774-851b48703e85

qglview/qglview.h

@@ -35,6 +35,7 @@
 #include <QApplication>
 #include "glprimitives.h"
 #include "glparticles_system.h"
+#include "glrendererbase.h"
 
 
 class QGLView: public QGraphicsView, public QGLViewBase
@@ -190,7 +191,7 @@ public:
 	void setSelectionRectBrush(const QBrush & v) {sel_brush = v;}
 
 	GLdouble aspect, iaspect;
-	QGLShaderProgram * shader_rope;
+	//QGLShaderProgram * shader_rope;
 
 protected:
 	virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -210,7 +211,7 @@ protected:
 
 	inline void applyFog();
 	void renderSelection();
-	void renderShadow() {renderSingleShadow(objects_);}
+	void renderShadow();
 
 	void checkCaps();
 	void collectLights();
@@ -222,7 +223,6 @@ private:
 	void renderSingleSelection(GLObjectBase & o);
 	void renderSingleShadow(GLObjectBase & o);
 	void renderHalo(const GLObjectBase * obj, const int iid, const QColor & color, const double & fill);
-	void applyLightShader(Material::LightModel type);
 	QList<QGraphicsItem * > collectGraphicItems();
 	void collectGraphicItems(QList<QGraphicsItem * > & list, QGraphicsItem * o);
 	void reloadThisShaders();
@@ -253,6 +253,7 @@ private:
 	SelectionMode sel_mode;
 	Qt::MouseButton sel_button;
 	Qt::KeyboardModifier sel_mod;
+	GLRendererBase::RenderingParameters start_rp;
 	double lineWidth_, linearFiltering_, accom_time, accom_max_speed, cur_luminance;
 	double fogDensity_, fogStart_, fogEnd_, fps_, fps_tm, hoverHaloFill_, selectionHaloFill_;
 	int timer, fps_cnt, sh_id_loc, shadow_map_size, dynamic_cubemap_size;