Fixing slang compilation temporarily, renaming vertexfactory

This commit is contained in:
Dynamitos
2020-08-06 00:54:43 +02:00
parent ab4a3b5e23
commit f27859a02c
66 changed files with 1005 additions and 627 deletions
+17 -7
View File
@@ -8,17 +8,12 @@ MaterialInstance::MaterialInstance()
}
MaterialInstance::MaterialInstance(const std::string& directory, const std::string& name)
: Asset(directory, name)
: MaterialAsset(directory, name)
{
}
MaterialInstance::MaterialInstance(const std::string& fullPath)
: Asset(fullPath)
{
}
MaterialInstance::MaterialInstance(const std::filesystem::path& fullPath)
: Asset(fullPath)
: MaterialAsset(fullPath)
{
}
@@ -26,6 +21,21 @@ MaterialInstance::~MaterialInstance()
{
}
void MaterialInstance::save()
{
}
void MaterialInstance::load()
{
}
inline std::string MaterialInstance::getMaterialName() const
{
return baseMaterial->getMaterialName();
}
PMaterial MaterialInstance::getBaseMaterial() const
{
return baseMaterial;