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
@@ -14,7 +14,7 @@
|
||||
#include "dialogue/TranslationDatabase.h"
|
||||
#include "AudioPlayerAsync.h"
|
||||
|
||||
namespace ZL {
|
||||
namespace FRG {
|
||||
|
||||
class TextRenderer;
|
||||
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
// Assigns a texture to a specific mesh by name.
|
||||
void setTexture(const std::string& meshName, std::shared_ptr<Texture> texture);
|
||||
// Assigns one texture to every mesh in every loaded animation. Call AFTER loading animations.
|
||||
void setTexture(std::shared_ptr<ZL::Texture> texture);
|
||||
void setTexture(std::shared_ptr<FRG::Texture> texture);
|
||||
|
||||
// Creates a fully-loaded Character from a CharacterState (including its creationInfo).
|
||||
// Loads all animations, textures, and weapon mesh/texture from the paths stored in creationInfo.
|
||||
@@ -158,4 +158,4 @@ private:
|
||||
const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const float* ambientColor, const float* fogColor);
|
||||
};
|
||||
|
||||
} // namespace ZL
|
||||
} // namespace FRG
|
||||
Reference in new issue
Block a user