From dbccd866229a4b06d10fbafc3eb3343015caedba Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sun, 26 Nov 2023 16:09:41 -0700 Subject: checkpoint --- inc/model_instance.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'inc/model_instance.hpp') diff --git a/inc/model_instance.hpp b/inc/model_instance.hpp index 059d3a5..997e9a6 100644 --- a/inc/model_instance.hpp +++ b/inc/model_instance.hpp @@ -5,17 +5,18 @@ #include "renderable.hpp" #include -class ModelInstance : Renderable { +class ModelInstance : public Renderable { private: + std::shared_ptr m_mesh; FIXED m_scale; - VECTOR m_rotation; // though technically "FIXED"'s, these are simply s32's - // where [0, 2pi] -> [0, 0xFFFF] in the x,y,z axes + VECTOR m_rot; // though technically "FIXED"'s, these are simply s32's + // where [0, 2pi] -> [0, 0xFFFF] in the x,y,z axes VECTOR m_pos; - std::shared_ptr m_mesh; - public: - void render(std::shared_ptr scene_context); + ModelInstance(std::shared_ptr mesh, FIXED scale, VECTOR m_rotation, + VECTOR m_pos); + virtual void render(std::shared_ptr scene_context); }; #endif // MODEL_INSTANCE_HPP -- cgit v1.2.3-70-g09d2