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

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

View File

@@ -19,7 +19,7 @@
#include "glprimitives.h"
void GLPrimitivePoint::draw(QGLShaderProgram * prog, bool simplest) {
void GLPrimitivePoint::draw(__GLShaderProgram__ * prog, bool simplest) {
glPointSize(sz);
glColor3f(material_.color_diffuse.redF(), material_.color_diffuse.greenF(), material_.color_diffuse.blueF());
glBegin(GL_POINTS);
@@ -29,7 +29,7 @@ void GLPrimitivePoint::draw(QGLShaderProgram * prog, bool simplest) {
void GLPrimitiveLine::draw(QGLShaderProgram * prog, bool simplest) {
void GLPrimitiveLine::draw(__GLShaderProgram__ * prog, bool simplest) {
glColor3f(material_.color_diffuse.redF(), material_.color_diffuse.greenF(), material_.color_diffuse.blueF());
glBegin(GL_LINES);
glVertex3d(p0.x(), p0.y(), p0.z());