Page MenuHome
Differential D585 Diff 1940 source/blender/blenkernel/intern/editderivedmesh.c

Changeset View

Standalone View

View Options

source/blender/blenkernel/intern/editderivedmesh.c

Show All 40 Lines
* is likely to be a little slow. * is likely to be a little slow.
*/ */
#include "GL/glew.h" #include "GL/glew.h"
#include "BLI_math.h" #include "BLI_math.h"
#include "BLI_jitter.h" #include "BLI_jitter.h"
#include "BLI_bitmap.h" #include "BLI_bitmap.h"
#include "BLI_listbase.h"
campbellbartonUnsubmitted
Not Done
Inline Actions

this file can be unchanged

campbellbarton: this file can be unchanged
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_editmesh.h" #include "BKE_editmesh.h"
#include "BKE_editmesh_bvh.h" #include "BKE_editmesh_bvh.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_mesh_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "BKE_deform.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "GPU_extensions.h" #include "GPU_extensions.h"
extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */ extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
static void bmdm_get_tri_colpreview(BMLoop *ls[3], MLoopCol *lcol[3], unsigned char(*color_vert_array)[4]); static void bmdm_get_tri_colpreview(BMLoop *ls[3], MLoopCol *lcol[3], unsigned char(*color_vert_array)[4]);
▲ Show 20 Lines • Show All 233 Lines • ▼ Show 20 Lines
} }
static void emDM_drawEdges(DerivedMesh *dm, static void emDM_drawEdges(DerivedMesh *dm,
bool UNUSED(drawLooseEdges), bool UNUSED(drawLooseEdges),
bool UNUSED(drawAllEdges)) bool UNUSED(drawAllEdges))
{ {
emDM_drawMappedEdges(dm, NULL, NULL); emDM_drawMappedEdges(dm, NULL, NULL);
} }
static void emDM_drawMappedEdgesInterp(DerivedMesh *dm, static void emDM_drawMappedEdgesInterp(DerivedMesh *dm,
DMSetDrawOptions setDrawOptions, DMSetDrawOptions setDrawOptions,
DMSetDrawInterpOptions setDrawInterpOptions, DMSetDrawInterpOptions setDrawInterpOptions,
void *userData) void *userData)
{ {
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm; EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMesh *bm = bmdm->em->bm; BMesh *bm = bmdm->em->bm;
Object *ob = bmdm->em->ob;
BMEdge *eed; BMEdge *eed;
BMIter iter; BMIter iter;
int i; int i;
const bool draw_weights = ((((Mesh *)ob->data)->drawflag & ME_DRAWEIGHT) != 0);
glBegin(GL_LINES);
if (bmdm->vertexCos) { if (bmdm->vertexCos) {
BM_mesh_elem_index_ensure(bm, BM_VERT); BM_mesh_elem_index_ensure(bm, BM_VERT);
campbellbartonUnsubmitted
Not Done
Inline Actions

I don't think this block of code is needed at all, setDrawInterpOptions can be used to set the color to use weights, This will also make drawing work with modifiers (subsurf in edimode for eg)

The way this would work is the caller has to check if weights are used and pass a different setDrawInterpOptions function in that case.

campbellbarton: I don't think this block of code is needed at all, `setDrawInterpOptions` can be used to set…
glBegin(GL_LINES);
BM_ITER_MESH_INDEX (eed, &iter, bm, BM_EDGES_OF_MESH, i) { BM_ITER_MESH_INDEX(eed, &iter, bm, BM_EDGES_OF_MESH, i) {
if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) { if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
setDrawInterpOptions(userData, i, 0.0); setDrawInterpOptions(userData, i, 0.0);
glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v1)]); glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v1)]);
setDrawInterpOptions(userData, i, 1.0); setDrawInterpOptions(userData, i, 1.0);
glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v2)]); glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v2)]);
} }
} }
glEnd();
} }
else { else {
glBegin(GL_LINES);
BM_ITER_MESH_INDEX (eed, &iter, bm, BM_EDGES_OF_MESH, i) { BM_ITER_MESH_INDEX(eed, &iter, bm, BM_EDGES_OF_MESH, i) {
if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) { if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
setDrawInterpOptions(userData, i, 0.0); setDrawInterpOptions(userData, i, 0.0);
glVertex3fv(eed->v1->co); glVertex3fv(eed->v1->co);
setDrawInterpOptions(userData, i, 1.0); setDrawInterpOptions(userData, i, 1.0);
glVertex3fv(eed->v2->co); glVertex3fv(eed->v2->co);
} }
} }
glEnd();
} }
glEnd();
} }
static void emDM_drawUVEdges(DerivedMesh *dm) static void emDM_drawUVEdges(DerivedMesh *dm)
{ {
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm; EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMesh *bm = bmdm->em->bm; BMesh *bm = bmdm->em->bm;
BMFace *efa; BMFace *efa;
BMIter iter; BMIter iter;
▲ Show 20 Lines • Show All 1,967 Lines • Show Last 20 Lines