#include <graph.h>
#include <stdlib.h>
+#include <stdio.h>
G_DEFINE_TYPE(Graph, graph, G_TYPE_OBJECT);
}
int graph_add_line(Graph* graph, double p0_x, double p0_y, double p1_x, double p1_y, double p2_x, double p2_y, double p3_x, double p3_y) {
+ #ifdef DEBUG
+ fprintf(stderr, "graph_add_line(%d, p0_x=%g, p0_y=%g, p1_x=%g, p1_y=%g, p2_x=%g, p2_y=%g, p3_x=%g, p3_y=%g\n", (unsigned int) graph, p0_x, p0_y, p1_x, p1_y, p2_x, p2_y, p3_x, p3_y);
+ #endif
if(graph->lines == NULL) {
- if((graph->points = g_ptr_array_new()) == NULL) return 1;
+ if((graph->lines = g_ptr_array_new()) == NULL) return 1;
}
struct graph_line *l;
if((l=(struct graph_line*)malloc(sizeof(struct graph_line))) == NULL) return 2;
l->p3_x=p3_x;
l->p3_y=p3_y;
g_ptr_array_add(graph->lines, l);
- if((graph->points->len == 0) && (graph->lines->len == 1)) {
+ if((graph->points->len == 0) &&
+ (graph->lines->len == 1)) {
graph->maxx = graph->minx = p0_x;
graph->maxy = graph->miny = p0_y;
}else{
struct cxt *cxt = user_data;
struct graph_point *p3 = data;
if(cxt->p0 != NULL) {
- double p1_x = (p3->x - cxt->p0->x)/3.0;
- double p1_y = (p3->y - cxt->p0->y)/3.0;
- double p2_x = (p3->x + 2*cxt->p0->x)/3.0;
- double p2_y = (p3->y + 2*cxt->p0->y)/3.0;
+ double p1_x = (p3->x + 2*cxt->p0->x)/3.0;
+ double p1_y = (p3->y + 2*cxt->p0->y)/3.0;
+ double p2_x = (2*p3->x + cxt->p0->x)/3.0;
+ double p2_y = (2*p3->y + cxt->p0->y)/3.0;
graph_add_line(cxt->graph, cxt->p0->x, cxt->p0->y, p1_x, p1_y, p2_x, p2_y, p3->x, p3->y);
}
cxt->p0 = p3;
cxt.p0 = NULL;
g_ptr_array_foreach(graph->points, &linear_interpolate, &cxt);
}
+
+void graph_bezier_linear_to_cubic(double x0, double x3, double *x1, double *x2) {
+ *x1 = (x3 + 2.0*x0)/3.0;
+ *x2 = (2.0*x3 + x0)/3.0;
+}
+
+void graph_bezier_qudratic_to_cubic(double x0, double x3, double *x1, double *x2) {
+ *x2 = (x3 - x0)/3.0 + (*x1);
+ *x1 = (x0 - 3.0*(*x1))/2.0;
+}