Commit: 32f4fb952a84bd31870856b1810b46a300ea705a
Author: Bastien Montagne
Date: Sun Mar 1 11:05:40 2015 +0100
Branches: asset-engine
https://developer.blender.org/rB32f4fb952a84bd31870856b1810b46a300ea705a
Cleanup - remove big commented blocks from renderengine initial copy/paste.
===================================================================
M source/blender/blenkernel/BKE_asset.h
M source/blender/blenkernel/intern/asset.c
M source/blender/makesrna/intern/rna_asset.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_asset.h
b/source/blender/blenkernel/BKE_asset.h
index 9c43561..e4726cd 100644
--- a/source/blender/blenkernel/BKE_asset.h
+++ b/source/blender/blenkernel/BKE_asset.h
@@ -45,51 +45,6 @@ struct uiLayout;
#include "DNA_space_types.h"
-#if 0
-#include "DNA_scene_types.h"
-#include "RE_bake.h"
-#include "RNA_types.h"
-
-
-struct bNode;
-struct bNodeTree;
-struct Object;
-struct Render;
-struct RenderData;
-struct RenderLayer;
-struct RenderResult;
-struct ReportList;
-struct Scene;
-struct BakePixel;
-
-/* External Engine */
-
-/* RenderEngineType.flag */
-#define RE_INTERNAL 1
-#define RE_GAME 2
-#define RE_USE_PREVIEW 4
-#define RE_USE_POSTPROCESS 8
-#define RE_USE_SHADING_NODES 16
-#define RE_USE_EXCLUDE_LAYERS 32
-#define RE_USE_SAVE_BUFFERS 64
-#define RE_USE_TEXTURE_PREVIEW 128
-
-/* RenderEngine.flag */
-#define RE_ENGINE_ANIMATION 1
-#define RE_ENGINE_PREVIEW 2
-#define RE_ENGINE_DO_DRAW 4
-#define RE_ENGINE_DO_UPDATE 8
-#define RE_ENGINE_RENDERING 16
-#define RE_ENGINE_HIGHLIGHT_TILES 32
-#define RE_ENGINE_USED_FOR_VIEWPORT 64
-
-/* RenderEngine.update_flag, used by internal now */
-#define RE_ENGINE_UPDATE_MA 1
-#define RE_ENGINE_UPDATE_OTHER 2
-#define RE_ENGINE_UPDATE_DATABASE 4
-
-#endif
-
enum {
AE_STATUS_VALID = 1 << 0,
AE_STATUS_RUNNING = 1 << 1, /* Asset engine is performing some
background tasks... */
@@ -176,32 +131,6 @@ AssetEngineType *BKE_asset_engines_find(const char
*idname);
AssetEngine *BKE_asset_engine_create(AssetEngineType *type);
void BKE_asset_engine_free(AssetEngine *engine);
-#if 0
-void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList
*reports, const char *filename, int x, int y);
-void RE_result_load_from_file(struct RenderResult *result, struct ReportList
*reports, const char *filename);
-
-struct RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int
y, int w, int h, const char *layername);
-void RE_engine_update_result(RenderEngine *engine, struct RenderResult
*result);
-void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result,
int cancel, int merge_results);
-
-int RE_engine_test_break(RenderEngine *engine);
-void RE_engine_update_stats(RenderEngine *engine, const char *stats, const
char *info);
-void RE_engine_update_progress(RenderEngine *engine, float progress);
-void RE_engine_update_memory_stats(RenderEngine *engine, float mem_used, float
mem_peak);
-void RE_engine_report(RenderEngine *engine, int type, const char *msg);
-void RE_engine_set_error_message(RenderEngine *engine, const char *msg);
-
-int RE_engine_render(struct Render *re, int do_all);
-
-bool RE_engine_is_external(struct Render *re);
-
-void RE_engine_frame_set(struct RenderEngine *engine, int frame, float
subframe);
-
-void RE_engine_get_current_tiles(struct Render *re, int *total_tiles_r, rcti
**tiles_r);
-struct RenderData *RE_engine_get_render_data(struct Render *re);
-void RE_bake_engine_set_engine_parameters(struct Render *re, struct Main
*bmain, struct Scene *scene);
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/source/blender/blenkernel/intern/asset.c
b/source/blender/blenkernel/intern/asset.c
index cc93a4f..c16b601 100644
--- a/source/blender/blenkernel/intern/asset.c
+++ b/source/blender/blenkernel/intern/asset.c
@@ -120,544 +120,3 @@ void BKE_asset_engine_free(AssetEngine *engine)
MEM_freeN(engine);
}
-
-#if 0
-bool RE_engine_is_external(Render *re)
-{
- RenderEngineType *type = RE_engines_find(re->r.engine);
- return (type && type->render);
-}
-
-/* Render Results */
-
-static RenderPart *get_part_from_result(Render *re, RenderResult *result)
-{
- RenderPart *pa;
-
- for (pa = re->parts.first; pa; pa = pa->next) {
- if (result->tilerect.xmin == pa->disprect.xmin -
re->disprect.xmin &&
- result->tilerect.ymin == pa->disprect.ymin -
re->disprect.ymin &&
- result->tilerect.xmax == pa->disprect.xmax -
re->disprect.xmin &&
- result->tilerect.ymax == pa->disprect.ymax -
re->disprect.ymin)
- {
- return pa;
- }
- }
-
- return NULL;
-}
-
-RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int
w, int h, const char *layername)
-{
- Render *re = engine->re;
- RenderResult *result;
- rcti disprect;
-
- /* ensure the coordinates are within the right limits */
- CLAMP(x, 0, re->result->rectx);
- CLAMP(y, 0, re->result->recty);
- CLAMP(w, 0, re->result->rectx);
- CLAMP(h, 0, re->result->recty);
-
- if (x + w > re->result->rectx)
- w = re->result->rectx - x;
- if (y + h > re->result->recty)
- h = re->result->recty - y;
-
- /* allocate a render result */
- disprect.xmin = x;
- disprect.xmax = x + w;
- disprect.ymin = y;
- disprect.ymax = y + h;
-
- result = render_result_new(re, &disprect, 0, RR_USE_MEM, layername);
-
- /* todo: make this thread safe */
-
- /* can be NULL if we CLAMP the width or height to 0 */
- if (result) {
- RenderPart *pa;
-
- /* Copy EXR tile settings, so pipeline knows whether this is a
result
- * for Save Buffers enabled rendering.
- */
- result->do_exr_tile = re->result->do_exr_tile;
-
- BLI_addtail(&engine->fullresult, result);
-
- result->tilerect.xmin += re->disprect.xmin;
- result->tilerect.xmax += re->disprect.xmin;
- result->tilerect.ymin += re->disprect.ymin;
- result->tilerect.ymax += re->disprect.ymin;
-
- pa = get_part_from_result(re, result);
-
- if (pa)
- pa->status = PART_STATUS_IN_PROGRESS;
- }
-
- return result;
-}
-
-void RE_engine_update_result(RenderEngine *engine, RenderResult *result)
-{
- Render *re = engine->re;
-
- if (result) {
- result->renlay = result->layers.first; /* weak, draws first
layer always */
- re->display_update(re->duh, result, NULL);
- }
-}
-
-void RE_engine_end_result(RenderEngine *engine, RenderResult *result, int
cancel, int merge_results)
-{
- Render *re = engine->re;
-
- if (!result) {
- return;
- }
-
- /* merge. on break, don't merge in result for preview renders, looks
nicer */
- if (!cancel) {
- /* for exr tile render, detect tiles that are done */
- RenderPart *pa = get_part_from_result(re, result);
-
- if (pa) {
- pa->status = PART_STATUS_READY;
- }
- else if (re->result->do_exr_tile) {
- /* if written result does not match any tile and we are
using save
- * buffers, we are going to get openexr save errors */
- fprintf(stderr, "RenderEngine.end_result: dimensions do
not match any OpenEXR tile.\n");
- }
- }
-
- if (!cancel || merge_results) {
- if (re->result->do_exr_tile) {
- if (!cancel) {
- render_result_exr_file_merge(re->result,
result);
- }
- }
- else if (!(re->test_break(re->tbh) && (re->r.scemode &
R_BUTS_PREVIEW)))
- render_result_merge(re->result, result);
-
- /* draw */
- if (!re->test_break(re->tbh)) {
- result->renlay = result->layers.first; /* weak, draws
first layer always */
- re->display_update(re->duh, result, NULL);
- }
- }
-
- /* free */
- BLI_remlink(&engine->fullresult, result);
- render_result_free(result);
-}
-
-/* Cancel */
-
-int RE_engine_test_break(RenderEngine *engine)
-{
- Render *re = engine->re;
-
- if (re)
- return re->test_break(re->tbh);
-
- return 0;
-}
-
-/* Statistics */
-
-void RE_engine_update_stats(RenderEngine *engine, const char *stats, const
char *info)
-{
- Render *re = engine->re;
-
- /* stats draw callback */
- if (re) {
- re->i.statstr = stats;
- re->i.infostr = info;
- re->stats_draw(re->sdh, &re->i);
- re->i.infostr = NULL;
- re->i.statstr = NULL;
- }
-
- /* set engine text */
- engine->text[0] = '\0';
-
- if (stats && stats[0] && info && info[0])
- BLI_snprintf(engine->text, sizeof(engine->text), "%s | %s",
stats, info);
- else if (info && info[0])
- BLI_strncpy(engine->text, info, sizeof(engine->text));
- else if (stats && stats[0])
- BLI_strncpy(engine->text, stats, sizeof(engine->text));
-}
-
-void RE_engine_update_progress(RenderEngine *engine, float progress)
-{
- Render *re = engine->re;
-
- if (re) {
- CLAMP(progress, 0.0f, 1.0f);
- re->progress(re->prh, progress);
- }
-}
-
-void RE_engine_update_memory_stats(RenderEngine *engine, float mem_used, float
mem_peak)
-{
- Render *re = engine->re;
-
- if (re) {
- re->i.mem_used = mem_used;
- re->i.mem_peak = mem_peak;
- }
-}
-
-void RE_engine_report(RenderEngine *engine, int type, const char *msg)
-{
- Render *re = engine->re;
-
- if (re)
- BKE_report(engine->re->reports, type, msg);
- else if (engine->reports)
- BKE_report(engine->reports, type, msg);
-}
-
-void RE_engine_set_error_message(RenderEngine *engine, const char *msg)
-{
- Render *re = engine->re;
- if (re != NULL) {
- RenderResult *rr = RE_AcquireResultRead(re);
- if (rr->error != NULL) {
- MEM_freeN(rr->error);
- }
- rr->error = BLI_strdup(msg);
- RE_ReleaseResult(re);
- }
-}
-
-void RE_engine_get_current_tiles(Render *re, int *total_tiles_r, rcti
**tiles_r)
-{
- RenderPart *pa;
- int total_tiles = 0;
- rcti *tiles = NULL;
- int allocation_size = 0, allocation_step = BLENDER_MAX_THREADS;
-
- if (re->engine && (re->engine->flag & RE_ENGINE_HIGHLIGHT_TILES) == 0) {
- *total_tiles_r = 0;
- *tiles_r = NULL;
- return;
- }
-
- for (pa = re->parts.first; pa; pa = pa->next) {
- if (pa->status == PART_STATUS_IN_PROGRESS) {
- if (total_tiles >= allocation_size) {
- if (tiles == NULL)
- tiles = MEM_mallocN(allocation_step *
sizeof(rcti), "current engine tiles");
- else
- tiles = MEM_reallocN(tiles,
(total_tiles + allocation_step) * sizeof(rcti));
-
- allocation_size += allocation_step;
- }
-
- tiles[total_tiles] = pa->disprect;
-
- if (pa->crop) {
- tiles[total_tiles].xmin += pa->crop;
- tiles[total_tiles].ymin += pa->crop;
- tiles[total_tiles].xmax -= pa->crop;
- tiles[total_tiles].ymax -= pa->crop;
- }
-
- total_tiles++;
- }
- }
-
- *total_tiles_r = total_tiles;
- *tiles_r = tiles;
-}
-
-RenderData *RE_engine_get_render_data(Render *re)
-{
- return &re->r;
-}
-
-/* Bake */
-void RE_bake_engine_set_engine_parameters(Render *re, Main *bmain, Scene
*scene)
-{
- re->scene = scene;
- re->main = bmain;
- re->r = scene->r;
-
- /* prevent crash when freeing the scene
- * but it potentially leaves unfreed memory blocks
- * not sure how to fix this yet -- dfelinto */
- BLI_listbase_clear(&re->r.layers);
-}
-
-bool RE_bake_
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
