Some clean up, web version prepare
This commit is contained in:
1 parent
e9c888e2bf
commit
0975f3b9cd
104 files changed
+779
-1483
No files matched your search
+3
-3
@@ -10,7 +10,7 @@
|
||||
#include "utils/Utils.h"
|
||||
#include "TextModel.h"
|
||||
|
||||
namespace ZL {
|
||||
namespace FRG {
|
||||
|
||||
const float ATTACK_COOLDOWN_TIME = 1.6f;
|
||||
extern float x;
|
||||
@@ -193,7 +193,7 @@ void Character::forceReplan() {
|
||||
state.onArrivedCallbackName.clear();
|
||||
}
|
||||
|
||||
void Character::setTexture(std::shared_ptr<ZL::Texture> texture) {
|
||||
void Character::setTexture(std::shared_ptr<FRG::Texture> texture) {
|
||||
for (auto& animEntry : animations) {
|
||||
for (const auto& name : animEntry.second.model.meshNamesOrdered) {
|
||||
meshTextures[name] = texture;
|
||||
@@ -1354,4 +1354,4 @@ void Character::drawHealthBar(Renderer& renderer,
|
||||
renderer.shaderManager.PopShader();
|
||||
}
|
||||
|
||||
} // namespace ZL
|
||||
} // namespace FRG
|
||||
Reference in new issue
Block a user