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/rope_system.cpp
+++ b/qglview/rope_system.cpp
@@ -47,7 +47,7 @@ void RopeSystem::init() {
 }


-void RopeSystem::draw(bool simplest) {
+void RopeSystem::draw(QGLShaderProgram * prog, bool simplest) {
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_1D, tex[0]);
 	glGetTexImage(GL_TEXTURE_1D, 0, GL_RGBA, GL_FLOAT, pos.data());