diff options
| -rw-r--r-- | assetFactory/style.cpp | 2 | ||||
| -rw-r--r-- | assetFactory/style.h | 2 | ||||
| -rw-r--r-- | res/brush47.xml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/assetFactory/style.cpp b/assetFactory/style.cpp index fc5c34e..5303d96 100644 --- a/assetFactory/style.cpp +++ b/assetFactory/style.cpp @@ -42,5 +42,5 @@ Style::persist(Persistence::PersistenceStore & store) } }; - return STORE_HELPER(colour, ColourParser); + return STORE_HELPER(colour, ColourParser) && STORE_MEMBER(texture) && STORE_MEMBER(textureRotation); } diff --git a/assetFactory/style.h b/assetFactory/style.h index e8fd012..84e5dab 100644 --- a/assetFactory/style.h +++ b/assetFactory/style.h @@ -28,6 +28,8 @@ public: } ColourAlpha colour {}; + std::string texture; + std::string textureRotation; // Multiples of 90deg, no int/enum support protected: bool persist(Persistence::PersistenceStore & store); diff --git a/res/brush47.xml b/res/brush47.xml index a7e3894..c345c82 100644 --- a/res/brush47.xml +++ b/res/brush47.xml @@ -71,7 +71,11 @@ <face id="top" type="extrude" scale="1,0.96,1" position="0,0,0.775"> <face id="front" colour="#e1eff3"/> <face id="back" colour="#e1eff3"/> - <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0"/> + <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0"> + <face id="top" texture="roofTopWithVents"/> + <face id="left" texture="roofSideWithVents"/> + <face id="right" texture="roofSideWithVents"/> + </face> </face> </face> </use> |