[Bf-blender-cvs] [7659ec8] temp_hair_flow: New strand functions in the physics library for solving hair flow grids.

[Lukas Tönne]

Commit: 7659ec802a299b68c6dc59ab40c602e33b03e092
Author: Lukas Tönne
Date:   Tue Jan 6 15:18:04 2015 +0100
Branches: temp_hair_flow
https://developer.blender.org/rB7659ec802a299b68c6dc59ab40c602e33b03e092

New strand functions in the physics library for solving hair flow grids.

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

M	source/blender/physics/BPH_strands.h
M	source/blender/physics/CMakeLists.txt
A	source/blender/physics/intern/hair_flow.cpp

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

diff --git a/source/blender/physics/BPH_strands.h b/source/blender/physics/BPH_strands.h
index 068c47f..46b0ab4 100644
--- a/source/blender/physics/BPH_strands.h
+++ b/source/blender/physics/BPH_strands.h
@@ -37,6 +37,15 @@ struct BMEditStrands;
 
 void BPH_strands_solve_constraints(struct Object *ob, struct BMEditStrands *es, float (*orig)[3]);
 
+/* Hair Flow Solver */
+
+struct HairFlowData;
+
+struct HairFlowData *BPH_strands_solve_hair_flow(struct Object *ob);
+void BPH_strands_free_hair_flow(struct HairFlowData *data);
+
+void BPH_strands_sample_hair_flow(struct Object *ob, struct BMEditStrands *es, struct HairFlowData *data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt
index 1208056..c2b7943 100644
--- a/source/blender/physics/CMakeLists.txt
+++ b/source/blender/physics/CMakeLists.txt
@@ -42,6 +42,9 @@ set(INC_SYS
 set(SRC
 	intern/BPH_mass_spring.cpp
 	intern/ConstrainedConjugateGradient.h
+	intern/hair_flow.cpp
+	intern/grid.cpp
+	intern/grid.h
 	intern/hair_volume.cpp
 	intern/implicit.h
 	intern/implicit_blender.c
diff --git a/source/blender/physics/BPH_strands.h b/source/blender/physics/intern/hair_flow.cpp
similarity index 65%
copy from source/blender/physics/BPH_strands.h
copy to source/blender/physics/intern/hair_flow.cpp
index 068c47f..570b2b3 100644
--- a/source/blender/physics/BPH_strands.h
+++ b/source/blender/physics/intern/hair_flow.cpp
@@ -25,20 +25,39 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BPH_STRANDS_H__
-#define __BPH_STRANDS_H__
+/** \file blender/blenkernel/intern/hair_flow.c
+ *  \ingroup bph
+ */
+
+#include "MEM_guardedalloc.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "DNA_texture_types.h"
+
+#include "BKE_effect.h"
+}
 
-struct Object;
-struct BMEditStrands;
+#include "BPH_strands.h"
 
-void BPH_strands_solve_constraints(struct Object *ob, struct BMEditStrands *es, float (*orig)[3]);
+#include "implicit.h"
+#include "eigen_utils.h"
 
-#ifdef __cplusplus
+struct HairFlowData {
+};
+
+HairFlowData *BPH_strands_solve_hair_flow(Object *ob)
+{
+	return NULL;
+}
+
+void BPH_strands_free_hair_flow(HairFlowData *data)
+{
 }
-#endif
 
-#endif
+void BPH_strands_sample_hair_flow(Object *ob, BMEditStrands *es, HairFlowData *data)
+{
+	
+}