[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56099] trunk/blender/source/blender: Blender Internal Render in viewport
Ton Roosendaal
ton at blender.org
Tue Apr 16 19:39:20 CEST 2013
Revision: 56099
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56099
Author: ton
Date: 2013-04-16 17:39:20 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Blender Internal Render in viewport
Because of our release soon, feature has been added behind the Debug Menu.
CTRL+ALT+D and set it to -1. Or commandline --debug-value -1.
When debug set to -1, you can put the viewport to 'render' mode, just like
for Cycles. Notes for testers: (and please no bugs in tracker for this :)
- It renders without AA, MBlur, Panorama, Sequence, Composite
- Only active render layer gets rendered. Select another layer will re-render.
- But yes: it works for FreeStyle renders!
- Also does great for local view.
- BI is not well suited for incremental renders on view changes. This only
works for non-raytrace scenes, or zoom in ortho or camera mode, or for
Material changes. In most cases a full re-render is being done.
- ESC works to stop the preview render.
- Borders render as well. (CTRL+B)
- Force a refresh with arrow key left/right. A lot of settings don't trigger
re-render yet.
Tech notes:
- FreeStyle is adding a lot of temp objects/meshes in the Main database. This
caused DepsGraph to trigger changes (and redraws). I've prepended the names
for these temp objects with char number 27 (ESC), and made these names be
ignored for tag update checking.
- Fixed some bugs that were noticable with such excessive re-renders, like
for opening file window, quit during renders.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenlib/BLI_math_matrix.h
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/include/ED_render.h
trunk/blender/source/blender/editors/render/render_intern.h
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/render/render_update.c
trunk/blender/source/blender/editors/space_api/spacetypes.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
trunk/blender/source/blender/render/extern/include/RE_engine.h
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/include/envmap.h
trunk/blender/source/blender/render/intern/include/initrender.h
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/external_engine.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/render_result.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2013-04-16 17:12:04 UTC (rev 56098)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2013-04-16 17:39:20 UTC (rev 56099)
@@ -2341,7 +2341,8 @@
/* we tag based on first ID type character to avoid
* looping over all ID's in case there are no tags */
- if (id && bmain->id_tag_update[id->name[0]]) {
+ /* XXX very weak... added check for '27' to ignore freestyle added objects */
+ if (id && id->name[2] > 27 && bmain->id_tag_update[id->name[0]]) {
updated = 1;
break;
}
Modified: trunk/blender/source/blender/blenlib/BLI_math_matrix.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_matrix.h 2013-04-16 17:12:04 UTC (rev 56098)
+++ trunk/blender/source/blender/blenlib/BLI_math_matrix.h 2013-04-16 17:39:20 UTC (rev 56099)
@@ -122,6 +122,8 @@
void transpose_m3(float R[3][3]);
void transpose_m4(float R[4][4]);
+int compare_m4m4(float mat1[4][4], float mat2[4][4], float limit);
+
void normalize_m3(float R[3][3]);
void normalize_m3_m3(float R[3][3], float A[3][3]);
void normalize_m4(float R[4][4]);
Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c 2013-04-16 17:12:04 UTC (rev 56098)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c 2013-04-16 17:39:20 UTC (rev 56099)
@@ -722,6 +722,16 @@
mat[3][2] = t;
}
+int compare_m4m4(float mat1[4][4], float mat2[4][4], float limit)
+{
+ if (compare_v4v4(mat1[0], mat2[0], limit))
+ if (compare_v4v4(mat1[1], mat2[1], limit))
+ if (compare_v4v4(mat1[2], mat2[2], limit))
+ if (compare_v4v4(mat1[3], mat2[3], limit))
+ return 1;
+ return 0;
+}
+
void orthogonalize_m3(float mat[3][3], int axis)
{
float size[3];
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-04-16 17:12:04 UTC (rev 56098)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-04-16 17:39:20 UTC (rev 56099)
@@ -6209,9 +6209,9 @@
v3d->properties_storage = NULL;
v3d->defmaterial = NULL;
- /* render can be quite heavy, set to wire on load */
+ /* render can be quite heavy, set to solid on load */
if (v3d->drawtype == OB_RENDER)
- v3d->drawtype = OB_WIRE;
+ v3d->drawtype = OB_SOLID;
blo_do_versions_view3d_split_250(v3d, &sl->regionbase);
}
Modified: trunk/blender/source/blender/editors/include/ED_render.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_render.h 2013-04-16 17:12:04 UTC (rev 56098)
+++ trunk/blender/source/blender/editors/include/ED_render.h 2013-04-16 17:39:20 UTC (rev 56099)
@@ -38,6 +38,8 @@
struct RenderInfo;
struct Scene;
struct ScrArea;
+struct RegionView3D;
+struct RenderEngine;
/* render_ops.c */
@@ -85,4 +87,6 @@
void ED_render_clear_mtex_copybuf(void);
+void ED_render_internal_init(void);
+
#endif
Modified: trunk/blender/source/blender/editors/render/render_intern.h
===================================================================
--- trunk/blender/source/blender/editors/render/render_intern.h 2013-04-16 17:12:04 UTC (rev 56098)
+++ trunk/blender/source/blender/editors/render/render_intern.h 2013-04-16 17:39:20 UTC (rev 56099)
@@ -83,6 +83,8 @@
/* render_internal.c */
void RENDER_OT_render(struct wmOperatorType *ot);
+void render_view3d(struct RenderEngine *engine, const struct bContext *C);
+void render_view3d_draw(struct RenderEngine *engine, const struct bContext *C);
/* render_opengl.c uses this */
void image_buffer_rect_update(struct Scene *scene, struct RenderResult *rr, struct ImBuf *ibuf, volatile struct rcti *renrect);
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2013-04-16 17:12:04 UTC (rev 56098)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2013-04-16 17:39:20 UTC (rev 56099)
@@ -42,9 +42,11 @@
#include "BLF_translation.h"
#include "DNA_scene_types.h"
+#include "DNA_view3d_types.h"
#include "BKE_blender.h"
#include "BKE_context.h"
+#include "BKE_freestyle.h"
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_library.h"
@@ -59,14 +61,23 @@
#include "WM_api.h"
#include "WM_types.h"
+#include "ED_object.h"
+#include "ED_render.h"
#include "ED_screen.h"
-#include "ED_object.h"
+#include "ED_view3d.h"
#include "RE_pipeline.h"
+#include "RE_engine.h"
+
#include "IMB_colormanagement.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
+#include "GPU_extensions.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
#include "RNA_access.h"
#include "RNA_define.h"
@@ -681,3 +692,352 @@
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
+
+/* ************** preview for 3d viewport ***************** */
+
+#define PR_UPDATE_VIEW 1
+#define PR_UPDATE_RENDERSIZE 2
+#define PR_UPDATE_MATERIAL 4
+
+typedef struct RenderPreview {
+ /* from wmJob */
+ void *owner;
+ short *stop, *do_update;
+
+ Scene *scene;
+ ScrArea *sa;
+ ARegion *ar;
+ View3D *v3d;
+ RegionView3D *rv3d;
+ Main *bmain;
+ RenderEngine *engine;
+
+ int keep_data;
+} RenderPreview;
+
+static int render_view3d_disprect(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, rcti *disprect)
+{
+ /* copied code from view3d_draw.c */
+ rctf viewborder;
+ int draw_border;
+
+ if (rv3d->persp == RV3D_CAMOB)
+ draw_border = (scene->r.mode & R_BORDER) != 0;
+ else
+ draw_border = (v3d->flag2 & V3D_RENDER_BORDER) != 0;
+
+ if (draw_border) {
+ if (rv3d->persp == RV3D_CAMOB) {
+ ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &viewborder, false);
+
+ disprect->xmin = viewborder.xmin + scene->r.border.xmin * BLI_rctf_size_x(&viewborder);
+ disprect->ymin = viewborder.ymin + scene->r.border.ymin * BLI_rctf_size_y(&viewborder);
+ disprect->xmax = viewborder.xmin + scene->r.border.xmax * BLI_rctf_size_x(&viewborder);
+ disprect->ymax = viewborder.ymin + scene->r.border.ymax * BLI_rctf_size_y(&viewborder);
+ }
+ else {
+ disprect->xmin = v3d->render_border.xmin * ar->winx;
+ disprect->xmax = v3d->render_border.xmax * ar->winx;
+ disprect->ymin = v3d->render_border.ymin * ar->winy;
+ disprect->ymax = v3d->render_border.ymax * ar->winy;
+ }
+
+ return 1;
+ }
+
+ BLI_rcti_init(disprect, 0, 0, 0, 0);
+ return 0;
+}
+
+/* returns 1 if OK */
+static int render_view3d_get_rects(ARegion *ar, View3D *v3d, RegionView3D *rv3d, rctf *viewplane, RenderEngine *engine, float *clipsta, float *clipend, int *ortho)
+{
+
+ if (ar->winx < 4 || ar->winy < 4) return 0;
+
+ *ortho = ED_view3d_viewplane_get(v3d, rv3d, ar->winx, ar->winy, viewplane, clipsta, clipend);
+
+ engine->resolution_x = ar->winx;
+ engine->resolution_y = ar->winy;
+
+ return 1;
+}
+
+/* called by renderer, checks job value */
+static int render_view3d_break(void *rpv)
+{
+ RenderPreview *rp = rpv;
+
+ if (G.is_break)
+ return 1;
+
+ /* during render, rv3d->engine can get freed */
+ if (rp->rv3d->render_engine == NULL)
+ *rp->stop = 1;
+
+ return *(rp->stop);
+}
+
+static void render_view3d_draw_update(void *rpv, RenderResult *UNUSED(rr), volatile struct rcti *UNUSED(rect))
+{
+ RenderPreview *rp = rpv;
+
+ *(rp->do_update) = TRUE;
+}
+
+static void render_view3d_renderinfo_cb(void *rjp, RenderStats *rs)
+{
+ RenderPreview *rp = rjp;
+
+ /* during render, rv3d->engine can get freed */
+ if (rp->rv3d->render_engine == NULL)
+ *rp->stop = 1;
+ else if (rp->engine->text) {
+ make_renderinfo_string(rs, rp->scene, rp->engine->text);
+
+ /* make jobs timer to send notifier */
+ *(rp->do_update) = TRUE;
+ }
+}
+
+
+static void render_view3d_startjob(void *customdata, short *stop, short *do_update, float *UNUSED(progress))
+{
+ RenderPreview *rp = customdata;
+ Render *re;
+ RenderStats *rstats;
+ RenderData rdata;
+ rctf viewplane;
+ rcti cliprct;
+ float clipsta, clipend;
+ int orth, restore = 0;
+ char name[32];
+
+ G.is_break = FALSE;
+
+ if (0 == render_view3d_get_rects(rp->ar, rp->v3d, rp->rv3d, &viewplane, rp->engine, &clipsta, &clipend, &orth))
+ return;
+
+ rp->stop = stop;
+ rp->do_update = do_update;
+
+// printf("Enter previewrender\n");
+
+ /* ok, are we rendering all over? */
+ sprintf(name, "View3dPreview %p", (void *)rp->ar);
+ re= rp->engine->re = RE_GetRender(name);
+
+ if (rp->engine->re == NULL) {
+
+ re = rp->engine->re= RE_NewRender(name);
+
+ rp->keep_data = 0;
+ }
+
+ /* set this always, rp is different for each job */
+ RE_test_break_cb(re, rp, render_view3d_break);
+ RE_display_draw_cb(re, rp, render_view3d_draw_update);
+ RE_stats_draw_cb(re, rp, render_view3d_renderinfo_cb);
+
+ rstats= RE_GetStats(re);
+
+ if (rp->keep_data == 0 || rstats->convertdone == 0 || (rp->keep_data & PR_UPDATE_RENDERSIZE)) {
+ /* no osa, blur, seq, layers, etc for preview render */
+ rdata = rp->scene->r;
+ rdata.mode &= ~(R_OSA | R_MBLUR | R_BORDER | R_PANORAMA);
+ rdata.scemode &= ~(R_DOSEQ | R_DOCOMP | R_FREE_IMAGE);
+ rdata.scemode |= R_PREVIEWBUTS;
+
+ /* we do use layers, but only active */
+ rdata.scemode |= R_SINGLE_LAYER;
+
+ /* initalize always */
+ if (render_view3d_disprect(rp->scene, rp->ar, rp->v3d, rp->rv3d, &cliprct)) {
+ rdata.mode |= R_BORDER;
+ RE_InitState(re, NULL, &rdata, NULL, rp->sa->winx, rp->sa->winy, &cliprct);
+ }
+ else
+ RE_InitState(re, NULL, &rdata, NULL, rp->sa->winx, rp->sa->winy, NULL);
+ }
+
+ if (orth)
+ RE_SetOrtho(re, &viewplane, clipsta, clipend);
+ else
+ RE_SetWindow(re, &viewplane, clipsta, clipend);
+
+ /* database free can crash on a empty Render... */
+ if (rp->keep_data == 0 && rstats->convertdone)
+ RE_Database_Free(re);
+
+ if (rstats->convertdone == 0) {
+ unsigned int lay = rp->scene->lay;
+
+ /* allow localview render for objects with lights in normal layers */
+ if (rp->v3d->lay & 0xFF000000)
+ lay |= rp->v3d->lay;
+ else lay = rp->v3d->lay;
+
+ RE_SetView(re, rp->rv3d->viewmat);
+
+ RE_Database_FromScene(re, rp->bmain, rp->scene, lay, 0); // 0= dont use camera view
+// printf("dbase update\n");
+ }
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list