diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-03-03 14:23:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-03-03 14:23:59 +0300 |
| commit | 7e05205296057d6295d4dd4b3195b14fc06a3256 (patch) | |
| tree | 4e49ff4993200c1e36bf53f34708a272fcc87395 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 560de5e6e507745ba928d2bdc514882e78ea4576 (diff) | |
worldspace text locations & made some improvements to string formatting for particle number display.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 697fe478602..b594fba90b9 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -544,7 +544,7 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa /* project first and test */ for(vos= strings->first; vos; vos= vos->next) { - if(mat) + if(mat && !(vos->flag & V3D_CACHE_TEXT_WORLDSPACE)) mul_m4_v3(mat, vos->vec); view3d_project_short_clip(ar, vos->vec, vos->mval, 0); if(vos->mval[0]!=IS_CLIPPED) @@ -3693,22 +3693,19 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv setlinestyle(0); } - if((part->draw&PART_DRAW_NUM || part->draw&PART_DRAW_HEALTH) && !(G.f & G_RENDER_SHADOW)){ + if((part->draw & PART_DRAW_NUM || part->draw & PART_DRAW_HEALTH) && !(G.f & G_RENDER_SHADOW)){ + char *val_pos= val; val[0]= '\0'; - + if(part->draw&PART_DRAW_NUM) - sprintf(val, " %i", a); + val_pos += sprintf(val, "%i", a); - if(part->draw&PART_DRAW_NUM && part->draw&PART_DRAW_HEALTH) - strcat(val, ":"); + if((part->draw & PART_DRAW_HEALTH) && a < totpart && part->phystype==PART_PHYS_BOIDS) + sprintf(val_pos, (val_pos==val) ? "%.2f" : ":%.2f", pa_health); - if(part->draw&PART_DRAW_HEALTH && a < totpart && part->phystype==PART_PHYS_BOIDS) { - char tval[8]; - sprintf(tval, " %.2f", pa_health); - strcat(val, tval); - } /* in path drawing state.co is the end point */ - view3d_cached_text_draw_add(state.co[0], state.co[1], state.co[2], val, 0, 0); + /* use worldspace beause object matrix is alredy applied */ + view3d_cached_text_draw_add(state.co[0], state.co[1], state.co[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE); } } } |