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

Merge remote-tracking branch 'tmj/master' into sim

Browse Source
This commit is contained in:
milek7
2020-10-21 02:52:49 +02:00
parent 0a8359068f dee0bd13f4
commit 494f4fbef2
10 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
material.h
View File

@@ -24,8 +24,8 @@ struct opengl_material {
std::vector<gl::shader::param_entry> params_state;
std::shared_ptr<gl::program> shader;
float opacity = std::numeric_limits<float>::quiet_NaN();
float selfillum = std::numeric_limits<float>::quiet_NaN();
std::optional<float> opacity;
std::optional<float> selfillum;
float glossiness { 10.f };
std::string name;