added npc's gift
This commit is contained in:
1 parent
bc2997d86f
commit
34759326b9
9 files changed
+166
-15
No files matched your search
+8
-1
@@ -2,6 +2,7 @@
|
||||
#include "BoneAnimatedModel.h"
|
||||
#include "render/Renderer.h"
|
||||
#include "render/TextureManager.h"
|
||||
#include "items/Item.h"
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <map>
|
||||
@@ -18,7 +19,7 @@ enum class AnimationState {
|
||||
class Character {
|
||||
public:
|
||||
void loadAnimation(AnimationState state, const std::string& filename, const std::string& zipFile = "");
|
||||
// void setTexture(std::shared_ptr<Texture> texture);
|
||||
// void setTexture(std::shared_ptr<Texture> texture);
|
||||
void setTexture(std::shared_ptr<Texture> texture) {
|
||||
this->texture = texture;
|
||||
}
|
||||
@@ -40,6 +41,12 @@ public:
|
||||
// Applied after scale, fixes model-space orientation (e.g. Blender Z-up exports)
|
||||
Eigen::Quaternionf modelCorrectionRotation = Eigen::Quaternionf::Identity();
|
||||
|
||||
// NPC Gift
|
||||
Item giftItem;
|
||||
std::string npcId;
|
||||
std::string npcName;
|
||||
bool giftReceived = false;
|
||||
|
||||
private:
|
||||
struct AnimationData {
|
||||
BoneSystem model;
|
||||
|
||||
Reference in new issue
Block a user