Page MenuHome
Differential D6076 Diff 19090 source/blender/draw/modes/object_mode.c

Changeset View

Standalone View

View Options

source/blender/draw/modes/object_mode.c

Show First 20 Lines • Show All 2,662 Lines • ▼ Show 20 Linesstatic void DRW_shgroup_volume_extra(OBJECT_ShadingGroupList *sgl,
if (sds == NULL) { if (sds == NULL) {
return; return;
} }
DRW_object_wire_theme_get(ob, view_layer, &color); DRW_object_wire_theme_get(ob, view_layer, &color);
/* Small cube showing voxel size. */ /* Small cube showing voxel size. */
float min[3];
madd_v3fl_v3fl_v3fl_v3i(min, sds->p0, sds->cell_size, sds->res_min);
float voxel_cubemat[4][4] = {{0.0f}}; float voxel_cubemat[4][4] = {{0.0f}};
voxel_cubemat[0][0] = 1.0f / (float)sds->res[0]; /* scale small cube to voxel size */
voxel_cubemat[1][1] = 1.0f / (float)sds->res[1]; voxel_cubemat[0][0] = 1.0f / (float)sds->base_res[0];
voxel_cubemat[2][2] = 1.0f / (float)sds->res[2]; voxel_cubemat[1][1] = 1.0f / (float)sds->base_res[1];
voxel_cubemat[2][2] = 1.0f / (float)sds->base_res[2];
voxel_cubemat[3][0] = voxel_cubemat[3][1] = voxel_cubemat[3][2] = -1.0f; voxel_cubemat[3][0] = voxel_cubemat[3][1] = voxel_cubemat[3][2] = -1.0f;
voxel_cubemat[3][3] = 1.0f; voxel_cubemat[3][3] = 1.0f;
/* translate small cube to corner */
voxel_cubemat[3][0] = min[0];
voxel_cubemat[3][1] = min[1];
voxel_cubemat[3][2] = min[2];
voxel_cubemat[3][3] = 1.0f;
/* move small cube into the domain (otherwise its centered on vertex of domain object) */
translate_m4(voxel_cubemat, 1.0f, 1.0f, 1.0f); translate_m4(voxel_cubemat, 1.0f, 1.0f, 1.0f);
mul_m4_m4m4(voxel_cubemat, ob->obmat, voxel_cubemat); mul_m4_m4m4(voxel_cubemat, ob->obmat, voxel_cubemat);
DRW_buffer_add_entry(sgl->empties.cube, color, &one, voxel_cubemat); DRW_buffer_add_entry(sgl->empties.cube, color, &one, voxel_cubemat);
/* Don't show smoke before simulation starts, this could be made an option in the future. */ /* Don't show smoke before simulation starts, this could be made an option in the future. */
if (!sds->draw_velocity || !sds->fluid || CFRA < sds->point_cache[0]->startframe) { if (!sds->draw_velocity || !sds->fluid || CFRA < sds->point_cache[0]->startframe) {
return; return;
Show All 19 Linesstatic void DRW_shgroup_volume_extra(OBJECT_ShadingGroupList *sgl,
DRWShadingGroup *grp = DRW_shgroup_create(volume_velocity_shader_get(use_needle), DRWShadingGroup *grp = DRW_shgroup_create(volume_velocity_shader_get(use_needle),
sgl->non_meshes); sgl->non_meshes);
DRW_shgroup_uniform_texture(grp, "velocityX", sds->tex_velocity_x); DRW_shgroup_uniform_texture(grp, "velocityX", sds->tex_velocity_x);
DRW_shgroup_uniform_texture(grp, "velocityY", sds->tex_velocity_y); DRW_shgroup_uniform_texture(grp, "velocityY", sds->tex_velocity_y);
DRW_shgroup_uniform_texture(grp, "velocityZ", sds->tex_velocity_z); DRW_shgroup_uniform_texture(grp, "velocityZ", sds->tex_velocity_z);
DRW_shgroup_uniform_float_copy(grp, "displaySize", sds->vector_scale); DRW_shgroup_uniform_float_copy(grp, "displaySize", sds->vector_scale);
DRW_shgroup_uniform_float_copy(grp, "slicePosition", sds->slice_depth); DRW_shgroup_uniform_float_copy(grp, "slicePosition", sds->slice_depth);
DRW_shgroup_uniform_vec3_copy(grp, "cellSize", sds->cell_size);
fclemUnsubmitted
Done
Inline Actions

You can use DRW_shgroup_uniform_vec3_copy for theses. Might be faster and less error prone.

fclem: You can use DRW_shgroup_uniform_vec3_copy for theses. Might be faster and less error prone.
DRW_shgroup_uniform_vec3_copy(grp, "domainOriginOffset", sds->p0);
DRW_shgroup_uniform_ivec3_copy(grp, "adaptiveCellOffset", sds->res_min);
DRW_shgroup_uniform_int_copy(grp, "sliceAxis", slice_axis); DRW_shgroup_uniform_int_copy(grp, "sliceAxis", slice_axis);
DRW_shgroup_call_procedural_lines(grp, ob, line_count); DRW_shgroup_call_procedural_lines(grp, ob, line_count);
BLI_addtail(&e_data.smoke_domains, BLI_genericNodeN(smd)); BLI_addtail(&e_data.smoke_domains, BLI_genericNodeN(smd));
} }
static void volumes_free_smoke_textures(void) static void volumes_free_smoke_textures(void)
{ {
▲ Show 20 Lines • Show All 1,140 Lines • Show Last 20 Lines