[Bf-blender-cvs] [29fa4b9] openvdb: Move some files and functions around.

Kévin Dietrich noreply at git.blender.org
Fri Jun 5 14:07:55 CEST 2015


Commit: 29fa4b913861aac3f6ff9836ba3617670e4ad237
Author: Kévin Dietrich
Date:   Sat May 23 11:36:08 2015 +0200
Branches: openvdb
https://developer.blender.org/rB29fa4b913861aac3f6ff9836ba3617670e4ad237

Move some files and functions around.

===================================================================

M	intern/openvdb/CMakeLists.txt
A	intern/openvdb/intern/openvdb_dense_convert.cpp
A	intern/openvdb/intern/openvdb_dense_convert.h
D	intern/openvdb/intern/openvdb_smoke_export.cpp
M	intern/openvdb/openvdb_capi.cpp
M	intern/openvdb/openvdb_capi.h
D	intern/openvdb/openvdb_intern.h

===================================================================

diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt
index 33dce2f..06d7c3b 100644
--- a/intern/openvdb/CMakeLists.txt
+++ b/intern/openvdb/CMakeLists.txt
@@ -53,12 +53,10 @@ if(WITH_OPENVDB)
 
 	list(APPEND SRC
 		intern/openvdb_reader.cpp
-		intern/openvdb_smoke_export.cpp
+		intern/openvdb_dense_convert.cpp
 		intern/openvdb_writer.cpp
 		openvdb_capi.cpp
 		openvdb_util.cpp
-
-		openvdb_intern.h
 	)
 endif()
 
diff --git a/intern/openvdb/intern/openvdb_smoke_export.cpp b/intern/openvdb/intern/openvdb_dense_convert.cpp
similarity index 98%
rename from intern/openvdb/intern/openvdb_smoke_export.cpp
rename to intern/openvdb/intern/openvdb_dense_convert.cpp
index c0096aa..a40c1d8 100644
--- a/intern/openvdb/intern/openvdb_smoke_export.cpp
+++ b/intern/openvdb/intern/openvdb_dense_convert.cpp
@@ -25,12 +25,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include <openvdb/openvdb.h>
-#include <openvdb/tools/Dense.h>
 #include <openvdb/tools/ValueTransformer.h>
 
 #include "openvdb_capi.h"
-#include "openvdb_intern.h"
+#include "openvdb_dense_convert.h"
 #include "openvdb_writer.h"
 
 using namespace openvdb;
diff --git a/intern/openvdb/openvdb_intern.h b/intern/openvdb/intern/openvdb_dense_convert.h
similarity index 95%
rename from intern/openvdb/openvdb_intern.h
rename to intern/openvdb/intern/openvdb_dense_convert.h
index 6c17145..092e9d9 100644
--- a/intern/openvdb/openvdb_intern.h
+++ b/intern/openvdb/intern/openvdb_dense_convert.h
@@ -18,13 +18,15 @@
  * The Original Code is Copyright (C) 2015 Blender Foundation.
  * All rights reserved.
  *
+ * The Original Code is: all of this file.
+ *
  * Contributor(s): Kevin Dietrich
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef  __OPENVDB_INTERN_H__
-#define  __OPENVDB_INTERN_H__
+#ifndef __OPENVDB_DENSE_CONVERT_H__
+#define __OPENVDB_DENSE_CONVERT_H__
 
 #include <openvdb/openvdb.h>
 #include <openvdb/tools/Dense.h>
@@ -32,10 +34,7 @@
 #include "openvdb_reader.h"
 #include "openvdb_writer.h"
 
-struct FLUID_3D;
 struct FluidDomainDescr;
-struct WTURBULENCE;
-struct OpenVDBWriter;
 
 namespace internal {
 
@@ -115,5 +114,5 @@ void OpenVDB_update_fluid_transform(const char *filename, FluidDomainDescr descr
 
 }
 
-#endif /* __OPENVDB_INTERN_H__ */
+#endif /* __OPENVDB_DENSE_CONVERT_H__ */
 
diff --git a/intern/openvdb/openvdb_capi.cpp b/intern/openvdb/openvdb_capi.cpp
index 246b312..c0a9071 100644
--- a/intern/openvdb/openvdb_capi.cpp
+++ b/intern/openvdb/openvdb_capi.cpp
@@ -34,9 +34,7 @@ extern "C" {
 #include "MEM_guardedalloc.h"
 
 #include "openvdb_capi.h"
-#include "openvdb_intern.h"
-#include "openvdb_reader.h"
-#include "openvdb_writer.h"
+#include "openvdb_dense_convert.h"
 #include "openvdb_util.h"
 
 using namespace openvdb;
diff --git a/intern/openvdb/openvdb_capi.h b/intern/openvdb/openvdb_capi.h
index 2bae96e..7b275d2 100644
--- a/intern/openvdb/openvdb_capi.h
+++ b/intern/openvdb/openvdb_capi.h
@@ -32,8 +32,6 @@ extern "C" {
 
 struct bNode;
 struct bNodeTree;
-struct FLUID_3D;
-struct WTURBULENCE;
 struct OpenVDBReader;
 struct OpenVDBWriter;
 
@@ -72,7 +70,6 @@ enum {
 	OPENVDB_UNKNOWN_ERROR = 11,
 };
 
-int OpenVDB_import_fluid(struct FLUID_3D *fluid, struct WTURBULENCE *wt, FluidDomainDescr *descr, const char *filename, float *shadow);
 void OpenVDB_update_fluid_transform(const char *filename, FluidDomainDescr descr);
 
 void OpenVDB_export_grid_fl(struct OpenVDBWriter *writer,




More information about the Bf-blender-cvs mailing list