-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#ifndef MSP_GL_PROGRAMDATA_H_
#define MSP_GL_PROGRAMDATA_H_
#include <map>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
namespace Msp {
namespace GL {
+class Color;
+class Matrix;
class Program;
class Uniform;
+class UniformBlock;
+class Vector3;
+class Vector4;
/**
Stores uniform variables for a shader program.
class ProgramData
{
public:
- class Loader: public DataFile::Loader
+ class Loader: public DataFile::ObjectLoader<ProgramData>
{
- private:
- ProgramData &pdata;
- Program &prog;
-
public:
- Loader(ProgramData &, Program &);
+ Loader(ProgramData &);
private:
void uniform1i(const std::string &, int);
void uniform1f(const std::string &, float);
};
private:
- std::map<int, Uniform *> data;
+ struct Block
+ {
+ bool dirty;
+ UniformBlock *block;
+
+ Block();
+ };
+
+ typedef std::map<std::string, Uniform *> UniformMap;
+ typedef std::map<unsigned, Block> BlockMap;
+
+ UniformMap uniforms;
+ mutable BlockMap blocks;
+ mutable bool modified;
- ProgramData(const ProgramData &);
ProgramData &operator=(const ProgramData &);
public:
ProgramData();
+ ProgramData(const ProgramData &);
~ProgramData();
- void uniform(int, Uniform *);
- 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 uniform3(int, const float *);
- void uniform(int, float, float, float, float);
- void uniform4(int, const float *);
- void uniform_matrix4(int, const float *);
+private:
+ void uniform(const std::string &, Uniform *);
+public:
+ 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 &);
+
+ const UniformBlock &get_block(const Program &) const;
+
void apply() const;
};