# HG changeset patch # User Teemu Piippo # Date 1632259531 -10800 # Node ID d384df40c8e7fb377634e62e7e05ab69f7e598ff # Parent f77d2230e87c731ba3324d38bf70d49e6bdeb1c6# Parent e39326ee48dcc14806fd40983c05826fbf07ec45 Merge commit diff -r e39326ee48dc -r d384df40c8e7 src/colors.cpp --- a/src/colors.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/colors.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -127,3 +127,13 @@ return colorTable[color].faceColor; } } + +QDataStream& operator<<(QDataStream& stream, ldraw::Color color) +{ + return stream << color.index; +} + +QDataStream& operator>>(QDataStream& stream, ldraw::Color& color) +{ + return stream >> color.index; +} diff -r e39326ee48dc -r d384df40c8e7 src/colors.h --- a/src/colors.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/colors.h Wed Sep 22 00:25:31 2021 +0300 @@ -105,3 +105,5 @@ } double luma(const QColor& color); +QDataStream& operator<<(QDataStream&, ldraw::Color); +QDataStream& operator>>(QDataStream&, ldraw::Color&); diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/comment.cpp --- a/src/linetypes/comment.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/comment.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -7,3 +7,9 @@ font.setItalic(true); return font; } + +ldraw::Object::Type ldraw::Comment::typeIdentifier() const +{ + return Type::Comment; +} + diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/comment.h --- a/src/linetypes/comment.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/comment.h Wed Sep 22 00:25:31 2021 +0300 @@ -11,4 +11,5 @@ { using MetaCommand::MetaCommand; QFont textRepresentationFont() const override; + Type typeIdentifier() const override; }; diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/conditionaledge.cpp --- a/src/linetypes/conditionaledge.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/conditionaledge.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -6,5 +6,10 @@ utility::vertexToStringParens(this->points[0]), utility::vertexToStringParens(this->points[1]), utility::vertexToStringParens(this->points[2]), - utility::vertexToStringParens(this->points[3])); + utility::vertexToStringParens(this->points[3])); } + +ldraw::Object::Type ldraw::ConditionalEdge::typeIdentifier() const +{ + return Type::ConditionalEdge; +} diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/conditionaledge.h --- a/src/linetypes/conditionaledge.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/conditionaledge.h Wed Sep 22 00:25:31 2021 +0300 @@ -11,4 +11,5 @@ public: using PolygonObject<4>::PolygonObject; QString textRepresentation() const override; + Type typeIdentifier() const override; }; diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/edge.cpp --- a/src/linetypes/edge.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/edge.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -15,3 +15,8 @@ Q_UNUSED(context) polygons.push_back(gl::edgeLine(this->points[0], this->points[1], this->colorIndex, this->id)); } + +ldraw::Object::Type ldraw::Edge::typeIdentifier() const +{ + return Type::EdgeLine; +} diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/edge.h --- a/src/linetypes/edge.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/edge.h Wed Sep 22 00:25:31 2021 +0300 @@ -12,4 +12,5 @@ using PolygonObject::PolygonObject; QString textRepresentation() const override; void getPolygons(std::vector& polygons, GetPolygonsContext* context) const override; + Type typeIdentifier() const override; }; diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/errorline.cpp --- a/src/linetypes/errorline.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/errorline.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -41,3 +41,18 @@ { return QBrush{Qt::red}; } + +ldraw::Object::Type ldraw::ErrorLine::typeIdentifier() const +{ + return Type::ErrorLine; +} + +QDataStream &ldraw::ErrorLine::serialize(QDataStream &stream) const +{ + return ldraw::Object::serialize(stream) << this->text; +} + +QDataStream &ldraw::ErrorLine::deserialize(QDataStream &stream) +{ + return ldraw::Object::deserialize(stream) >> this->text; +} diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/errorline.h --- a/src/linetypes/errorline.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/errorline.h Wed Sep 22 00:25:31 2021 +0300 @@ -15,6 +15,9 @@ QString textRepresentation() const override; QBrush textRepresentationForeground() const override; QBrush textRepresentationBackground() const override; + Type typeIdentifier() const override; + QDataStream& serialize(QDataStream& stream) const override; + QDataStream& deserialize(QDataStream& stream) override; QString text; QString message; protected: diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/metacommand.cpp --- a/src/linetypes/metacommand.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/metacommand.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -26,3 +26,28 @@ return this->storedText; } +ldraw::Object::Type ldraw::MetaCommand::typeIdentifier() const +{ + return Type::MetaCommand; +} + +/** + * @brief @overload ldraw::Object::serialize + * @param stream + * @return stream + */ +QDataStream& ldraw::MetaCommand::serialize(QDataStream& stream) const +{ + return ldraw::Object::serialize(stream) << this->storedText; +} + +/** + * @brief @overload ldraw::Object::deserialize + * @param stream + * @return stream + */ +QDataStream& ldraw::MetaCommand::deserialize(QDataStream& stream) +{ + return ldraw::Object::deserialize(stream) >> this->storedText; +} + diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/metacommand.h --- a/src/linetypes/metacommand.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/metacommand.h Wed Sep 22 00:25:31 2021 +0300 @@ -14,6 +14,9 @@ QVariant getProperty(Property property) const override; QString textRepresentation() const override; QString storedText = ""; + Type typeIdentifier() const override; + QDataStream& serialize(QDataStream& stream) const override; + QDataStream& deserialize(QDataStream& stream) override; protected: void setProperty(SetPropertyResult* result, const PropertyKeyValue& pair) override; }; diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/object.cpp --- a/src/linetypes/object.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/object.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -74,6 +74,27 @@ throw BadPointIndex{}; } +/** + * @brief Serializes the object into a stream of bytes for internal storage. + * @param stream Data stream to serialize into + */ +QDataStream& ldraw::Object::serialize(QDataStream &stream) const +{ + return stream << static_cast(this->typeIdentifier()); +} + +/** + * @brief Deserializes the object from a stream of bytes coming from internal storage. + * @param stream Data stream to serialize from. + * @note @c ldraw::Object::serialize will insert a type enumerator. Before calling this function, + * this enumerator is assumed to have been handled as the object class needs to be initialized based + * on the value of this enumerator. + */ +QDataStream& ldraw::Object::deserialize(QDataStream &stream) +{ + return stream; +} + ldraw::ColoredObject::ColoredObject(const Color color_index) : colorIndex{color_index} { @@ -101,7 +122,32 @@ Object::setProperty(result, pair); } +/** + * @brief @overload @c ldraw::Object::serialize + * @param stream + * @return stream + */ +QDataStream& ldraw::ColoredObject::serialize(QDataStream& stream) const +{ + return Object::serialize(stream) << this->colorIndex; +} + +/** + * @brief @overload @c ldraw::Object::deserialize + * @param stream + * @return stream + */ +QDataStream& ldraw::ColoredObject::deserialize(QDataStream& stream) +{ + return Object::deserialize(stream) >> this->colorIndex; +} + QString ldraw::Empty::textRepresentation() const { return ""; } + +ldraw::Object::Type ldraw::Empty::typeIdentifier() const +{ + return Type::Empty; +} diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/object.h --- a/src/linetypes/object.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/object.h Wed Sep 22 00:25:31 2021 +0300 @@ -33,6 +33,21 @@ Success = 0, PropertyNotHandled }; + /** + * @brief Enumerates different object types + */ + enum class Type + { + Empty, + Comment, + MetaCommand, + ErrorLine, + SubfileReference, + EdgeLine, + ConditionalEdge, + Triangle, + Quadrilateral, + }; friend bool handled(SetPropertyResult result) { return result == SetPropertyResult::Success; @@ -57,6 +72,10 @@ virtual void invert() {} virtual int numPoints() const { return 0; } virtual const glm::vec3& getPoint(int index) const; + virtual QDataStream& serialize(QDataStream& stream) const; + virtual QDataStream& deserialize(QDataStream& stream); + virtual Type typeIdentifier() const = 0; + protected: template void handle(SetPropertyResult* result, const PropertyKeyValue& pair, Function function); @@ -87,6 +106,8 @@ ColoredObject(const Color colorIndex = ldraw::mainColor); bool hasColor() const override final; QVariant getProperty(Property id) const override; + QDataStream &serialize(QDataStream& stream) const override; + QDataStream& deserialize(QDataStream& stream) override; Color colorIndex = ldraw::mainColor; protected: void setProperty(SetPropertyResult* result, const PropertyKeyValue& pair) override; @@ -98,4 +119,5 @@ class ldraw::Empty : public Object { QString textRepresentation() const override; + Type typeIdentifier() const override; }; diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/polygonobject.h --- a/src/linetypes/polygonobject.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/polygonobject.h Wed Sep 22 00:25:31 2021 +0300 @@ -66,5 +66,23 @@ } ColoredObject::setProperty(result, pair); } + QDataStream &serialize(QDataStream& stream) const override + { + ColoredObject::serialize(stream); + for (const glm::vec3& point : this->points) + { + stream << point; + } + return stream; + } + QDataStream& deserialize(QDataStream& stream) override + { + ColoredObject::deserialize(stream); + for (glm::vec3& point : this->points) + { + stream >> point; + } + return stream; + } std::array points; }; diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/quadrilateral.cpp --- a/src/linetypes/quadrilateral.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/quadrilateral.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -29,3 +29,8 @@ // -> 2 1 0 3 std::swap(this->points[0], this->points[2]); } + +ldraw::Object::Type ldraw::Quadrilateral::typeIdentifier() const +{ + return Type::Quadrilateral; +} diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/quadrilateral.h --- a/src/linetypes/quadrilateral.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/quadrilateral.h Wed Sep 22 00:25:31 2021 +0300 @@ -13,4 +13,5 @@ QString textRepresentation() const override; void getPolygons(std::vector& polygons, GetPolygonsContext* context) const override; void invert() override; + Type typeIdentifier() const override; }; diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/subfilereference.cpp --- a/src/linetypes/subfilereference.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/subfilereference.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -87,3 +87,18 @@ { return documents->findModelByName(this->referenceName); } + +ldraw::Object::Type ldraw::SubfileReference::typeIdentifier() const +{ + return Type::SubfileReference; +} + +QDataStream& ldraw::SubfileReference::serialize(QDataStream &stream) const +{ + return ColoredObject::serialize(stream) << this->transformation << this->referenceName << this->isInverted; +} + +QDataStream& ldraw::SubfileReference::deserialize(QDataStream &stream) +{ + return ColoredObject::deserialize(stream) >> this->transformation >> this->referenceName >> this->isInverted; +} diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/subfilereference.h --- a/src/linetypes/subfilereference.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/subfilereference.h Wed Sep 22 00:25:31 2021 +0300 @@ -22,6 +22,9 @@ glm::vec3 position() const; void invert() override; Model* resolve(DocumentManager* documents) const; + Type typeIdentifier() const override; + QDataStream& serialize(QDataStream& stream) const override; + QDataStream& deserialize(QDataStream& stream) override; glm::mat4 transformation; QString referenceName; bool isInverted = false; diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/triangle.cpp --- a/src/linetypes/triangle.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/triangle.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -27,3 +27,8 @@ // -> 1 0 2 std::swap(this->points[0], this->points[1]); } + +ldraw::Object::Type ldraw::Triangle::typeIdentifier() const +{ + return Type::Triangle; +} diff -r e39326ee48dc -r d384df40c8e7 src/linetypes/triangle.h --- a/src/linetypes/triangle.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/linetypes/triangle.h Wed Sep 22 00:25:31 2021 +0300 @@ -13,5 +13,6 @@ QString textRepresentation() const override; void getPolygons(std::vector& polygons, GetPolygonsContext* context) const override; void invert() override; + Type typeIdentifier() const override; }; diff -r e39326ee48dc -r d384df40c8e7 src/main.cpp --- a/src/main.cpp Tue Sep 21 19:58:06 2021 +0300 +++ b/src/main.cpp Wed Sep 22 00:25:31 2021 +0300 @@ -37,3 +37,12 @@ mainwindow.show(); return app.exec(); } + +QDataStream& operator<<(QDataStream& stream, const glm::vec3& vec) +{ + return stream << vec.x << vec.y << vec.z; +} +QDataStream& operator>>(QDataStream& stream, glm::vec3& vec) +{ + return stream >> vec.x >> vec.y >> vec.z; +} diff -r e39326ee48dc -r d384df40c8e7 src/main.h --- a/src/main.h Tue Sep 21 19:58:06 2021 +0300 +++ b/src/main.h Wed Sep 22 00:25:31 2021 +0300 @@ -223,3 +223,41 @@ MapItemsIterator::iterator> >{map}; } + +/** + * Iterates a @c glm::mat + */ +template +void iter_matrix(const glm::mat& matrix, Fn&& fn) +{ + for (int i = 0; i < X; ++i) + { + for (int j = 0; j < Y; ++j) + { + fn(i, j, matrix[i][j]); + } + } +} + +QDataStream& operator<<(QDataStream&, const glm::vec3&); +QDataStream& operator>>(QDataStream&, glm::vec3&); + +template +QDataStream& operator<<(QDataStream& stream, const glm::mat& mat) +{ + iter_matrix(mat, [&stream](int, int, float x) + { + stream << x; + }); + return stream; +} + +template +QDataStream& operator>>(QDataStream& stream, glm::mat& mat) +{ + iter_matrix(mat, [&stream](int, int, float x) + { + stream >> x; + }); + return stream; +}