YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed more *nix compile issues

Browse Source
This commit is contained in:
Dominic Masters
2023-02-03 06:23:21 -08:00
parent 7db25fc659
commit 6e9a54b4f2
7 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dawnpokergame/prefabs/characters/CharacterPrefab.hpp
View File

@ -47,7 +47,7 @@ namespace Dawn {
TiledSprite *tiledSprite;
AudioSource *audioSource;
CharacterPrefab(Scene *s, sceneitemid_t i) : SceneItemPrefab(s, i) {}
CharacterPrefab(Scene *s, sceneitemid_t i) : SceneItemPrefab<T>(s, i) {}
void prefabInit(AssetManager *man) override {
characterTexture = man->get<TextureAsset>(T::getCharacterTexture());
@ -57,24 +57,24 @@ namespace Dawn {
auto emotion = this->defineAndGetInitialEmotion(man);
// Components
meshRenderer = this->addComponent<MeshRenderer>();
meshHost = this->addComponent<MeshHost>();
meshRenderer = SceneItem::addComponent<MeshRenderer>();
meshHost = SceneItem::addComponent<MeshHost>();
material = this->addComponent<SimpleTexturedMaterial>();
material = SceneItem::addComponent<SimpleTexturedMaterial>();
material->texture = &characterTexture->texture;
vnCharacter = this->addComponent<VisualNovelCharacter>();
vnCharacter = SceneItem::addComponent<VisualNovelCharacter>();
vnCharacter->nameKey = T::getLanguagePrefix() + ".name";
animation = this->addComponent<AnimationController>();
animation = SceneItem::addComponent<AnimationController>();
tiledSprite = this->addComponent<TiledSprite>();
tiledSprite = SceneItem::addComponent<TiledSprite>();
tiledSprite->setTileset(&characterTileset->tileset);
float_t ratio = characterTileset->tileset.getTileWidth() / characterTileset->tileset.getTileHeight();
tiledSprite->setSize(glm::vec2(ratio, 1.0f));
tiledSprite->setTile(emotion.tile);
audioSource = this->addComponent<AudioSource>();
audioSource = SceneItem::addComponent<AudioSource>();
this->transform.setLocalPosition(glm::vec3(0, 0, 0));
}

2
src/dawnpokergame/scenes/Scene_1.hpp
View File

@ -8,7 +8,7 @@
#include "scenes/Scene_2.hpp"
#include "prefabs/characters/DeathPrefab.hpp"
#include "visualnovel/events/characters/VisualNovelFadeCharacterEvent.hpp"
#include "visualnovel/events/characters/VIsualNovelTransformItemEvent.hpp"
#include "visualnovel/events/characters/VisualNovelTransformItemEvent.hpp"
#include "visualnovel/events/timing/VisualNovelBatchEvent.hpp"
namespace Dawn {