Better hide ospray from updated wrapping API

Recent removal of WRAP_EXCLUDE_PYTHON cause paraview build to complain about not finding ospray header. Address by better hiding ospray's own API from the headers as is done in other files already.
leftwillow · Dec 20, 2017 · f89c449 · f89c449
1 parent 6e9f059
commit f89c449
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/Rendering/OSPRay/vtkOSPRayMaterialHelpers.cxx b/Rendering/OSPRay/vtkOSPRayMaterialHelpers.cxx
@@ -20,6 +20,8 @@
 #include "vtkProperty.h"
 #include "vtkTexture.h"
 
+#include "ospray/ospray.h"
+
 //------------------------------------------------------------------------------
 osp::Texture2D *vtkOSPRayMaterialHelpers::VTKToOSPTexture
   (vtkImageData *vColorTextureMap)
@@ -56,8 +58,8 @@ osp::Texture2D *vtkOSPRayMaterialHelpers::VTKToOSPTexture
 //------------------------------------------------------------------------------
 void vtkOSPRayMaterialHelpers::MakeMaterials
   (vtkOSPRayRendererNode *orn,
-   OSPRenderer oRenderer,
-   std::map<std::string, OSPMaterial> &mats)
+   osp::Renderer *oRenderer,
+   std::map<std::string, osp::Material*> &mats)
 {
   vtkOSPRayMaterialLibrary *ml = vtkOSPRayRendererNode::GetMaterialLibrary(orn->GetRenderer());
   if (!ml)
@@ -69,7 +71,7 @@ void vtkOSPRayMaterialHelpers::MakeMaterials
   std::set<std::string >::iterator it = nicknames.begin();
   while (it != nicknames.end())
   {
-    OSPMaterial newmat = vtkOSPRayMaterialHelpers::MakeMaterial
+    osp::Material* newmat = vtkOSPRayMaterialHelpers::MakeMaterial
       (orn, oRenderer, *it);
     mats[*it] = newmat;
     ++it;
@@ -121,11 +123,11 @@ void vtkOSPRayMaterialHelpers::MakeMaterials
   }
 
 //------------------------------------------------------------------------------
-OSPMaterial vtkOSPRayMaterialHelpers::MakeMaterial
+osp::Material* vtkOSPRayMaterialHelpers::MakeMaterial
   (vtkOSPRayRendererNode *orn,
-  OSPRenderer oRenderer, std::string nickname)
+  osp::Renderer* oRenderer, std::string nickname)
 {
-  OSPMaterial oMaterial;
+  osp::Material* oMaterial;
   vtkOSPRayMaterialLibrary *ml = vtkOSPRayRendererNode::GetMaterialLibrary(orn->GetRenderer());
   if (!ml)
     {

diff --git a/Rendering/OSPRay/vtkOSPRayMaterialHelpers.h b/Rendering/OSPRay/vtkOSPRayMaterialHelpers.h
@@ -31,7 +31,12 @@
 #ifndef vtkOSPRayMaterialHelpers_h
 #define vtkOSPRayMaterialHelpers_h
 
-#include "ospray/ospray.h"
+namespace osp {
+  struct Texture2D;
+  struct Renderer;
+  struct Material;
+}
+
 #include <map>
 
 class vtkImageData;
@@ -42,23 +47,23 @@ namespace vtkOSPRayMaterialHelpers {
   /**
    * Manufacture an ospray texture from a 2d vtkImageData
    */
-  osp::Texture2D *VTKToOSPTexture(vtkImageData *vColorTextureMap);
+  osp::Texture2D* VTKToOSPTexture(vtkImageData *vColorTextureMap);
 
   /**
    * Construct a set of ospray materials for all of the material names.
    */
   void MakeMaterials(vtkOSPRayRendererNode *orn,
-                     OSPRenderer oRenderer,
-                     std::map<std::string, OSPMaterial> &mats);
+                     osp::Renderer *oRenderer,
+                     std::map<std::string, osp::Material*> &mats);
 
   /**
    * Construct one ospray material within the given renderer that
    * corresponds to the visual characteristics set out in the named
    * material in the material library.
    */
-  OSPMaterial MakeMaterial(vtkOSPRayRendererNode *orn,
-                           OSPRenderer oRenderer,
-                           std::string nickname);
+  osp::Material* MakeMaterial(vtkOSPRayRendererNode *orn,
+                              osp::Renderer *oRenderer,
+                              std::string nickname);
 
 }
 #endif