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

2015-11-20 21:19:36 +00:00
parent cabaead1c6
commit 104a7f99ad
48 changed files with 1973 additions and 1273 deletions
--- a/qglview/water_system.h
+++ b/qglview/water_system.h
@@ -31,9 +31,9 @@ public:
 	WaterSystem();
 	~WaterSystem();

-	virtual void draw(bool simplest = false);
+	virtual void draw(QGLShaderProgram * prog, bool simplest = false);
 	virtual void update();
-	virtual void init() {createGLTexture(texture, QImage("./media-record.png")); material_.diffuse.bitmap_id = texture; is_init = true;}
+	virtual void init() {createGLTexture(texture, QImage("./media-record.png")); material_.map_diffuse.bitmap_id = texture; is_init = true;}

 protected:
 	class Chunk;