diff options
| author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2021-12-25 07:42:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-25 07:42:52 +0100 |
| commit | 40421159568518bb7573903d14a2c69c64dead95 (patch) | |
| tree | 15c830dce151bf0b427123efd214173742887e8e /src/AssetManager.hpp | |
| parent | Merge pull request #70 from LaG1924/ftr/build-3 (diff) | |
| parent | Fixed missing APIENTRY linux build (diff) | |
| download | AltCraft-40421159568518bb7573903d14a2c69c64dead95.tar AltCraft-40421159568518bb7573903d14a2c69c64dead95.tar.gz AltCraft-40421159568518bb7573903d14a2c69c64dead95.tar.bz2 AltCraft-40421159568518bb7573903d14a2c69c64dead95.tar.lz AltCraft-40421159568518bb7573903d14a2c69c64dead95.tar.xz AltCraft-40421159568518bb7573903d14a2c69c64dead95.tar.zst AltCraft-40421159568518bb7573903d14a2c69c64dead95.zip | |
Diffstat (limited to 'src/AssetManager.hpp')
| -rw-r--r-- | src/AssetManager.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/AssetManager.hpp b/src/AssetManager.hpp index 7f6c4fb..2bee47c 100644 --- a/src/AssetManager.hpp +++ b/src/AssetManager.hpp @@ -6,7 +6,6 @@ #include <functional> #include <memory> -#include <GL/glew.h> #include <glm/vec4.hpp> #include <glm/vec3.hpp> #include <glm/mat4x4.hpp> @@ -14,7 +13,7 @@ #include "Vector.hpp" #include "Block.hpp" #include "TextureAtlas.hpp" -#include "Shader.hpp" +#include "Gal.hpp" enum FaceDirection { down, @@ -164,7 +163,7 @@ struct AssetTexture : Asset { }; struct AssetShader : Asset { - std::unique_ptr<Shader> shader; + }; struct AssetScript : Asset { @@ -189,7 +188,7 @@ namespace AssetManager { AssetTreeNode *GetAssetByAssetName(const std::string &assetName); - GLuint GetTextureAtlasId(); + std::shared_ptr<Gal::Texture> GetTextureAtlas(); TextureCoord GetTexture(const std::string assetName); }; |