summaryrefslogtreecommitdiff
path: root/assetFactory/assetFactory.h
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2023-11-09 01:57:27 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2023-11-09 01:57:27 +0000
commitd771fbda2c171cfbc36cc0eb3122c1a02ffbb081 (patch)
tree69d2879e41da2b79264b6c3b8500b5d18383ae85 /assetFactory/assetFactory.h
parentWIP typedefing all the things - sources (diff)
downloadilt-d771fbda2c171cfbc36cc0eb3122c1a02ffbb081.tar.bz2
ilt-d771fbda2c171cfbc36cc0eb3122c1a02ffbb081.tar.xz
ilt-d771fbda2c171cfbc36cc0eb3122c1a02ffbb081.zip
WIP typedefing just about everything else
Diffstat (limited to 'assetFactory/assetFactory.h')
-rw-r--r--assetFactory/assetFactory.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h
index e449ce2..787f0a4 100644
--- a/assetFactory/assetFactory.h
+++ b/assetFactory/assetFactory.h
@@ -15,10 +15,9 @@ public:
using Assets = std::map<std::string, Asset::Ptr, std::less<>>;
using AssImps = std::map<std::string, AssImp::Ptr, std::less<>>;
using TextureFragments = std::map<std::string, TextureFragment::Ptr, std::less<>>;
- using Colour = glm::vec3;
- using ColourAlpha = glm::vec4;
+ using Colour = RGB;
+ using ColourAlpha = RGBA;
using Colours = std::map<std::string, Colour, std::less<>>;
- using TextureFragmentCoords = std::array<glm::vec2, 4>;
AssetFactory();
[[nodiscard]] static std::shared_ptr<AssetFactory> loadXML(const std::filesystem::path &);