worked on android port

opengl1 -> es
This commit is contained in:
root
2018-01-31 17:15:11 +01:00
parent a9bab839b2
commit e5e19779d5
53 changed files with 884 additions and 203 deletions

View File

@@ -2,9 +2,11 @@
#define CUBE_H
#include <Indoor/geo/Point3.h>
#include <QtOpenGL>
#include "Renderable3D.h"
class Cube {
class Shader;
class Cube : public Renderable3D {
private:
@@ -12,20 +14,28 @@ private:
Point3 size;
Point3 rot;
Point3 color;
public:
Cube(Point3 pos, float size) : pos(pos), size(size,size,size), rot(0,0,0) {
Cube(Point3 pos, float size);
}
Cube(Point3 pos, Point3 size, Point3 rot);
Cube(Point3 pos, Point3 size, Point3 rot) : pos(pos), size(size), rot(rot) {
void setColor(float r, float g, float b);
}
void render(const RenderSettings& rs) override;
void paintGL() {
float s = 1;
/*
void paintGL(Shader* shader);
TODO_GL
glColor3f(color.x, color.y, color.z);
glPushMatrix();
@@ -90,7 +100,7 @@ public:
glPopMatrix();
}
*/
};