diff options
author | Keuin <[email protected]> | 2022-04-17 20:50:22 +0800 |
---|---|---|
committer | Keuin <[email protected]> | 2022-04-17 20:50:22 +0800 |
commit | ee3b665441b2f83041416098049cc16b6b63d942 (patch) | |
tree | 261e5b5ab15e4ec7add1489bbe2d5e8dd42524b6 | |
parent | bf1bfa34d5ad0e41379179fb9d2dfe0e2cb372f6 (diff) |
Fix: rename object::material() to object::get_material. Make it compile on Debian 11 GCC.
-rw-r--r-- | hitlist.h | 2 | ||||
-rw-r--r-- | object.h | 2 | ||||
-rw-r--r-- | sphere.h | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -86,7 +86,7 @@ public: return pixel<T>::from_normalized(nv); #endif #ifdef T_DIFFUSE - const auto &materi = hit_obj->material(); + const auto &materi = hit_obj->get_material(); if (materi.scatter(r, *hit_obj, hit_t, ruvg)) { TRACELOG(" scattered ray: [%-10f,%-10f,%-10f], decay=[%-10f,%-10f,%-10f]\n", r.direction().x, r.direction().y, r.direction().z, @@ -41,7 +41,7 @@ public: virtual ~object() = default; // Get this object's material. - virtual material &material() const = 0; + virtual material &get_material() const = 0; }; @@ -39,7 +39,7 @@ public: return (where - center) / radius; } - class material &material() const override { + class material &get_material() const override { return materi; } |