Bind ProgramData to a Program upon construction

[libs/gl.git] / source / programdata.h

diff --git a/source/programdata.h b/source/programdata.h
index 51ecc579a2582fcfedbcc72e86cb04961e909194..4cc2398ec9bafafeffd4fa202f2f64baa4801d6c 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -14,8 +14,12 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
+class Color;
+class Matrix;
 class Program;
 class Uniform;
+class Vector3;
+class Vector4;
 
 /**
 Stores uniform variables for a shader program.
@@ -25,11 +29,8 @@ class ProgramData
 public:
        class Loader: public DataFile::ObjectLoader<ProgramData>
        {
-       private:
-               Program &prog;
-
        public:
-               Loader(ProgramData &, Program &);
+               Loader(ProgramData &);
        private:
                void uniform1i(const std::string &, int);
                void uniform1f(const std::string &, float);
@@ -39,24 +40,46 @@ public:
        };
 
 private:
+       const Program &program;
        std::map<int, Uniform *> data;
 
        ProgramData &operator=(const ProgramData &);
 public:
-       ProgramData();
+       explicit ProgramData(const Program &);
        ProgramData(const ProgramData &);
        ~ProgramData();
 
+private:
        void uniform(int, Uniform *);
+public:
        void uniform(int, int);
        void uniform(int, float);
        void uniform(int, float, float);
        void uniform2(int, const float *);
        void uniform(int, float, float, float);
+       void uniform(int, const Vector3 &);
        void uniform3(int, const float *);
        void uniform(int, float, float, float, float);
+       void uniform(int, const Vector4 &);
+       void uniform(int, const Color &);
        void uniform4(int, const float *);
        void uniform_matrix4(int, const float *);
+       void uniform_matrix4(int, const Matrix &);
+
+       void uniform(const std::string &, int);
+       void uniform(const std::string &, float);
+       void uniform(const std::string &, float, float);
+       void uniform2(const std::string &, const float *);
+       void uniform(const std::string &, float, float, float);
+       void uniform(const std::string &, const Vector3 &);
+       void uniform3(const std::string &, const float *);
+       void uniform(const std::string &, float, float, float, float);
+       void uniform(const std::string &, const Vector4 &);
+       void uniform(const std::string &, const Color &);
+       void uniform4(const std::string &, const float *);
+       void uniform_matrix4(const std::string &, const float *);
+       void uniform_matrix4(const std::string &, const Matrix &);
+
        void apply() const;
 };