Page MenuHome

vcolbake_3_bmesh.patch

File Metadata

Author
Campbell Barton (campbellbarton)
Created
Nov 13 2013, 4:03 PM

vcolbake_3_bmesh.patch

Index: release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- release/scripts/startup/bl_ui/properties_render.py (revision 51351)
+++ release/scripts/startup/bl_ui/properties_render.py (working copy)
@@ -589,9 +589,12 @@
split = layout.split()
col = split.column()
- col.prop(rd, "use_bake_clear")
- col.prop(rd, "bake_margin")
- col.prop(rd, "bake_quad_split", text="Split")
+ col.prop(rd, "use_bake_to_vertex_color")
+ sub = col.column()
+ sub.active = not rd.use_bake_to_vertex_color
+ sub.prop(rd, "use_bake_clear")
+ sub.prop(rd, "bake_margin")
+ sub.prop(rd, "bake_quad_split", text="Split")
col = split.column()
col.prop(rd, "use_bake_selected_to_active")
Index: source/blender/makesdna/DNA_scene_types.h
===================================================================
--- source/blender/makesdna/DNA_scene_types.h (revision 51351)
+++ source/blender/makesdna/DNA_scene_types.h (working copy)
@@ -1288,6 +1288,7 @@
#define R_BAKE_NORMALIZE 8
#define R_BAKE_MULTIRES 16
#define R_BAKE_LORES_MESH 32
+#define R_BAKE_VCOL 64
/* bake_normal_space */
#define R_BAKE_SPACE_CAMERA 0
Index: source/blender/makesrna/intern/rna_scene.c
===================================================================
--- source/blender/makesrna/intern/rna_scene.c (revision 51351)
+++ source/blender/makesrna/intern/rna_scene.c (working copy)
@@ -3835,6 +3835,11 @@
"Calculate heights against unsubdivided low resolution mesh");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
+ prop= RNA_def_property(srna, "use_bake_to_vertex_color", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_VCOL);
+ RNA_def_property_ui_text(prop, "Bake to Vertex Colour",
+ "Bake to vertex colors instead of to a UV-mapped image.");
+
/* stamp */
prop = RNA_def_property(srna, "use_stamp_time", PROP_BOOLEAN, PROP_NONE);
Index: source/blender/render/intern/include/renderdatabase.h
===================================================================
--- source/blender/render/intern/include/renderdatabase.h (revision 51351)
+++ source/blender/render/intern/include/renderdatabase.h (working copy)
@@ -65,6 +65,8 @@
struct VlakRen *vlak;
struct MTFace *mtface;
struct MCol *mcol;
+ /* Index of face in source mesh. */
+ int *origindex;
int totmtface, totmcol;
float *surfnor;
float *tangent;
@@ -117,6 +119,7 @@
struct MTFace *RE_vlakren_get_tface(struct ObjectRen *obr, VlakRen *ren, int n, char **name, int verify);
struct MCol *RE_vlakren_get_mcol(struct ObjectRen *obr, VlakRen *ren, int n, char **name, int verify);
+int *RE_vlakren_get_origindex(struct ObjectRen *obr, VlakRen *vlak, int verify);
float *RE_vlakren_get_surfnor(struct ObjectRen *obr, VlakRen *ren, int verify);
float *RE_vlakren_get_nmap_tangent(struct ObjectRen *obr, VlakRen *ren, int verify);
RadFace **RE_vlakren_get_radface(struct ObjectRen *obr, VlakRen *ren, int verify);
Index: source/blender/render/intern/source/convertblender.c
===================================================================
--- source/blender/render/intern/source/convertblender.c (revision 51351)
+++ source/blender/render/intern/source/convertblender.c (working copy)
@@ -3246,7 +3246,7 @@
CustomDataMask mask;
float xn, yn, zn, imat[3][3], mat[4][4]; //nor[3],
float *orco=0;
- int need_orco=0, need_stress=0, need_nmap_tangent=0, need_tangent=0;
+ int need_orco=0, need_stress=0, need_nmap_tangent=0, need_tangent=0, need_origindex=0;
int a, a1, ok, vertofs;
int end, do_autosmooth = FALSE, totvert = 0;
int use_original_normals = FALSE;
@@ -3296,6 +3296,10 @@
need_nmap_tangent= 1;
}
+ /* origindex currently only used when baking to vertex colors */
+ if(re->flag & R_BAKING && re->r.bake_flag & R_BAKE_VCOL)
+ need_origindex= 1;
+
/* check autosmooth and displacement, we then have to skip only-verts optimize */
do_autosmooth |= (me->flag & ME_AUTOSMOOTH);
if (do_autosmooth)
@@ -3436,6 +3440,7 @@
MTFace *mtface, *mtf;
MCol *mcol, *mc;
int index, mtfn= 0, mcn= 0, mtng=0, vindex;
+ int *origindex_poly = need_origindex ? dm->getTessFaceDataArray(dm, CD_POLYINDEX) : NULL;
char *name;
int nr_verts = v4!=0 ? 4 : 3;
@@ -3470,6 +3475,12 @@
}
}
}
+
+ if(need_origindex && origindex_poly) {
+ int *origindex;
+ origindex = RE_vlakren_get_origindex(obr, vlr, 1);
+ *origindex = origindex_poly[a];
+ }
}
}
}
Index: source/blender/render/intern/source/rendercore.c
===================================================================
--- source/blender/render/intern/source/rendercore.c (revision 51351)
+++ source/blender/render/intern/source/rendercore.c (working copy)
@@ -20,6 +20,7 @@
*
* Contributors: Hos, Robert Wenzlaff.
* Contributors: 2004/2005/2006 Blender Foundation, full recode
+ * Contributors: Vertex color baking, Copyright 2011 AutoCRC
*
* ***** END GPL LICENSE BLOCK *****
*/
@@ -51,9 +52,11 @@
#include "DNA_image_types.h"
#include "DNA_lamp_types.h"
#include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_group_types.h"
+#include "BKE_customdata.h"
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_main.h"
@@ -2030,6 +2033,11 @@
float dir[3];
Object *actob;
+
+
+ /* Output: vertex color or image data. If vcol is not NULL, rect and
+ * rect_float should be NULL. */
+ MLoopCol *vcol;
unsigned int *rect;
float *rect_float;
@@ -2206,7 +2214,7 @@
}
}
- if (bs->rect_float) {
+ if (bs->rect_float && !bs->vcol) {
float *col= bs->rect_float + 4*(bs->rectx*y + x);
copy_v3_v3(col, shr.combined);
if (bs->type==RE_BAKE_ALL || bs->type==RE_BAKE_TEXTURE) {
@@ -2217,7 +2225,8 @@
}
}
else {
- unsigned char *col= (unsigned char *)(bs->rect + bs->rectx*y + x);
+ /* Target is char (LDR). */
+ unsigned char col[4];
if (ELEM(bs->type, RE_BAKE_ALL, RE_BAKE_TEXTURE)) {
float rgb[3];
@@ -2236,6 +2245,19 @@
else {
col[3]= 255;
}
+
+ if(bs->vcol) {
+ /* Vertex colour baking. Vcol has no useful alpha channel (it exists
+ * but is used only for vertex painting). */
+ bs->vcol->r = col[0];
+ bs->vcol->g = col[1];
+ bs->vcol->b = col[2];
+ }
+ else {
+ unsigned char *imcol= (unsigned char *)(bs->rect + bs->rectx*y + x);
+ copy_v4_v4_char((char *)imcol, (char *)col);
+ }
+
}
if (bs->rect_mask) {
@@ -2255,15 +2277,28 @@
disp = 0.5f + dist; /* alter the range from [-0.5,0.5] to [0,1]*/
}
- if (bs->rect_float) {
+ if (bs->rect_float && !bs->vcol) {
float *col= bs->rect_float + 4*(bs->rectx*y + x);
col[0] = col[1] = col[2] = disp;
col[3]= 1.0f;
}
else {
- char *col= (char *)(bs->rect + bs->rectx*y + x);
+ /* Target is char (LDR). */
+ unsigned char col[4];
col[0] = col[1] = col[2] = FTOCHAR(disp);
- col[3]= 255;
+ col[3] = 255;
+
+ if(bs->vcol) {
+ /* Vertex colour baking. Vcol has no useful alpha channel (it exists
+ * but is used only for vertex painting). */
+ bs->vcol->r = col[0];
+ bs->vcol->g = col[1];
+ bs->vcol->b = col[2];
+ }
+ else {
+ char *imcol= (char *)(bs->rect + bs->rectx*y + x);
+ copy_v4_v4_char((char *)imcol, (char *)col);
+ }
}
if (bs->rect_mask) {
bs->rect_mask[bs->rectx*y + x] = FILTER_MASK_USED;
@@ -2481,54 +2516,91 @@
vlr= RE_findOrAddVlak(obr, v);
if ((bs->actob && bs->actob == obr->ob) || (!bs->actob && (obr->ob->flag & SELECT))) {
- tface= RE_vlakren_get_tface(obr, vlr, obr->bakemtface, NULL, 0);
+ if(R.r.bake_flag & R_BAKE_VCOL) {
+ /* Gather face data for vertex colour bake */
+ Mesh *me;
+ int *origindex, vcollayer;
+ CustomDataLayer *cdl;
- if (tface && tface->tpage) {
- Image *ima= tface->tpage;
- ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
- const float vec_alpha[4]= {0.0f, 0.0f, 0.0f, 0.0f};
- const float vec_solid[4]= {0.0f, 0.0f, 0.0f, 1.0f};
-
- if (ibuf==NULL)
+ origindex = RE_vlakren_get_origindex(obr, vlr, 0);
+ if(origindex == NULL)
continue;
-
- if (ibuf->rect==NULL && ibuf->rect_float==NULL)
+
+ if(obr->ob->type != OB_MESH)
continue;
-
- if (ibuf->rect_float && !(ibuf->channels==0 || ibuf->channels==4))
+ me = obr->ob->data;
+#if 0
+ /* Only shade selected faces. */
+ if((me->mface[*origindex].flag & ME_FACE_SEL) == 0)
continue;
-
- if (ima->flag & IMA_USED_FOR_RENDER) {
- ima->id.flag &= ~LIB_DOIT;
+#endif
+
+ vcollayer = CustomData_get_render_layer_index(&me->ldata, CD_MLOOPCOL);
+ if(vcollayer == -1)
continue;
- }
-
- /* find the image for the first time? */
- if (ima->id.flag & LIB_DOIT) {
- ima->id.flag &= ~LIB_DOIT;
-
- /* we either fill in float or char, this ensures things go fine */
- if (ibuf->rect_float)
- imb_freerectImBuf(ibuf);
- /* clear image */
- if (R.r.bake_flag & R_BAKE_CLEAR)
- IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA) ? vec_alpha : vec_solid);
- ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
+ cdl = &me->ldata.layers[vcollayer];
+ bs->vcol = cdl->data;
+ bs->vcol += me->mpoly[*origindex].loopstart;
- /* might be read by UI to set active image for display */
- R.bakebuf= ima;
- }
-
+ /* XXX, de-duplicate */
bs->obi= obi;
bs->vlr= vlr;
-
bs->vdone++; /* only for error message if nothing was rendered */
v++;
-
BLI_unlock_thread(LOCK_CUSTOM1);
return 1;
}
+ else {
+
+ tface= RE_vlakren_get_tface(obr, vlr, obr->bakemtface, NULL, 0);
+
+ if (tface && tface->tpage) {
+ Image *ima= tface->tpage;
+ ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
+ const float vec_alpha[4]= {0.0f, 0.0f, 0.0f, 0.0f};
+ const float vec_solid[4]= {0.0f, 0.0f, 0.0f, 1.0f};
+
+ if (ibuf==NULL)
+ continue;
+
+ if (ibuf->rect==NULL && ibuf->rect_float==NULL)
+ continue;
+
+ if (ibuf->rect_float && !(ibuf->channels==0 || ibuf->channels==4))
+ continue;
+
+ if (ima->flag & IMA_USED_FOR_RENDER) {
+ ima->id.flag &= ~LIB_DOIT;
+ continue;
+ }
+
+ /* find the image for the first time? */
+ if (ima->id.flag & LIB_DOIT) {
+ ima->id.flag &= ~LIB_DOIT;
+
+ /* we either fill in float or char, this ensures things go fine */
+ if (ibuf->rect_float)
+ imb_freerectImBuf(ibuf);
+ /* clear image */
+ if (R.r.bake_flag & R_BAKE_CLEAR)
+ IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA) ? vec_alpha : vec_solid);
+
+ ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
+
+ /* might be read by UI to set active image for display */
+ R.bakebuf= ima;
+ }
+
+ /* XXX, de-duplicate */
+ bs->obi= obi;
+ bs->vlr= vlr;
+ bs->vdone++; /* only for error message if nothing was rendered */
+ v++;
+ BLI_unlock_thread(LOCK_CUSTOM1);
+ return 1;
+ }
+ }
}
}
}
@@ -2537,6 +2609,67 @@
return 0;
}
+/* Bake all vertices of a face. Actually, this still works on a face-by-face
+ basis, and each vertex on each face is shaded. Vertex colors are a property
+ of faces, not vertices. */
+static void shade_verts(BakeShade *bs)
+{
+ VlakRen *vlr= bs->vlr;
+ MLoopCol *basevcol;
+ int i1, i2, i3, i4;
+
+ /* Disable baking to image; write to vcol instead (pointer set below). */
+ bs->ima= NULL;
+ bs->rect= NULL;
+ bs->rect_float= NULL;
+
+ bs->quad= 0;
+
+ /* No anti-aliasing for vertices. */
+ bs->dxco[0]= bs->dxco[1]= bs->dxco[2]= 0.0f;
+ bs->dyco[0]= bs->dyco[1]= bs->dyco[2]= 0.0f;
+
+ /* Shade each vertex of the face. u and v are barycentric coordinates; since
+ we're only interested in vertices, these will be 0 or 1. */
+ basevcol = bs->vcol;
+ if((vlr->flag & R_FACE_SPLIT) == 0) {
+ /* Processing triangle face, whole quad, or first half of split quad.
+ Vertex indices have to be corrected for possible split. */
+ i1= 0; i2= 1; i3= 2;
+ vlr_set_uv_indices(vlr, &i1, &i2, &i3);
+
+ bs->vcol= basevcol + i1;
+ do_bake_shade(bs, 0, 0, 1.0f, 0.0f);
+ bs->vcol= basevcol + i2;
+ do_bake_shade(bs, 0, 0, 0.0f, 1.0f);
+ bs->vcol= basevcol + i3;
+ do_bake_shade(bs, 0, 0, 0.0f, 0.0f);
+
+ if(vlr->v4) {
+ bs->quad= 1;
+ /* Find index to use for fourth vertex. */
+ for(i4=0; i4<4; i4++) {
+ if(i4 != i1 && i4 != i2 && i4 != i3)
+ break;
+ }
+ bs->vcol= basevcol + i4;
+ do_bake_shade(bs, 0, 0, 0.0f, 0.0f);
+ }
+ }
+ else {
+ /* Processing second half of split quad. Only one vertex to go. */
+ if(vlr->flag &R_DIVIDE_24) {
+ bs->vcol= basevcol + 2;
+ do_bake_shade(bs, 0, 0, 0.0f, 1.0f);
+ }
+ else {
+ bs->vcol= basevcol + 3;
+ do_bake_shade(bs, 0, 0, 0.0f, 0.0f);
+ }
+ }
+ bs->vcol = basevcol;
+}
+
/* already have tested for tface and ima and zspan */
static void shade_tface(BakeShade *bs)
{
@@ -2562,6 +2695,7 @@
bs->rect= bs->ibuf->rect;
bs->rect_colorspace= bs->ibuf->rect_colorspace;
bs->rect_float= bs->ibuf->rect_float;
+ bs->vcol = NULL;
bs->quad= 0;
if (bs->use_mask) {
@@ -2605,7 +2739,10 @@
BakeShade *bs= bs_v;
while (get_next_bake_face(bs)) {
- shade_tface(bs);
+ if(R.r.bake_flag & R_BAKE_VCOL)
+ shade_verts(bs);
+ else
+ shade_tface(bs);
/* fast threadsafe break test */
if (R.test_break(R.tbh))
@@ -2665,12 +2802,14 @@
use_mask = TRUE;
/* baker uses this flag to detect if image was initialized */
- for (ima= G.main->image.first; ima; ima= ima->id.next) {
- ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
- ima->id.flag |= LIB_DOIT;
- ima->flag&= ~IMA_USED_FOR_RENDER;
- if (ibuf) {
- ibuf->userdata = NULL; /* use for masking if needed */
+ if((R.r.bake_flag & R_BAKE_VCOL) == 0) {
+ for (ima= G.main->image.first; ima; ima= ima->id.next) {
+ ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
+ ima->id.flag |= LIB_DOIT;
+ ima->flag&= ~IMA_USED_FOR_RENDER;
+ if (ibuf) {
+ ibuf->userdata = NULL; /* use for masking if needed */
+ }
}
}
@@ -2695,7 +2834,10 @@
handles[a].type= type;
handles[a].actob= actob;
- handles[a].zspan= MEM_callocN(sizeof(ZSpan), "zspan for bake");
+ if (R.r.bake_flag & R_BAKE_VCOL)
+ handles[a].zspan= NULL;
+ else
+ handles[a].zspan= MEM_callocN(sizeof(ZSpan), "zspan for bake");
handles[a].use_mask = use_mask;
@@ -2722,27 +2864,29 @@
}
/* filter and refresh images */
- for (ima= G.main->image.first; ima; ima= ima->id.next) {
- if ((ima->id.flag & LIB_DOIT)==0) {
- ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
+ if ((R.r.bake_flag & R_BAKE_VCOL) == 0) {
+ for (ima= G.main->image.first; ima; ima= ima->id.next) {
+ if ((ima->id.flag & LIB_DOIT)==0) {
+ ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
- if (ima->flag & IMA_USED_FOR_RENDER)
- result= BAKE_RESULT_FEEDBACK_LOOP;
+ if (ima->flag & IMA_USED_FOR_RENDER)
+ result= BAKE_RESULT_FEEDBACK_LOOP;
- if (!ibuf)
- continue;
+ if (!ibuf)
+ continue;
- RE_bake_ibuf_filter(ibuf, (char *)ibuf->userdata, re->r.bake_filter);
+ RE_bake_ibuf_filter(ibuf, (char *)ibuf->userdata, re->r.bake_filter);
- ibuf->userflags |= IB_BITMAPDIRTY;
+ ibuf->userflags |= IB_BITMAPDIRTY;
+ }
}
+
+ /* calculate return value */
+ for (a=0; a<re->r.threads; a++) {
+ zbuf_free_span(handles[a].zspan);
+ MEM_freeN(handles[a].zspan);
+ }
}
-
- /* calculate return value */
- for (a=0; a<re->r.threads; a++) {
- zbuf_free_span(handles[a].zspan);
- MEM_freeN(handles[a].zspan);
- }
MEM_freeN(handles);
Index: source/blender/render/intern/source/renderdatabase.c
===================================================================
--- source/blender/render/intern/source/renderdatabase.c (revision 51351)
+++ source/blender/render/intern/source/renderdatabase.c (working copy)
@@ -105,6 +105,7 @@
#define RE_MTFACE_ELEMS 1
#define RE_MCOL_ELEMS 4
#define RE_UV_ELEMS 2
+#define RE_ORIGINDEX_ELEMS 1
#define RE_SURFNOR_ELEMS 3
#define RE_RADFACE_ELEMS 1
#define RE_SIMPLIFY_ELEMS 2
@@ -332,6 +333,21 @@
return node->mcol + index*RE_MCOL_ELEMS;
}
+int *RE_vlakren_get_origindex(ObjectRen *obr, VlakRen *vlak, int verify)
+{
+ int *origindex;
+ int nr= vlak->index>>8;
+
+ origindex= obr->vlaknodes[nr].origindex;
+ if(origindex==NULL) {
+ if(verify)
+ origindex= obr->vlaknodes[nr].origindex= MEM_callocN(256*RE_ORIGINDEX_ELEMS*sizeof(int), "origindex table");
+ else
+ return NULL;
+ }
+ return origindex + (vlak->index & 255)*RE_ORIGINDEX_ELEMS;
+}
+
float *RE_vlakren_get_surfnor(ObjectRen *obr, VlakRen *vlak, int verify)
{
float *surfnor;
@@ -383,6 +399,7 @@
MTFace *mtface, *mtface1;
MCol *mcol, *mcol1;
float *surfnor, *surfnor1, *tangent, *tangent1;
+ int *origindex, *origindex1;
RadFace **radface, **radface1;
int i, index = vlr1->index;
char *name;
@@ -400,6 +417,13 @@
memcpy(mcol1, mcol, sizeof(MCol)*RE_MCOL_ELEMS);
}
+ origindex= RE_vlakren_get_origindex(obr, vlr, 0);
+ if(origindex) {
+ origindex1= RE_vlakren_get_origindex(obr, vlr1, 1);
+ /* Just an int, but memcpy for consistency. */
+ memcpy(origindex1, origindex, sizeof(int)*RE_ORIGINDEX_ELEMS);
+ }
+
surfnor= RE_vlakren_get_surfnor(obr, vlr, 0);
if (surfnor) {
surfnor1= RE_vlakren_get_surfnor(obr, vlr1, 1);
@@ -743,6 +767,8 @@
MEM_freeN(vlaknodes[a].mtface);
if (vlaknodes[a].mcol)
MEM_freeN(vlaknodes[a].mcol);
+ if(vlaknodes[a].origindex)
+ MEM_freeN(vlaknodes[a].origindex);
if (vlaknodes[a].surfnor)
MEM_freeN(vlaknodes[a].surfnor);
if (vlaknodes[a].tangent)

Event Timeline