suzanne.soy/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix refactoring issue in gl2shader.h.

Browse Source 
Oops, I accidentally changed the order of fields where I shouldn't
have; add a comment to avoid this in the future.
This commit is contained in:
whitequark 2016-12-02 11:13:15 +00:00
parent 47244c5e89
commit b975380493
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/render/gl2shader.h
View File

@ -25,6 +25,10 @@
namespace SolveSpace { namespace SolveSpace {
//-----------------------------------------------------------------------------
// Floating-point data structures; the layout of these must match shaders
//-----------------------------------------------------------------------------
class Vector2f { class Vector2f {
public: public:
float x, y; float x, y;
@ -45,7 +49,7 @@ public:
class Vector4f { class Vector4f {
public: public:
float w, x, y, z; float x, y, z, w;
static Vector4f From(float x, float y, float z, float w); static Vector4f From(float x, float y, float z, float w);
static Vector4f From(const Vector &v, float w); static Vector4f From(const Vector &v, float w);
@ -53,6 +57,10 @@ public:
static Vector4f From(const RgbaColor &c); static Vector4f From(const RgbaColor &c);
}; };
//-----------------------------------------------------------------------------
// Wrappers for our shaders
//-----------------------------------------------------------------------------
class Shader { class Shader {
public: public:
GLuint program; GLuint program;