Details

Reviewers

Commits

rB589e4836f511: match looptri axis calculation with editmesh & tessface
rBc8a0daff452b: correct for mistake

Summary

This is intended to remove use of MFace for runtime tessellation which are not ideal for drawing,
and instead cache loop tris.

The main differences are:

All faces will be 3 sides which simplifies a lot of code (MFace's can be 3 or 4 sides).
We won't need to store duplicate custom-data layers (UV's, colors, normals). (for MFace and MPoly+MLoop).

This has some advantages for OpenGL and should reduce memory use.

Details:

Tessellated data is stored in MLoopTri array instead of MFace.
MLoopTri's are int[4] (3 indices to the loops, one to the original polygon).
MLoopTri's are stored in the DerivedMesh and accessed directly by the struct member. though they may be moved behind API access.
Currently this patch does not remove MFace, though eventually it should. Or, for the common cases MFace can be removed. And only allocated in specific situations.

These areas are working on a basic level:

GPU buffers
CDDM drawing
Sculpting (PBVH)
Vertex/Weight paint

Areas not yet converted

Particles
Projection paint
Bvhutils
Blender-Internal rendering

Diff Detail

Repository: rB Blender
Branch: temp-derivedmesh-looptri

Event Timeline

Campbell Barton (campbellbarton) updated this revision to Diff 4649.Jul 14 2015, 3:57 PM

Campbell Barton (campbellbarton) retitled this revision from to Initial looptri addition.

Campbell Barton (campbellbarton) added a reviewer: Antonis Ryakiotakis (psy-fi).

Campbell Barton (campbellbarton) updated this object.

Campbell Barton (campbellbarton) updated this object.Jul 14 2015, 4:00 PM

Campbell Barton (campbellbarton) retitled this revision from Initial looptri addition to DerivedMesh move from MFace to MLoopTri's.Jul 14 2015, 4:02 PM

Campbell Barton (campbellbarton) updated this object.

Campbell Barton (campbellbarton) updated this object.Jul 14 2015, 4:05 PM

Campbell Barton (campbellbarton) updated this object.Jul 14 2015, 4:08 PM

Campbell Barton (campbellbarton) updated this object.

Sync with master
DM_draw_attrib_vertex works now

correct for mistake with normals

match looptri axis calculation with editmesh & tessface

Closed by commit rBc8a0daff452b: correct for mistake (authored by Campbell Barton (campbellbarton)). · Explain WhyJul 15 2015, 12:29 PM

This revision was automatically updated to reflect the committed changes.

Campbell Barton (campbellbarton) reopened this revision.Jul 16 2015, 4:28 PM

Re-Branch temp-derivedmesh-looptri against master
Correct bad index use
Fix for DM_draw_attrib_vertex which was temp disabled
correct for mistake
match looptri axis calculation with editmesh & tessface
Merge branch 'master' into temp-derivedmesh-looptri
Use mloopcol to check if we want to enable colors for drawing
No need to use looptri to convert vertex colors
Start move drawing code for cdderivedmesh to indexed/mpoly design.
Merge branch 'master' into temp-derivedmesh-looptri
Textured and GLSL drawing for cddm except from tangent layer
Port texture paint and mcolor GPU upload to new design
Port UV display to new design. As plus, we can remove the extra buffer completely
Revert "Port UV display to new design. As plus, we can remove the extra buffer completely"
Correctly support UVs with VBO/cddm
Merge branch 'master' into temp-derivedmesh-looptri
Merge branch 'master' into temp-derivedmesh-looptri
quiet uninitialized warning w/ memcmp
Fix for subsurf using MCol instead of MLoopCol
Fix for flipped colors drawing vertex colors in subsurf
use loop-data for subsurf uv's
Use loop-data for subsurf normals
Move MLoopTri access behind API calls
Correct last commit
When calculating the modifier stack, prepare for looptri by default

Remove redundant if check

Refactor cdDM_buffer_copy_normal to avoid array allocation

remove redundant comment

