index b1bfea613302c607d9bb6d3a4c8f28df37805007..5d351884cdcfb8c3f232d4aaa457da62e7125f52 100644 (file)
--- a/src/sp-feturbulence.cpp
+++ b/src/sp-feturbulence.cpp
*/
/*
* Authors:
+ * Felipe CorrĂȘa da Silva Sanches <felipe.sanches@gmail.com>
* hugo Rodrigues <haa.rodrigues@gmail.com>
*
+ * Copyright (C) 2007 Felipe Sanches
* Copyright (C) 2006 Hugo Rodrigues
*
* Released under GNU GPL, read the file 'COPYING' for more information
#include "attributes.h"
#include "svg/svg.h"
#include "sp-feturbulence.h"
+#include "helper-fns.h"
#include "xml/repr.h"
+#include <string.h>
+#include "display/nr-filter.h"
+#include "display/nr-filter-turbulence.h"
/* FeTurbulence base class */
static void sp_feTurbulence_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feTurbulence_update(SPObject *object, SPCtx *ctx, guint flags);
static Inkscape::XML::Node *sp_feTurbulence_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static void sp_feTurbulence_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter);
static SPFilterPrimitiveClass *feTurbulence_parent_class;
sp_feTurbulence_class_init(SPFeTurbulenceClass *klass)
{
SPObjectClass *sp_object_class = (SPObjectClass *)klass;
+ SPFilterPrimitiveClass * sp_primitive_class = (SPFilterPrimitiveClass *)klass;
feTurbulence_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
sp_object_class->write = sp_feTurbulence_write;
sp_object_class->set = sp_feTurbulence_set;
sp_object_class->update = sp_feTurbulence_update;
+
+ sp_primitive_class->build_renderer = sp_feTurbulence_build_renderer;
}
static void
sp_feTurbulence_init(SPFeTurbulence *feTurbulence)
{
+ feTurbulence->updated=false;
}
/**
@@ -89,6 +100,11 @@ sp_feTurbulence_build(SPObject *object, SPDocument *document, Inkscape::XML::Nod
}
/*LOAD ATTRIBUTES FROM REPR HERE*/
+ sp_object_read_attr(object, "baseFrequency");
+ sp_object_read_attr(object, "numOctaves");
+ sp_object_read_attr(object, "seed");
+ sp_object_read_attr(object, "stitchTiles");
+ sp_object_read_attr(object, "type");
}
/**
((SPObjectClass *) feTurbulence_parent_class)->release(object);
}
+static bool sp_feTurbulence_read_stitchTiles(gchar const *value){
+ if (!value) return false; // 'noStitch' is default
+ switch(value[0]){
+ case 's':
+ if (strncmp(value, "stitch", 6) == 0) return true;
+ break;
+ case 'n':
+ if (strncmp(value, "noStitch", 8) == 0) return false;
+ break;
+ }
+ return false; // 'noStitch' is default
+}
+
+static NR::FilterTurbulenceType sp_feTurbulence_read_type(gchar const *value){
+ if (!value) return NR::TURBULENCE_TURBULENCE; // 'turbulence' is default
+ switch(value[0]){
+ case 'f':
+ if (strncmp(value, "fractalNoise", 12) == 0) return NR::TURBULENCE_FRACTALNOISE;
+ break;
+ case 't':
+ if (strncmp(value, "turbulence", 10) == 0) return NR::TURBULENCE_TURBULENCE;
+ break;
+ }
+ return NR::TURBULENCE_TURBULENCE; // 'turbulence' is default
+}
+
/**
* Sets a specific value in the SPFeTurbulence.
*/
sp_feTurbulence_set(SPObject *object, unsigned int key, gchar const *value)
{
SPFeTurbulence *feTurbulence = SP_FETURBULENCE(object);
+ (void)feTurbulence;
+
+ int read_int;
+ double read_num;
+ bool read_bool;
+ NR::FilterTurbulenceType read_type;
- switch(key) {\r
+ switch(key) {
/*DEAL WITH SETTING ATTRIBUTES HERE*/
+
+ case SP_ATTR_BASEFREQUENCY:
+ feTurbulence->baseFrequency.set(value);
+ //From SVG spec: If two <number>s are provided, the first number represents a base frequency in the X direction and the second value represents a base frequency in the Y direction. If one number is provided, then that value is used for both X and Y.
+ if (feTurbulence->baseFrequency.optNumIsSet() == false)
+ feTurbulence->baseFrequency.setOptNumber(feTurbulence->baseFrequency.getNumber());
+ feTurbulence->updated = false;
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
+ case SP_ATTR_NUMOCTAVES:
+ read_int = (int) helperfns_read_number(value);
+ if (read_int != feTurbulence->numOctaves){
+ feTurbulence->numOctaves = read_int;
+ feTurbulence->updated = false;
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ }
+ break;
+ case SP_ATTR_SEED:
+ read_num = helperfns_read_number(value);
+ if (read_num != feTurbulence->seed){
+ feTurbulence->seed = read_num;
+ feTurbulence->updated = false;
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ }
+ break;
+ case SP_ATTR_STITCHTILES:
+ read_bool = sp_feTurbulence_read_stitchTiles(value);
+ if (read_bool != feTurbulence->stitchTiles){
+ feTurbulence->stitchTiles = read_bool;
+ feTurbulence->updated = false;
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ }
+ break;
+ case SP_ATTR_TYPE:
+ read_type = sp_feTurbulence_read_type(value);
+ if (read_type != feTurbulence->type){
+ feTurbulence->type = read_type;
+ feTurbulence->updated = false;
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ }
+ break;
default:
if (((SPObjectClass *) feTurbulence_parent_class)->set)
((SPObjectClass *) feTurbulence_parent_class)->set(object, key, value);
if (flags & SP_OBJECT_WRITE_EXT) {
if (repr) {
// is this sane?
- repr->mergeFrom(SP_OBJECT_REPR(object), "id");
+ //repr->mergeFrom(SP_OBJECT_REPR(object), "id");
} else {
- repr = SP_OBJECT_REPR(object)->duplicate();
+ repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME
}
}
@@ -160,6 +249,27 @@ sp_feTurbulence_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
return repr;
}
+static void sp_feTurbulence_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter) {
+ g_assert(primitive != NULL);
+ g_assert(filter != NULL);
+
+ SPFeTurbulence *sp_turbulence = SP_FETURBULENCE(primitive);
+
+ int primitive_n = filter->add_primitive(NR::NR_FILTER_TURBULENCE);
+ NR::FilterPrimitive *nr_primitive = filter->get_primitive(primitive_n);
+ NR::FilterTurbulence *nr_turbulence = dynamic_cast<NR::FilterTurbulence*>(nr_primitive);
+ g_assert(nr_turbulence != NULL);
+
+ sp_filter_primitive_renderer_common(primitive, nr_primitive);
+
+ nr_turbulence->set_baseFrequency(0, sp_turbulence->baseFrequency.getNumber());
+ nr_turbulence->set_baseFrequency(1, sp_turbulence->baseFrequency.getOptNumber());
+ nr_turbulence->set_numOctaves(sp_turbulence->numOctaves);
+ nr_turbulence->set_seed(sp_turbulence->seed);
+ nr_turbulence->set_stitchTiles(sp_turbulence->stitchTiles);
+ nr_turbulence->set_type(sp_turbulence->type);
+ nr_turbulence->set_updated(sp_turbulence->updated);
+}
/*
Local Variables: