SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-10-03 12:20:32 +00:00
parent b46b9329f3
commit 7ad19d72c5
40 changed files with 320 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qglview/glparticles_system.cpp
View File

@@ -108,9 +108,10 @@ void GLParticlesSystem::update() {
}
void GLParticlesSystem::draw(QGLShaderProgram * prog, bool) {
void GLParticlesSystem::draw(__GLShaderProgram__ * prog, bool) {
if (particles.isEmpty()) return;
if (view_ == 0) return;
QGLCI
pass_ = GLObjectBase::Transparent;
Camera & camera(view_->camera());
QVector3D apos = camera.pos(), dir = camera.direction();
@@ -186,7 +187,7 @@ void GLParticlesSystem::draw(QGLShaderProgram * prog, bool) {
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glEnableClientState(GL_COLOR_ARRAY);
glBindBuffer(GL_ARRAY_BUFFER, 0);
QGLC glBindBuffer(GL_ARRAY_BUFFER, 0);
//glNormal3f(vn.x(), vn.y(), vn.z());
glNormal3f(0., 0., 1.);
glDepthMask(false);