Merge branch 'release/v2.10.7'

CMakeLists.txt

@@ -7,7 +7,7 @@ PROJECT(AVANGO CXX)
 # version number
 set(AVANGO_MAJOR 2)
 set(AVANGO_MINOR 10)
-set(AVANGO_PATCH 6)
+set(AVANGO_PATCH 7)
 set(AVANGO_VERSION ${AVANGO_MAJOR}.${AVANGO_MINOR}.${AVANGO_PATCH})
 set(AVANGO_DESCRIPTION "AVANGO")
 set(AVANGO_HOMEPAGE "https://github.com/vrsys")
@@ -107,7 +107,7 @@ ENDIF(UNIX)
 ################################################################
 SET (AVANGO_VERSION_MAJOR "2" CACHE STRING "Major version of AvangoNG.")
 SET (AVANGO_VERSION_MINOR "10" CACHE STRING "Minor version of AvangoNG.")
-SET (AVANGO_VERSION_MAINT "6" CACHE STRING "Maintenance version of AvangoNG.")
+SET (AVANGO_VERSION_MAINT "7" CACHE STRING "Maintenance version of AvangoNG.")
 
 SET (AVANGO_LOG_LEVEL "WARN" CACHE STRING "Set AvangoNG log level: FATAL, ERROR, WARN, INFO, DEBUG, TRACE")
 SET (AVANGO_INSTALL_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib CACHE PATH "Install path for avango.")

avango-gua/include/avango/gua/Types.hpp

@@ -14,6 +14,13 @@
   #include <avango/Msg.h>
 #endif //#if defined(AVANGO_DISTRIBUTION_SUPPORT)
 
