Merge branch 'main' into public

Author: cklosters

cmake/version.cmake

@@ -1,6 +1,6 @@
 set(NAP_MAJOR_VERSION 0)
 set(NAP_MINOR_VERSION 7)
-set(NAP_PATCH_VERSION 0)
+set(NAP_PATCH_VERSION 1)
 set(NAP_VERSION "${NAP_MAJOR_VERSION}.${NAP_MINOR_VERSION}.${NAP_PATCH_VERSION}")
 # Be careful updating this as it's currently parsed during packaging by package.py
 message(STATUS "NAP version: ${NAP_VERSION}")

system_modules/naprenderadvanced/src/emptymesh.cpp

@@ -11,7 +11,11 @@
 
  RTTI_BEGIN_CLASS_NO_DEFAULT_CONSTRUCTOR(nap::EmptyMesh, "A mesh without data for simple render operations, with shaders without geometry")
 	RTTI_CONSTRUCTOR(nap::Core&)
-RTTI_END_CLASS
+    RTTI_PROPERTY("Usage",			&nap::EmptyMesh::mUsage,		nap::rtti::EPropertyMetaData::Default)
+    RTTI_PROPERTY("DrawMode",		&nap::EmptyMesh::mDrawMode,	    nap::rtti::EPropertyMetaData::Default)
+    RTTI_PROPERTY("CullMode",		&nap::EmptyMesh::mCullMode,	    nap::rtti::EPropertyMetaData::Default)
+    RTTI_PROPERTY("PolygonMode",	&nap::EmptyMesh::mPolygonMode,	nap::rtti::EPropertyMetaData::Default)
+ RTTI_END_CLASS
 
 namespace nap
 {
@@ -28,6 +32,14 @@ namespace nap
 		// Initialize no mesh instance
 		assert(mRenderService != nullptr);
 		mMeshInstance = std::make_unique<MeshInstance>(*mRenderService);
+
+        // Configure the mesh instance
+        mMeshInstance->setUsage(mUsage);
+        mMeshInstance->setDrawMode(mDrawMode);
+        mMeshInstance->setCullMode(mCullMode);
+        mMeshInstance->setPolygonMode(mPolygonMode);
+        mMeshInstance->setNumVertices(0);
+
 		return mMeshInstance->init(errorState);
 	}
 }

system_modules/naprenderadvanced/src/emptymesh.h

@@ -45,6 +45,11 @@ namespace nap
 		 */
 		virtual const MeshInstance& getMeshInstance() const	override	{ return *mMeshInstance; }
 
+        EMemoryUsage			mUsage = EMemoryUsage::Static;		    ///< Property: 'Usage' GPU memory usage
+        EDrawMode				mDrawMode = EDrawMode::Triangles;	    ///< Property: 'DrawMode' The draw mode that should be used to draw the shapes
+        ECullMode				mCullMode = ECullMode::Back;		    ///< Property: 'CullMode' The triangle cull mode to use
+        EPolygonMode			mPolygonMode = EPolygonMode::Fill;	    ///< Property: 'PolygonMode' The polygon mode to use, fill is always available and should be the default
+
 	private:
 		nap::RenderService* mRenderService = nullptr;					///< Handle to the render service
 		std::unique_ptr<MeshInstance> mMeshInstance;					///< The mesh instance to construct