[Bf-blender-cvs] [753b6b3] openvdb: Cleanups:
Kévin Dietrich
noreply at git.blender.org
Sun Nov 29 22:33:50 CET 2015
Commit: 753b6b3c471cdee3325c11c4c1c4f51615e52f3e
Author: Kévin Dietrich
Date: Sun Nov 29 22:07:33 2015 +0100
Branches: openvdb
https://developer.blender.org/rB753b6b3c471cdee3325c11c4c1c4f51615e52f3e
Cleanups:
- rework includes order in intern/openvdb: first include should be the
source file's header, then other header in the same directory, following
by system/library headers and finally other local headers.
- move ScopeTimer cdtor definitions to openvdb_util.cc, no reason for
them to be in a header.
- add a DEBUG_TIME macro to switch Timer macro on and off instead of
using NDEBUG macro (doesn't make much sense to time in debug mode)
===================================================================
M intern/openvdb/intern/openvdb_dense_convert.cc
M intern/openvdb/intern/openvdb_dense_convert.h
M intern/openvdb/intern/openvdb_writer.cc
M intern/openvdb/openvdb_util.cc
M intern/openvdb/openvdb_util.h
===================================================================
diff --git a/intern/openvdb/intern/openvdb_dense_convert.cc b/intern/openvdb/intern/openvdb_dense_convert.cc
index 92160ec..4968f1a 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.cc
+++ b/intern/openvdb/intern/openvdb_dense_convert.cc
@@ -25,10 +25,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#include <openvdb/tools/ValueTransformer.h> /* for tools::foreach */
-
#include "openvdb_dense_convert.h"
+#include <openvdb/tools/ValueTransformer.h> /* for tools::foreach */
+
namespace internal {
openvdb::Mat4R convertMatrix(const float mat[4][4])
diff --git a/intern/openvdb/intern/openvdb_dense_convert.h b/intern/openvdb/intern/openvdb_dense_convert.h
index 3bc3c3b..6e06819 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.h
+++ b/intern/openvdb/intern/openvdb_dense_convert.h
@@ -28,13 +28,12 @@
#ifndef __OPENVDB_DENSE_CONVERT_H__
#define __OPENVDB_DENSE_CONVERT_H__
-#include <openvdb/openvdb.h>
-#include <openvdb/tools/Clip.h>
-#include <openvdb/tools/Dense.h>
-
#include "openvdb_reader.h"
#include "openvdb_writer.h"
+#include <openvdb/tools/Clip.h>
+#include <openvdb/tools/Dense.h>
+
#define TOLERANCE 1e-3f
namespace internal {
diff --git a/intern/openvdb/intern/openvdb_writer.cc b/intern/openvdb/intern/openvdb_writer.cc
index a348be3..117aa03 100644
--- a/intern/openvdb/intern/openvdb_writer.cc
+++ b/intern/openvdb/intern/openvdb_writer.cc
@@ -28,9 +28,9 @@
OpenVDBWriter::OpenVDBWriter()
: m_grids(new openvdb::GridPtrVec())
, m_meta_map(new openvdb::MetaMap())
+ , m_save_as_half(false)
{
m_meta_map->insertMeta("creator", openvdb::StringMetadata("Blender/OpenVDBWriter"));
- m_save_as_half = false;
}
OpenVDBWriter::~OpenVDBWriter()
diff --git a/intern/openvdb/openvdb_util.cc b/intern/openvdb/openvdb_util.cc
index 9d23877..d157796 100644
--- a/intern/openvdb/openvdb_util.cc
+++ b/intern/openvdb/openvdb_util.cc
@@ -25,6 +25,8 @@
#include "openvdb_util.h"
+#include <cstdio>
+
#ifdef _WIN32
#include <windows.h>
@@ -52,3 +54,14 @@ double time_dt()
}
#endif
+
+ScopeTimer::ScopeTimer(const std::string &message)
+ : m_message(message)
+{
+ m_start = time_dt();
+}
+
+ScopeTimer::~ScopeTimer()
+{
+ printf("%s: %fs\n", m_message.c_str(), time_dt() - m_start);
+}
diff --git a/intern/openvdb/openvdb_util.h b/intern/openvdb/openvdb_util.h
index 2da3c53..9fc4a9c 100644
--- a/intern/openvdb/openvdb_util.h
+++ b/intern/openvdb/openvdb_util.h
@@ -26,9 +26,10 @@
#ifndef __OPENVDB_UTIL_H__
#define __OPENVDB_UTIL_H__
-#include <cstdio>
#include <string>
+//#define DEBUG_TIME
+
double time_dt();
/* A utility class which prints the time elapsed during its lifetime, useful for
@@ -38,21 +39,13 @@ class ScopeTimer {
std::string m_message;
public:
- ScopeTimer(const std::string &message)
- : m_message(message)
- {
- m_start = time_dt();
- }
-
- ~ScopeTimer()
- {
- printf("%s: %fs\n", m_message.c_str(), time_dt() - m_start);
- }
+ ScopeTimer(const std::string &message);
+ ~ScopeTimer();
};
-#ifndef NDEBUG
+#ifdef DEBUG_TIME
# define Timer(x) \
- ScopeTimer func(x);
+ ScopeTimer prof(x);
#else
# define Timer(x)
#endif
More information about the Bf-blender-cvs
mailing list