+namespace gua
+{
+  class TriMeshNode;
+  class Video3DNode;
+  class NURBSNode;
+}
+
 namespace av
 {
   AV_GUA_DLL OutputStream& operator<<(OutputStream&, const ::gua::math::mat4&);
@@ -66,8 +73,12 @@ namespace av
   AV_GUA_DLL av::OutputStream& operator<<(OutputStream& os, const ::gua::TexturedQuadNode&);
   AV_GUA_DLL av::InputStream& operator>>(InputStream& is, ::gua::TexturedQuadNode&);
 
-  AV_GUA_DLL av::OutputStream& operator<<(OutputStream& os, const ::gua::GeometryNode&);
-  AV_GUA_DLL av::InputStream& operator>>(InputStream& is, ::gua::GeometryNode&);
+  AV_GUA_DLL av::OutputStream& operator<<(OutputStream& os, const ::gua::TriMeshNode&);
+  AV_GUA_DLL av::InputStream& operator>>(InputStream& is, ::gua::TriMeshNode&);
+  AV_GUA_DLL av::OutputStream& operator<<(OutputStream& os, const ::gua::Video3DNode&);
+  AV_GUA_DLL av::InputStream& operator>>(InputStream& is, ::gua::Video3DNode&);
+  AV_GUA_DLL av::OutputStream& operator<<(OutputStream& os, const ::gua::NURBSNode&);
+  AV_GUA_DLL av::InputStream& operator>>(InputStream& is, ::gua::NURBSNode&);
 
   AV_GUA_DLL av::OutputStream& operator<<(OutputStream& os, const ::gua::VolumeNode&);
   AV_GUA_DLL av::InputStream& operator>>(InputStream& is, ::gua::VolumeNode&);

avango-gua/include/avango/gua/renderer/NURBSLoader.hpp

@@ -0,0 +1,91 @@
+#ifndef AVANGO_GUA_NURBS_LOADER_HPP
+#define AVANGO_GUA_NURBS_LOADER_HPP
+
+/**
+ * \file
+ * \ingroup av_gua
+ */
+
+#include <gua/renderer/NURBSLoader.hpp>
+
+#include <avango/gua/Fields.hpp>
+#include <avango/gua/scenegraph/TriMeshNode.hpp>
+#include <avango/FieldContainer.h>
+
+#include <avango/gua/windows_specific_gua.hpp>
+
+
+namespace av
+{
+  namespace gua
+  {
+    /**
+     * Wrapper for ::gua::NURBSLoader
+     *
+     * \ingroup av_gua
+     */
+    class AV_GUA_DLL NURBSLoader : public av::FieldContainer
+    {
+      AV_FC_DECLARE();
+
+    public:
+
+      enum Flags {
+        DEFAULTS = ::gua::NURBSLoader::DEFAULTS,
+        LOAD_MATERIALS = ::gua::NURBSLoader::LOAD_MATERIALS,
+        OPTIMIZE_GEOMETRY = ::gua::NURBSLoader::OPTIMIZE_GEOMETRY,
+        MAKE_PICKABLE = ::gua::NURBSLoader::MAKE_PICKABLE,
+        NORMALIZE_SCALE = ::gua::NURBSLoader::NORMALIZE_SCALE,
+        NORMALIZE_POSITION = ::gua::NURBSLoader::NORMALIZE_POSITION
+      };
+
+      /**
+       * Constructor. When called without arguments, a new ::gua::NURBSLoader is created.
+       * Otherwise, the given ::gua::NURBSLoader is used.
+       */
+      NURBSLoader(::gua::NURBSLoader* guaNURBSLoader = new ::gua::NURBSLoader());
+
+      av::Link<av::gua::Node> createGeometryFromFile(
+                                           std::string const& nodeName,
+                                           std::string const& fileName,
+                                           std::string const& fallbackMaterial,
+                                           Flags flags = DEFAULTS) const;
+
+    protected:
+
+      /**
+       * Destructor made protected to prevent allocation on stack.
+       */
+//      virtual ~NURBSLoader();
+
+    public:
+
+      /**
+       * Get the wrapped ::gua::NURBSLoader.
+       */
+      ::gua::NURBSLoader* getGuaNURBSLoader() const;
+
+
+    private:
+
+      ::gua::NURBSLoader *m_guaNURBSLoader;
+
+      av::gua::Node* createChildren(std::shared_ptr< ::gua::Node> root) const;
+
+      NURBSLoader(const NURBSLoader&);
+      NURBSLoader& operator=(const NURBSLoader&);
+    };
+
+    typedef SingleField<Link<NURBSLoader> > SFNURBSLoader;
+    typedef MultiField<Link<NURBSLoader> > MFNURBSLoader;
+
+  }
+
+#ifdef AV_INSTANTIATE_FIELD_TEMPLATES
+  template class AV_GUA_DLL SingleField<Link<gua::NURBSLoader> >;
+  template class AV_GUA_DLL MultiField<Link<gua::NURBSLoader> >;
+#endif
+
+}
+
+#endif //AVANGO_GUA_NURBS_LOADER_HPP

avango-gua/include/avango/gua/renderer/Pipeline.hpp

@@ -41,6 +41,8 @@ namespace av
        */
       Pipeline(::gua::Pipeline* guaPipeline = new ::gua::Pipeline());
 
+      void print_shaders(std::string const& directory) const;
+
     protected:
 
       /**

avango-gua/include/avango/gua/renderer/TriMeshLoader.hpp

@@ -0,0 +1,90 @@
+#ifndef AVANGO_GUA_TRI_MESH_LOADER_HPP
+#define AVANGO_GUA_TRI_MESH_LOADER_HPP
+
+/**
+ * \file
+ * \ingroup av_gua
+ */
+
+#include <gua/renderer/TriMeshLoader.hpp>
+
+#include <avango/gua/Fields.hpp>
+#include <avango/gua/scenegraph/TriMeshNode.hpp>
+#include <avango/FieldContainer.h>
+
+#include <avango/gua/windows_specific_gua.hpp>
+
+
+namespace av
+{
+  namespace gua
+  {
+    /**
+     * Wrapper for ::gua::TriMeshLoader
+     *
+     * \ingroup av_gua
+     */
+    class AV_GUA_DLL TriMeshLoader : public av::FieldContainer
+    {
+      AV_FC_DECLARE();
+
+    public:
+
+      enum Flags {
+        DEFAULTS = ::gua::TriMeshLoader::DEFAULTS,
+        LOAD_MATERIALS = ::gua::TriMeshLoader::LOAD_MATERIALS,
+        OPTIMIZE_GEOMETRY = ::gua::TriMeshLoader::OPTIMIZE_GEOMETRY,
+        MAKE_PICKABLE = ::gua::TriMeshLoader::MAKE_PICKABLE,
+        NORMALIZE_SCALE = ::gua::TriMeshLoader::NORMALIZE_SCALE,
+        NORMALIZE_POSITION = ::gua::TriMeshLoader::NORMALIZE_POSITION
+      };
+
+      /**
+       * Constructor. When called without arguments, a new ::gua::TriMeshLoader is created.
+       * Otherwise, the given ::gua::TriMeshLoader is used.
+       */
+      TriMeshLoader(::gua::TriMeshLoader* guaTriMeshLoader = new ::gua::TriMeshLoader());
+
+      av::Link<av::gua::Node> createGeometryFromFile(std::string const& nodeName,
+                                                             std::string const& fileName,
+                                                             std::string const& fallbackMaterial,
+                                                             Flags flags = DEFAULTS) const;
+
+    protected:
+
+      /**
+       * Destructor made protected to prevent allocation on stack.
+       */
+//      virtual ~TriMeshLoader();
+
+    public:
+
+      /**
+       * Get the wrapped ::gua::TriMeshLoader.
+       */
+      ::gua::TriMeshLoader* getGuaTriMeshLoader() const;
+
+
+    private:
+
+      ::gua::TriMeshLoader *m_guaTriMeshLoader;
+
+      av::gua::Node* createChildren(std::shared_ptr< ::gua::Node> root) const;
+
+      TriMeshLoader(const TriMeshLoader&);
+      TriMeshLoader& operator=(const TriMeshLoader&);
+    };
+
+    typedef SingleField<Link<TriMeshLoader> > SFTriMeshLoader;
+    typedef MultiField<Link<TriMeshLoader> > MFTriMeshLoader;
+
+  }
+
+#ifdef AV_INSTANTIATE_FIELD_TEMPLATES
+  template class AV_GUA_DLL SingleField<Link<gua::TriMeshLoader> >;
+  template class AV_GUA_DLL MultiField<Link<gua::TriMeshLoader> >;
+#endif
+
+}
+
+#endif //AVANGO_GUA_TRI_MESH_LOADER_HPP