Revision 7b6332f by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:17 (GMT) |
Apply the hair matrices when converting from particle keys to bmesh, so the edit data is consistently in object space. |
Revision 833a11f by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:17 (GMT) |
New image file icons for hair brush tools and an according tool enum in the Brush RNA. |
Revision 98b15d9 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:17 (GMT) |
Copied high-level operator code from the paint/sculpt system as a basis for brush-stroke operators in hair edit mode. Hopefully this can help avoid some redundant code and ensure consistent keymapping etc. |
Revision a889a14 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:17 (GMT) |
Missing bmesh include folder for hair editor in scons. |
Revision eb52570 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:17 (GMT) |
New drawing code for hair edit mode. Conflicts: source/blender/editors/space_view3d/drawobject.c source/blender/editors/space_view3d/view3d_intern.h |
Revision 23b2843 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:15 (GMT) |
Removed deprecated code. |
Revision 2d79994 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:15 (GMT) |
Free strand edit memory after use. |
Revision 4e47239 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:15 (GMT) |
Store the hair key weight in edit mode. Currently particles only have a single weight value, controlling pinning in the simulation (for root and virtual root verts) and goal force scaling. This will be replaced by a full vertex group weight system eventually. |
Revision dc43df8 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:15 (GMT) |
CustomData layer for storing hair root locations as MSurfaceSamples. This requires converting the old messy particle num/num_dmcache/fuv/foffset data into the new mesh samples, which can potentially introduce floating point errors and inaccuracies due to lack of face index mapping in the new system. However, in any well-constructed particle system the hair roots should be nearest to their num face, so mapping would be accurate enough. If necessary face index data could be added to samples as a legacy code hack, but probably it's best to eventually replace the hair system as a whole anyway. |
Revision fd34e3e by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:15 (GMT) |
Fix for verts-of-strand iterator: This requires a second pointer in addition to the edge, otherwise the last point is omitted. |
Revision 991ee8a by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:15 (GMT) |
First customdata layer for particle mass. This is more for testing purposes, since currently there is only a single mass property for the psys as a whole. This should change in the future though, to allow variable mass per strand or vertex. Conflicts: source/blender/bmesh/intern/bmesh_interp.c |
Revision 1afd5be by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:14 (GMT) |
Fix for verts-of-strand iterator: After last edge step has to set the edge to NULL to avoid infinite looping over the same edge (1-elem disk). |
Revision d550a29 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:14 (GMT) |
Fix for particle-to-bmesh: only was looping over totvert instead of pa->totkey. |
Revision e43ef55 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:14 (GMT) |
Basic particle data reconstruction when exiting edit mode. |
Revision 5f44f4a by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:14 (GMT) |
Intermediate commit: switching strand edit data to BMesh. Hair/Strand editing will only use a subset of the bmesh topology and expect a specific topology that needs to be verified and enforced. However, this extra requirement is much less work than reimplementing a whole edit data system with the same feature set as bmesh and avoids much redundant code. Conflicts: source/blender/blenkernel/intern/customdata.c source/blender/makesdna/DNA_customdata_types.h |
Revision b0a9e48 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:14 (GMT) |
New customdata type for mesh surface samples. Conflicts: source/blender/makesdna/DNA_customdata_types.h |
Revision afb947c by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:13 (GMT) |
Switched the hair edit data to a bmesh-like structure for consistency. This means using mempools to store curve and vertex data, which allows arbitrary addition and removal of data more easily. Also this includes an iterator system similar to bmesh iterators (although the simpler topology makes it a lot less complex). Conflicts: source/blender/blenkernel/intern/customdata.c source/blender/makesdna/DNA_customdata_types.h |
Revision f1e4d35 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:12 (GMT) |
Reconstruct most basic particle data when applying the hair edit, so particle hairs remain visible. Note that currently the hair root location (num/num_dmcache, fuv, foffset) is not stored from edit data, so all hairs end up in a default location. |
Revision 1c7053f by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:11 (GMT) |
Store hair edit data in particle systems and manage it in the operator for entering/exiting the edit mode. Conflicts: source/blender/blenkernel/intern/particle.c |
Revision 7bb90a0 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:11 (GMT) |
Moved code for the hair edit data structures to blenkernel. This makes it work more like editmesh, and avoid the awkward and basically bad-level approach in particles, where the edit data is an anonymous pointer in particle systems together with a callback for freeing. Conflicts: source/blender/blenkernel/CMakeLists.txt |
|