comparison: src/parser.cpp
src/parser.cpp
- changeset 21
- 0133e565e072
- parent 18
- 918b6c0f8b5b
- child 23
- 3387a84ddaba
equal
deleted
inserted
replaced
| 20:cef43609a374 | 21:0133e565e072 |
|---|---|
| 348 } | 348 } |
| 349 const Color color = colorFromString(tokens[colorPosition]); | 349 const Color color = colorFromString(tokens[colorPosition]); |
| 350 const Point3D position = vertexFromStrings(tokens, positionPosition); | 350 const Point3D position = vertexFromStrings(tokens, positionPosition); |
| 351 const Matrix3x3 transform = matrixFromStrings(tokens, transformPosition); | 351 const Matrix3x3 transform = matrixFromStrings(tokens, transformPosition); |
| 352 const QString& name = tokens[namePosition]; | 352 const QString& name = tokens[namePosition]; |
| 353 return std::make_unique<linetypes::SubfileReference>(position, transform, name, color); | 353 return std::make_unique<linetypes::SubfileReference>(combine(transform, position), name, color); |
| 354 } | 354 } |
| 355 | 355 |
| 356 template<typename T, int NumVertices> | 356 template<typename T, int NumVertices> |
| 357 static std::unique_ptr<T> parsePolygon( | 357 static std::unique_ptr<T> parsePolygon( |
| 358 const QString& line, | 358 const QString& line, |
