[Bf-blender-cvs] [1b75ceff7a8] greasepencil-object: GPencil: Cleanup code and rename variables
Antonio Vazquez
noreply at git.blender.org
Sat Aug 1 11:19:49 CEST 2020
Commit: 1b75ceff7a85c4f531b8b5ccd3f27cfbd089c34b
Author: Antonio Vazquez
Date: Sat Aug 1 11:19:40 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1b75ceff7a85c4f531b8b5ccd3f27cfbd089c34b
GPencil: Cleanup code and rename variables
===================================================================
M source/blender/io/gpencil/intern/gpencil_io_base.cc
M source/blender/io/gpencil/intern/gpencil_io_base.h
M source/blender/io/gpencil/intern/gpencil_io_svg.cc
===================================================================
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 8b1c5fc0a40..f39c2c3efea 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -100,12 +100,13 @@ GpencilExporter::GpencilExporter(const struct GpencilExportParams *iparams)
ObjectZ obz = {camera_z, object};
// obz.zdepth = camera_z;
// obz.ob = object;
- ob_list.push_back(obz);
+ ob_list_.push_back(obz);
}
}
/* Sort list of objects from point of view. */
- ob_list.sort([](const ObjectZ &obz1, const ObjectZ &obz2) { return obz1.zdepth < obz2.zdepth; });
+ ob_list_.sort(
+ [](const ObjectZ &obz1, const ObjectZ &obz2) { return obz1.zdepth < obz2.zdepth; });
}
/**
@@ -115,8 +116,8 @@ GpencilExporter::GpencilExporter(const struct GpencilExportParams *iparams)
*/
void GpencilExporter::set_out_filename(char *filename)
{
- BLI_strncpy(out_filename, filename, FILE_MAX);
- BLI_path_abs(out_filename, BKE_main_blendfile_path(bmain));
+ BLI_strncpy(out_filename_, filename, FILE_MAX);
+ BLI_path_abs(out_filename_, BKE_main_blendfile_path(bmain));
//#ifdef WIN32
// UTF16_ENCODE(svg_filename);
@@ -128,7 +129,7 @@ void GpencilExporter::set_out_filename(char *filename)
bool GpencilExporter::gpencil_3d_point_to_screen_space(const float co[3], float r_co[2])
{
float parent_co[3];
- mul_v3_m4v3(parent_co, diff_mat, co);
+ mul_v3_m4v3(parent_co, diff_mat_, co);
float screen_co[2];
eV3DProjTest test = (eV3DProjTest)(V3D_PROJ_RET_OK);
if (ED_view3d_project_float_global(params_.region, parent_co, screen_co, test) ==
@@ -136,11 +137,11 @@ bool GpencilExporter::gpencil_3d_point_to_screen_space(const float co[3], float
if (!ELEM(V2D_IS_CLIPPED, screen_co[0], screen_co[1])) {
copy_v2_v2(r_co, screen_co);
/* Invert X axis. */
- if (invert_axis[0]) {
+ if (invert_axis_[0]) {
r_co[0] = winx - r_co[0];
}
/* Invert Y axis. */
- if (invert_axis[1]) {
+ if (invert_axis_[1]) {
r_co[1] = winy - r_co[1];
}
@@ -151,11 +152,11 @@ bool GpencilExporter::gpencil_3d_point_to_screen_space(const float co[3], float
r_co[1] = V2D_IS_CLIPPED;
/* Invert X axis. */
- if (invert_axis[0]) {
+ if (invert_axis_[0]) {
r_co[0] = winx - r_co[0];
}
/* Invert Y axis. */
- if (invert_axis[1]) {
+ if (invert_axis_[1]) {
r_co[1] = winy - r_co[1];
}
@@ -220,7 +221,7 @@ float GpencilExporter::stroke_point_radius_get(struct bGPDstroke *gps)
/* Radius. */
bGPDstroke *gps_perimeter = BKE_gpencil_stroke_perimeter_from_view(
- rv3d, gpd, gpl, gps, 3, diff_mat);
+ rv3d, gpd, gpl, gps, 3, diff_mat_);
pt = &gps_perimeter->points[0];
gpencil_3d_point_to_screen_space(&pt->x, screen_ex);
@@ -279,7 +280,7 @@ struct bGPDlayer *GpencilExporter::gpl_current_get(void)
void GpencilExporter::gpl_current_set(struct bGPDlayer *gpl)
{
gpl_cur = gpl;
- BKE_gpencil_parent_matrix_get(depsgraph, params_.obact, gpl, diff_mat);
+ BKE_gpencil_parent_matrix_get(depsgraph, params_.obact, gpl, diff_mat_);
}
struct bGPDframe *GpencilExporter::gpf_current_get(void)
@@ -310,7 +311,7 @@ void GpencilExporter::gps_current_set(struct Object *ob,
(gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
/* Stroke color. */
- copy_v4_v4(stroke_color, gp_style->stroke_rgba);
+ copy_v4_v4(stroke_color_, gp_style->stroke_rgba);
avg_opacity = 0;
/* Get average vertex color and apply. */
float avg_color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
@@ -321,13 +322,13 @@ void GpencilExporter::gps_current_set(struct Object *ob,
}
mul_v4_v4fl(avg_color, avg_color, 1.0f / (float)gps->totpoints);
- interp_v3_v3v3(stroke_color, stroke_color, avg_color, avg_color[3]);
+ interp_v3_v3v3(stroke_color_, stroke_color_, avg_color, avg_color[3]);
avg_opacity /= (float)gps->totpoints;
/* Fill color. */
- copy_v4_v4(fill_color, gp_style->fill_rgba);
+ copy_v4_v4(fill_color_, gp_style->fill_rgba);
/* Apply vertex color for fill. */
- interp_v3_v3v3(fill_color, fill_color, gps->vert_color_fill, gps->vert_color_fill[3]);
+ interp_v3_v3v3(fill_color_, fill_color_, gps->vert_color_fill, gps->vert_color_fill[3]);
}
}
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index 38e53d8079f..141c0115df6 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -57,20 +57,18 @@ class GpencilExporter {
std::string to_lower_string(char *input_text);
protected:
- bool invert_axis[2];
- float diff_mat[4][4];
+ bool invert_axis_[2];
+ float diff_mat_[4][4];
GpencilExportParams params_;
- char out_filename[FILE_MAX];
+ char out_filename_[FILE_MAX];
+ /* Used for sorting objects. */
struct ObjectZ {
float zdepth;
struct Object *ob;
- // ObjectZ(int izdepth, Object *iob) : zdepth(izdepth), ob(iob)
- //{
- //}
};
- std::list<ObjectZ> ob_list;
+ std::list<ObjectZ> ob_list_;
/* Data for easy access. */
struct Depsgraph *depsgraph;
@@ -79,7 +77,7 @@ class GpencilExporter {
struct RegionView3D *rv3d;
int winx, winy;
- float stroke_color[4], fill_color[4];
+ float stroke_color_[4], fill_color_[4];
struct bGPDlayer *gpl_current_get(void);
struct bGPDframe *gpf_current_get(void);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
index 66446ee0cfb..59f20cb13c0 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_svg.cc
@@ -63,8 +63,8 @@ namespace blender ::io ::gpencil {
GpencilExporterSVG::GpencilExporterSVG(const struct GpencilExportParams *iparams)
: GpencilExporter(iparams)
{
- invert_axis[0] = false;
- invert_axis[1] = true;
+ invert_axis_[0] = false;
+ invert_axis_[1] = true;
}
/* Main write method for SVG format. */
@@ -75,7 +75,7 @@ bool GpencilExporterSVG::write(std::string actual_frame)
export_layers();
/* Add frame to filename. */
- std::string frame_file = out_filename;
+ std::string frame_file = out_filename_;
size_t found = frame_file.find_last_of(".", 0);
if (found != std::string::npos) {
frame_file.replace(found, 8, actual_frame + ".svg");
@@ -116,7 +116,7 @@ void GpencilExporterSVG::create_document_header(void)
/* Main layer loop. */
void GpencilExporterSVG::export_layers(void)
{
- for (ObjectZ &obz : ob_list) {
+ for (ObjectZ &obz : ob_list_) {
Object *ob = obz.ob;
pugi::xml_node ob_node = main_node.append_child("g");
ob_node.append_attribute("zdepth").set_value(ob->id.name + 2);
@@ -144,7 +144,7 @@ void GpencilExporterSVG::export_layers(void)
}
gpf_current_set(gpf);
- BKE_gpencil_parent_matrix_get(depsgraph, ob, gpl, diff_mat);
+ BKE_gpencil_parent_matrix_get(depsgraph, ob, gpl, diff_mat_);
LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
if (gps->totpoints == 0) {
@@ -183,7 +183,7 @@ void GpencilExporterSVG::export_layers(void)
}
else {
bGPDstroke *gps_perimeter = BKE_gpencil_stroke_perimeter_from_view(
- rv3d, gpd, gpl, gps_duplicate, 3, diff_mat);
+ rv3d, gpd, gpl, gps_duplicate, 3, diff_mat_);
gps_current_set(ob, gps_perimeter, false);
@@ -207,7 +207,7 @@ void GpencilExporterSVG::export_layers(void)
* Export a point
* \param gpl_node: Node of the layer.
* \param gps: Stroke to export.
- * \param diff_mat: Transformation matrix.
+ * \param diff_mat_: Transformation matrix.
*/
void GpencilExporterSVG::export_point(pugi::xml_node gpl_node)
{
@@ -235,7 +235,7 @@ void GpencilExporterSVG::export_point(pugi::xml_node gpl_node)
* Export a stroke using path
* \param gpl_node: Node of the layer.
* \param gps: Stroke to export.
- * \param diff_mat: Transformation matrix.
+ * \param diff_mat_: Transformation matrix.
* \param is_fill: True if the stroke is only fill
*/
void GpencilExporterSVG::export_stroke_path(pugi::xml_node gpl_node, const bool is_fill)
@@ -248,15 +248,15 @@ void GpencilExporterSVG::export_stroke_path(pugi::xml_node gpl_node, const bool
float col[3];
std::string stroke_hex;
if (is_fill) {
- gps_node.append_attribute("fill-opacity").set_value(fill_color[3] * gpl->opacity);
+ gps_node.append_attribute("fill-opacity").set_value(fill_color_[3] * gpl->opacity);
- interp_v3_v3v3(col, fill_color, gpl->tintcolor, gpl->tintcolor[3]);
+ interp_v3_v3v3(col, fill_color_, gpl->tintcolor, gpl->tintcolor[3]);
}
else {
gps_node.append_attribute("fill-opacity")
- .set_value(stroke_color[3] * stroke_average_opacity() * gpl->opacity);
+ .set_value(stroke_color_[3] * stroke_average_opacity() * gpl->opacity);
- interp_v3_v3v3(col, stroke_color, gpl->tintcolor, gpl->tintcolor[3]);
+ interp_v3_v3v3(col, stroke_color_, gpl->tintcolor, gpl->tintcolor[3]);
}
linearrgb_to_srgb_v3_v3(col, col);
stroke_hex = rgb_to_hex(col);
@@ -286,7 +286,7 @@ void GpencilExporterSVG::export_stroke_path(pugi::xml_node gpl_node, const bool
* Export a stroke using polyline or polygon
* \param gpl_node: Node of the layer.
* \param gps: Stroke to export.
- * \param diff_mat: Transformation matrix.
+ * \param diff_mat_: Transformation matrix.
* \param is_fill: True if the stroke is only fill
*/
void GpencilExporterSVG::export_stroke_polyline(pugi::xml_node gpl_node, const bool is_fill)
@@ -347,20 +347,20 @@ void GpencilExporterSVG::color_string_set(pugi::xml_node gps_node, const bool is
float col[3];
if (is_fill) {
- interp_v3_v3v3(col, fill_color, gpl->tintcolor, gpl->tintcolor[3]);
+ interp_v3_v3v3(col, fill_color_, gpl->tintcolor, gpl->tintcolor[3]);
linearrgb_to_srgb_v3_v3(col, col);
std::string stroke_hex = rgb_to_hex(col);
gps_node.append_attribute("fill").set_value(stroke_hex.c_str());
gps_node.append_attribute("stroke").set_value("none");
- gps_nod
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list