Formatted EVERYTHING

This commit is contained in:
Dynamitos
2024-06-09 12:20:53 +02:00
parent f18bf8acbe
commit d95dab850c
265 changed files with 8002 additions and 12310 deletions
+26 -49
View File
@@ -1,40 +1,30 @@
#include "MaterialInstance.h"
#include "Material.h"
#include "Graphics/Graphics.h"
#include "Material.h"
using namespace Seele;
MaterialInstance::MaterialInstance()
{
}
MaterialInstance::MaterialInstance() {}
MaterialInstance::MaterialInstance(uint64 id,
Gfx::PGraphics graphics,
Array<OShaderExpression>& expressions,
Array<std::string> params,
uint32 uniformBinding,
uint32 uniformSize)
: graphics(graphics)
, uniformBinding(uniformBinding)
, id(id)
{
if(uniformSize > 0)
{
MaterialInstance::MaterialInstance(uint64 id, Gfx::PGraphics graphics, Array<OShaderExpression>& expressions, Array<std::string> params,
uint32 uniformBinding, uint32 uniformSize)
: graphics(graphics), uniformBinding(uniformBinding), id(id) {
if (uniformSize > 0) {
uniformBuffer = graphics->createUniformBuffer(UniformBufferCreateInfo{
.sourceData = {
.sourceData =
{
.size = uniformSize,
},
.dynamic = true,
}
);
.dynamic = true,
});
}
uniformData.resize(uniformSize);
ArchiveBuffer buffer(graphics);
parameters.reserve(params.size());
for (size_t i = 0; i < params.size(); ++i)
{
for (size_t i = 0; i < params.size(); ++i) {
const std::string& name = params[i];
Serialization::save(buffer, *expressions.find([&name](const OShaderExpression& p) {return p->key == name; }));
Serialization::save(buffer, *expressions.find([&name](const OShaderExpression& p) { return p->key == name; }));
buffer.rewind();
OShaderParameter param;
Serialization::load(buffer, param);
@@ -43,21 +33,15 @@ MaterialInstance::MaterialInstance(uint64 id,
}
}
MaterialInstance::~MaterialInstance()
{
}
MaterialInstance::~MaterialInstance() {}
void MaterialInstance::updateDescriptor()
{
void MaterialInstance::updateDescriptor() {
Gfx::PDescriptorLayout layout = baseMaterial->getMaterial()->getDescriptorLayout();
descriptor = layout->allocateDescriptorSet();
for (auto& param : parameters)
{
for (auto& param : parameters) {
param->updateDescriptorSet(descriptor, uniformData.data());
}
if(uniformData.size() > 0)
{
if (uniformData.size() > 0) {
uniformBuffer->updateContents(DataSource{
.size = uniformData.size(),
.data = uniformData.data(),
@@ -67,36 +51,29 @@ void MaterialInstance::updateDescriptor()
descriptor->writeChanges();
}
Gfx::PDescriptorSet MaterialInstance::getDescriptorSet() const
{
return descriptor;
}
Gfx::PDescriptorSet MaterialInstance::getDescriptorSet() const { return descriptor; }
void MaterialInstance::setBaseMaterial(PMaterialAsset asset)
{
if(uniformData.size() > 0)
{
void MaterialInstance::setBaseMaterial(PMaterialAsset asset) {
if (uniformData.size() > 0) {
uniformBuffer = graphics->createUniformBuffer(UniformBufferCreateInfo{
.sourceData = {
.sourceData =
{
.size = uniformData.size(),
},
.dynamic = true,
}
);
.dynamic = true,
});
}
baseMaterial = asset;
}
void MaterialInstance::save(ArchiveBuffer& buffer) const
{
void MaterialInstance::save(ArchiveBuffer& buffer) const {
Serialization::save(buffer, uniformData);
Serialization::save(buffer, uniformBinding);
Serialization::save(buffer, parameters);
Serialization::save(buffer, id);
}
void MaterialInstance::load(ArchiveBuffer& buffer)
{
void MaterialInstance::load(ArchiveBuffer& buffer) {
graphics = buffer.getGraphics();
Serialization::load(buffer, uniformData);
Serialization::load(buffer, uniformBinding);