[Bf-blender-cvs] [d02b932] hair_system: Simple volume instance owned by the hair solver.

[Lukas Tönne]

Commit: d02b9326a7c68ada7463f96033f35765bd858cbd
Author: Lukas Tönne
Date:   Sun Aug 24 15:43:41 2014 +0200
Branches: hair_system
https://developer.blender.org/rBd02b9326a7c68ada7463f96033f35765bd858cbd

Simple volume instance owned by the hair solver.

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

M	source/blender/hair/intern/HAIR_solver.cpp
M	source/blender/hair/intern/HAIR_solver.h

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

diff --git a/source/blender/hair/intern/HAIR_solver.cpp b/source/blender/hair/intern/HAIR_solver.cpp
index bb64efd..d60ef00 100644
--- a/source/blender/hair/intern/HAIR_solver.cpp
+++ b/source/blender/hair/intern/HAIR_solver.cpp
@@ -719,6 +719,9 @@ void Solver::step_threaded(float time, float timestep)
 		}
 	}
 	
+	// XXX TODO
+	m_volume.resize(10, 10, 10);
+	
 	create_step_tasks(time, timestep, contacts);
 	
 	advance_state(m_data);
diff --git a/source/blender/hair/intern/HAIR_solver.h b/source/blender/hair/intern/HAIR_solver.h
index a5f5cc5..de8922a 100644
--- a/source/blender/hair/intern/HAIR_solver.h
+++ b/source/blender/hair/intern/HAIR_solver.h
@@ -37,6 +37,7 @@ extern "C" {
 
 #include "HAIR_curve.h"
 #include "HAIR_memalloc.h"
+#include "HAIR_volume.h"
 
 struct rbDynamicsWorld;
 struct rbGhostObject;
@@ -159,6 +160,8 @@ public:
 	
 	SolverForces &forces() { return m_forces; }
 	
+	Volume &volume() { return m_volume; }
+	
 	void set_data(SolverData *data);
 	void free_data();
 	SolverData *data() const { return m_data; }
@@ -176,6 +179,7 @@ private:
 	HairParams m_params;
 	SolverForces m_forces;
 	SolverData *m_data;
+	Volume m_volume;
 
 	HAIR_CXX_CLASS_ALLOC(Solver)
 };