[Bf-blender-cvs] [6cbc913b00a] soc-2019-npr: Cleanup: make format.
YimingWu
noreply at git.blender.org
Wed Jul 10 14:32:50 CEST 2019
Commit: 6cbc913b00ada7459ac5e7cd20ce5f570acca070
Author: YimingWu
Date: Wed Jul 10 20:32:35 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB6cbc913b00ada7459ac5e7cd20ce5f570acca070
Cleanup: make format.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_ops.c
M source/blender/editors/gpencil/gpencil_svg.c
M source/blender/editors/include/ED_svg.h
M source/blender/editors/io/io_svg.c
M source/blender/editors/io/io_svg.h
M source/blender/editors/object/object_add.c
M source/blender/makesrna/intern/rna_mesh.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 5f33d655039..874abb2ba90 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -4406,11 +4406,11 @@ int lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int intersectons_
if ((lanpr->enable_chaining || !is_lanpr_engine) && (!intersectons_only)) {
float t_image = rb->scene->lanpr.chaining_image_threshold;
float t_geom = rb->scene->lanpr.chaining_geometry_threshold;
-
- lanpr_NO_THREAD_chain_feature_lines(rb);
+
+ lanpr_NO_THREAD_chain_feature_lines(rb);
lanpr_split_chains_for_fixed_occlusion(rb);
- if (t_image<FLT_EPSILON && t_geom<FLT_EPSILON){
+ if (t_image < FLT_EPSILON && t_geom < FLT_EPSILON) {
t_geom = 0.0f;
t_image = 0.01f;
}
@@ -4419,7 +4419,7 @@ int lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int intersectons_
lanpr_connect_chains(rb, 0);
/* This configuration ensures there won't be accidental lost of short segments */
- lanpr_discard_short_chains(rb, MIN3(t_image,t_geom,0.01f)-FLT_EPSILON);
+ lanpr_discard_short_chains(rb, MIN3(t_image, t_geom, 0.01f) - FLT_EPSILON);
}
rb->cached_for_frame = rb->scene->r.cfra;
@@ -5120,13 +5120,14 @@ void OBJECT_OT_lanpr_update_gp_source(struct wmOperatorType *ot)
static int lanpr_export_svg_exec(bContext *C, wmOperator *op)
{
- LANPR_RenderBuffer* rb = lanpr_share.render_buffer_shared;
- SceneLANPR* lanpr = &rb->scene->lanpr;
- LANPR_LineLayer* ll;
+ LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared;
+ SceneLANPR *lanpr =
+ &rb->scene->lanpr; /* XXX: This is not evaluated for copy_on_write stuff... */
+ LANPR_LineLayer *ll;
- for(ll = lanpr->line_layers.first; ll; ll = ll->next){
- Text *ta = BKE_text_add(CTX_data_main(C),"exported_svg");
- ED_svg_data_from_lanpr_chain(ta,rb,ll);
+ for (ll = lanpr->line_layers.first; ll; ll = ll->next) {
+ Text *ta = BKE_text_add(CTX_data_main(C), "exported_svg");
+ ED_svg_data_from_lanpr_chain(ta, rb, ll);
}
return OPERATOR_FINISHED;
@@ -5134,7 +5135,7 @@ static int lanpr_export_svg_exec(bContext *C, wmOperator *op)
static bool lanpr_render_buffer_found(bContext *C)
{
- if(lanpr_share.render_buffer_shared){
+ if (lanpr_share.render_buffer_shared) {
return true;
}
return false;
@@ -5159,5 +5160,3 @@ void SCENE_OT_lanpr_export_svg(wmOperatorType *ot)
/* properties */
/* Should have: facing, layer, visibility, file split... */
}
-
-
diff --git a/source/blender/editors/gpencil/gpencil_svg.c b/source/blender/editors/gpencil/gpencil_svg.c
index 494f38df299..9437659e94f 100644
--- a/source/blender/editors/gpencil/gpencil_svg.c
+++ b/source/blender/editors/gpencil/gpencil_svg.c
@@ -53,13 +53,13 @@
static int gpencil_export_svg_exec(bContext *C, wmOperator *op)
{
- Object* gpobj = CTX_data_active_object(C);
+ Object *gpobj = CTX_data_active_object(C);
bGPdata *gpd = gpobj->data;
- bGPDlayer* gpl;
+ bGPDlayer *gpl;
- for(gpl = gpd->layers.first; gpl; gpl = gpl->next){
- Text *ta = BKE_text_add(CTX_data_main(C),"exported_svg");
- ED_svg_data_from_gpencil(gpd,ta,gpl,CTX_data_scene(C)->r.cfra);
+ for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
+ Text *ta = BKE_text_add(CTX_data_main(C), "exported_svg");
+ ED_svg_data_from_gpencil(gpd, ta, gpl, CTX_data_scene(C)->r.cfra);
}
return OPERATOR_FINISHED;
@@ -67,9 +67,9 @@ static int gpencil_export_svg_exec(bContext *C, wmOperator *op)
static bool gpencil_found(bContext *C)
{
- Object* o = CTX_data_active_object(C);
-
- if(o && o->type == OB_GPENCIL){
+ Object *o = CTX_data_active_object(C);
+
+ if (o && o->type == OB_GPENCIL) {
return true;
}
return false;
@@ -94,4 +94,3 @@ void GPENCIL_OT_export_svg(wmOperatorType *ot)
/* properties */
/* Should have: facing, layer, visibility, file split... */
}
-
diff --git a/source/blender/editors/include/ED_svg.h b/source/blender/editors/include/ED_svg.h
index df7d77620ab..2b0bb3d6c90 100644
--- a/source/blender/editors/include/ED_svg.h
+++ b/source/blender/editors/include/ED_svg.h
@@ -24,7 +24,12 @@
#ifndef __ED_SVG_H__
#define __ED_SVG_H__
-bool ED_svg_data_from_lanpr_chain(Text* ta, struct LANPR_RenderBuffer* rb, struct LANPR_LineLayer* ll);
-bool ED_svg_data_from_gpencil(struct bGPdata* gpd, struct Text* ta, struct bGPDlayer* layer, int frame);
+bool ED_svg_data_from_lanpr_chain(Text *ta,
+ struct LANPR_RenderBuffer *rb,
+ struct LANPR_LineLayer *ll);
+bool ED_svg_data_from_gpencil(struct bGPdata *gpd,
+ struct Text *ta,
+ struct bGPDlayer *layer,
+ int frame);
#endif /* __ED_SVG_H__ */
diff --git a/source/blender/editors/io/io_svg.c b/source/blender/editors/io/io_svg.c
index 925a7bc9afd..499fce6cc4d 100644
--- a/source/blender/editors/io/io_svg.c
+++ b/source/blender/editors/io/io_svg.c
@@ -44,198 +44,236 @@
#include "MEM_guardedalloc.h"
-static void write_svg_head(Text* ta){
- BKE_text_write(ta, NULL, "<?xml version=\"1.0\" standalone=\"no\"?>\n");
- BKE_text_write(ta, NULL, "<svg width=\"10\" height=\"10\" viewBox=\"-5 -5 10 10\" "
- "xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n");
+static void write_svg_head(Text *ta)
+{
+ BKE_text_write(ta, NULL, "<?xml version=\"1.0\" standalone=\"no\"?>\n");
+ BKE_text_write(ta,
+ NULL,
+ "<svg width=\"10\" height=\"10\" viewBox=\"-5 -5 10 10\" "
+ "xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n");
}
-static void write_svg_end(Text* ta){
- BKE_text_write(ta, NULL, "</svg>");
+static void write_svg_end(Text *ta)
+{
+ BKE_text_write(ta, NULL, "</svg>");
}
-typedef int (svg_get_path_callback)(void* iterator, float* fill_rgba, float* stroke_rgba, float* stroke_width);
-typedef int (svg_get_node_callback)(void* iterator, float *x, float *y);
-
-#define FAC_255_COLOR3(color) ((int)(255*color[0])),((int)(255*color[1])),((int)(255*color[2]))
-
-static void write_paths_from_callback(void* iterator, Text* ta, svg_get_path_callback get_path, svg_get_node_callback get_node){
- int status;
- float fill_color[3], stroke_color[3], stroke_width;
- int fill_color_i[3], stroke_color_i[3];
- float x,y;
- char buf[128];
- int first_in;
- while(get_path(iterator,fill_color,stroke_color,&stroke_width)){
-
- /* beginning of a path item */
- BKE_text_write(ta, NULL, "<path d=\"");
-
- first_in = 1;
- while(get_node(iterator,&x,&y)){
- sprintf(buf,"%c %f %f\n",first_in?'M':'L',x,y); /* Should handle closed stroke as well. */
- BKE_text_write(ta, NULL, buf);
- first_in = 0;
- }
-
- CLAMP3(fill_color,0,1);
- CLAMP3(stroke_color,0,1);
-
- /* end the path */
- sprintf(buf,"\" fill=\"#%02X%02X%02X\" stroke=\"#%02X%02X%02X\" stroke-width=\"%f\" />\n",
- FAC_255_COLOR3(fill_color), FAC_255_COLOR3(stroke_color), stroke_width/1000.0f);
- BKE_text_write(ta, NULL, buf);
+typedef int(svg_get_path_callback)(void *iterator,
+ float *fill_rgba,
+ float *stroke_rgba,
+ float *stroke_width);
+typedef int(svg_get_node_callback)(void *iterator, float *x, float *y);
+
+#define FAC_255_COLOR3(color) \
+ ((int)(255 * color[0])), ((int)(255 * color[1])), ((int)(255 * color[2]))
+
+static void write_paths_from_callback(void *iterator,
+ Text *ta,
+ svg_get_path_callback get_path,
+ svg_get_node_callback get_node)
+{
+ int status;
+ float fill_color[3], stroke_color[3], stroke_width;
+ int fill_color_i[3], stroke_color_i[3];
+ float x, y;
+ char buf[128];
+ int first_in;
+ while (get_path(iterator, fill_color, stroke_color, &stroke_width)) {
+
+ /* beginning of a path item */
+ BKE_text_write(ta, NULL, "<path d=\"");
+
+ first_in = 1;
+ while (get_node(iterator, &x, &y)) {
+ sprintf(buf,
+ "%c %f %f\n",
+ first_in ? 'M' : 'L',
+ x,
+ y); /* Should handle closed stroke as well. */
+ BKE_text_write(ta, NULL, buf);
+ first_in = 0;
}
-
+
+ CLAMP3(fill_color, 0, 1);
+ CLAMP3(stroke_color, 0, 1);
+
+ /* end the path */
+ sprintf(buf,
+ "\" fill=\"#%02X%02X%02X\" stroke=\"#%02X%02X%02X\" stroke-width=\"%f\" />\n",
+ FAC_255_COLOR3(fill_color),
+ FAC_255_COLOR3(stroke_color),
+ stroke_width / 1000.0f);
+ BKE_text_write(ta, NULL, buf);
+ }
}
-typedef struct GPencilSVGIterator{
- bGPdata* gpd;
- bGPDlayer* layer;
- bGPDframe* frame;
- bGPDstroke* stroke;
- bGPDspoint* point;
- int point_i;
-}GPencilSVGIterator;
-
-typedef struct LanprSVGIterator{
- LANPR_RenderLineChain* rlc;
- LANPR_LineLayer* ll;
- LANPR_RenderLineChainItem * rlci;
-}LanprSVGIterator;
-
-static int svg_gpencil_get_path_callback(GPencilSVGIterator* iterator, float* fill_color, float* stroke_color, float* stroke_width){
- GPencilSVGIterator* sr = (GPencilSVGIterator*)iterator;
- if(!sr->stroke){
- if(!sr->frame->strokes.first){
- return 0;
- }
- sr->stroke = sr->frame->strokes.first;
- }else{
- sr->stroke = sr->stroke->next;
- if(!sr->stroke){
- return 0;
- }
+typedef struct GPencilSVGIterator {
+ bGPdata *gpd;
+ bGPDlayer *layer;
+ bGPDframe *frame;
+ bGPDstroke *stroke;
+ bGPDspoint *point;
+ int point_i;
+} GPencilSVGIterator;
+
+typedef struct LanprSVGIterator {
+ LANPR_RenderLineChain *rlc;
+ LANPR_LineLayer *ll;
+ LANPR_RenderLineChainItem *rlci;
+} LanprSVGIterator;
+
+static int svg_gpencil_get_path_callback(GPencilSVGIterator *iterator,
+ float *fill_color,
+ float *stroke_color,
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list