diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-01-11 21:35:56 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-01-11 21:35:56 +0300 |
| commit | da97b6930b47555fbc526b7165d5b73abe06252d (patch) | |
| tree | 023f37711a9be4ed523f31831966ba5558b094c4 /source/blender/draw/intern/draw_common.c | |
| parent | 31782609f457b97d99912503a16f3176a3d4aec0 (diff) | |
DRW: Fix T53583 Armature instances not drawing.
Was due to the fact that the instances don't have a "static" obmat that can be referenced to use as a uniform.
Solution : precompute the full matrix for each bone and pass it as instance data. (theses are copied into a buffer and can be discarded right away)
Note: this could be optimized further and make only one drawcall (shgroup) to draw all bone instance of one type (vs. one call per armature).
Diffstat (limited to 'source/blender/draw/intern/draw_common.c')
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index e86a231c19d..0eb97a54ba5 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -215,7 +215,7 @@ DRWShadingGroup *shgroup_instance_screenspace(DRWPass *pass, struct Gwn_Batch *g return grp; } -DRWShadingGroup *shgroup_instance_objspace_solid(DRWPass *pass, struct Gwn_Batch *geom, float (*obmat)[4]) +DRWShadingGroup *shgroup_instance_solid(DRWPass *pass, struct Gwn_Batch *geom) { static float light[3] = {0.0f, 0.0f, 1.0f}; GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_OBJECTSPACE_SIMPLE_LIGHTING_VARIYING_COLOR); @@ -223,20 +223,18 @@ DRWShadingGroup *shgroup_instance_objspace_solid(DRWPass *pass, struct Gwn_Batch DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom); DRW_shgroup_attrib_float(grp, "InstanceModelMatrix", 16); DRW_shgroup_attrib_float(grp, "color", 4); - DRW_shgroup_uniform_mat4(grp, "ObjectModelMatrix", (float *)obmat); DRW_shgroup_uniform_vec3(grp, "light", light, 1); return grp; } -DRWShadingGroup *shgroup_instance_objspace_wire(DRWPass *pass, struct Gwn_Batch *geom, float (*obmat)[4]) +DRWShadingGroup *shgroup_instance_wire(DRWPass *pass, struct Gwn_Batch *geom) { GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_OBJECTSPACE_VARIYING_COLOR); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom); DRW_shgroup_attrib_float(grp, "InstanceModelMatrix", 16); DRW_shgroup_attrib_float(grp, "color", 4); - DRW_shgroup_uniform_mat4(grp, "ObjectModelMatrix", (float *)obmat); return grp; } @@ -336,7 +334,7 @@ DRWShadingGroup *shgroup_spot_instance(DRWPass *pass, struct Gwn_Batch *geom) return grp; } -DRWShadingGroup *shgroup_instance_bone_envelope_wire(DRWPass *pass, struct Gwn_Batch *geom, float (*obmat)[4]) +DRWShadingGroup *shgroup_instance_bone_envelope_wire(DRWPass *pass, struct Gwn_Batch *geom) { GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_WIRE); @@ -346,12 +344,11 @@ DRWShadingGroup *shgroup_instance_bone_envelope_wire(DRWPass *pass, struct Gwn_B DRW_shgroup_attrib_float(grp, "radius_head", 1); DRW_shgroup_attrib_float(grp, "radius_tail", 1); DRW_shgroup_attrib_float(grp, "distance", 1); - DRW_shgroup_uniform_mat4(grp, "ObjectModelMatrix", (float *)obmat); return grp; } -DRWShadingGroup *shgroup_instance_bone_envelope_solid(DRWPass *pass, struct Gwn_Batch *geom, float (*obmat)[4]) +DRWShadingGroup *shgroup_instance_bone_envelope_solid(DRWPass *pass, struct Gwn_Batch *geom) { static float light[3] = {0.0f, 0.0f, 1.0f}; GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_SOLID); @@ -361,7 +358,6 @@ DRWShadingGroup *shgroup_instance_bone_envelope_solid(DRWPass *pass, struct Gwn_ DRW_shgroup_attrib_float(grp, "color", 4); DRW_shgroup_attrib_float(grp, "radius_head", 1); DRW_shgroup_attrib_float(grp, "radius_tail", 1); - DRW_shgroup_uniform_mat4(grp, "ObjectModelMatrix", (float *)obmat); DRW_shgroup_uniform_vec3(grp, "light", light, 1); return grp; |