Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support of OpenGL 3.0-3.2 #107

Merged
merged 9 commits into from
Aug 3, 2018
Merged

Add support of OpenGL 3.0-3.2 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5c44d2
Drop QObject from AbstractOpenGLPlan
matwey Aug 1, 2018
ee8e2e9
Add const qualifier to AbstractOpenGLPlane::*ShaderSourceCode()
matwey Aug 1, 2018
6bea52b
Rename *OpenGL33Plan: *-opengl3 to *-opengl3.3
matwey Aug 1, 2018
db93c22
Introduce AbstractOpenGLPlanTexture template class
matwey Aug 1, 2018
09196a5
Add initial implementation for Uint8OpenGL30Plan
matwey Aug 1, 2018
e4c9f0d
Initial implementation for Int16OpenGL30Plan
matwey Aug 1, 2018
01616a1
Add initial implementation for Int32OpenGL30Plan
matwey Aug 1, 2018
2a5eff5
Initial implementation for FloatOpenGL30Plan
hombit Aug 2, 2018
b5010c9
Initial implementation for DoubleOpenGL30Plan
hombit Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 97 additions & 10 deletions include/abstractopenglplan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef _ABSTRACTOPENGLPLAN_H
#define _ABSTRACTOPENGLPLAN_H

#include <QObject>
#include <QOpenGLFunctions>
#include <QOpenGLShaderProgram>
#include <QOpenGLVertexArrayObject>
Expand All @@ -32,7 +31,6 @@
#include <openglshaderprogram.h>

class AbstractOpenGLPlan:
public QObject,
protected QOpenGLFunctions {
private:
class AbstractDrawer {
Expand Down Expand Up @@ -115,7 +113,7 @@ class AbstractOpenGLPlan:
AbstractOpenGLPlan(const QString& name, const FITS::AbstractHeaderDataUnit& hdu,
const std::pair<double, double>& hdu_minmax,
const std::pair<double, double>& instrumental_minmax,
quint8 channels, quint8 channel_size, QObject* parent = Q_NULLPTR);
quint8 channels, quint8 channel_size);
virtual ~AbstractOpenGLPlan() = 0;

inline const QString& name() const { return name_; }
Expand All @@ -128,8 +126,8 @@ class AbstractOpenGLPlan:
inline const quint8& channels() const { return channels_; }
inline const quint8& channel_size() const { return channel_size_; };

virtual QString fragmentShaderSourceCode() = 0;
virtual QString vertexShaderSourceCode();
virtual QString fragmentShaderSourceCode() const = 0;
virtual QString vertexShaderSourceCode() const = 0;
virtual AbstractOpenGLTexture& imageTexture() = 0;

bool initialize();
Expand All @@ -140,15 +138,104 @@ class AbstractOpenGLPlan:
}
};

class AbstractOpenGL33Plan:
template<class T>
class AbstractOpenGLPlanTexture:
public AbstractOpenGLPlan {
public:
AbstractOpenGL33Plan(const QString& name, const FITS::AbstractHeaderDataUnit& hdu,
typedef T texture_type;
private:
texture_type image_texture_;
public:
template<class U>
AbstractOpenGLPlanTexture(const QString& name, const FITS::HeaderDataUnit<FITS::DataUnit<U>>& hdu,
const std::pair<double, double>& hdu_minmax,
const std::pair<double, double>& instrumental_minmax,
quint8 channels, quint8 channel_size):
AbstractOpenGLPlan(name, hdu, hdu_minmax, instrumental_minmax, channels, channel_size),
image_texture_(hdu) {
}
virtual ~AbstractOpenGLPlanTexture() override = 0;

virtual texture_type& imageTexture() override {
return image_texture_;
}
};

template<class T>
AbstractOpenGLPlanTexture<T>::~AbstractOpenGLPlanTexture() = default;

template<class T>
class AbstractOpenGL2Plan:
public AbstractOpenGLPlanTexture<T> {
public:
template<class U>
AbstractOpenGL2Plan(const QString& name, const FITS::HeaderDataUnit<FITS::DataUnit<U>>& hdu,
const std::pair<double, double>& hdu_minmax,
const std::pair<double, double>& instrumental_minmax,
quint8 channels, quint8 channel_size, QObject* parent = Q_NULLPTR);
virtual QString vertexShaderSourceCode() override;
virtual ~AbstractOpenGL33Plan() = 0;
quint8 channels, quint8 channel_size):
AbstractOpenGLPlanTexture<T>(name, hdu, hdu_minmax, instrumental_minmax, channels, channel_size) {
}
virtual ~AbstractOpenGL2Plan() override = 0;

virtual QString vertexShaderSourceCode() const override;
};

template<class T>
QString AbstractOpenGL2Plan<T>::vertexShaderSourceCode() const {
static const QString source = R"(
attribute vec2 vertexCoord;
attribute vec2 vertexUV;
varying vec2 UV;
uniform mat4 MVP;

void main() {
gl_Position = MVP * vec4(vertexCoord,0,1);
UV = vertexUV;
}
)";

return source;
}

template<class T>
AbstractOpenGL2Plan<T>::~AbstractOpenGL2Plan() = default;

template<class T>
class AbstractOpenGL33Plan:
public AbstractOpenGLPlanTexture<T> {
public:
template<class U>
AbstractOpenGL33Plan(const QString& name, const FITS::HeaderDataUnit<FITS::DataUnit<U>>& hdu,
const std::pair<double, double>& hdu_minmax,
const std::pair<double, double>& instrumental_minmax,
quint8 channels, quint8 channel_size):
AbstractOpenGLPlanTexture<T>(name, hdu, hdu_minmax, instrumental_minmax, channels, channel_size) {
}
virtual ~AbstractOpenGL33Plan() override = 0;

virtual QString vertexShaderSourceCode() const override;
};

template<class T>
QString AbstractOpenGL33Plan<T>::vertexShaderSourceCode() const {
static const QString source = R"(
#version 330

in vec2 vertexCoord;
in vec2 vertexUV;
out vec2 UV;
uniform mat4 MVP;

void main() {
gl_Position = MVP * vec4(vertexCoord,0,1);
UV = vertexUV;
}
)";

return source;
}

template<class T>
AbstractOpenGL33Plan<T>::~AbstractOpenGL33Plan() = default;

#endif // _ABSTRACTOPENGLPLAN_H
Loading