Feature/serializer #9
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rms) added optional name field to textures added test target
hotstreams
reviewed
Nov 17, 2020
|
|
||
| class Uniform { | ||
| protected: | ||
| std::string name; | ||
| UniformType type; | ||
| UniformValueType value_type; | ||
| bool changed; | ||
|
|
||
| virtual ByteWriter& serialize(ByteWriter& writer) const { |
There was a problem hiding this comment.
make better serialization interface
move it to cpp file
hotstreams
reviewed
Nov 17, 2020
| @@ -30,16 +49,25 @@ namespace GraphicsEngine { | |||
|
|
|||
| [[nodiscard]] virtual Uniform* clone() noexcept = 0; | |||
| virtual void set(const ShaderProgram& shader) = 0; | |||
|
|
|||
| friend ByteWriter& operator<<(ByteWriter& writer, const Uniform& u) { | |||
There was a problem hiding this comment.
separate definition from declaration
| UniformValue(const std::string& name, UniformType type, const T& value); | ||
|
|
||
| ByteWriter& serializeFields(ByteWriter& writer) const; |
There was a problem hiding this comment.
consider using more template/constexpr/compile-time language features
| public: | ||
| explicit UniformSampler(ByteReader& reader); |
| @@ -5,21 +5,40 @@ | |||
| #include <chrono> | |||
| #include <core/texture_visitor.hpp> | |||
| #include <core/context_debug.hpp> | |||
| #include <util/bytewriter.hpp> | |||
| @@ -59,6 +64,12 @@ namespace GraphicsEngine { | |||
|
|
|||
| [[nodiscard]] virtual Material* clone() const noexcept; | |||
|
|
|||
| static constexpr uint32_t serial_version = 0x1; | |||
| try { | ||
| sampler = assets.textures.at(path); | ||
| } | ||
| catch (const resource_container_error& err) { |
There was a problem hiding this comment.
why not ... or resource_container_error ?
| @@ -221,3 +263,30 @@ namespace GraphicsEngine { | |||
| template class UniformValue<glm::mat3>; | |||
| template class UniformValue<glm::mat4>; | |||
| } | |||
|
|
|||
| std::unique_ptr<Uniform> GraphicsEngine::deserializeUniformValue(ByteReader& reader) { | |||
| for (size_t i = 0; i < size; ++i) { | ||
| PropertyType ptype {reader}; | ||
| auto uptr = deserializeUniform(reader); | ||
| material_builder.add(ptype, std::move(uptr)); |
There was a problem hiding this comment.
a che ne material_builder.add(ptype,deserializeUniform(reader));
nah lishniy move
| } | ||
| } | ||
|
|
||
| return material_builder.build(); |
There was a problem hiding this comment.
a che esly material - custom ??????????////////
There was a problem hiding this comment.
custom material eto drugaya cool story
| @@ -192,3 +192,8 @@ MaterialType MaterialBuilder::getMaterialType() const noexcept { | |||
|
|
|||
| return MaterialType{std::move(props), material->shading}; | |||
| } | |||
|
|
|||
| MaterialBuilder& MaterialBuilder::add(PropertyType type, std::unique_ptr<Uniform> uniform) { | |||
hotstreams
reviewed
Nov 17, 2020
|
|
||
| enum class UniformType { Value, Sampler, Time }; | ||
| enum class UniformValueType { Float, Int, Uint, Vec2, Vec3, Vec4, Mat3, Mat4 }; | ||
| enum class UniformValueType { Invalid, Float, Int, Uint, Vec2, Vec3, Vec4, Mat3, Mat4 }; |
There was a problem hiding this comment.
soryan need poison value
| public: | ||
| explicit Uniform(ByteReader& reader) : changed{false} { |
| public: | ||
| explicit UniformValue(ByteReader& reader); |
| @@ -68,7 +100,15 @@ namespace GraphicsEngine { | |||
| class UniformTime : public UniformValue<float> { | |||
| private: | |||
| std::chrono::time_point<std::chrono::steady_clock> start; | |||
| protected: | |||
| ByteWriter& serialize(ByteWriter& writer) const override { | |||
| writer << UniformType::Time; | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
implemented material serializer & deserializer