diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-09 23:29:00 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-09 23:29:00 +0100 |
| commit | b6b3944e9507f337f77a72ea44b5c0ccba7a2c01 (patch) | |
| tree | a487df54853522f973ed987006e787117804b9eb /assetFactory/style.h | |
| parent | Swap messy glmvec wrapper for OpenMesh Point/Normal with real glm::vec and a ... (diff) | |
| parent | Move remaining split/plane functions to use library (diff) | |
| download | ilt-b6b3944e9507f337f77a72ea44b5c0ccba7a2c01.tar.bz2 ilt-b6b3944e9507f337f77a72ea44b5c0ccba7a2c01.tar.xz ilt-b6b3944e9507f337f77a72ea44b5c0ccba7a2c01.zip | |
Merge branch 'model-factory-textures'
Diffstat (limited to 'assetFactory/style.h')
| -rw-r--r-- | assetFactory/style.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/assetFactory/style.h b/assetFactory/style.h index e8fd012..d931f98 100644 --- a/assetFactory/style.h +++ b/assetFactory/style.h @@ -12,6 +12,7 @@ public: using StyleStack = std::vector<const Style *>; using Colour = glm::vec3; using ColourAlpha = glm::vec4; + using EffectiveColour = std::optional<std::reference_wrapper<const ColourAlpha>>; void applyStyle(ModelFactoryMesh &, const StyleStack & parents, const Shape::CreatedFaces &) const; void applyStyle(ModelFactoryMesh &, const StyleStack & parents, const ModelFactoryMesh::FaceHandle &) const; @@ -27,8 +28,14 @@ public: return {}; } + static EffectiveColour getColour(const StyleStack & parents); + ColourAlpha colour {}; + std::optional<bool> smooth; + std::string texture; + std::string textureRotation; // Multiples of 90deg, no int/enum support protected: bool persist(Persistence::PersistenceStore & store); + void applyStyle(ModelFactoryMesh &, const ModelFactoryMesh::FaceHandle &, EffectiveColour) const; }; |