eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 20:59:19 +02:00
Code Issues 123 Wiki Activity

merge (with bugs)

Browse Source
This commit is contained in:
VB
2017-04-24 19:08:08 +02:00
parent 73e1c1dc98 96b01c6205
commit 401d95fc57
53 changed files with 2340 additions and 2233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shader.h
View File

@@ -35,8 +35,8 @@ public:
gl_program_mvp() = default;
gl_program_mvp(std::vector<gl_shader>);
void set_mv(glm::mat4 &);
void set_p(glm::mat4 &);
void set_mv(const glm::mat4 &);
void set_p(const glm::mat4 &);
void copy_gl_mvp();
};
@@ -55,16 +55,14 @@ public:
gl_program_light() = default;
gl_program_light(std::vector<gl_shader>);
void set_ambient(float3 &ambient);
void set_ambient(glm::vec3 &ambient);
void set_light_count(GLuint count);
void set_light(GLuint id, type t, float3 &pos, float3 &dir, float in_cutoff, float out_cutoff,
float3 &color, float linear, float quadratic);
void set_object(float specular);
void set_light(GLuint id, type t, glm::vec3 &pos, glm::vec3 &dir, float in_cutoff, float out_cutoff,
glm::vec3 &color, float linear, float quadratic);
private:
GLuint lcount_uniform;
GLuint ambient_uniform;
GLuint specular_uniform;
struct light_s
{
GLuint type;