Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forgetting to delete leads to memoryleaks

Browse Source
This commit is contained in:
Dynamitos
2023-11-07 16:55:13 +01:00
parent 46a0befb80
commit ecb5050dc7
29 changed files with 178 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Editor/Asset/MaterialLoader.cpp
+5 -5
View File
@@ -75,7 +75,7 @@ void MaterialLoader::import(MaterialImportArgs args, PMaterialAsset asset)
p->data = std::stof(defaultValue.value().get<std::string>());
}
parameters.add(p->key);
expressions[p->key] = std::move(p);
expressions[param.key()] = std::move(p);
}
// TODO: ALIGNMENT RULES
else if(type.compare("float3") == 0)
@@ -92,7 +92,7 @@ void MaterialLoader::import(MaterialImportArgs args, PMaterialAsset asset)
p->data = parseVector(defaultValue.value().get<std::string>().c_str());
}
parameters.add(p->key);
expressions[p->key] = std::move(p);
expressions[param.key()] = std::move(p);
}
else if(type.compare("Texture2D") == 0)
{
@@ -108,7 +108,7 @@ void MaterialLoader::import(MaterialImportArgs args, PMaterialAsset asset)
p->data = AssetRegistry::findTexture(""); // this will return placeholder texture
}
parameters.add(p->key);
expressions[p->key] = std::move(p);
expressions[param.key()] = std::move(p);
}
else if(type.compare("SamplerState") == 0)
{
@@ -116,7 +116,7 @@ void MaterialLoader::import(MaterialImportArgs args, PMaterialAsset asset)
layout->addDescriptorBinding(bindingCounter++, Gfx::SE_DESCRIPTOR_TYPE_SAMPLER);
p->data = graphics->createSamplerState({});
parameters.add(p->key);
expressions[p->key] = std::move(p);
expressions[param.key()] = std::move(p);
}
else
{
@@ -136,7 +136,7 @@ void MaterialLoader::import(MaterialImportArgs args, PMaterialAsset asset)
OConstantExpression c = new ConstantExpression(str, ExpressionType::UNKNOWN);
std::string name = std::format("Const{0}", auxKey++);
c->key = name;
expressions[c->key] = std::move(c);
expressions[name] = std::move(c);
return name;
}
else