FHWS/YASMIN
Archived
3
0
Fork 0
Code Issues 12 Pull Requests Releases Wiki Activity

fixed android setup

Browse Source 
added missing c++11 methods
This commit is contained in:
kazu
2016-07-15 15:49:58 +02:00
parent b188cb992c
commit 719a66937e
12 changed files with 86 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
map/MapView.cpp
View File

@@ -11,22 +11,22 @@ MapView::MapView(QWidget* parent) : QGLWidget(parent) {
glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
glShadeModel(GL_SMOOTH);
glEnable(GL_LIGHTING);
glEnable(GL_LIGHT0);
//glShadeModel(GL_SMOOTH);
//glEnable(GL_LIGHTING);
//glEnable(GL_LIGHT0);
static GLfloat lightPosition[4] = { 0, 0, 10, 1.0 };
glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
//static GLfloat lightPosition[4] = { 0, 0, 10, 1.0 };
//glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
}
void MapView::paintGL() {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
glTranslatef(0.0, 0.0, -10.0);
glRotatef(20 / 16.0, 1.0, 0.0, 0.0);
glRotatef(30 / 16.0, 0.0, 1.0, 0.0);
glRotatef(60 / 16.0, 0.0, 0.0, 1.0);
//glLoadIdentity();
//glTranslatef(0.0, 0.0, -10.0);
//glRotatef(20 / 16.0, 1.0, 0.0, 0.0);
//glRotatef(30 / 16.0, 0.0, 1.0, 0.0);
//glRotatef(60 / 16.0, 0.0, 0.0, 1.0);
draw();
}
@@ -34,20 +34,20 @@ MapView::MapView(QWidget* parent) : QGLWidget(parent) {
int side = qMin(width, height);
glViewport((width - side) / 2, (height - side) / 2, side, side);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
//glMatrixMode(GL_PROJECTION);
//glLoadIdentity();
#ifdef QT_OPENGL_ES_1
glOrthof(-2, +2, -2, +2, 1.0, 15.0);
#else
glOrtho(-2, +2, -2, +2, 1.0, 15.0);
//glOrtho(-2, +2, -2, +2, 1.0, 15.0);
#endif
glMatrixMode(GL_MODELVIEW);
//glMatrixMode(GL_MODELVIEW);
}
void MapView::draw()
{
qglColor(Qt::red);
glBegin(GL_QUADS);
/*glBegin(GL_QUADS);
glNormal3f(0,0,-1);
glVertex3f(-1,-1,0);
glVertex3f(-1,1,0);
@@ -78,5 +78,5 @@ MapView::MapView(QWidget* parent) : QGLWidget(parent) {
glVertex3f(-1,1,0);
glVertex3f(-1,-1,0);
glVertex3f(0,0,1.2);
glEnd();
glEnd();*/
}