[Bf-blender-cvs] [9b22c38] object_nodes: New util file for structure type implementations in C/C++.

Lukas Tönne noreply at git.blender.org
Mon Jan 18 13:10:53 CET 2016


Commit: 9b22c3854d3304ded0b7488f7f41bd1e4acbb978
Author: Lukas Tönne
Date:   Fri Jan 15 10:08:09 2016 +0100
Branches: object_nodes
https://developer.blender.org/rB9b22c3854d3304ded0b7488f7f41bd1e4acbb978

New util file for structure type implementations in C/C++.

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

M	source/blender/blenvm/CMakeLists.txt
M	source/blender/blenvm/util/bvm_util_data_ptr.h
A	source/blender/blenvm/util/bvm_util_structs.h

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

diff --git a/source/blender/blenvm/CMakeLists.txt b/source/blender/blenvm/CMakeLists.txt
index 8e18180..b24f1db 100644
--- a/source/blender/blenvm/CMakeLists.txt
+++ b/source/blender/blenvm/CMakeLists.txt
@@ -52,6 +52,7 @@ set(SRC
 	util/bvm_util_map.h
 	util/bvm_util_math.h
 	util/bvm_util_string.h
+	util/bvm_util_structs.h
 	util/bvm_util_thread.h
 
 	BVM_api.h
diff --git a/source/blender/blenvm/util/bvm_util_data_ptr.h b/source/blender/blenvm/util/bvm_util_data_ptr.h
index 5c6ab66..937bb5f 100644
--- a/source/blender/blenvm/util/bvm_util_data_ptr.h
+++ b/source/blender/blenvm/util/bvm_util_data_ptr.h
@@ -25,12 +25,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenvm/intern/bvm_type_data_ptr.h
+/** \file blender/blenvm/intern/bvm_util_data_ptr.h
  *  \ingroup bvm
  */
 
-#ifndef __BVM_TYPE_DATA_PTR_H__
-#define __BVM_TYPE_DATA_PTR_H__
+#ifndef __BVM_UTIL_DATA_PTR_H__
+#define __BVM_UTIL_DATA_PTR_H__
 
 #include <assert.h>
 
diff --git a/source/blender/blenvm/util/bvm_util_structs.h b/source/blender/blenvm/util/bvm_util_structs.h
new file mode 100644
index 0000000..91670d1
--- /dev/null
+++ b/source/blender/blenvm/util/bvm_util_structs.h
@@ -0,0 +1,49 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) Blender Foundation
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Lukas Toenne
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenvm/intern/bvm_util_structs.h
+ *  \ingroup bvm
+ */
+
+#ifndef __BVM_UTIL_STRUCTS_H__
+#define __BVM_UTIL_STRUCTS_H__
+
+#include "MEM_guardedalloc.h"
+
+#include "bvm_util_data_ptr.h"
+#include "bvm_util_math.h"
+
+namespace bvm {
+
+struct TransformedMesh {
+	mesh_ptr mesh;
+	matrix44 tfm;
+};
+
+} /* namespace bvm */
+
+#endif




More information about the Bf-blender-cvs mailing list