SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@564 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2019-06-26 17:54:14 +00:00
parent a840b5d61a
commit 1e08d029e2
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qglview/glframebuffer.h
View File

@@ -20,6 +20,8 @@
#define GLFRAMEBUFFER_H #define GLFRAMEBUFFER_H
#include "gltypes.h" #include "gltypes.h"
#include <QOpenGLExtraFunctions>
class GLFramebuffer : protected QOpenGLExtraFunctions class GLFramebuffer : protected QOpenGLExtraFunctions
{ {

4
qglview/gltypes.h
View File

@@ -54,7 +54,7 @@
# include <GL/glu.h> # include <GL/glu.h>
# endif # endif
#endif #endif
#include <QOpenGLExtraFunctions> #include <QOpenGLFunctions>
#include <QOpenGLWidget> #include <QOpenGLWidget>
#include <QOpenGLShader> #include <QOpenGLShader>
#include <QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
@@ -162,7 +162,7 @@ void glDrawQuad(QOpenGLShaderProgram * prog = nullptr, QVector4D * corner_dirs =
QMatrix4x4 getGLMatrix(GLenum matrix); QMatrix4x4 getGLMatrix(GLenum matrix);
void setGLMatrix(QMatrix4x4 matrix); void setGLMatrix(QMatrix4x4 matrix);
inline void deleteGLTexture(GLuint & tex) {if (tex != 0) glDeleteTextures(1, &tex); tex = 0;} inline void deleteGLTexture(GLuint & tex) {if (tex != 0) glDeleteTextures(1, &tex); tex = 0;}
//# define QGLCI if (!QOpenGLContext::currentContext()) return; QOpenGLExtraFunctions gf(QOpenGLContext::currentContext()); //# define QGLCI if (!QOpenGLContext::currentContext()) return; QOpenGLFunctions gf(QOpenGLContext::currentContext());
//# define QGLC gf. //# define QGLC gf.
//inline void glActiveTextureChannel(int channel) {QGLCI gf.glActiveTexture(GL_TEXTURE0 + channel);} //inline void glActiveTextureChannel(int channel) {QGLCI gf.glActiveTexture(GL_TEXTURE0 + channel);}
//inline void glDisableTextures(int channels = 8) {QGLCI for (int i = channels - 1; i >= 0; --i) {glActiveTextureChannel(i); glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_CUBE_MAP);}} //inline void glDisableTextures(int channels = 8) {QGLCI for (int i = channels - 1; i >= 0; --i) {glActiveTextureChannel(i); glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_CUBE_MAP);}}

2
qglview/glvbo.h
View File

@@ -22,7 +22,7 @@
#include "gltypes.h" #include "gltypes.h"
#include "chunkstream.h" #include "chunkstream.h"
class GLVBO : protected QOpenGLExtraFunctions class GLVBO : protected QOpenGLFunctions
{ {
friend class GLObjectBase; friend class GLObjectBase;
friend QDataStream & operator <<(QDataStream & s, const GLVBO & m); friend QDataStream & operator <<(QDataStream & s, const GLVBO & m);

1
qglview/renderer_deferred_shading.h
View File

@@ -22,6 +22,7 @@
#include "qglview.h" #include "qglview.h"
#include <QLabel> #include <QLabel>
class RendererDeferredShading: public GLRendererBase class RendererDeferredShading: public GLRendererBase
{ {
public: public: