First runnable render loop
This commit is contained in:
@@ -47,7 +47,6 @@ void Material::compile()
|
||||
json j;
|
||||
stream >> j;
|
||||
materialName = j["name"].get<std::string>();
|
||||
std::cout << "Compiling material " << materialName << std::endl;
|
||||
//Shader file needs to conform to the slang standard, which prohibits _
|
||||
materialName.erase(std::remove(materialName.begin(), materialName.end(), '_'), materialName.end());
|
||||
std::ofstream codeStream("./shaders/generated/"+materialName+".slang");
|
||||
|
||||
@@ -48,7 +48,7 @@ void MaterialAsset::updateDescriptorData()
|
||||
descriptorSet->writeChanges();
|
||||
}
|
||||
|
||||
Gfx::PDescriptorSet MaterialAsset::getDescriptor() const
|
||||
const Gfx::PDescriptorSet MaterialAsset::getDescriptor() const
|
||||
{
|
||||
return descriptorSet;
|
||||
}
|
||||
@@ -24,7 +24,7 @@ public:
|
||||
|
||||
// This needs to be called while the descriptorset is unused
|
||||
void updateDescriptorData();
|
||||
Gfx::PDescriptorSet getDescriptor() const;
|
||||
const Gfx::PDescriptorSet getDescriptor() const;
|
||||
protected:
|
||||
//For now its simply the collection of parameters, since there is no point for expressions
|
||||
Array<PShaderParameter> parameters;
|
||||
|
||||
Reference in New Issue
Block a user