Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/draw/modes/particle_mode.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/draw/modes/particle_mode.c')
-rw-r--r--source/blender/draw/modes/particle_mode.c278
1 files changed, 135 insertions, 143 deletions
diff --git a/source/blender/draw/modes/particle_mode.c b/source/blender/draw/modes/particle_mode.c
index 3090322fc80..600a29fecb4 100644
--- a/source/blender/draw/modes/particle_mode.c
+++ b/source/blender/draw/modes/particle_mode.c
@@ -43,101 +43,96 @@ extern char datatoc_common_globals_lib_glsl[];
/* *********** LISTS *********** */
typedef struct PARTICLE_PassList {
- struct DRWPass *psys_edit_pass;
+ struct DRWPass *psys_edit_pass;
} PARTICLE_PassList;
typedef struct PARTICLE_FramebufferList {
- struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} PARTICLE_FramebufferList;
typedef struct PARTICLE_TextureList {
- struct GPUTexture *texture;
+ struct GPUTexture *texture;
} PARTICLE_TextureList;
typedef struct PARTICLE_StorageList {
- struct CustomStruct *block;
- struct PARTICLE_PrivateData *g_data;
+ struct CustomStruct *block;
+ struct PARTICLE_PrivateData *g_data;
} PARTICLE_StorageList;
typedef struct PARTICLE_Data {
- void *engine_type; /* Required */
- PARTICLE_FramebufferList *fbl;
- PARTICLE_TextureList *txl;
- PARTICLE_PassList *psl;
- PARTICLE_StorageList *stl;
+ void *engine_type; /* Required */
+ PARTICLE_FramebufferList *fbl;
+ PARTICLE_TextureList *txl;
+ PARTICLE_PassList *psl;
+ PARTICLE_StorageList *stl;
} PARTICLE_Data;
/* *********** STATIC *********** */
static struct {
- struct GPUShader *strands_shader;
- struct GPUShader *strands_weight_shader;
- struct GPUShader *points_shader;
+ struct GPUShader *strands_shader;
+ struct GPUShader *strands_weight_shader;
+ struct GPUShader *points_shader;
} e_data = {NULL}; /* Engine data */
typedef struct PARTICLE_PrivateData {
- DRWShadingGroup *strands_group;
- DRWShadingGroup *inner_points_group;
- DRWShadingGroup *tip_points_group;
+ DRWShadingGroup *strands_group;
+ DRWShadingGroup *inner_points_group;
+ DRWShadingGroup *tip_points_group;
} PARTICLE_PrivateData; /* Transient data */
/* *********** FUNCTIONS *********** */
static void particle_engine_init(void *UNUSED(vedata))
{
- if (!e_data.strands_shader) {
- e_data.strands_shader = DRW_shader_create_with_lib(
- datatoc_particle_strand_vert_glsl,
- NULL,
- datatoc_particle_strand_frag_glsl,
- datatoc_common_globals_lib_glsl,
- "");
-
- e_data.strands_weight_shader = DRW_shader_create_with_lib(
- datatoc_particle_strand_vert_glsl,
- NULL,
- datatoc_particle_strand_frag_glsl,
- datatoc_common_globals_lib_glsl,
- "#define USE_WEIGHT");
-
- e_data.points_shader = DRW_shader_create_with_lib(
- datatoc_particle_strand_vert_glsl,
- NULL,
- datatoc_particle_strand_frag_glsl,
- datatoc_common_globals_lib_glsl,
- "#define USE_POINTS");
- }
+ if (!e_data.strands_shader) {
+ e_data.strands_shader = DRW_shader_create_with_lib(datatoc_particle_strand_vert_glsl,
+ NULL,
+ datatoc_particle_strand_frag_glsl,
+ datatoc_common_globals_lib_glsl,
+ "");
+
+ e_data.strands_weight_shader = DRW_shader_create_with_lib(datatoc_particle_strand_vert_glsl,
+ NULL,
+ datatoc_particle_strand_frag_glsl,
+ datatoc_common_globals_lib_glsl,
+ "#define USE_WEIGHT");
+
+ e_data.points_shader = DRW_shader_create_with_lib(datatoc_particle_strand_vert_glsl,
+ NULL,
+ datatoc_particle_strand_frag_glsl,
+ datatoc_common_globals_lib_glsl,
+ "#define USE_POINTS");
+ }
}
static void particle_cache_init(void *vedata)
{
- PARTICLE_PassList *psl = ((PARTICLE_Data *)vedata)->psl;
- PARTICLE_StorageList *stl = ((PARTICLE_Data *)vedata)->stl;
- const DRWContextState *draw_ctx = DRW_context_state_get();
- ParticleEditSettings *pset = PE_settings(draw_ctx->scene);
- const bool use_weight = (pset->brushtype == PE_BRUSH_WEIGHT);
-
- if (!stl->g_data) {
- /* Alloc transient pointers */
- stl->g_data = MEM_mallocN(sizeof(*stl->g_data), __func__);
- }
-
- /* Create a pass */
- psl->psys_edit_pass = DRW_pass_create("PSys Edit Pass",
- (DRW_STATE_WRITE_COLOR |
- DRW_STATE_WRITE_DEPTH |
- DRW_STATE_DEPTH_LESS_EQUAL |
- DRW_STATE_WIRE |
- DRW_STATE_POINT));
-
- GPUShader *strand_shader = (use_weight) ? e_data.strands_weight_shader : e_data.strands_shader;
- stl->g_data->strands_group = DRW_shgroup_create(strand_shader, psl->psys_edit_pass);
- stl->g_data->inner_points_group = DRW_shgroup_create(e_data.points_shader, psl->psys_edit_pass);
- stl->g_data->tip_points_group = DRW_shgroup_create(e_data.points_shader, psl->psys_edit_pass);
-
- DRW_shgroup_uniform_block(stl->g_data->strands_group, "globalsBlock", G_draw.block_ubo);
- DRW_shgroup_uniform_block(stl->g_data->inner_points_group, "globalsBlock", G_draw.block_ubo);
- DRW_shgroup_uniform_block(stl->g_data->tip_points_group, "globalsBlock", G_draw.block_ubo);
+ PARTICLE_PassList *psl = ((PARTICLE_Data *)vedata)->psl;
+ PARTICLE_StorageList *stl = ((PARTICLE_Data *)vedata)->stl;
+ const DRWContextState *draw_ctx = DRW_context_state_get();
+ ParticleEditSettings *pset = PE_settings(draw_ctx->scene);
+ const bool use_weight = (pset->brushtype == PE_BRUSH_WEIGHT);
+
+ if (!stl->g_data) {
+ /* Alloc transient pointers */
+ stl->g_data = MEM_mallocN(sizeof(*stl->g_data), __func__);
+ }
+
+ /* Create a pass */
+ psl->psys_edit_pass = DRW_pass_create("PSys Edit Pass",
+ (DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
+ DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_WIRE |
+ DRW_STATE_POINT));
+
+ GPUShader *strand_shader = (use_weight) ? e_data.strands_weight_shader : e_data.strands_shader;
+ stl->g_data->strands_group = DRW_shgroup_create(strand_shader, psl->psys_edit_pass);
+ stl->g_data->inner_points_group = DRW_shgroup_create(e_data.points_shader, psl->psys_edit_pass);
+ stl->g_data->tip_points_group = DRW_shgroup_create(e_data.points_shader, psl->psys_edit_pass);
+
+ DRW_shgroup_uniform_block(stl->g_data->strands_group, "globalsBlock", G_draw.block_ubo);
+ DRW_shgroup_uniform_block(stl->g_data->inner_points_group, "globalsBlock", G_draw.block_ubo);
+ DRW_shgroup_uniform_block(stl->g_data->tip_points_group, "globalsBlock", G_draw.block_ubo);
}
static void particle_edit_cache_populate(void *vedata,
@@ -145,69 +140,66 @@ static void particle_edit_cache_populate(void *vedata,
ParticleSystem *psys,
PTCacheEdit *edit)
{
- PARTICLE_StorageList *stl = ((PARTICLE_Data *)vedata)->stl;
- const DRWContextState *draw_ctx = DRW_context_state_get();
- ParticleEditSettings *pset = PE_settings(draw_ctx->scene);
- const bool use_weight = (pset->brushtype == PE_BRUSH_WEIGHT);
- {
- struct GPUBatch *strands =
- DRW_cache_particles_get_edit_strands(object, psys, edit, use_weight);
- DRW_shgroup_call_add(stl->g_data->strands_group, strands, NULL);
- }
- if (pset->selectmode == SCE_SELECT_POINT) {
- struct GPUBatch *points =
- DRW_cache_particles_get_edit_inner_points(object, psys, edit);
- DRW_shgroup_call_add(stl->g_data->inner_points_group, points, NULL);
- }
- if (ELEM(pset->selectmode, SCE_SELECT_POINT, SCE_SELECT_END)) {
- struct GPUBatch *points =
- DRW_cache_particles_get_edit_tip_points(object, psys, edit);
- DRW_shgroup_call_add(stl->g_data->tip_points_group, points, NULL);
- }
+ PARTICLE_StorageList *stl = ((PARTICLE_Data *)vedata)->stl;
+ const DRWContextState *draw_ctx = DRW_context_state_get();
+ ParticleEditSettings *pset = PE_settings(draw_ctx->scene);
+ const bool use_weight = (pset->brushtype == PE_BRUSH_WEIGHT);
+ {
+ struct GPUBatch *strands = DRW_cache_particles_get_edit_strands(
+ object, psys, edit, use_weight);
+ DRW_shgroup_call_add(stl->g_data->strands_group, strands, NULL);
+ }
+ if (pset->selectmode == SCE_SELECT_POINT) {
+ struct GPUBatch *points = DRW_cache_particles_get_edit_inner_points(object, psys, edit);
+ DRW_shgroup_call_add(stl->g_data->inner_points_group, points, NULL);
+ }
+ if (ELEM(pset->selectmode, SCE_SELECT_POINT, SCE_SELECT_END)) {
+ struct GPUBatch *points = DRW_cache_particles_get_edit_tip_points(object, psys, edit);
+ DRW_shgroup_call_add(stl->g_data->tip_points_group, points, NULL);
+ }
}
static void particle_cache_populate(void *vedata, Object *object)
{
- if (object->mode != OB_MODE_PARTICLE_EDIT) {
- return;
- }
- const DRWContextState *draw_ctx = DRW_context_state_get();
- Scene *scene_orig = (Scene *)DEG_get_original_id(&draw_ctx->scene->id);
- /* Usually the edit structure is created by Particle Edit Mode Toggle
- * operator, but sometimes it's invoked after tagging hair as outdated
- * (for example, when toggling edit mode). That makes it impossible to
- * create edit structure for until after next dependency graph evaluation.
- *
- * Ideally, the edit structure will be created here already via some
- * dependency graph callback or so, but currently trying to make it nicer
- * only causes bad level calls and breaks design from the past.
- */
- Object *object_orig = DEG_get_original_object(object);
- PTCacheEdit *edit = PE_create_current(
- draw_ctx->depsgraph, scene_orig, object_orig);
- if (edit == NULL) {
- /* Happens when trying to edit particles in EMITTER mode without
- * having them cached.
- */
- return;
- }
- /* NOTE: We need to pass evaluated particle system, which we need
- * to find first.
- */
- ParticleSystem *psys = object->particlesystem.first;
- ParticleSystem *psys_orig = object_orig->particlesystem.first;
- while (psys_orig != NULL) {
- if (PE_get_current_from_psys(psys_orig) == edit) {
- break;
- }
- psys = psys->next;
- psys_orig = psys_orig->next;
- }
- if (psys == NULL) {
- printf("Error getting evaluated particle system for edit.\n");
- return;
- }
- particle_edit_cache_populate(vedata, object, psys, edit);
+ if (object->mode != OB_MODE_PARTICLE_EDIT) {
+ return;
+ }
+ const DRWContextState *draw_ctx = DRW_context_state_get();
+ Scene *scene_orig = (Scene *)DEG_get_original_id(&draw_ctx->scene->id);
+ /* Usually the edit structure is created by Particle Edit Mode Toggle
+ * operator, but sometimes it's invoked after tagging hair as outdated
+ * (for example, when toggling edit mode). That makes it impossible to
+ * create edit structure for until after next dependency graph evaluation.
+ *
+ * Ideally, the edit structure will be created here already via some
+ * dependency graph callback or so, but currently trying to make it nicer
+ * only causes bad level calls and breaks design from the past.
+ */
+ Object *object_orig = DEG_get_original_object(object);
+ PTCacheEdit *edit = PE_create_current(draw_ctx->depsgraph, scene_orig, object_orig);
+ if (edit == NULL) {
+ /* Happens when trying to edit particles in EMITTER mode without
+ * having them cached.
+ */
+ return;
+ }
+ /* NOTE: We need to pass evaluated particle system, which we need
+ * to find first.
+ */
+ ParticleSystem *psys = object->particlesystem.first;
+ ParticleSystem *psys_orig = object_orig->particlesystem.first;
+ while (psys_orig != NULL) {
+ if (PE_get_current_from_psys(psys_orig) == edit) {
+ break;
+ }
+ psys = psys->next;
+ psys_orig = psys_orig->next;
+ }
+ if (psys == NULL) {
+ printf("Error getting evaluated particle system for edit.\n");
+ return;
+ }
+ particle_edit_cache_populate(vedata, object, psys, edit);
}
/* Optional: Post-cache_populate callback */
@@ -219,32 +211,32 @@ static void particle_cache_finish(void *UNUSED(vedata))
static void particle_draw_scene(void *vedata)
{
- PARTICLE_PassList *psl = ((PARTICLE_Data *)vedata)->psl;
+ PARTICLE_PassList *psl = ((PARTICLE_Data *)vedata)->psl;
- DRW_draw_pass(psl->psys_edit_pass);
+ DRW_draw_pass(psl->psys_edit_pass);
}
static void particle_engine_free(void)
{
- DRW_SHADER_FREE_SAFE(e_data.strands_shader);
- DRW_SHADER_FREE_SAFE(e_data.strands_weight_shader);
- DRW_SHADER_FREE_SAFE(e_data.points_shader);
+ DRW_SHADER_FREE_SAFE(e_data.strands_shader);
+ DRW_SHADER_FREE_SAFE(e_data.strands_weight_shader);
+ DRW_SHADER_FREE_SAFE(e_data.points_shader);
}
-static const DrawEngineDataSize particle_data_size =
- DRW_VIEWPORT_DATA_SIZE(PARTICLE_Data);
+static const DrawEngineDataSize particle_data_size = DRW_VIEWPORT_DATA_SIZE(PARTICLE_Data);
DrawEngineType draw_engine_particle_type = {
- NULL, NULL,
- N_("Particle Mode"),
- &particle_data_size,
- &particle_engine_init,
- &particle_engine_free,
- &particle_cache_init,
- &particle_cache_populate,
- &particle_cache_finish,
- NULL, /* draw_background but not needed by mode engines */
- &particle_draw_scene,
- NULL,
- NULL,
+ NULL,
+ NULL,
+ N_("Particle Mode"),
+ &particle_data_size,
+ &particle_engine_init,
+ &particle_engine_free,
+ &particle_cache_init,
+ &particle_cache_populate,
+ &particle_cache_finish,
+ NULL, /* draw_background but not needed by mode engines */
+ &particle_draw_scene,
+ NULL,
+ NULL,
};