Merge branch 'milek-dev' into gfx-work

2026-07-21 13:39:18 +02:00 · 2018-10-10 19:33:08 +02:00
parent b4c67dba8c c7ef111791
commit 09970d73b1
49 changed files with 1697 additions and 1026 deletions
--- a/material.h
+++ b/material.h
@@ -28,6 +28,7 @@ struct opengl_material {
    float selfillum = std::numeric_limits<float>::quiet_NaN();

    std::string name;
+    glm::vec2 size { -1.f, -1.f }; // 'physical' size of bound texture, in meters

 // constructors
    opengl_material();