rename confusingly short vars

Merge branch 'master' into temp-derivedmesh-looptri

Generally good, I think we can do fixes and changes in master for any remaining issues if you feel it's safe to merge.

source/blender/blenkernel/BKE_DerivedMesh.h
207	Perhaps this is not needed now?
source/blender/blenkernel/intern/pbvh.c
217–219	We may be able to use polys here? (no big deal though, this is cached I think)
299–300	Not sure if storing triangles is the best option for sculpting. For intersection it is tesselated anyway, but for hiding etc it might be better to use polys? We can refine this later though.
1553–1554	Probably change to ray_triangle_intersection now?

Campbell Barton (campbellbarton) added inline comments.Jul 16 2015, 7:07 PM

source/blender/blenkernel/intern/pbvh.c
217–219	That can work if `bvh->prim_indices` are polys.
299–300	agree, just sculpt stores tri's per node, not polys... which makes sense for actual sculpting part. but as you say - not here.
1553–1554	We could, I checked this and there are other tris in sculpt code being passed to this function, so which defines epsilon & compares dist.. so could be good to wrap stilll.

Committed rB595a491e63d6f3f3462675d38cfa71b4e784fe9c

Campbell Barton (campbellbarton) mentioned this in T45474: Deprecate legacy MFace data storage.Jul 17 2015, 10:48 PM

DerivedMesh move from MFace to MLoopTri's
AbandonedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 4649

source/blender/blenkernel/BKE_DerivedMesh.h

source/blender/blenkernel/BKE_cdderivedmesh.h

source/blender/blenkernel/BKE_mesh.h

source/blender/blenkernel/BKE_paint.h

source/blender/blenkernel/BKE_pbvh.h

source/blender/blenkernel/intern/DerivedMesh.c

source/blender/blenkernel/intern/cdderivedmesh.c

source/blender/blenkernel/intern/mesh_evaluate.c

source/blender/blenkernel/intern/paint.c

source/blender/blenkernel/intern/pbvh.c

source/blender/blenkernel/intern/pbvh_intern.h

source/blender/blenkernel/intern/subsurf_ccg.c

source/blender/blenlib/BLI_math_geom.h

source/blender/blenlib/intern/math_geom.c

source/blender/editors/mesh/editface.c

source/blender/editors/sculpt_paint/paint_vertex.c

source/blender/editors/space_view3d/drawmesh.c

source/blender/gpu/GPU_buffers.h

source/blender/gpu/intern/gpu_buffers.c

source/blender/makesdna/DNA_customdata_types.h

source/blender/makesdna/DNA_meshdata_types.h

DerivedMesh move from MFace to MLoopTri'sAbandonedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4649

source/blender/blenkernel/BKE_DerivedMesh.h

source/blender/blenkernel/BKE_cdderivedmesh.h

source/blender/blenkernel/BKE_mesh.h

source/blender/blenkernel/BKE_paint.h

source/blender/blenkernel/BKE_pbvh.h

source/blender/blenkernel/intern/DerivedMesh.c

source/blender/blenkernel/intern/cdderivedmesh.c

source/blender/blenkernel/intern/mesh_evaluate.c

source/blender/blenkernel/intern/paint.c

source/blender/blenkernel/intern/pbvh.c

source/blender/blenkernel/intern/pbvh_intern.h

source/blender/blenkernel/intern/subsurf_ccg.c

source/blender/blenlib/BLI_math_geom.h

source/blender/blenlib/intern/math_geom.c

source/blender/editors/mesh/editface.c

source/blender/editors/sculpt_paint/paint_vertex.c

source/blender/editors/space_view3d/drawmesh.c

source/blender/gpu/GPU_buffers.h

source/blender/gpu/intern/gpu_buffers.c

source/blender/makesdna/DNA_customdata_types.h

source/blender/makesdna/DNA_meshdata_types.h

DerivedMesh move from MFace to MLoopTri's
AbandonedPublic
Actions

Revision Contents
Changeset List