[Bf-blender-cvs] [37bbfd4d3cf] temp-gpencil-io: More cleanup and rename of functions
Antonio Vazquez
noreply at git.blender.org
Tue Mar 23 12:59:01 CET 2021
Commit: 37bbfd4d3cf8eb5124e989841a4b6baf74f8ba21
Author: Antonio Vazquez
Date: Tue Mar 23 12:58:57 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rB37bbfd4d3cf8eb5124e989841a4b6baf74f8ba21
More cleanup and rename of functions
===================================================================
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_export_pdf.cc
M source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
M source/blender/io/gpencil/intern/gpencil_io_export_svg.h
===================================================================
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 116bd7b6219..77ac035ebe3 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -306,27 +306,13 @@ float GpencilIO::stroke_point_radius_get(bGPDlayer *gpl, struct bGPDstroke *gps)
return MAX2(radius, 1.0f);
}
-/** Convert a color to Hex value (#FFFFFF). */
-std::string GpencilIO::rgb_to_hexstr(float color[3])
-{
- uint8_t r = color[0] * 255.0f;
- uint8_t g = color[1] * 255.0f;
- uint8_t b = color[2] * 255.0f;
- char hex_string[20];
- sprintf(hex_string, "#%02X%02X%02X", r, g, b);
-
- std::string hexstr = hex_string;
-
- return hexstr;
-}
-
-void GpencilIO::gpl_matrix_set(struct Object *ob, struct bGPDlayer *gpl)
+void GpencilIO::gpl_prepare_export_matrix(struct Object *ob, struct bGPDlayer *gpl)
{
BKE_gpencil_layer_transform_matrix_get(depsgraph_, ob, gpl, diff_mat_);
mul_m4_m4m4(diff_mat_, diff_mat_, gpl->layer_invmat);
}
-void GpencilIO::gps_material_data_prepare(struct Object *ob, struct bGPDstroke *gps)
+void GpencilIO::gps_prepare_export_colors(struct Object *ob, struct bGPDstroke *gps)
{
MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(ob, gps->mat_nr + 1);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index 06e2ea60476..88c988f9db1 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -87,8 +87,6 @@ class GpencilIO {
float stroke_color_[4], fill_color_[4];
- static std::string rgb_to_hexstr(float color[3]);
-
/* Geometry functions. */
bool gpencil_3d_point_to_screen_space(const float co[3], float r_co[2]);
void gpencil_3d_point_to_render_space(const float co[3], float r_co[2]);
@@ -101,8 +99,8 @@ class GpencilIO {
float stroke_average_opacity_get();
- void gpl_matrix_set(struct Object *ob, struct bGPDlayer *gpl);
- void gps_material_data_prepare(struct Object *ob, struct bGPDstroke *gps);
+ void gpl_prepare_export_matrix(struct Object *ob, struct bGPDlayer *gpl);
+ void gps_prepare_export_colors(struct Object *ob, struct bGPDstroke *gps);
void selected_objects_boundbox_calc();
void selected_objects_boundbox_get(rctf *boundbox);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
index b2602ae8183..82bfa58f5d4 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
@@ -166,7 +166,7 @@ void GpencilExporterPDF::export_gpencil_layers()
if (gpl->flag & GP_LAYER_HIDE) {
continue;
}
- gpl_matrix_set(ob, gpl);
+ gpl_prepare_export_matrix(ob, gpl);
bGPDframe *gpf = gpl->actframe;
if ((gpf == nullptr) || (gpf->strokes.first == nullptr)) {
@@ -189,7 +189,7 @@ void GpencilExporterPDF::export_gpencil_layers()
(gp_style->stroke_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
const bool is_fill = ((gp_style->flag & GP_MATERIAL_FILL_SHOW) &&
(gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
- gps_material_data_prepare(ob, gps_duplicate);
+ gps_prepare_export_colors(ob, gps_duplicate);
/* Apply layer thickness change. */
gps_duplicate->thickness += gpl->line_change;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
index 05bf8f7cac1..e9a8314e2f0 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -184,7 +184,7 @@ void GpencilExporterSVG::export_gpencil_layers()
if (gpl->flag & GP_LAYER_HIDE) {
continue;
}
- gpl_matrix_set(ob, gpl);
+ gpl_prepare_export_matrix(ob, gpl);
bGPDframe *gpf = gpl->actframe;
if ((gpf == nullptr) || (gpf->strokes.first == nullptr)) {
@@ -218,7 +218,7 @@ void GpencilExporterSVG::export_gpencil_layers()
const bool is_fill = ((gp_style->flag & GP_MATERIAL_FILL_SHOW) &&
(gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
- gps_material_data_prepare(ob, gps_duplicate);
+ gps_prepare_export_colors(ob, gps_duplicate);
/* Apply layer thickness change. */
gps_duplicate->thickness += gpl->line_change;
@@ -457,4 +457,19 @@ void GpencilExporterSVG::add_text(pugi::xml_node node,
nodetxt.append_attribute("fill").set_value(hexcolor.c_str());
nodetxt.text().set(text.c_str());
}
+
+/** Convert a color to Hex value (#FFFFFF). */
+std::string GpencilExporterSVG::rgb_to_hexstr(float color[3])
+{
+ uint8_t r = color[0] * 255.0f;
+ uint8_t g = color[1] * 255.0f;
+ uint8_t b = color[2] * 255.0f;
+ char hex_string[20];
+ sprintf(hex_string, "#%02X%02X%02X", r, g, b);
+
+ std::string hexstr = hex_string;
+
+ return hexstr;
+}
+
} // namespace blender::io::gpencil
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.h b/source/blender/io/gpencil/intern/gpencil_io_export_svg.h
index 13c77481120..97c76b014f9 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.h
@@ -84,6 +84,8 @@ class GpencilExporterSVG : public GpencilExporter {
struct bGPDstroke *gps,
pugi::xml_node node_gps,
const bool is_fill);
+
+ std::string rgb_to_hexstr(float color[3]);
};
} // namespace blender::io::gpencil
More information about the Bf-blender-cvs
mailing list