diff options
| -rw-r--r-- | MM_2015_Base_Project.pro | 6 | ||||
| -rw-r--r-- | src/gldisc.cpp | 17 | ||||
| -rw-r--r-- | src/gldisc.h | 17 |
3 files changed, 38 insertions, 2 deletions
diff --git a/MM_2015_Base_Project.pro b/MM_2015_Base_Project.pro index 8a4cee2..b86c23a 100644 --- a/MM_2015_Base_Project.pro +++ b/MM_2015_Base_Project.pro @@ -12,7 +12,8 @@ SOURCES += \ src/mmscene.cpp \ src/glbody.cpp \ src/glcube.cpp \ - src/glsphere.cpp + src/glsphere.cpp \ + src/gldisc.cpp HEADERS += \ src/glcolorrgba.h \ @@ -24,7 +25,8 @@ HEADERS += \ src/mmscene.h \ src/glbody.h \ src/glcube.h \ - src/glsphere.h + src/glsphere.h \ + src/gldisc.h RESOURCES += qml.qrc \ shaders.qrc diff --git a/src/gldisc.cpp b/src/gldisc.cpp new file mode 100644 index 0000000..cf65450 --- /dev/null +++ b/src/gldisc.cpp @@ -0,0 +1,17 @@ +#include "gldisc.h" + +GLDisc::GLDisc(double radius, double height, int sides) + :GLBody(radius) +{ + +} + +void GLDisc::makeSurface(QVector<GLPoint> *pointContainer, QVector<GLshort> *indexContainer) +{ + +} + +bool GLDisc::isHit(QVector3D p1, QVector3D p2) +{ + +} diff --git a/src/gldisc.h b/src/gldisc.h new file mode 100644 index 0000000..21db6b8 --- /dev/null +++ b/src/gldisc.h @@ -0,0 +1,17 @@ +#ifndef GLDISC_H +#define GLDISC_H + +#include <cmath> + +#include "glbody.h" + +class GLDisc : public GLBody +{ +public: + GLDisc(double radius = 1.0, double height = 2.0, int sides = 10); + + virtual void makeSurface(QVector<GLPoint> *pointContainer, QVector<GLshort> *indexContainer); + virtual bool isHit(QVector3D p1, QVector3D p2); +}; + +#endif // GLDISC_H |