Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-03-25 09:27:25 +0300
committerMatt Ebb <matt@mke3.net>2010-03-25 09:27:25 +0300
commit33f880e8666e9bb0ed954fccb82bc23255a97868 (patch)
treec7b5e5283efd2540982d99917551e3a585b59720 /source/blender/makesrna/intern/rna_object.c
parent5bcca8206e3397b6d1a31e278a4e4bad9051e68f (diff)
Restored Fluid Sim baking
This commit restores fluid sim baking functionality in 2.5, it's been on the todo for a while, and was previously almost completely non-functional. The old code was quite complicated and specific to the 2.4 animation system, so I've pretty much rewritten most of it. This includes: * Animated variables work again - just key them in the UI. Non-animateable values should be already set non-animateable in RNA, hopefully I got them all. Available are: Domain Gravity / Domain Viscosity / Object loc/rot/scale / Object initial velocity / Deforming meshes / Fluid control Attract strength / Fluid control Attract radius / Fluid control Velocity strength / Fluid control Velocity radius / Object Active status (checkbox next to fluid type) The Domain time scale is still not yet implemented. * Fluid sim now use global scene units data by default - when enabled, the scene's global gravity value is used and when units are set (metric/imperial) the simulation real world size is taken from the object's actual measurements. * The baking process is now done in the background, using the nifty threaded Jobs system. It's non-blocking and your domain object will show the simulated fluid as it becomes available for that frame. A nice extra thing for the future would be to improve the visualisation of the object's state while baking, and also the jobs system/ui could do with some touchups - currently it has to share a bit from the 'render' job, and appears as 'Render' in the header. Progress bars for jobs in the header would be great too.
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r--source/blender/makesrna/intern/rna_object.c32
1 files changed, 2 insertions, 30 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 86767342586..3823af25619 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -579,41 +579,13 @@ static void rna_Object_rotation_mode_set(PointerRNA *ptr, int value)
static void rna_Object_dimensions_get(PointerRNA *ptr, float *value)
{
Object *ob= ptr->data;
- BoundBox *bb = NULL;
-
- bb= object_get_boundbox(ob);
- if (bb) {
- float scale[3];
-
- mat4_to_size( scale,ob->obmat);
-
- value[0] = fabs(scale[0]) * (bb->vec[4][0] - bb->vec[0][0]);
- value[1] = fabs(scale[1]) * (bb->vec[2][1] - bb->vec[0][1]);
- value[2] = fabs(scale[2]) * (bb->vec[1][2] - bb->vec[0][2]);
- } else {
- value[0] = value[1] = value[2] = 0.f;
- }
+ object_get_dimensions(ob, value);
}
static void rna_Object_dimensions_set(PointerRNA *ptr, const float *value)
{
Object *ob= ptr->data;
- BoundBox *bb = NULL;
-
- bb= object_get_boundbox(ob);
- if (bb) {
- float scale[3], len[3];
-
- mat4_to_size( scale,ob->obmat);
-
- len[0] = bb->vec[4][0] - bb->vec[0][0];
- len[1] = bb->vec[2][1] - bb->vec[0][1];
- len[2] = bb->vec[1][2] - bb->vec[0][2];
-
- if (len[0] > 0.f) ob->size[0] = value[0] / len[0];
- if (len[1] > 0.f) ob->size[1] = value[1] / len[1];
- if (len[2] > 0.f) ob->size[2] = value[2] / len[2];
- }
+ object_set_dimensions(ob, value);
}
static int rna_Object_location_editable(PointerRNA *ptr, int index)