Skip to content

Commit 9136a74

Browse files
committed
node creation fix
1 parent c63fbc9 commit 9136a74

5 files changed

Lines changed: 23 additions & 27 deletions

File tree

sources/RenderSystem/Assets/TextureAsset.ixx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,14 @@ export{
5050
texture = nullptr;
5151

5252
ar& NVP(texture);
53+
ar& NVP(name);
54+
55+
if (!texture)
56+
texture = HAL::Texture::null;
5357

58+
if constexpr (Archive::is_loading::value)
5459
texture->resource->set_name(convert(name));
5560

56-
if (!texture)
57-
texture = HAL::Texture::null;
5861
}
5962

6063
};

sources/RenderSystem/Defines.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
// string representation.
1313
// ============================================================================
1414
#define H(x) x = #x
15+
16+
#define REGISTER_MATERIAL_NODE(TYPE) static MaterialNodeRegister<TYPE> _reg_##TYPE(#TYPE);

sources/RenderSystem/Materials/Values.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,19 @@ void MaterialFunction::add_function(std::string s)
487487
{
488488
text += std::string("\t") + s + ";\n";
489489
}
490+
REGISTER_MATERIAL_NODE(ScalarNode);
491+
REGISTER_MATERIAL_NODE(MulNode);
492+
REGISTER_MATERIAL_NODE(SumNode);
493+
REGISTER_MATERIAL_NODE(TextureNode);
494+
REGISTER_MATERIAL_NODE(VectorNode);
495+
REGISTER_MATERIAL_NODE(TiledTextureNode);
496+
REGISTER_MATERIAL_NODE(MaterialGraph);
497+
REGISTER_MATERIAL_NODE(SpecToMetNode);
498+
499+
500+
501+
502+
490503
REGISTER_TYPE(ScalarNode);
491504
REGISTER_TYPE(MulNode);
492505
REGISTER_TYPE(SumNode);

sources/RenderSystem/Materials/Values.ixx

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public:
183183
}
184184

185185
};
186-
#define REGISTER_MATERIAL_NODE(TYPE) static MaterialNodeRegister<TYPE> _reg_##TYPE(#TYPE);
186+
187187

188188
class MaterialFunction;
189189

@@ -697,26 +697,3 @@ class TiledTextureNode : public MaterialNode, public AssetHolder
697697
};
698698

699699
}
700-
701-
702-
REGISTER_MATERIAL_NODE(SumNode);
703-
704-
REGISTER_MATERIAL_NODE(ScalarNode);
705-
REGISTER_MATERIAL_NODE(VectorNode);
706-
707-
REGISTER_MATERIAL_NODE(MulNode);
708-
709-
REGISTER_MATERIAL_NODE(SpecToMetNode);
710-
711-
REGISTER_MATERIAL_NODE(PowerNode);
712-
REGISTER_MATERIAL_NODE(MaterialFunction);
713-
// REGISTER_MATERIAL_NODE(TiledTextureNode);
714-
// REGISTER_TYPE(ScalarNode);
715-
// REGISTER_TYPE(MulNode);
716-
// REGISTER_TYPE(SumNode);
717-
// REGISTER_TYPE(TextureNode);
718-
// REGISTER_TYPE(VectorNode);
719-
// REGISTER_TYPE(TiledTextureNode);
720-
// REGISTER_TYPE(MaterialGraph);
721-
// REGISTER_TYPE(SpecToMetNode);
722-
//// REGISTER_TYPE(TextureSRVParams);
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#include <HAL.h>
22

3-
import <FrameGraph/defines.h>;
3+
import <FrameGraph/defines.h>;
4+

0 commit comments

Comments
 (0)