FHWS/IndoorMap
Archived
2
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

Removed obsolete opengl module

Browse Source
This commit is contained in:
Markus Bullmann
2018-04-04 09:40:53 +02:00
parent e02c294ff6
commit 467514ea6c
12 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mapview/3D/misc/Cube.cpp
View File

@@ -1,6 +1,5 @@
#include "Cube.h"
#include "Shader.h"
#include <QtOpenGL>
static float cube_vertices[] = {
@@ -76,7 +75,7 @@ void Cube::render(const RenderSettings& rs) {
rs.shader->setVertices(cube_vertices);
rs.shader->setNormals(cube_normals);
glDrawArrays(GL_TRIANGLES, 0, 12*3);
rs.funcs->glDrawArrays(GL_TRIANGLES, 0, 12*3);
//glDrawElements(GL_TRIANGLES, +12, GL_INT, cube_vertex_indices);
rs.shader->unsetVertices();
rs.shader->unsetNormals();

2
mapview/3D/misc/Handrail.cpp
View File

@@ -54,7 +54,7 @@ void Handrail::render(const RenderSettings& rs) {
}
rs.shader->setVertices(vertices.data());
glDrawArrays(GL_LINES, 0, vertices.size() / 3);
rs.funcs->glDrawArrays(GL_LINES, 0, vertices.size() / 3);
rs.shader->unsetVertices();
rs.shader->release();

2
mapview/3D/misc/Outline.cpp
View File

@@ -26,7 +26,7 @@ void Outline::render(const RenderSettings& rs) {
rs.shader->setColor(color.x, color.y, color.z);
rs.shader->setVertices(triangles.getVertices().data());
rs.shader->setNormals(triangles.getNormals().data());
glDrawArrays(GL_TRIANGLES, 0, triangles.getVertices().size() / 3);
rs.funcs->glDrawArrays(GL_TRIANGLES, 0, triangles.getVertices().size() / 3);
rs.shader->unsetVertices();
rs.shader->unsetNormals();

8
mapview/3D/misc/Renderable3D.h
View File

@@ -1,11 +1,15 @@
#ifndef RENDERABLE3D_H
#define RENDERABLE3D_H
#include <QOpenGLFunctions>
class Shader;
struct RenderSettings {
Shader* shader = nullptr;
RenderSettings(Shader* shader) : shader(shader) {;}
Shader* shader = nullptr;
QOpenGLFunctions* funcs = nullptr;
RenderSettings(Shader* shader, QOpenGLFunctions* f) : shader(shader), funcs(f) {;}
};

8
mapview/3D/misc/Window.cpp
View File

@@ -69,20 +69,20 @@ void Window::render(const RenderSettings& rs) {
rs.shader->setColor(0.75, 0.85, 1.0, 0.35);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
rs.funcs->glEnable(GL_BLEND);
rs.funcs->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
//glDisable(GL_CULL_FACE);
rs.shader->setModelMatrix(mat);
rs.shader->setVertices(window_vertices);
rs.shader->setNormals(window_normals);
glDrawArrays(GL_TRIANGLES, 0, 12);
rs.funcs->glDrawArrays(GL_TRIANGLES, 0, 12);
rs.shader->unsetVertices();
rs.shader->unsetNormals();
//glEnable(GL_CULL_FACE);
glDisable(GL_BLEND);
rs.funcs->glDisable(GL_BLEND);
rs.shader->release();