NC-7840: Expose tilestyle-values of textures

Add API functions
- lib3mf_texture2d_settilestyleuv
- lib3mf_texture2d_gettilestyleuv
Refactor reading/writing of tilestyles
Update Tests, SDK documentation and SDK-examples

Author: martinweismann

CMakeLists.txt

@@ -8,8 +8,8 @@ project (lib3MF)
 
 # Define Version
 set(LIB3MF_VERSION_MAJOR 1)				# increase on every backward-compatibility breaking change of the API
-set(LIB3MF_VERSION_MINOR 1)				# increase on every backward compatible change of the API
-set(LIB3MF_VERSION_MICRO 5)				# increase on on every change that does not alter the API
+set(LIB3MF_VERSION_MINOR 2)				# increase on every backward compatible change of the API
+set(LIB3MF_VERSION_MICRO 0)				# increase on on every change that does not alter the API
 
 set(CMAKE_INSTALL_BINDIR bin CACHE PATH "directory for installing binary files")
 set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "directory for installing library files")

Include/Common/NMR_ErrorConst.h

@@ -1013,6 +1013,9 @@ Model error codes (0x8XXX)
 // Slice contains only one point within a polygon
 #define NMR_ERROR_SLICE_ONEPOINT 0x80C3
 
+// Invalid Tile Style
+#define NMR_ERROR_INVALIDTILESTYLE 0x80C4
+
 /*-------------------------------------------------------------------
 XML Parser Error Constants (0x9XXX)
 -------------------------------------------------------------------*/

Include/Model/COM/NMR_COMInterface_ModelTexture2D.h

