diff options
| author | Jean-Ren?? Reinhard <jrreinhard@users.sourceforge.net> | 2007-07-26 19:05:15 +0000 |
|---|---|---|
| committer | jrreinhard <jrreinhard@users.sourceforge.net> | 2007-07-26 19:05:15 +0000 |
| commit | 55276d8efe0b8ae9062d7a35754e5836679ec306 (patch) | |
| tree | 0b4e3673453d2f955db4af836db30d5e58358c98 /src/sp-fepointlight.cpp | |
| parent | Added support for feMerge filter priitive (diff) | |
| download | inkscape-55276d8efe0b8ae9062d7a35754e5836679ec306.tar.gz inkscape-55276d8efe0b8ae9062d7a35754e5836679ec306.zip | |
Improved svg input and output for lighting effects and lights
(bzr r3309)
Diffstat (limited to 'src/sp-fepointlight.cpp')
| -rw-r--r-- | src/sp-fepointlight.cpp | 53 |
1 files changed, 45 insertions, 8 deletions
diff --git a/src/sp-fepointlight.cpp b/src/sp-fepointlight.cpp index 9d912da14..88af35621 100644 --- a/src/sp-fepointlight.cpp +++ b/src/sp-fepointlight.cpp @@ -85,6 +85,10 @@ sp_fepointlight_init(SPFePointLight *fepointlight) fepointlight->x = 0; fepointlight->y = 0; fepointlight->z = 0; + + fepointlight->x_set = FALSE; + fepointlight->y_set = FALSE; + fepointlight->z_set = FALSE; } /** @@ -131,10 +135,20 @@ static void sp_fepointlight_set(SPObject *object, unsigned int key, gchar const *value) { SPFePointLight *fepointlight = SP_FEPOINTLIGHT(object); - + gchar *end_ptr; switch (key) { case SP_ATTR_X: - fepointlight->x = g_ascii_strtod(value, NULL); + end_ptr = NULL; + if (value) { + fepointlight->x = g_ascii_strtod(value, &end_ptr); + if (end_ptr) { + fepointlight->x_set = TRUE; + } + } + if (!value || !end_ptr) { + fepointlight->x = 0; + fepointlight->x_set = FALSE; + } if (object->parent && (SP_IS_FEDIFFUSELIGHTING(object->parent) || SP_IS_FESPECULARLIGHTING(object->parent))) { @@ -142,7 +156,17 @@ sp_fepointlight_set(SPObject *object, unsigned int key, gchar const *value) } break; case SP_ATTR_Y: - fepointlight->y = g_ascii_strtod(value, NULL); + end_ptr = NULL; + if (value) { + fepointlight->y = g_ascii_strtod(value, &end_ptr); + if (end_ptr) { + fepointlight->y_set = TRUE; + } + } + if (!value || !end_ptr) { + fepointlight->y = 0; + fepointlight->y_set = FALSE; + } if (object->parent && (SP_IS_FEDIFFUSELIGHTING(object->parent) || SP_IS_FESPECULARLIGHTING(object->parent))) { @@ -150,7 +174,17 @@ sp_fepointlight_set(SPObject *object, unsigned int key, gchar const *value) } break; case SP_ATTR_Z: - fepointlight->z = g_ascii_strtod(value, NULL); + end_ptr = NULL; + if (value) { + fepointlight->z = g_ascii_strtod(value, &end_ptr); + if (end_ptr) { + fepointlight->z_set = TRUE; + } + } + if (!value || !end_ptr) { + fepointlight->z = 0; + fepointlight->z_set = FALSE; + } if (object->parent && (SP_IS_FEDIFFUSELIGHTING(object->parent) || SP_IS_FESPECULARLIGHTING(object->parent))) { @@ -197,10 +231,13 @@ sp_fepointlight_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) if (!repr) { repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME } - - sp_repr_set_css_double(repr, "x", fepointlight->x); - sp_repr_set_css_double(repr, "y", fepointlight->y); - sp_repr_set_css_double(repr, "z", fepointlight->z); + + if (fepointlight->x_set) + sp_repr_set_css_double(repr, "x", fepointlight->x); + if (fepointlight->y_set) + sp_repr_set_css_double(repr, "y", fepointlight->y); + if (fepointlight->z_set) + sp_repr_set_css_double(repr, "z", fepointlight->z); if (((SPObjectClass *) fePointLight_parent_class)->write) { ((SPObjectClass *) fePointLight_parent_class)->write(object, repr, flags); |