Merge branch 'tmj-dev' into milek-dev

2026-07-21 22:59:19 +02:00 · 2018-10-01 21:00:27 +02:00
parent d9020b5881 913541bbee
commit 14b27a6e98
47 changed files with 1674 additions and 972 deletions
--- a/material.h
+++ b/material.h
@@ -24,6 +24,7 @@ struct opengl_material {

    bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1
    std::string name;
+    glm::vec2 size { -1.f, -1.f }; // 'physical' size of bound texture, in meters

 // constructors
    opengl_material() = default;