@@ -67,6 +67,8 @@ namespace NMR {
 		LIB3MFMETHOD(SetPathUTF8) (_In_z_ LPCSTR pszPath);
 		LIB3MFMETHOD(GetContentType) (_Out_ eModelTexture2DType * peContentType);
 		LIB3MFMETHOD(SetContentType) (_In_ eModelTexture2DType eContentType);
+		LIB3MFMETHOD(GetTileStyleUV) (_Out_ eModelTextureTileStyle * peTileStyleU, _Out_ eModelTextureTileStyle * peTileStyleV);
+		LIB3MFMETHOD(SetTileStyleUV) (_In_ eModelTextureTileStyle eTileStyleU, _In_ eModelTextureTileStyle eTileStyleV);
 		LIB3MFMETHOD(GetBox2D) (_Out_ FLOAT * pfU, _Out_ FLOAT * pfV, _Out_ FLOAT * pfWidth, _Out_ FLOAT * pfHeight);
 		LIB3MFMETHOD(SetBox2D) (_In_ FLOAT fU, _In_ FLOAT fV, _In_ FLOAT fWidth, _In_ FLOAT fHeight);
 		LIB3MFMETHOD(ClearBox2D) ();

Include/Model/COM/NMR_COMInterfaces.h

@@ -1285,6 +1285,24 @@ namespace NMR {
 		*/
 		LIB3MFMETHOD(SetContentType) (_In_ eModelTexture2DType eContentType) LIB3MFABSTRACT;
 
+		/**
+		* Retrieves a texture's tilestyle type
+		*
+		* @param[out] peTileStyleU returns tilestyle type enum
+		* @param[out] peTileStyleV returns tilestyle type enum
+		* @return error code or 0 (success)
+		*/
+		LIB3MFMETHOD(GetTileStyleUV) (_Out_ eModelTextureTileStyle * peTileStyleU, _Out_ eModelTextureTileStyle * peTileStyleV) LIB3MFABSTRACT;
+
+		/**
+		* Sets a texture's tilestyle type
+		*
+		* @param[out] eTileStyleU new tilestyle type enum
+		* @param[out] eTileStyleV new tilestyle type enum
+		* @return error code or 0 (success)
+		*/
+		LIB3MFMETHOD(SetTileStyleUV) (_In_ eModelTextureTileStyle eTileStyleU, _In_ eModelTextureTileStyle eTileStyleV) LIB3MFABSTRACT;
+
 		/**
 		* Retrieves a texture's box2D coordinates.
 		*

Include/Model/COM/NMR_DLLInterfaces.h

@@ -1350,6 +1350,26 @@ namespace NMR {
 		*/
 		LIB3MF_DECLSPEC LIB3MFRESULT lib3mf_texture2d_setcontenttype(_In_ PLib3MFModelTexture2D * pTexture2D, _In_ eModelTexture2DType eContentType);
 
+		/**
+		* Retrieves a texture's tilestyle type
+		*
+		* @param[in] pTexture2D Texture2D Resource Instance
+		* @param[out] peTileStyleU returns tilestyle type enum
+		* @param[out] peTileStyleV returns tilestyle type enum
+		* @return error code or 0 (success)
+		*/
+		LIB3MF_DECLSPEC LIB3MFRESULT lib3mf_texture2d_gettilestyleuv(_In_ PLib3MFModelTexture2D * pTexture2D, _Out_ eModelTextureTileStyle * peTileStyleU, _Out_ eModelTextureTileStyle * peTileStyleV);
+
+		/**
+		* Sets a texture's tilestyle type
+		*
+		* @param[in] pTexture2D Texture2D Resource Instance
+		* @param[out] eTileStyleU new tilestyle type enum
+		* @param[out] eTileStyleV new tilestyle type enum
+		* @return error code or 0 (success)
+		*/
+		LIB3MF_DECLSPEC LIB3MFRESULT lib3mf_texture2d_settilestyleuv(_In_ PLib3MFModelTexture2D * pTexture2D, _In_ eModelTextureTileStyle eTileStyleU, _In_ eModelTextureTileStyle eTileStyleV);
+
 		/**
 		* Retrieves a texture's box2D coordinates.
 		*

Include/Model/Classes/NMR_ModelConstants.h

@@ -183,6 +183,9 @@ These are given by the 3MF Standard
 #define XML_3MF_ATTRIBUTE_TEXTURE2D_BOX             L"box"
 #define XML_3MF_ATTRIBUTE_TEXTURE2D_TILESTYLEU      L"tilestyleu"
 #define XML_3MF_ATTRIBUTE_TEXTURE2D_TILESTYLEV      L"tilestylev"
+#define XML_3MF_ATTRIBUTE_TEXTURE2D_TILESTYLE_WRAP  L"wrap"
+#define XML_3MF_ATTRIBUTE_TEXTURE2D_TILESTYLE_MIRROR L"mirror"
+#define XML_3MF_ATTRIBUTE_TEXTURE2D_TILESTYLE_CLAMP L"clamp"
 
 // Compositematerials and composite element (not implemented!)
 #define XML_3MF_ELEMENT_COMPOSITEMATERIALS          L"compositematerials"

Include/Model/Classes/NMR_ModelTexture2D.h

@@ -60,8 +60,8 @@ namespace NMR {
 		nfFloat m_fBox2D_V;
 		nfFloat m_fBox2D_Width;
 		nfFloat m_fBox2D_Height;
-		std::wstring m_sTileStyleU;
-		std::wstring m_sTileStyleV;
+		eModelTextureTileStyle m_eTileStyleU;
+		eModelTextureTileStyle m_eTileStyleV;
 	public:
 		CModelTexture2DResource() = delete;
 		CModelTexture2DResource(_In_ const ModelResourceID sID, _In_ CModel * pModel);
@@ -78,6 +78,8 @@ namespace NMR {
 		void setContentType(_In_ eModelTexture2DType ContentType);
 		std::wstring getContentTypeString();
 		void setContentTypeString(_In_ std::wstring sValue, _In_ nfBool bFailIfUnknown);
+		void setTileStyleUString(_In_ std::wstring sValue);
+		void setTileStyleVString(_In_ std::wstring sValue);
 
 		// getters/setters Box2D
 		nfBool getBox2D (_Out_ nfFloat & fU, _Out_ nfFloat & fV, _Out_ nfFloat & fWidth, _Out_ nfFloat & fHeight);
@@ -86,14 +88,16 @@ namespace NMR {
 		nfBool hasBox2D();
 
 		// getters/setters TileStyle
-		std::wstring getTileStyleU();
-		std::wstring getTileStyleV();
-		void setTileStyleU(_In_ std::wstring sValue);		
-		void setTileStyleV(_In_ std::wstring sValue);
+		eModelTextureTileStyle getTileStyleU();
+		eModelTextureTileStyle getTileStyleV();
+		void setTileStyleU(_In_ eModelTextureTileStyle sStyle);
+		void setTileStyleV(_In_ eModelTextureTileStyle sStyle);
 
 		// copy all parameters from source
 		void copyFrom(_In_ CModelTexture2DResource * pSourceTexture);
 
+		static eModelTextureTileStyle tileStyleFromString(_In_ std::wstring sValue);
+		static std::wstring tileStyleToString(_In_ eModelTextureTileStyle eTileStyle);
 	};
 
 	typedef std::shared_ptr <CModelTexture2DResource> PModelTexture2DResource;

Include/Model/Classes/NMR_ModelTypes.h

@@ -146,6 +146,12 @@ namespace NMR {
 		MODELTEXTURETYPE_JPEG = 2,
 	};
 
+	enum eModelTextureTileStyle {
+		MODELTEXTURETILESTYLE_WRAP = 0,
+		MODELTEXTURETILESTYLE_MIRROR = 1,
+		MODELTEXTURETILESTYLE_CLAMP = 2
+	};
+
 	typedef struct {
 		FLOAT m_fPosition[2];
 	} MODELSLICEVERTEX;