projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
assign mesh, material to objects
[demo]
/
src
/
shader.h
diff --git
a/src/shader.h
b/src/shader.h
index
a6bec05
..
204d053
100644
(file)
--- a/
src/shader.h
+++ b/
src/shader.h
@@
-2,7
+2,7
@@
#define SHADER_H_
enum SType {
#define SHADER_H_
enum SType {
- SDR_VERTzX,
+ SDR_VERTEX,
SDR_FRAGMENT
};
SDR_FRAGMENT
};
@@
-14,7
+14,7
@@
public:
Shader();
~Shader();
Shader();
~Shader();
- virtual bool load(const char *fname, SType type) = 0;
+ virtual bool load(const char *fname, SType type);
};
class ShaderProgram {
};
class ShaderProgram {
@@
-25,7
+25,9
@@
public:
ShaderProgram();
virtual ~ShaderProgram() = 0;
ShaderProgram();
virtual ~ShaderProgram() = 0;
- void set_shader(Shader *sdr, SType type);
+ void add_shader(Shader *sdr, SType type);
+ bool link();
+ void bind();
};
#endif // SHADER_H_
};
#endif // SHADER_H_