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

Fixing a boatload of warnings

Browse Source
This commit is contained in:
Stefan Högler
2021-04-01 16:40:14 +02:00
parent f042480540
commit d5f0fe644f
84 changed files with 496 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Material/BRDF.cpp
+1 -1
View File
@@ -129,4 +129,4 @@ void BlinnPhong::generateMaterialCode(std::ofstream& codeStream, json codeJson)
codeStream << "}" << std::endl;
}
IMPLEMENT_BRDF(BlinnPhong);
IMPLEMENT_BRDF(BlinnPhong)
src/Engine/Material/BRDF.h
+1 -1
View File
@@ -29,7 +29,7 @@ protected:
class BlinnPhong : public BRDF
{
DECLARE_BRDF(BlinnPhong);
DECLARE_BRDF(BlinnPhong)
public:
virtual void generateMaterialCode(std::ofstream& codeStream, nlohmann::json codeJson);
protected:
src/Engine/Material/Material.h
+1 -1
View File
@@ -31,5 +31,5 @@ private:
friend class MaterialLoader;
friend class MaterialInstance;
};
DEFINE_REF(Material);
DEFINE_REF(Material)
} // namespace Seele
src/Engine/Material/MaterialAsset.h
+3 -3
View File
@@ -5,8 +5,8 @@
namespace Seele
{
DECLARE_REF(VertexShaderInput);
DECLARE_REF(Material);
DECLARE_REF(VertexShaderInput)
DECLARE_REF(Material)
class MaterialAsset : public Asset
{
public:
@@ -34,5 +34,5 @@ protected:
uint8* uniformData;
int32 uniformBinding;
};
DEFINE_REF(MaterialAsset);
DEFINE_REF(MaterialAsset)
} // namespace Seele
src/Engine/Material/MaterialInstance.h
+3 -3
View File
@@ -3,8 +3,8 @@
namespace Seele
{
DECLARE_NAME_REF(Gfx, DescriptorSet);
DECLARE_REF(Material);
DECLARE_NAME_REF(Gfx, DescriptorSet)
DECLARE_REF(Material)
class MaterialInstance : public MaterialAsset
{
public:
@@ -18,5 +18,5 @@ public:
private:
Material* baseMaterial;
};
DEFINE_REF(MaterialInstance);
DEFINE_REF(MaterialInstance)
} // namespace Seele
src/Engine/Material/ShaderExpression.cpp
+4 -4
View File
@@ -24,7 +24,7 @@ FloatParameter::~FloatParameter()
{
}
void FloatParameter::updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst)
void FloatParameter::updateDescriptorSet(Gfx::PDescriptorSet, uint8* dst)
{
std::memcpy(dst + byteOffset, &data, sizeof(float));
}
@@ -38,7 +38,7 @@ VectorParameter::~VectorParameter()
{
}
void VectorParameter::updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst)
void VectorParameter::updateDescriptorSet(Gfx::PDescriptorSet, uint8* dst)
{
std::memcpy(dst + byteOffset, &data, sizeof(Vector));
}
@@ -52,7 +52,7 @@ TextureParameter::~TextureParameter()
{
}
void TextureParameter::updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst)
void TextureParameter::updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8*)
{
descriptorSet->updateTexture(binding, data->getTexture());
}
@@ -67,7 +67,7 @@ SamplerParameter::~SamplerParameter()
}
void SamplerParameter::updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst)
void SamplerParameter::updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8*)
{
descriptorSet->updateSampler(binding, data);
}
src/Engine/Material/ShaderExpression.h
+8 -8
View File
@@ -14,7 +14,7 @@ struct ExpressionOutput
struct ShaderExpression
{
};
DECLARE_NAME_REF(Gfx, DescriptorSet);
DECLARE_NAME_REF(Gfx, DescriptorSet)
struct ShaderParameter : public ShaderExpression
{
std::string name;
@@ -25,7 +25,7 @@ struct ShaderParameter : public ShaderExpression
// update a descriptorset, in case of a uniform buffer, copy the data to the dst + byteOffset
virtual void updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst) = 0;
};
DEFINE_REF(ShaderParameter);
DEFINE_REF(ShaderParameter)
struct FloatParameter : public ShaderParameter
{
float data;
@@ -33,7 +33,7 @@ struct FloatParameter : public ShaderParameter
virtual ~FloatParameter();
virtual void updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst) override;
};
DEFINE_REF(FloatParameter);
DEFINE_REF(FloatParameter)
struct VectorParameter : public ShaderParameter
{
Vector data;
@@ -41,8 +41,8 @@ struct VectorParameter : public ShaderParameter
virtual ~VectorParameter();
virtual void updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst) override;
};
DEFINE_REF(VectorParameter);
DECLARE_REF(TextureAsset);
DEFINE_REF(VectorParameter)
DECLARE_REF(TextureAsset)
struct TextureParameter : public ShaderParameter
{
PTextureAsset data;
@@ -50,8 +50,8 @@ struct TextureParameter : public ShaderParameter
virtual ~TextureParameter();
virtual void updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst) override;
};
DEFINE_REF(TextureParameter);
DECLARE_NAME_REF(Gfx, SamplerState);
DEFINE_REF(TextureParameter)
DECLARE_NAME_REF(Gfx, SamplerState)
struct SamplerParameter : public ShaderParameter
{
Gfx::PSamplerState data;
@@ -59,6 +59,6 @@ struct SamplerParameter : public ShaderParameter
virtual ~SamplerParameter();
virtual void updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst) override;
};
DEFINE_REF(SamplerParameter);
DEFINE_REF(SamplerParameter)
} // namespace Seele