Removed old OpengGL widget.
This commit is contained in:
David Williams
parent
c62bde0066
commit
f042584ed5
@ -1,398 +0,0 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
#include "OpenGLWidget.h"
|
|
||||||
|
|
||||||
#include <QMouseEvent>
|
|
||||||
#include <QMatrix4x4>
|
|
||||||
#include <QtMath>
|
|
||||||
|
|
||||||
using namespace PolyVox;
|
|
||||||
using namespace std;
|
|
||||||
|
|
||||||
OpenGLWidget::OpenGLWidget(QWidget *parent)
|
|
||||||
:QGLWidget(parent)
|
|
||||||
,m_xRotation(0)
|
|
||||||
,m_yRotation(0)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::setSurfaceMeshToRender(const PolyVox::SurfaceMesh<PositionMaterial>& surfaceMesh)
|
|
||||||
{
|
|
||||||
//Convienient access to the vertices and indices
|
|
||||||
const auto& vecIndices = surfaceMesh.getIndices();
|
|
||||||
const auto& vecVertices = surfaceMesh.getVertices();
|
|
||||||
|
|
||||||
//Create the VAO for the mesh
|
|
||||||
//glGenVertexArrays(1, &vertexArrayObject);
|
|
||||||
//glBindVertexArray(vertexArrayObject);
|
|
||||||
|
|
||||||
//The GL_ARRAY_BUFFER will contain the list of vertex positions
|
|
||||||
glGenBuffers(1, &vertexBuffer);
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
|
|
||||||
glBufferData(GL_ARRAY_BUFFER, vecVertices.size() * sizeof(PositionMaterial), vecVertices.data(), GL_STATIC_DRAW);
|
|
||||||
|
|
||||||
//and GL_ELEMENT_ARRAY_BUFFER will contain the indices
|
|
||||||
glGenBuffers(1, &indexBuffer);
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
|
|
||||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, vecIndices.size() * sizeof(uint32_t), vecIndices.data(), GL_STATIC_DRAW);
|
|
||||||
|
|
||||||
//We need to tell OpenGL how to understand the format of the vertex data
|
|
||||||
glEnableVertexAttribArray(0); //We're talking about shader attribute '0'
|
|
||||||
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(PositionMaterial), 0); //take the first 3 floats from every sizeof(decltype(vecVertices)::value_type)
|
|
||||||
|
|
||||||
//glBindVertexArray(0);
|
|
||||||
|
|
||||||
noOfIndices = vecIndices.size(); //Save this for the call to glDrawElements later
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::initializeGL()
|
|
||||||
{
|
|
||||||
initializeOpenGLFunctions();
|
|
||||||
|
|
||||||
//Print out some information about the OpenGL implementation.
|
|
||||||
std::cout << "OpenGL Implementation Details:" << std::endl;
|
|
||||||
if(glGetString(GL_VENDOR))
|
|
||||||
std::cout << "\tGL_VENDOR: " << glGetString(GL_VENDOR) << std::endl;
|
|
||||||
if(glGetString(GL_RENDERER))
|
|
||||||
std::cout << "\tGL_RENDERER: " << glGetString(GL_RENDERER) << std::endl;
|
|
||||||
if(glGetString(GL_VERSION))
|
|
||||||
std::cout << "\tGL_VERSION: " << glGetString(GL_VERSION) << std::endl;
|
|
||||||
if(glGetString(GL_SHADING_LANGUAGE_VERSION))
|
|
||||||
std::cout << "\tGL_SHADING_LANGUAGE_VERSION: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl;
|
|
||||||
|
|
||||||
//Set up the clear colour
|
|
||||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
|
||||||
glClearDepth(1.0f);
|
|
||||||
|
|
||||||
glEnable(GL_CULL_FACE);
|
|
||||||
glEnable(GL_DEPTH_TEST);
|
|
||||||
glDepthMask(GL_TRUE);
|
|
||||||
glDepthFunc(GL_LEQUAL);
|
|
||||||
glDepthRange(0.0, 1.0);
|
|
||||||
|
|
||||||
if(!shader.addShaderFromSourceCode(QOpenGLShader::Vertex,
|
|
||||||
"#version 140\n"
|
|
||||||
|
|
||||||
"in vec4 position; //This will be the position of the vertex in model-space\n"
|
|
||||||
|
|
||||||
"uniform mat4 cameraToClipMatrix;\n"
|
|
||||||
"uniform mat4 worldToCameraMatrix;\n"
|
|
||||||
"uniform mat4 modelToWorldMatrix;\n"
|
|
||||||
|
|
||||||
"out vec4 worldPosition; //This is being passed to the fragment shader to calculate the normals\n"
|
|
||||||
|
|
||||||
"void main()\n"
|
|
||||||
"{\n"
|
|
||||||
" worldPosition = modelToWorldMatrix * position;\n"
|
|
||||||
" vec4 cameraPosition = worldToCameraMatrix * worldPosition;\n"
|
|
||||||
" gl_Position = cameraToClipMatrix * cameraPosition;\n"
|
|
||||||
"}\n"
|
|
||||||
))
|
|
||||||
{
|
|
||||||
std::cerr << shader.log().toStdString() << std::endl;
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!shader.addShaderFromSourceCode(QOpenGLShader::Fragment,
|
|
||||||
"#version 130\n"
|
|
||||||
|
|
||||||
"in vec4 worldPosition; //Passed in from the vertex shader\n"
|
|
||||||
|
|
||||||
"out vec4 outputColor;\n"
|
|
||||||
|
|
||||||
"void main()\n"
|
|
||||||
"{\n"
|
|
||||||
" vec3 normal = normalize(cross(dFdy(worldPosition.xyz), dFdx(worldPosition.xyz)));\n"
|
|
||||||
|
|
||||||
" float color = clamp(abs(dot(normalize(normal.xyz), vec3(0.9,0.1,0.5))), 0, 1);\n"
|
|
||||||
" outputColor = vec4(1.0, 0.5, color, 1.0);\n"
|
|
||||||
"}\n"
|
|
||||||
))
|
|
||||||
{
|
|
||||||
std::cerr << shader.log().toStdString() << std::endl;
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
shader.bindAttributeLocation("position", 0);
|
|
||||||
|
|
||||||
if(!shader.link())
|
|
||||||
{
|
|
||||||
std::cerr << shader.log().toStdString() << std::endl;
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
shader.bind();
|
|
||||||
|
|
||||||
QMatrix4x4 worldToCameraMatrix;
|
|
||||||
worldToCameraMatrix.translate(0, 0, -50); //Move the camera back by 50 units
|
|
||||||
|
|
||||||
shader.setUniformValue("worldToCameraMatrix", worldToCameraMatrix);
|
|
||||||
|
|
||||||
shader.release();
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::resizeGL(int w, int h)
|
|
||||||
{
|
|
||||||
//Setup the viewport
|
|
||||||
glViewport(0, 0, w, h);
|
|
||||||
|
|
||||||
auto aspectRatio = w / (float)h;
|
|
||||||
float zNear = 1.0;
|
|
||||||
float zFar = 1000.0;
|
|
||||||
|
|
||||||
QMatrix4x4 cameraToClipMatrix;
|
|
||||||
cameraToClipMatrix.frustum(-aspectRatio, aspectRatio, -1, 1, zNear, zFar);
|
|
||||||
|
|
||||||
shader.bind();
|
|
||||||
shader.setUniformValue("cameraToClipMatrix", cameraToClipMatrix);
|
|
||||||
shader.release();
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::paintGL()
|
|
||||||
{
|
|
||||||
//Clear the screen
|
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
|
||||||
|
|
||||||
QMatrix4x4 modelToWorldMatrix;
|
|
||||||
modelToWorldMatrix.rotate(m_xRotation, 0, 1, 0); //rotate around y-axis
|
|
||||||
modelToWorldMatrix.rotate(m_yRotation, 1, 0, 0); //rotate around x-axis
|
|
||||||
modelToWorldMatrix.translate(-32, -32, -32); //centre the model on the origin
|
|
||||||
|
|
||||||
shader.bind();
|
|
||||||
|
|
||||||
shader.setUniformValue("modelToWorldMatrix", modelToWorldMatrix); //Update to the latest camera matrix
|
|
||||||
|
|
||||||
//glBindVertexArray(vertexArrayObject);
|
|
||||||
|
|
||||||
glDrawElements(GL_TRIANGLES, noOfIndices, GL_UNSIGNED_INT, 0);
|
|
||||||
|
|
||||||
//glBindVertexArray(0);
|
|
||||||
|
|
||||||
shader.release();
|
|
||||||
|
|
||||||
GLenum errCode = glGetError();
|
|
||||||
if(errCode != GL_NO_ERROR)
|
|
||||||
{
|
|
||||||
std::cerr << "OpenGL Error: " << errCode << std::endl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::mousePressEvent(QMouseEvent* event)
|
|
||||||
{
|
|
||||||
m_CurrentMousePos = event->pos();
|
|
||||||
m_LastFrameMousePos = m_CurrentMousePos;
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::mouseMoveEvent(QMouseEvent* event)
|
|
||||||
{
|
|
||||||
m_CurrentMousePos = event->pos();
|
|
||||||
QPoint diff = m_CurrentMousePos - m_LastFrameMousePos;
|
|
||||||
m_xRotation += diff.x();
|
|
||||||
m_yRotation += diff.y();
|
|
||||||
m_LastFrameMousePos = m_CurrentMousePos;
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
=======
|
|
||||||
#include "OpenGLWidget.h"
|
|
||||||
|
|
||||||
#include <QMouseEvent>
|
|
||||||
#include <QMatrix4x4>
|
|
||||||
#include <QtMath>
|
|
||||||
|
|
||||||
using namespace PolyVox;
|
|
||||||
using namespace std;
|
|
||||||
|
|
||||||
OpenGLWidget::OpenGLWidget(QWidget *parent)
|
|
||||||
:QGLWidget(parent)
|
|
||||||
,m_xRotation(0)
|
|
||||||
,m_yRotation(0)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::setSurfaceMeshToRender(const PolyVox::SurfaceMesh<PositionMaterial>& surfaceMesh)
|
|
||||||
{
|
|
||||||
//Convienient access to the vertices and indices
|
|
||||||
const auto& vecIndices = surfaceMesh.getIndices();
|
|
||||||
const auto& vecVertices = surfaceMesh.getVertices();
|
|
||||||
|
|
||||||
//Create the VAO for the mesh
|
|
||||||
glGenVertexArrays(1, &vertexArrayObject);
|
|
||||||
glBindVertexArray(vertexArrayObject);
|
|
||||||
|
|
||||||
//The GL_ARRAY_BUFFER will contain the list of vertex positions
|
|
||||||
glGenBuffers(1, &vertexBuffer);
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
|
|
||||||
glBufferData(GL_ARRAY_BUFFER, vecVertices.size() * sizeof(PositionMaterial), vecVertices.data(), GL_STATIC_DRAW);
|
|
||||||
|
|
||||||
//and GL_ELEMENT_ARRAY_BUFFER will contain the indices
|
|
||||||
glGenBuffers(1, &indexBuffer);
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
|
|
||||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, vecIndices.size() * sizeof(uint32_t), vecIndices.data(), GL_STATIC_DRAW);
|
|
||||||
|
|
||||||
//We need to tell OpenGL how to understand the format of the vertex data
|
|
||||||
glEnableVertexAttribArray(0); //We're talking about shader attribute '0'
|
|
||||||
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(PositionMaterial), 0); //take the first 3 floats from every sizeof(decltype(vecVertices)::value_type)
|
|
||||||
|
|
||||||
glBindVertexArray(0);
|
|
||||||
|
|
||||||
noOfIndices = vecIndices.size(); //Save this for the call to glDrawElements later
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::initializeGL()
|
|
||||||
{
|
|
||||||
GLenum err = glewInit();
|
|
||||||
if (GLEW_OK != err)
|
|
||||||
{
|
|
||||||
/* Problem: glewInit failed, something is seriously wrong. */
|
|
||||||
std::cout << "GLEW Error: " << glewGetErrorString(err) << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Print out some information about the OpenGL implementation.
|
|
||||||
std::cout << "OpenGL Implementation Details:" << std::endl;
|
|
||||||
if(glGetString(GL_VENDOR))
|
|
||||||
std::cout << "\tGL_VENDOR: " << glGetString(GL_VENDOR) << std::endl;
|
|
||||||
if(glGetString(GL_RENDERER))
|
|
||||||
std::cout << "\tGL_RENDERER: " << glGetString(GL_RENDERER) << std::endl;
|
|
||||||
if(glGetString(GL_VERSION))
|
|
||||||
std::cout << "\tGL_VERSION: " << glGetString(GL_VERSION) << std::endl;
|
|
||||||
if(glGetString(GL_SHADING_LANGUAGE_VERSION))
|
|
||||||
std::cout << "\tGL_SHADING_LANGUAGE_VERSION: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl;
|
|
||||||
|
|
||||||
//Set up the clear colour
|
|
||||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
|
||||||
glClearDepth(1.0f);
|
|
||||||
|
|
||||||
glEnable(GL_CULL_FACE);
|
|
||||||
glEnable(GL_DEPTH_TEST);
|
|
||||||
glDepthMask(GL_TRUE);
|
|
||||||
glDepthFunc(GL_LEQUAL);
|
|
||||||
glDepthRange(0.0, 1.0);
|
|
||||||
|
|
||||||
if(!shader.addShaderFromSourceCode(QOpenGLShader::Vertex, R"(
|
|
||||||
#version 140
|
|
||||||
|
|
||||||
in vec4 position; //This will be the position of the vertex in model-space
|
|
||||||
|
|
||||||
uniform mat4 cameraToClipMatrix;
|
|
||||||
uniform mat4 worldToCameraMatrix;
|
|
||||||
uniform mat4 modelToWorldMatrix;
|
|
||||||
|
|
||||||
out vec4 worldPosition; //This is being passed to the fragment shader to calculate the normals
|
|
||||||
|
|
||||||
void main()
|
|
||||||
{
|
|
||||||
worldPosition = modelToWorldMatrix * position;
|
|
||||||
vec4 cameraPosition = worldToCameraMatrix * worldPosition;
|
|
||||||
gl_Position = cameraToClipMatrix * cameraPosition;
|
|
||||||
}
|
|
||||||
)"))
|
|
||||||
{
|
|
||||||
std::cerr << shader.log().toStdString() << std::endl;
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!shader.addShaderFromSourceCode(QOpenGLShader::Fragment, R"(
|
|
||||||
#version 130
|
|
||||||
|
|
||||||
in vec4 worldPosition; //Passed in from the vertex shader
|
|
||||||
|
|
||||||
out vec4 outputColor;
|
|
||||||
|
|
||||||
void main()
|
|
||||||
{
|
|
||||||
vec3 normal = normalize(cross(dFdy(worldPosition.xyz), dFdx(worldPosition.xyz)));
|
|
||||||
|
|
||||||
float color = clamp(abs(dot(normalize(normal.xyz), vec3(0.9,0.1,0.5))), 0, 1);
|
|
||||||
outputColor = vec4(1.0, 0.5, color, 1.0);
|
|
||||||
}
|
|
||||||
)"))
|
|
||||||
{
|
|
||||||
std::cerr << shader.log().toStdString() << std::endl;
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
shader.bindAttributeLocation("position", 0);
|
|
||||||
|
|
||||||
if(!shader.link())
|
|
||||||
{
|
|
||||||
std::cerr << shader.log().toStdString() << std::endl;
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
shader.bind();
|
|
||||||
|
|
||||||
QMatrix4x4 worldToCameraMatrix{};
|
|
||||||
worldToCameraMatrix.translate(0, 0, -50); //Move the camera back by 50 units
|
|
||||||
|
|
||||||
shader.setUniformValue("worldToCameraMatrix", worldToCameraMatrix);
|
|
||||||
|
|
||||||
shader.release();
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::resizeGL(int w, int h)
|
|
||||||
{
|
|
||||||
//Setup the viewport
|
|
||||||
glViewport(0, 0, w, h);
|
|
||||||
|
|
||||||
auto aspectRatio = w / (float)h;
|
|
||||||
float zNear = 1.0;
|
|
||||||
float zFar = 1000.0;
|
|
||||||
|
|
||||||
QMatrix4x4 cameraToClipMatrix{};
|
|
||||||
cameraToClipMatrix.frustum(-aspectRatio, aspectRatio, -1, 1, zNear, zFar);
|
|
||||||
|
|
||||||
shader.bind();
|
|
||||||
shader.setUniformValue("cameraToClipMatrix", cameraToClipMatrix);
|
|
||||||
shader.release();
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::paintGL()
|
|
||||||
{
|
|
||||||
//Clear the screen
|
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
|
||||||
|
|
||||||
QMatrix4x4 modelToWorldMatrix{};
|
|
||||||
modelToWorldMatrix.rotate(m_xRotation, 0, 1, 0); //rotate around y-axis
|
|
||||||
modelToWorldMatrix.rotate(m_yRotation, 1, 0, 0); //rotate around x-axis
|
|
||||||
modelToWorldMatrix.translate(-32, -32, -32); //centre the model on the origin
|
|
||||||
|
|
||||||
shader.bind();
|
|
||||||
|
|
||||||
shader.setUniformValue("modelToWorldMatrix", modelToWorldMatrix); //Update to the latest camera matrix
|
|
||||||
|
|
||||||
glBindVertexArray(vertexArrayObject);
|
|
||||||
|
|
||||||
glDrawElements(GL_TRIANGLES, noOfIndices, GL_UNSIGNED_INT, 0);
|
|
||||||
|
|
||||||
glBindVertexArray(0);
|
|
||||||
|
|
||||||
shader.release();
|
|
||||||
|
|
||||||
GLenum errCode = glGetError();
|
|
||||||
if(errCode != GL_NO_ERROR)
|
|
||||||
{
|
|
||||||
std::cerr << "OpenGL Error: " << errCode << std::endl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::mousePressEvent(QMouseEvent* event)
|
|
||||||
{
|
|
||||||
m_CurrentMousePos = event->pos();
|
|
||||||
m_LastFrameMousePos = m_CurrentMousePos;
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenGLWidget::mouseMoveEvent(QMouseEvent* event)
|
|
||||||
{
|
|
||||||
m_CurrentMousePos = event->pos();
|
|
||||||
QPoint diff = m_CurrentMousePos - m_LastFrameMousePos;
|
|
||||||
m_xRotation += diff.x();
|
|
||||||
m_yRotation += diff.y();
|
|
||||||
m_LastFrameMousePos = m_CurrentMousePos;
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
>>>>>>> parent of 2da902d... This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.
|
|
||||||
@ -1,143 +0,0 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
/*******************************************************************************
|
|
||||||
Copyright (c) 2005-2009 David Williams
|
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
|
||||||
warranty. In no event will the authors be held liable for any damages
|
|
||||||
arising from the use of this software.
|
|
||||||
|
|
||||||
Permission is granted to anyone to use this software for any purpose,
|
|
||||||
including commercial applications, and to alter it and redistribute it
|
|
||||||
freely, subject to the following restrictions:
|
|
||||||
|
|
||||||
1. The origin of this software must not be misrepresented; you must not
|
|
||||||
claim that you wrote the original software. If you use this software
|
|
||||||
in a product, an acknowledgment in the product documentation would be
|
|
||||||
appreciated but is not required.
|
|
||||||
|
|
||||||
2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
misrepresented as being the original software.
|
|
||||||
|
|
||||||
3. This notice may not be removed or altered from any source
|
|
||||||
distribution.
|
|
||||||
*******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef __BasicExample_OpenGLWidget_H__
|
|
||||||
#define __BasicExample_OpenGLWidget_H__
|
|
||||||
|
|
||||||
#include "PolyVoxCore/SurfaceMesh.h"
|
|
||||||
|
|
||||||
#include <QOpenGLFunctions>
|
|
||||||
|
|
||||||
#include <QGLWidget>
|
|
||||||
#include <QOpenGLShaderProgram>
|
|
||||||
#include <QOpenGLVertexArrayObject>
|
|
||||||
#include <QOpenGLBuffer>
|
|
||||||
|
|
||||||
class OpenGLWidget : public QGLWidget, protected QOpenGLFunctions
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
//Constructor
|
|
||||||
OpenGLWidget(QWidget *parent);
|
|
||||||
|
|
||||||
//Mouse handling
|
|
||||||
void mouseMoveEvent(QMouseEvent* event);
|
|
||||||
void mousePressEvent(QMouseEvent* event);
|
|
||||||
|
|
||||||
//Convert a SurfaceMesh to OpenGL index/vertex buffers
|
|
||||||
void setSurfaceMeshToRender(const PolyVox::SurfaceMesh<PolyVox::PositionMaterial>& surfaceMesh);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
//Qt OpenGL functions
|
|
||||||
void initializeGL();
|
|
||||||
void resizeGL(int w, int h);
|
|
||||||
void paintGL();
|
|
||||||
|
|
||||||
private:
|
|
||||||
//Index/vertex buffer data
|
|
||||||
GLuint noOfIndices;
|
|
||||||
GLuint indexBuffer;
|
|
||||||
GLuint vertexBuffer;
|
|
||||||
GLuint vertexArrayObject;
|
|
||||||
|
|
||||||
QOpenGLShaderProgram shader;
|
|
||||||
|
|
||||||
//Mouse data
|
|
||||||
QPoint m_LastFrameMousePos;
|
|
||||||
QPoint m_CurrentMousePos;
|
|
||||||
int m_xRotation;
|
|
||||||
int m_yRotation;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif //__BasicExample_OpenGLWidget_H__
|
|
||||||
=======
|
|
||||||
/*******************************************************************************
|
|
||||||
Copyright (c) 2005-2009 David Williams
|
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
|
||||||
warranty. In no event will the authors be held liable for any damages
|
|
||||||
arising from the use of this software.
|
|
||||||
|
|
||||||
Permission is granted to anyone to use this software for any purpose,
|
|
||||||
including commercial applications, and to alter it and redistribute it
|
|
||||||
freely, subject to the following restrictions:
|
|
||||||
|
|
||||||
1. The origin of this software must not be misrepresented; you must not
|
|
||||||
claim that you wrote the original software. If you use this software
|
|
||||||
in a product, an acknowledgment in the product documentation would be
|
|
||||||
appreciated but is not required.
|
|
||||||
|
|
||||||
2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
misrepresented as being the original software.
|
|
||||||
|
|
||||||
3. This notice may not be removed or altered from any source
|
|
||||||
distribution.
|
|
||||||
*******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef __BasicExample_OpenGLWidget_H__
|
|
||||||
#define __BasicExample_OpenGLWidget_H__
|
|
||||||
|
|
||||||
#include "PolyVoxCore/SurfaceMesh.h"
|
|
||||||
|
|
||||||
#include "glew/glew.h"
|
|
||||||
|
|
||||||
#include <QGLWidget>
|
|
||||||
#include <QOpenGLShaderProgram>
|
|
||||||
|
|
||||||
class OpenGLWidget : public QGLWidget
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
//Constructor
|
|
||||||
OpenGLWidget(QWidget *parent);
|
|
||||||
|
|
||||||
//Mouse handling
|
|
||||||
void mouseMoveEvent(QMouseEvent* event);
|
|
||||||
void mousePressEvent(QMouseEvent* event);
|
|
||||||
|
|
||||||
//Convert a SurfaceMesh to OpenGL index/vertex buffers
|
|
||||||
void setSurfaceMeshToRender(const PolyVox::SurfaceMesh<PolyVox::PositionMaterial>& surfaceMesh);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
//Qt OpenGL functions
|
|
||||||
void initializeGL();
|
|
||||||
void resizeGL(int w, int h);
|
|
||||||
void paintGL();
|
|
||||||
|
|
||||||
private:
|
|
||||||
//Index/vertex buffer data
|
|
||||||
GLuint noOfIndices;
|
|
||||||
GLuint indexBuffer;
|
|
||||||
GLuint vertexBuffer;
|
|
||||||
GLuint vertexArrayObject;
|
|
||||||
|
|
||||||
QOpenGLShaderProgram shader;
|
|
||||||
|
|
||||||
//Mouse data
|
|
||||||
QPoint m_LastFrameMousePos;
|
|
||||||
QPoint m_CurrentMousePos;
|
|
||||||
int m_xRotation;
|
|
||||||
int m_yRotation;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif //__BasicExample_OpenGLWidget_H__
|
|
||||||
>>>>>>> parent of 2da902d... This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.
|
|
||||||
@ -51,7 +51,7 @@ QT5_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc)
|
|||||||
SOURCE_GROUP("Resource Files" FILES ../common/example.qrc ${COMMON_RESOURCES_RCC})
|
SOURCE_GROUP("Resource Files" FILES ../common/example.qrc ${COMMON_RESOURCES_RCC})
|
||||||
|
|
||||||
#Build
|
#Build
|
||||||
ADD_EXECUTABLE(SmoothLODExample ${SRC_FILES})
|
ADD_EXECUTABLE(SmoothLODExample ${SRC_FILES} ${COMMON_RESOURCES_RCC})
|
||||||
IF(MSVC)
|
IF(MSVC)
|
||||||
SET_TARGET_PROPERTIES(SmoothLODExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") #All warnings
|
SET_TARGET_PROPERTIES(SmoothLODExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") #All warnings
|
||||||
ENDIF(MSVC)
|
ENDIF(MSVC)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user