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

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-10-11 00:14:49 +02:00
parent 09970d73b1 52c8b40f88
commit 2357026146
45 changed files with 2215 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gl/glsl_common.cpp
View File

@@ -33,7 +33,6 @@ void gl::glsl_common_setup()
layout(std140) uniform light_ubo
{
vec3 ambient;
float fog_density;
vec3 fog_color;
uint lights_count;
@@ -50,6 +49,8 @@ void gl::glsl_common_setup()
mat4 future;
float opacity;
float emission;
float fog_density;
float alpha_mult;
};
layout (std140) uniform scene_ubo

6
gl/ubo.h
View File

@@ -58,7 +58,9 @@ namespace gl
glm::mat4 future;
float opacity;
float emission;
UBS_PAD(12);
float fog_density;
float alpha_mult;
UBS_PAD(4);
void set_modelview(const glm::mat4 &mv)
{
@@ -100,7 +102,7 @@ namespace gl
struct light_ubs
{
glm::vec3 ambient;
float fog_density;
UBS_PAD(4);
glm::vec3 fog_color;
uint32_t lights_count;