Format more engine code

This commit is contained in:
Wojtek Figat
2022-06-14 20:17:00 +02:00
parent 7c923198e0
commit b49e5e9984
219 changed files with 348 additions and 1236 deletions

View File

@@ -174,11 +174,10 @@ struct SerializedMaterialParam
/// </summary>
API_CLASS(NoSpawn) class FLAXENGINE_API MaterialParameter : public ScriptingObject
{
DECLARE_SCRIPTING_TYPE_WITH_CONSTRUCTOR_IMPL(MaterialParameter, ScriptingObject);
DECLARE_SCRIPTING_TYPE_WITH_CONSTRUCTOR_IMPL(MaterialParameter, ScriptingObject);
friend MaterialParams;
friend MaterialInstance;
private:
Guid _paramId;
MaterialParameterType _type = MaterialParameterType::Invalid;
bool _isPublic;
@@ -202,7 +201,6 @@ private:
String _name;
public:
MaterialParameter(const MaterialParameter& other)
: MaterialParameter()
{
@@ -220,7 +218,6 @@ public:
}
public:
/// <summary>
/// Gets the parameter ID (not the parameter instance Id but the original parameter ID).
/// </summary>
@@ -286,7 +283,6 @@ public:
}
public:
/// <summary>
/// Gets the value of the parameter.
/// </summary>
@@ -300,7 +296,6 @@ public:
API_PROPERTY() void SetValue(const Variant& value);
public:
/// <summary>
/// The material parameter binding metadata.
/// </summary>
@@ -346,11 +341,9 @@ public:
bool HasContentLoaded() const;
private:
void clone(const MaterialParameter* param);
public:
bool operator==(const MaterialParameter& other) const;
// [Object]
@@ -364,25 +357,21 @@ class FLAXENGINE_API MaterialParams : public Array<MaterialParameter>
{
friend MaterialInstance;
private:
int32 _versionHash = 0;
public:
MaterialParameter* Get(const Guid& id);
MaterialParameter* Get(const StringView& name);
int32 Find(const Guid& id);
int32 Find(const StringView& name);
public:
/// <summary>
/// Gets the parameters version hash. Every time the parameters are modified (loaded, edited, etc.) the hash changes. Can be used to sync instanced parameters collection.
/// </summary>
int32 GetVersionHash() const;
public:
/// <summary>
/// Binds the parameters to the pipeline.
/// </summary>
@@ -429,7 +418,6 @@ public:
static void Save(BytesContainer& data, const Array<SerializedMaterialParam>* params);
public:
#if USE_EDITOR
/// <summary>
@@ -443,6 +431,5 @@ public:
bool HasContentLoaded() const;
private:
void UpdateHash();
};