From 7e30070a6dfd415b3f76201106d9b29f5b1c68f1 Mon Sep 17 00:00:00 2001 From: Pascal <engelerp@phys.ethz.ch> Date: Mon, 30 May 2022 11:28:19 +0200 Subject: [PATCH] Added more getters, adapted draw(), added enable/disable lighting --- include/heightmap.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/heightmap.hpp b/include/heightmap.hpp index 4e0e2d4..05442b0 100644 --- a/include/heightmap.hpp +++ b/include/heightmap.hpp @@ -22,7 +22,7 @@ public: bool is(const std::string filename) const; //inherited methods - virtual void draw(glm::mat4 projection, glm::mat4 view, glm::mat4 model) override; + virtual void draw(glm::mat4 projection, glm::mat4 view, glm::mat4 model, glm::vec3 camera_pos) override; virtual void upload() override; virtual void unload() override; @@ -32,6 +32,14 @@ public: void updatePlotWindow(); float minZ() const; + float minX() const; + float maxX() const; + float minY() const; + float maxY() const; + + //Shader control + void enableLighting(); + void disableLighting(); private: void _plotHeightLineAlongX(const float y); -- GitLab