Revision: 21050
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21050
Author: jhk
Date: 2009-06-21 12:16:52 +0200 (Sun, 21 Jun 2009)
Log Message:
-----------
Pointcache refresh part 1:
* Particles support larger than 1 frame changes, bigger frame changes can
result in inaccurate results, but it's super fast and you get a nice feeling of
how the particles behave!
* "Cache to current frame" button calculates the exact result of particles at
current frame.
* Current state of cache can be protected by making it a bake.
* Cache is now in memory by default, disk cache is an option.
* Only "viewport %" number of particles are calculated and cached in viewport,
baking and rendering calculate all particles.
* Info on cached frames and memory usage given in ui.
* Support for exact "autocaching" of changes and large frame changes(disabled
for now until exact place in event system is decided)
* "Continue physics" is probably deprecated after this and should be removed
once sb & cloth use the new cache code.
Todo:
* Make softbody & cloth use the new cache things.
Other changes:
* Some cleanup of particle buttons.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_particle.py
branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/makesdna/DNA_object_force.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object_force.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_particle.c
branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/include/ED_pointcache.h
branches/blender2.5/blender/source/blender/editors/physics/ed_pointcache.c
Modified: branches/blender2.5/blender/release/ui/buttons_particle.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_particle.py 2009-06-21
04:07:01 UTC (rev 21049)
+++ branches/blender2.5/blender/release/ui/buttons_particle.py 2009-06-21
10:16:52 UTC (rev 21050)
@@ -34,12 +34,8 @@
if psys:
split.template_ID(context, psys, "settings")
- #if ob:
- # split.itemR(ob, "active_particle_system_index",
text="Active")
-
if psys:
#row = layout.row()
- #row.itemL(text="Particle system datablock")
#row.itemL(text="Viewport")
#row.itemL(text="Render")
@@ -49,56 +45,27 @@
if ptype not in ('EMITTER', 'REACTOR', 'HAIR'):
layout.itemL(text="No settings for fluid
particles")
return
+
+ split = layout.split(percentage=0.65)
- row = layout.row()
- row.enabled = particle_panel_enabled(psys)
- row.itemR(part, "type")
- row.itemR(psys, "seed")
+ split.enabled = particle_panel_enabled(psys)
+ split.itemR(part, "type")
+ split.itemR(psys, "seed")
- row = layout.row()
+ split = layout.split(percentage=0.65)
if part.type=='HAIR':
if psys.editable==True:
- row.itemO("PARTICLE_OT_editable_set",
text="Free Edit")
+ split.itemO("PARTICLE_OT_editable_set",
text="Free Edit")
else:
- row.itemO("PARTICLE_OT_editable_set",
text="Make Editable")
- subrow = row.row()
- subrow.enabled = particle_panel_enabled(psys)
- subrow.itemR(part, "hair_step")
+ split.itemO("PARTICLE_OT_editable_set",
text="Make Editable")
+ row = split.row()
+ row.enabled = particle_panel_enabled(psys)
+ row.itemR(part, "hair_step")
elif part.type=='REACTOR':
- row.itemR(psys, "reactor_target_object")
- row.itemR(psys,
"reactor_target_particle_system", text="Particle System")
+ split.enabled = particle_panel_enabled(psys)
+ split.itemR(psys, "reactor_target_object")
+ split.itemR(psys,
"reactor_target_particle_system", text="Particle System")
- if psys:
- #row = layout.row()
- #row.itemL(text="Particle system datablock")
- #row.itemL(text="Viewport")
- #row.itemL(text="Render")
-
- part = psys.settings
- ptype = psys.settings.type
-
- if ptype not in ('EMITTER', 'REACTOR', 'HAIR'):
- layout.itemL(text="No settings for fluid
particles")
- return
-
- row = layout.row()
- row.enabled = particle_panel_enabled(psys)
- row.itemR(part, "type", expand=True)
-
-
- row = layout.row()
- if part.type=='HAIR':
- if psys.editable==True:
- row.itemO("PARTICLE_OT_editable_set",
text="Free Edit")
- else:
- row.itemO("PARTICLE_OT_editable_set",
text="Make Editable")
- subrow = row.row()
- subrow.enabled = particle_panel_enabled(psys)
- subrow.itemR(part, "hair_step")
- elif part.type=='REACTOR':
- row.itemR(psys, "reactor_target_object")
- row.itemR(psys,
"reactor_target_particle_system", text="Particle System")
-
class PARTICLE_PT_emission(ParticleButtonsPanel):
__idname__= "PARTICLE_PT_emission"
__label__ = "Emission"
@@ -112,9 +79,7 @@
layout.enabled = particle_panel_enabled(psys)
row = layout.row()
- #col.itemL(text="TODO: Rate instead of amount")
row.itemR(part, "amount")
- row.itemR(psys, "seed")
split = layout.split()
@@ -150,6 +115,7 @@
class PARTICLE_PT_cache(ParticleButtonsPanel):
__idname__= "PARTICLE_PT_cache"
__label__ = "Cache"
+ __default_closed__ = True
def poll(self, context):
psys = context.particle_system
@@ -163,15 +129,35 @@
part = psys.settings
cache = psys.point_cache
- #if cache.baked==True:
- #layout.itemO("PARTICLE_OT_free_bake", text="BAKE")
- #else:
row = layout.row()
- #row.itemO("PARTICLE_OT_bake", text="BAKE")
- row.itemR(cache, "start_frame")
- row.itemR(cache, "end_frame")
+ row.itemR(cache, "name", text="")
+ if cache.outdated:
+ row.itemL(text="Cache is outdated.")
+ else:
+ row.itemL(text="")
+
+ row = layout.row()
+
+ if cache.baked == True:
+ row.itemO("PTCACHE_OT_free_bake_particle_system",
text="Free Bake")
+ else:
+ row.item_booleanO("PTCACHE_OT_cache_particle_system",
"bake", True, text="Bake")
- #layout.row().itemL(text="No simulation frames in disk
cache.")
+ row = layout.row()
+ row.enabled = particle_panel_enabled(psys)
+ row.itemO("PTCACHE_OT_bake_from_particles_cache", text="Current
Cache to Bake")
+ if cache.autocache == 0:
+ row.itemO("PTCACHE_OT_cache_particle_system",
text="Cache to Current Frame")
+
+ row = layout.row()
+ row.enabled = particle_panel_enabled(psys)
+ #row.itemR(cache, "autocache")
+ row.itemR(cache, "disk_cache")
+ row.itemL(text=cache.info)
+
+ # for particles these are figured out automatically
+ #row.itemR(cache, "start_frame")
+ #row.itemR(cache, "end_frame")
class PARTICLE_PT_initial(ParticleButtonsPanel):
__idname__= "PARTICLE_PT_initial"
@@ -184,8 +170,6 @@
part = psys.settings
layout.enabled = particle_panel_enabled(psys)
-
- #layout.row().itemL(text="")
layout.row().itemL(text="Direction:")
@@ -362,27 +346,14 @@
row = layout.row()
col = row.column()
-
-# subrow = col.row()
-# subrow.active = part.render_strand == False
-# subrow.itemR(part, "render_adaptive")
-# col = row.column(align=True)
-# subrow = col.row()
-# subrow.active = part.render_adaptive or
part.render_strand == True
-# subrow.itemR(part, "adaptive_angle")
-# subrow = col.row()
-# subrow.active = part.render_adaptive == True and
part.render_strand == False
-# subrow.itemR(part, "adaptive_pix")
-
if part.type=='HAIR' and part.render_strand==True and
part.child_type=='FACES':
layout.itemR(part, "enable_simplify")
if part.enable_simplify==True:
- box = layout.box()
- row = box.row()
+ row = layout.row()
row.itemR(part, "simplify_refsize")
row.itemR(part, "simplify_rate")
row.itemR(part, "simplify_transition")
- row = box.row()
+ row = layout.row()
row.itemR(part, "viewport")
subrow = row.row()
subrow.active = part.viewport==True
@@ -438,6 +409,7 @@
class PARTICLE_PT_draw(ParticleButtonsPanel):
__idname__= "PARTICLE_PT_draw"
__label__ = "Display"
+ __default_closed__ = True
def poll(self, context):
return (context.particle_system != None)
@@ -490,6 +462,7 @@
class PARTICLE_PT_children(ParticleButtonsPanel):
__idname__= "PARTICLE_PT_children"
__label__ = "Children"
+ __default_closed__ = True
def draw(self, context):
layout = self.layout
@@ -557,6 +530,7 @@
class PARTICLE_PT_vertexgroups(ParticleButtonsPanel):
__idname__= "PARTICLE_PT_vertexgroups"
__label__ = "Vertexgroups"
+ __default_closed__ = True
def draw(self, context):
layout = self.layout
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
2009-06-21 04:07:01 UTC (rev 21049)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
2009-06-21 10:16:52 UTC (rev 21050)
@@ -217,6 +217,7 @@
struct ParticleSystem *psys_get_current(struct Object *ob);
short psys_get_current_num(struct Object *ob);
+struct Object *psys_find_object(struct Scene *scene, struct ParticleSystem
*psys);
//struct ParticleSystem *psys_get(struct Object *ob, int index);
struct ParticleData *psys_get_selected_particle(struct ParticleSystem *psys,
int *index);
struct ParticleKey *psys_get_selected_key(struct ParticleSystem *psys, int
pa_index, int *key_index);
@@ -251,6 +252,7 @@
struct ParticleSettings *psys_new_settings(char *name, struct Main *main);
struct ParticleSettings *psys_copy_settings(struct ParticleSettings *part);
+int psys_count_autocache(struct Scene *scene, struct ParticleSettings *part);
void psys_flush_particle_settings(struct Scene *scene, struct ParticleSettings
*part, int recalc);
void make_local_particlesettings(struct ParticleSettings *part);
@@ -290,10 +292,13 @@
void psys_init_effectors(struct Scene *scene, struct Object *obsrc, struct
Group *group, struct ParticleSystem *psys);
void psys_end_effectors(struct ParticleSystem *psys);
+void psys_get_pointcache_start_end(struct Scene *scene, struct ParticleSystem
*psys, int *sfra, int *efra);
+
void particle_system_update(struct Scene *scene, struct Object *ob, struct
ParticleSystem *psys);
/* ----------- functions needed only inside particlesystem ------------ */
/* particle.c */
+void psys_interpolate_particle(short type, struct ParticleKey keys[4], float
dt, struct ParticleKey *result, int velocity);
void psys_key_to_object(struct Object *ob, struct ParticleKey *key, float
imat[][4]);
//void psys_key_to_geometry(struct DerivedMesh *dm, struct ParticleData *pa,
struct ParticleKey *key);
//void psys_key_from_geometry(struct DerivedMesh *dm, struct ParticleData *pa,
struct ParticleKey *key);
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
2009-06-21 04:07:01 UTC (rev 21049)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
2009-06-21 10:16:52 UTC (rev 21050)
@@ -31,6 +31,8 @@
#include "DNA_ID.h"
+#include "MEM_guardedalloc.h"
+
/* Point cache clearing option, for BKE_ptcache_id_clear, before
* and after are non inclusive (they wont remove the cfra) */
#define PTCACHE_CLEAR_ALL 0
@@ -42,6 +44,7 @@
#define PTCACHE_RESET_DEPSGRAPH 0
#define PTCACHE_RESET_BAKED 1
#define PTCACHE_RESET_OUTDATED 2
+#define PTCACHE_RESET_FREE 3
/* Add the blendfile name after blendcache_ */
#define PTCACHE_EXT ".bphys"
@@ -56,6 +59,11 @@
#define PTCACHE_TYPE_PARTICLES 1
#define PTCACHE_TYPE_CLOTH 2
+/* PTCache read return code */
+#define PTCACHE_READ_EXACT 1
+#define PTCACHE_READ_INTERPOLATED 2
+#define PTCACHE_READ_OLD 3
+
/* Structs */
struct Object;
struct Scene;
@@ -80,6 +88,41 @@
struct PointCache *cache;
} PTCacheID;
+typedef struct PTCacheWriter {
+ struct PTCacheID *pid;
+ int cfra;
+ int totelem;
+
+ float *(*elem_ptr)(int index, void *calldata);
+ void *calldata;
+} PTCacheWriter;
+
+typedef struct PTCacheReader {
+ struct Scene *scene;
+ struct PTCacheID *pid;
+ float cfra;
+ int totelem;
+
+ void (*set_elem)(int index, void *calldata, float *data);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
