mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-05 15:54:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Attempt to get GLSL working on Linux. Does not work.
This commit is contained in:
Person
2018-04-04 18:54:32 -07:00
parent ae7b1f3ba8
commit d6131b67e5
4 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Fractorium/GLWidget.h
View File

@ -28,7 +28,8 @@ template<typename T> class FractoriumEmberController;
/// </summary>
class GLWidget : public QOpenGLWidget, protected
#ifdef USE_GLSL
QOpenGLFunctions_3_2_Core
//QOpenGLFunctions_4_5_Core
QOpenGLFunctions_3_3_Core
#else
QOpenGLFunctions_2_0
#endif
@ -99,7 +100,7 @@ private:
QMatrix4x4 m_ModelViewProjectionMatrix;
QMatrix4x4 m_TextureProjMatrix;
vector<float> m_Verts;
std::array<GLfloat, 10> m_TexVerts =
std::array<GLfloat, 10> m_TexVerts = std::array<GLfloat, 10>
{
0, 0,
0, 1,