From 855da86feae1a5cc14dc2d486ccf115f484dbc2e Mon Sep 17 00:00:00 2001 From: rtk0c Date: Mon, 25 Apr 2022 20:22:07 -0700 Subject: Changeset: 16 Initial work on rendering sprites to screen --- source/Player.hpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'source/Player.hpp') diff --git a/source/Player.hpp b/source/Player.hpp index 4ae4f80..d003a25 100644 --- a/source/Player.hpp +++ b/source/Player.hpp @@ -1,7 +1,9 @@ #pragma once #include "GameObject.hpp" -#include "GameObjectTags.hpp" +#include "Material.hpp" +#include "RcPtr.hpp" +#include "Sprite.hpp" #define GLFW_INCLUDE_NONE #include @@ -24,26 +26,25 @@ struct PlayerKeyBinds { std::span GetKeyStatusArray(); }; -class PlayerVisual { -public: -}; - class Player : public GameObject { public: std::vector boundKeyboards; PlayerKeyBinds keybinds; - PlayerVisual visuals; + Sprite sprite; + RenderObject renderObject; int mId; public: Player(GameWorld* world, int id); - virtual Tags::GameObjectType GetTypeTag() const override { return Tags::GOT_Player; } - virtual void Awaken() override; virtual void Resleep() override; virtual void Update() override; + Material* GetMaterial() const; + void SetMaterial(Material* material); + virtual std::span GetRenderObjects() const override; + int GetId() const { return mId; } void HandleKeyInput(int key, int action); -- cgit v1.2.3-70-g09d2