diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2015-11-22 20:17:09 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2015-11-22 20:18:43 +0300 |
commit | 3e1a9ee386b054912b540b7a061d76235f4049fa (patch) | |
tree | 4109341018601a6d9f70dfc2e32ffe4177e4bbce /source/blender/editors/space_view3d/view3d_intern.h | |
parent | 8623d75b468ff1a495a326cf74ca6d61f1ee4ce7 (diff) |
Smoke drawing code cleanups (and little refactor)
This patch contains the following changes:
- the vertices and edges arrays would be assigned default values, and
then reassigned new ones right away. It appears that those arrays were
once global and then made local
(rB06a2ee4afed4237398b69ddf253e29a730b2f9f0), so it makes sense now to
initialize them with the right values.
- the flame spectrum texture was created whether it was needed or not,
so now it's only created if there's flame to be drawn, also split the
code in a separate function.
- reduce the number of parameters to the main draw function, as most of
them are member of SmokeDomainSettings.
- some other minor cleanups: fold multiple operations into one to get
rid of one local variable, mark variables as `const` when necessary,
unecessary gl draw calls, reorder the code a bit...
Reviewers: campbellbarton, psy-fi
Differential Revision: https://developer.blender.org/D1368
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_intern.h')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 95c0ef92680..94c1db8aa5d 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -273,9 +273,8 @@ extern const char *view3d_context_dir[]; /* doc access */ /* draw_volume.c */ void draw_smoke_volume(struct SmokeDomainSettings *sds, struct Object *ob, - struct GPUTexture *tex, const float min[3], const float max[3], - const int res[3], float dx, float base_scale, const float viewnormal[3], - struct GPUTexture *tex_shadow, struct GPUTexture *tex_flame); + const float min[3], const float max[3], + const int res[3], const float viewnormal[3]); //#define SMOKE_DEBUG_VELOCITY //#define SMOKE_DEBUG_HEAT |