diff options
| author | Hugues Ross <hugues.ross@gmail.com> | 2020-04-14 14:41:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 20:41:29 +0200 |
| commit | 5cf6318117edcae6bf30d829d9e9dd9dbf1d4bf7 (patch) | |
| tree | de590965f9f1cf68a4b6ee7ca802aaa5c0b987ee /src/nodedef.h | |
| parent | 7e21b3cd4883eb8b9eb7e9ca49e50f6f0c7bc0d6 (diff) | |
| download | minetest-5cf6318117edcae6bf30d829d9e9dd9dbf1d4bf7.tar.gz minetest-5cf6318117edcae6bf30d829d9e9dd9dbf1d4bf7.tar.bz2 minetest-5cf6318117edcae6bf30d829d9e9dd9dbf1d4bf7.zip | |
Refactor texture overrides and add new features (#9600)
* Refactor texture overrides, and add new features:
- Texture overrides can support multiple targets in one line
- Texture override files can have comment lines
- Item images/wield images can be overridden
* Formatting changes
* Address soime feedback
- Pass vectors by const reference
- Log syntax errors as warnings
- Remove 'C' prefix from TextureOverrideSource
* Simplify override target checks with an inline helper function
* make linter happy
* Apply feedback suggestions
Co-Authored-By: rubenwardy <rw@rubenwardy.com>
* Remove remaining != 0 checks
* Update copyright notice
Co-authored-by: sfan5 <sfan5@live.de>
Co-authored-by: rubenwardy <rw@rubenwardy.com>
Diffstat (limited to 'src/nodedef.h')
| -rw-r--r-- | src/nodedef.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/nodedef.h b/src/nodedef.h index 1a12aae93..c77d53324 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -33,6 +33,7 @@ class Client; #include "itemgroup.h" #include "sound.h" // SimpleSoundSpec #include "constants.h" // BS +#include "texture_override.h" // TextureOverride #include "tileanimation.h" // PROTOCOL_VERSION >= 37 @@ -583,15 +584,12 @@ public: void updateAliases(IItemDefManager *idef); /*! - * Reads the used texture pack's override.txt, and replaces the textures - * of registered nodes with the ones specified there. + * Replaces the textures of registered nodes with the ones specified in + * the texturepack's override.txt file * - * Format of the input file: in each line - * `node_name top|bottom|right|left|front|back|all|*|sides texture_name.png` - * - * @param override_filepath path to 'texturepack/override.txt' + * @param overrides the texture overrides */ - void applyTextureOverrides(const std::string &override_filepath); + void applyTextureOverrides(const std::vector<TextureOverride> &overrides); /*! * Only the client uses this. Loads textures and shaders required for |