itdominator
/
SWBF2-Classic-Msh-Viewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move texture to GeometryEngine

This commit is contained in:
Anakin 2016-12-29 13:37:15 +01:00
parent faea3b0737
commit 0499982150
6 changed files with 99 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
QtMeshViewer/Header/GeometryEngine.h
View File

@ -1,59 +1,9 @@
/**************************************************************************** #pragma once
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef GEOMETRYENGINE_H
#define GEOMETRYENGINE_H
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
#include <QOpenGLBuffer> #include <QOpenGLBuffer>
#include <QOpenGLTexture>
class GeometryEngine : protected QOpenGLFunctions class GeometryEngine : protected QOpenGLFunctions
{ {
@ -61,13 +11,15 @@ public:
GeometryEngine(); GeometryEngine();
virtual ~GeometryEngine(); virtual ~GeometryEngine();
void drawCubeGeometry(QOpenGLShaderProgram *program); void drawGeometry(QOpenGLShaderProgram *program);
private: private:
void initCubeGeometry(); void initCubeGeometry();
void initTexture();
QOpenGLBuffer arrayBuf; QOpenGLBuffer arrayBuf;
QOpenGLBuffer indexBuf; QOpenGLBuffer indexBuf;
QOpenGLTexture *texture;
}; };
#endif // GEOMETRYENGINE_H

9
QtMeshViewer/Header/OglViewerWidget.h
View File

@ -9,7 +9,7 @@
#include <QVector2D> #include <QVector2D>
#include <QBasicTimer> #include <QBasicTimer>
#include <QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
#include <QOpenGLTexture>
class GeometryEngine; class GeometryEngine;
@ -31,8 +31,8 @@ protected:
void resizeGL(int w, int h) Q_DECL_OVERRIDE; void resizeGL(int w, int h) Q_DECL_OVERRIDE;
void paintGL() Q_DECL_OVERRIDE; void paintGL() Q_DECL_OVERRIDE;
private:
void initShaders(); void initShaders();
void initTextures();
private: private:
struct { struct {
@ -40,10 +40,9 @@ private:
bool right = false; bool right = false;
QVector2D position; QVector2D position;
} m_mouse; } m_mouse;
QOpenGLShaderProgram program;
GeometryEngine *geometries;
QOpenGLTexture *texture; QOpenGLShaderProgram m_program;
GeometryEngine *m_dataEngine;
QMatrix4x4 m_projection; QMatrix4x4 m_projection;
QQuaternion m_rotation; QQuaternion m_rotation;

3
QtMeshViewer/Resources/fshader.glsl
View File

@ -8,11 +8,8 @@ uniform sampler2D texture;
varying vec2 v_texcoord; varying vec2 v_texcoord;
//! [0]
void main() void main()
{ {
// Set fragment color from texture // Set fragment color from texture
gl_FragColor = texture2D(texture, v_texcoord); gl_FragColor = texture2D(texture, v_texcoord);
} }
//! [0]

2
QtMeshViewer/Resources/vshader.glsl
View File

@ -11,7 +11,6 @@ attribute vec2 a_texcoord;
varying vec2 v_texcoord; varying vec2 v_texcoord;
//! [0]
void main() void main()
{ {
// Calculate vertex position in screen space // Calculate vertex position in screen space
@ -21,4 +20,3 @@ void main()
// Value will be automatically interpolated to fragments inside polygon faces // Value will be automatically interpolated to fragments inside polygon faces
v_texcoord = a_texcoord; v_texcoord = a_texcoord;
} }
//! [0]

105
QtMeshViewer/Source/GeometryEngine.cpp
View File

@ -1,67 +1,18 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "..\Header\GeometryEngine.h" #include "..\Header\GeometryEngine.h"
#include <QVector2D> #include <QVector2D>
#include <QVector3D> #include <QVector3D>
struct VertexData struct VertexData
{ {
QVector3D position; QVector3D position;
QVector2D texCoord; QVector2D texCoord;
}; };
//! [0]
GeometryEngine::GeometryEngine() GeometryEngine::GeometryEngine()
: indexBuf(QOpenGLBuffer::IndexBuffer) : indexBuf(QOpenGLBuffer::IndexBuffer)
, texture(Q_NULLPTR)
{ {
initializeOpenGLFunctions(); initializeOpenGLFunctions();
@ -77,8 +28,8 @@ GeometryEngine::~GeometryEngine()
{ {
arrayBuf.destroy(); arrayBuf.destroy();
indexBuf.destroy(); indexBuf.destroy();
delete texture;
} }
//! [0]
void GeometryEngine::initCubeGeometry() void GeometryEngine::initCubeGeometry()
{ {
@ -131,31 +82,56 @@ void GeometryEngine::initCubeGeometry()
// connecting strips have same vertex order then only last // connecting strips have same vertex order then only last
// index of the first strip needs to be duplicated. // index of the first strip needs to be duplicated.
GLushort indices[] = { GLushort indices[] = {
0, 1, 2, 3, 3, // Face 0 - triangle strip ( v0, v1, v2, v3) 0,1,2, //vorne (4)
4, 4, 5, 6, 7, 7, // Face 1 - triangle strip ( v4, v5, v6, v7) 3,2,1,
8, 8, 9, 10, 11, 11, // Face 2 - triangle strip ( v8, v9, v10, v11) 4,5,7, //rechts (1)
12, 12, 13, 14, 15, 15, // Face 3 - triangle strip (v12, v13, v14, v15) 6,4,7,
16, 16, 17, 18, 19, 19, // Face 4 - triangle strip (v16, v17, v18, v19) 8,9,11, //hinten (3)*
20, 20, 21, 22, 23 // Face 5 - triangle strip (v20, v21, v22, v23) 8,11,10,
14,12,13, //links (6)*
14,13,15,
18,16,17, //unten (5)
19,18,17,
23,22,20, //oben (2)*
23,20,21
}; };
//! [1]
// Transfer vertex data to VBO 0 // Transfer vertex data to VBO 0
arrayBuf.bind(); arrayBuf.bind();
arrayBuf.allocate(vertices, 24 * sizeof(VertexData)); arrayBuf.allocate(vertices, 24 * sizeof(VertexData));
// Transfer index data to VBO 1 // Transfer index data to VBO 1
indexBuf.bind(); indexBuf.bind();
indexBuf.allocate(indices, 34 * sizeof(GLushort)); indexBuf.allocate(indices, 36 * sizeof(GLushort));
//! [1]
initTexture();
} }
//! [2] void GeometryEngine::initTexture()
void GeometryEngine::drawCubeGeometry(QOpenGLShaderProgram *program) {
// Load cube.png image
texture = new QOpenGLTexture(QImage(":images/cube.png").mirrored());
// Set nearest filtering mode for texture minification
texture->setMinificationFilter(QOpenGLTexture::Nearest);
// Set bilinear filtering mode for texture magnification
texture->setMagnificationFilter(QOpenGLTexture::Linear);
// Wrap texture coordinates by repeating
// f.ex. texture coordinate (1.1, 1.2) is same as (0.1, 0.2)
texture->setWrapMode(QOpenGLTexture::Repeat);
}
void GeometryEngine::drawGeometry(QOpenGLShaderProgram *program)
{ {
// Tell OpenGL which VBOs to use // Tell OpenGL which VBOs to use
arrayBuf.bind(); arrayBuf.bind();
indexBuf.bind(); indexBuf.bind();
texture->bind();
// Use texture unit 0 which contains cube.png
program->setUniformValue("texture", 0);
// Offset for position // Offset for position
quintptr offset = 0; quintptr offset = 0;
@ -174,6 +150,5 @@ void GeometryEngine::drawCubeGeometry(QOpenGLShaderProgram *program)
program->setAttributeBuffer(texcoordLocation, GL_FLOAT, offset, 2, sizeof(VertexData)); program->setAttributeBuffer(texcoordLocation, GL_FLOAT, offset, 2, sizeof(VertexData));
// Draw cube geometry using indices from VBO 1 // Draw cube geometry using indices from VBO 1
glDrawElements(GL_TRIANGLE_STRIP, 34, GL_UNSIGNED_SHORT, 0); glDrawElements(GL_TRIANGLES, 36, GL_UNSIGNED_SHORT, 0);
} }
//! [2]

49
QtMeshViewer/Source/OglViewerWidget.cpp
View File

@ -2,12 +2,10 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <math.h> #include <math.h>
#include <iostream>
OglViewerWidget::OglViewerWidget(QWidget *parent) : OglViewerWidget::OglViewerWidget(QWidget *parent) :
QOpenGLWidget(parent), QOpenGLWidget(parent),
geometries(0), m_dataEngine(0)
texture(0)
{ {
setFocus(); setFocus();
} }
@ -17,8 +15,7 @@ OglViewerWidget::~OglViewerWidget()
// Make sure the context is current when deleting the texture // Make sure the context is current when deleting the texture
// and the buffers. // and the buffers.
makeCurrent(); makeCurrent();
delete texture; delete m_dataEngine;
delete geometries;
doneCurrent(); doneCurrent();
} }
@ -75,7 +72,6 @@ void OglViewerWidget::initializeGL()
glClearColor(0, 0, 0, 1); glClearColor(0, 0, 0, 1);
initShaders(); initShaders();
initTextures();
// Enable depth buffer // Enable depth buffer
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
@ -83,45 +79,29 @@ void OglViewerWidget::initializeGL()
// Enable back face culling // Enable back face culling
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
geometries = new GeometryEngine; m_dataEngine = new GeometryEngine;
} }
void OglViewerWidget::initShaders() void OglViewerWidget::initShaders()
{ {
// Compile vertex shader // Compile vertex shader
if (!program.addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/vshader.glsl")) if (!m_program.addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/vshader.glsl"))
close(); close();
// Compile fragment shader // Compile fragment shader
if (!program.addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/fshader.glsl")) if (!m_program.addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/fshader.glsl"))
close(); close();
// Link shader pipeline // Link shader pipeline
if (!program.link()) if (!m_program.link())
close(); close();
// Bind shader pipeline for use // Bind shader pipeline for use
if (!program.bind()) if (!m_program.bind())
close(); close();
} }
void OglViewerWidget::initTextures()
{
// Load cube.png image
texture = new QOpenGLTexture(QImage(":images/cube.png").mirrored());
// Set nearest filtering mode for texture minification
texture->setMinificationFilter(QOpenGLTexture::Nearest);
// Set bilinear filtering mode for texture magnification
texture->setMagnificationFilter(QOpenGLTexture::Linear);
// Wrap texture coordinates by repeating
// f.ex. texture coordinate (1.1, 1.2) is same as (0.1, 0.2)
texture->setWrapMode(QOpenGLTexture::Repeat);
}
void OglViewerWidget::resizeGL(int w, int h) void OglViewerWidget::resizeGL(int w, int h)
{ {
// Calculate aspect ratio // Calculate aspect ratio
@ -142,19 +122,14 @@ void OglViewerWidget::paintGL()
// Clear color and depth buffer // Clear color and depth buffer
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
texture->bind();
// Calculate model view transformation // Calculate model view transformation
QMatrix4x4 matrix; QMatrix4x4 view;
matrix.translate(0.0, 0.0, -5.0); view.translate(0.0, 0.0, -5.0);
matrix.rotate(m_rotation); view.rotate(m_rotation);
// Set modelview-projection matrix // Set modelview-projection matrix
program.setUniformValue("mvp_matrix", m_projection * matrix); m_program.setUniformValue("mvp_matrix", m_projection * view);
// Use texture unit 0 which contains cube.png
program.setUniformValue("texture", 0);
// Draw cube geometry // Draw cube geometry
geometries->drawCubeGeometry(&program); m_dataEngine->drawGeometry(&m_program);
} }