[Bf-blender-cvs] [aad1c61] alembic_pointcache: Removed unused deprecated functions for cache library.

Lukas Tönne noreply at git.blender.org
Tue Mar 17 16:39:28 CET 2015


Commit: aad1c616caccba9a663877ae55c63ff97891bc76
Author: Lukas Tönne
Date:   Tue Mar 17 16:33:00 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rBaad1c616caccba9a663877ae55c63ff97891bc76

Removed unused deprecated functions for cache library.

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

M	source/blender/blenkernel/BKE_cache_library.h
M	source/blender/blenkernel/intern/cache_library.c

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

diff --git a/source/blender/blenkernel/BKE_cache_library.h b/source/blender/blenkernel/BKE_cache_library.h
index 4baf5c0..4496721 100644
--- a/source/blender/blenkernel/BKE_cache_library.h
+++ b/source/blender/blenkernel/BKE_cache_library.h
@@ -98,40 +98,8 @@ void BKE_cache_library_group_update(struct Main *bmain, struct CacheLibrary *cac
 bool BKE_cache_archive_path_test(const char *path, ID *id, Library *lib);
 void BKE_cache_archive_path(const char *path, ID *id, Library *lib, char *result, int max);
 
-/* temporary list of writers for CacheLibrary */
-typedef struct CacheLibraryWriterLink {
-	struct CacheLibraryWriterLink *next, *prev;
-	
-	struct PTCWriter *writer;
-	
-	struct Object *ob; /* optional: object to construct render DM */
-} CacheLibraryWriterLink;
-
-void BKE_cache_library_writers(struct Main *bmain, struct CacheLibrary *cachelib, struct Scene *scene, struct DerivedMesh **render_dm_ptr, struct ListBase *writers);
-struct PTCWriterArchive *BKE_cache_library_writers_open_archive(struct Scene *scene, struct CacheLibrary *cachelib, struct ListBase *writers);
-void BKE_cache_library_writers_free(struct PTCWriterArchive *archive, struct ListBase *writers);
-
 void BKE_cache_library_dag_recalc_tag(struct EvaluationContext *eval_ctx, struct Main *bmain);
 
-eCacheReadSampleResult BKE_cache_library_read_derived_mesh(struct Scene *scene, float frame, struct CacheLibrary *cachelib, struct Object *ob, struct DerivedMesh **r_dm);
-eCacheReadSampleResult BKE_cache_library_read_hair_dynamics(struct Scene *scene, float frame, struct CacheLibrary *cachelib, struct Object *ob, struct ParticleSystem *psys);
-eCacheReadSampleResult BKE_cache_library_read_particles(struct Scene *scene, float frame, struct CacheLibrary *cachelib, struct Object *ob, struct ParticleSystem *psys);
-eCacheReadSampleResult BKE_cache_library_read_particles_pathcache_parents(struct Scene *scene, float frame, struct CacheLibrary *cachelib, struct Object *ob, struct ParticleSystem *psys);
-eCacheReadSampleResult BKE_cache_library_read_particles_pathcache_children(struct Scene *scene, float frame, struct CacheLibrary *cachelib, struct Object *ob, struct ParticleSystem *psys);
-
-bool BKE_cache_read_derived_mesh(struct Main *bmain, struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode,
-                                 struct Object *ob, struct DerivedMesh **r_dm);
-bool BKE_cache_read_cloth(struct Main *bmain, struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode,
-                          struct Object *ob, struct ClothModifierData *clmd);
-bool BKE_cache_read_hair_dynamics(struct Main *bmain, struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode,
-                                  struct Object *ob, struct ParticleSystem *psys);
-bool BKE_cache_read_particles(struct Main *bmain, struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode,
-                              struct Object *ob, struct ParticleSystem *psys);
-bool BKE_cache_read_particles_pathcache_parents(struct Main *bmain, struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode,
-                                                struct Object *ob, struct ParticleSystem *psys);
-bool BKE_cache_read_particles_pathcache_children(struct Main *bmain, struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode,
-                                                 struct Object *ob, struct ParticleSystem *psys);
-
 bool BKE_cache_test_dupligroup(struct Main *bmain, eCacheLibrary_EvalMode eval_mode, struct Group *dupgroup);
 bool BKE_cache_read_dupligroup(struct Main *bmain, struct Scene *scene, float frame, eCacheLibrary_EvalMode eval_mode, struct Group *dupgroup, struct DupliCache *dupcache);
 
diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index b0c82ba..57d4e96 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -648,476 +648,6 @@ void BKE_cache_archive_path(const char *path, ID *id, Library *lib, char *result
 }
 
 
-static void tag_dupligroup_recursive(Main *bmain, Group *group)
-{
-	GroupObject *gob;
-	
-	if (!(group->id.flag & LIB_DOIT)) {
-		group->id.flag |= LIB_DOIT;
-		
-		for (gob = group->gobject.first; gob; gob = gob->next) {
-			Object *ob = gob->ob;
-			if (!(ob->id.flag & LIB_DOIT)) {
-				ob->id.flag |= LIB_DOIT;
-				
-				if ((ob->transflag & OB_DUPLIGROUP) && ob->dup_group)
-					tag_dupligroup_recursive(bmain, ob->dup_group);
-			}
-		}
-	}
-}
-
-static void cachelib_add_writer(ListBase *writers, struct PTCWriter *writer, struct Object *ob)
-{
-	if (writer) {
-		CacheLibraryWriterLink *link = MEM_callocN(sizeof(CacheLibraryWriterLink), "cachelib writers link");
-		
-		link->writer = writer;
-		link->ob = ob;
-		BLI_addtail(writers, link);
-	}
-}
-
-#if 0
-static int cachelib_writers_cmp(const void *a, const void *b)
-{
-	const CacheLibraryWriterLink *la = a, *lb = b;
-	return la->ob > lb->ob;
-}
-#endif
-
-#if 0
-BLI_INLINE int cache_required_mode(CacheLibrary *cachelib)
-{
-	switch (cachelib->eval_mode) {
-		case CACHE_LIBRARY_EVAL_RENDER : return eModifierMode_Render;
-		case CACHE_LIBRARY_EVAL_VIEWPORT : return eModifierMode_Realtime;
-	}
-	return 0;
-}
-#endif
-
-static void cache_library_object_writers(CacheLibrary *cachelib, Scene *scene, DerivedMesh **render_dm_ptr, ListBase *writers, Object *ob)
-{
-	const eCacheLibrary_EvalMode eval_mode = cachelib->eval_mode;
-	CacheItem *item;
-	char name[2*MAX_NAME];
-	
-	if ((item = BKE_cache_library_find_item(cachelib, ob, CACHE_TYPE_OBJECT, -1))) {
-		cachelib_add_writer(writers, PTC_writer_object(ob->id.name, ob), ob);
-	}
-	
-	if ((item = BKE_cache_library_find_item(cachelib, ob, CACHE_TYPE_DERIVED_MESH, -1))) {
-		BKE_cache_item_name(item->ob, item->type, item->index, name);
-		
-		if (ob->type == OB_MESH) {
-			switch (eval_mode) {
-				case CACHE_LIBRARY_EVAL_VIEWPORT:
-					cachelib_add_writer(writers, PTC_writer_derived_final_realtime(name, ob), ob);
-					break;
-				case CACHE_LIBRARY_EVAL_RENDER:
-					cachelib_add_writer(writers, PTC_writer_derived_final_render(name, scene, ob, render_dm_ptr), ob);
-					break;
-			}
-		}
-	}
-}
-
-void BKE_cache_library_writers(Main *bmain, CacheLibrary *cachelib, Scene *scene, DerivedMesh **render_dm_ptr, ListBase *writers)
-{
-	Group *cache_group = cachelib->group;
-	
-	BLI_listbase_clear(writers);
-	
-	if (!cache_group)
-		return;
-	
-	/* clear tags */
-	BKE_main_id_tag_idcode(bmain, ID_OB, false);
-	BKE_main_id_tag_idcode(bmain, ID_GR, false);
-	
-	/* tag dupligroups recursively */
-	tag_dupligroup_recursive(bmain, cache_group);
-	
-	/* create object writers */
-	{
-		Object *ob;
-		for (ob = bmain->object.first; ob; ob = ob->id.next) {
-			if (!(ob->id.flag & LIB_DOIT))
-				continue;
-			
-			cache_library_object_writers(cachelib, scene, render_dm_ptr, writers, ob);
-		}
-	}
-	
-	/* create group writers */
-	{
-		Group *group;
-		for (group = bmain->group.first; group; group = group->id.next) {
-			if (!(group->id.flag & LIB_DOIT))
-				continue;
-			
-			/* Note: we don't explicitly enable groups as cache items.
-			 * They only store a list of object references which does not contain much data
-			 * and contains only objects that are themselves enabled.
-			 */
-			cachelib_add_writer(writers, PTC_writer_group(group->id.name, group), NULL);
-		}
-	}
-	
-#if 0
-	for (item = cachelib->items.first; item; item = item->next) {
-		char name[2*MAX_NAME];
-		
-		if (!item->ob || !(item->flag & CACHE_ITEM_ENABLED))
-			continue;
-		
-		BKE_cache_item_name(item->ob, item->type, item->index, name);
-		
-		switch (item->type) {
-			case CACHE_TYPE_DERIVED_MESH: {
-				if (item->ob->type == OB_MESH) {
-					CacheModifierData *cachemd = (CacheModifierData *)mesh_find_cache_modifier(scene, item->ob, required_mode);
-					if (cachemd) {
-						switch (eval_mode) {
-							case CACHE_LIBRARY_EVAL_VIEWPORT:
-								cachelib_add_writer(writers, item, PTC_writer_cache_modifier_realtime(name, item->ob, cachemd));
-								break;
-							case CACHE_LIBRARY_EVAL_RENDER:
-								cachelib_add_writer(writers, item, PTC_writer_cache_modifier_render(name, scene, item->ob, cachemd));
-								break;
-						}
-					}
-					else {
-						switch (eval_mode) {
-							case CACHE_LIBRARY_EVAL_VIEWPORT:
-								cachelib_add_writer(writers, item, PTC_writer_derived_final_realtime(name, item->ob));
-								break;
-							case CACHE_LIBRARY_EVAL_RENDER:
-								cachelib_add_writer(writers, item, PTC_writer_derived_final_render(name, scene, item->ob, render_dm_ptr));
-								break;
-						}
-					}
-				}
-				break;
-			}
-			case CACHE_TYPE_HAIR: {
-				ParticleSystem *psys = (ParticleSystem *)BLI_findlink(&item->ob->particlesystem, item->index);
-				if (psys && psys->part && psys->part->type == PART_HAIR && psys->clmd) {
-					cachelib_add_writer(writers, item, PTC_writer_hair_dynamics(name, item->ob, psys));
-				}
-				break;
-			}
-			case CACHE_TYPE_HAIR_PATHS: {
-				ParticleSystem *psys = (ParticleSystem *)BLI_findlink(&item->ob->particlesystem, item->index);
-				if (psys && psys->part && psys->part->type == PART_HAIR) {
-					cachelib_add_writer(writers, item, PTC_writer_particles_pathcache_parents(name, item->ob, psys));
-					cachelib_add_writer(writers, item, PTC_writer_particles_pathcache_children(name, item->ob, psys));
-				}
-				break;
-			}
-			case CACHE_TYPE_PARTICLES: {
-				ParticleSystem *psys = (ParticleSystem *)BLI_findlink(&item->ob->particlesystem, item->index);
-				if (psys && psys->part && psys->part->type != PART_HAIR) {
-					cachelib_add_writer(writers, item, PTC_writer_particles(name, item->ob, psys));
-				}
-				break;
-			}
-			default:
-				break;
-		}
-	}
-	
-	/* Sort writers by their object.
-	 * This is necessary so objects can be evaluated with render settings
-	 * and all cached items exported, without having to reevaluate the same object multiple times.
-	 */
-	BLI_listbase_sort(writers, cachelib_writers_cmp);
-#endif
-}
-
-struct PTCWriterArchive *BKE_cache_library_writers_open_archive(Scene *scene, CacheLibrary *cachelib, ListBase *writers)
-{
-	char filename[FILE_MAX];
-	struct PTCWriter

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list