[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59364] branches/soc-2013-cycles_volume/ intern/cycles/kernel: - removed unused functions;

Rafael Campos rafaelcdn at gmail.com
Wed Aug 21 15:26:17 CEST 2013


Revision: 59364
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59364
Author:   jehuty
Date:     2013-08-21 13:26:17 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
- removed unused functions;

Modified Paths:
--------------
    branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2013-cycles_volume/intern/cycles/kernel/textures/openvdb_volume.cpp
    branches/soc-2013-cycles_volume/intern/cycles/kernel/textures/openvdb_volume.h

Modified: branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.cpp	2013-08-21 13:13:48 UTC (rev 59363)
+++ branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.cpp	2013-08-21 13:26:17 UTC (rev 59364)
@@ -99,17 +99,18 @@
 OSLRenderServices::OSLRenderServices()
 {
 	kernel_globals = NULL;
+    vdb_ts = VDBTextureSystem::init();
 }
 
 OSLRenderServices::~OSLRenderServices()
 {
+    VDBTextureSystem::free(vdb_ts);
 }
 
 void OSLRenderServices::thread_init(KernelGlobals *kernel_globals_, OSL::TextureSystem *osl_ts_)
 {
 	kernel_globals = kernel_globals_;
 	osl_ts = osl_ts_;
-    vdb_ts = VDBTextureSystem::init();
 }
 
 bool OSLRenderServices::get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform, float time)

Modified: branches/soc-2013-cycles_volume/intern/cycles/kernel/textures/openvdb_volume.cpp
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/kernel/textures/openvdb_volume.cpp	2013-08-21 13:13:48 UTC (rev 59363)
+++ branches/soc-2013-cycles_volume/intern/cycles/kernel/textures/openvdb_volume.cpp	2013-08-21 13:26:17 UTC (rev 59364)
@@ -42,22 +42,6 @@
         file.close();
     }
     
-    VDBVolumeFile(const VDBVolumeFile& vdb_file) : file(vdb_file.file.filename())
-    {
-        // file should be open already;
-        if(file.isOpen())
-        {
-            std::cout << "Filename: " << this->file.filename() << ".\n";
-           // file.open();
-            
-            grids = file.getGrids();
-            meta = file.getMetadata();
-            version = file.version();
-        }
-        
-
-    }
-    
 } VDBVolumeFile;
 
 class OpenVDBUtil
@@ -81,17 +65,9 @@
 /* static ustrings */
 ustring OpenVDBUtil::u_openvdb_file_extension(".vdb");
 
-class OpenVDBVolumeAccessor {
-public:
-private:
-	openvdb::GridBase::Ptr grid;
-	eOpenVDBGridType grid_type; // This is needed because it's impossible to know the grid value type beforehand;
-};
 
-
 void OpenVDBUtil::initialize_library()
 {
-    //any additional configuration needed?
 	openvdb::initialize();
 }
 
@@ -136,11 +112,6 @@
     return false;
 }
 
-VDBVolumeFile *OpenVDBUtil::get_volume_from_file(ustring filename)
-{
-    VDBVolumeFile vdb_volume(filename);
-    return &vdb_volume;
-}
 
 int OpenVDBUtil::get_number_of_grids(VDBVolumeFile vdb_volume)
 {
@@ -153,6 +124,7 @@
     return x;
 }
 
+
 // VDBTextureSystem
 
 VDBTextureSystem::Ptr VDBTextureSystem::init() {
@@ -165,13 +137,11 @@
 
 bool VDBTextureSystem::is_vdb_volume(ustring filename)
 {
-    
-    //testing things out
-    if (get_map().empty())
+    if (vdb_files.empty())
     {
         return OpenVDBUtil::is_vdb_volume_file(filename);
     }
-    if (get_map().find(filename) != get_map().end())
+    if (vdb_files.find(filename) != vdb_files.end())
         return true;
     else
         return OpenVDBUtil::is_vdb_volume_file(filename);
@@ -210,36 +180,20 @@
     const float myResult(accessor.getValue(point));
     *result = myResult; 
     return true;
-    
-    /*
-    if (OpenVDBUtil::get_number_of_grids(myVDB) != 1) {
-       
-       // Name of the grid will be unimportant if it's the only one present in the file.
-        
-        do {
-            ++iter;
-        } while (iter != myVDB.grids->end());
-        
-    } */
-    
-    // perform lookup.
-    
-    //return false;
 }
 
 VDBTextureSystem::VDBMap::const_iterator VDBTextureSystem::add_vdb_to_map(ustring filename)
 {
-    VDBVolumeFile *vdb_sp = new VDBVolumeFile(filename);
+    VDBFilePtr vdb_sp(new VDBVolumeFile(filename));
     
     return (vdb_files.insert(std::make_pair(filename, vdb_sp))).first;
 }
 
-VDBTextureSystem::VDBMap VDBTextureSystem::get_map()
+void VDBTextureSystem::free(VDBTextureSystem::Ptr vdb_ts)
 {
-    return vdb_files;
+    vdb_ts.reset();
 }
 
-
 VDBTextureSystem::~VDBTextureSystem(){
 }
 

Modified: branches/soc-2013-cycles_volume/intern/cycles/kernel/textures/openvdb_volume.h
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/kernel/textures/openvdb_volume.h	2013-08-21 13:13:48 UTC (rev 59363)
+++ branches/soc-2013-cycles_volume/intern/cycles/kernel/textures/openvdb_volume.h	2013-08-21 13:26:17 UTC (rev 59364)
@@ -22,21 +22,10 @@
 #include <OSL/oslexec.h>
 #include "util_map.h"
 
+using namespace OIIO;
 
 CCL_NAMESPACE_BEGIN
 
-using namespace OIIO;
-
-typedef enum eOpenVDBGridType
-{
-	OPENVDB_GRID_TYPE_NOT_SET,
-	OPENVDB_GRID_TYPE_FLOAT,
-	OPENVDB_GRID_TYPE_INT32,
-	OPENVDB_GRID_TYPE_INT64,
-	OPENVDB_GRID_TYPE_VEC3F
-} eOpenVDBGridType;
-
-
 struct VDBVolumeFile;
 class OpenVDBVolumeAccessor;
 class OpenVDBUtil;
@@ -48,7 +37,7 @@
     typedef boost::shared_ptr<VDBTextureSystem> Ptr;
     
     static VDBTextureSystem::Ptr init();
-    static void destroy (VDBTextureSystem::Ptr vdb_ts);
+    static void free (VDBTextureSystem::Ptr vdb_ts);
     
     VDBTextureSystem() { }
     ~VDBTextureSystem();




More information about the Bf-blender-cvs mailing list