commit 54655b02bfe0d9147294e79be770b80ebbeca0af
parent 92f109794866530271aaff1201e1ee9124bc95c3
Author: Yoann <yoann.b87@voila.fr>
Date: Tue, 18 Oct 2011 12:24:00 +0200
Ajout d'un deuxième route avec une intersection avec la première route.
Diffstat:
| M | roads.c | | | 23 | ++++++++++++++++++++++- |
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/roads.c b/roads.c
@@ -101,19 +101,33 @@ void carreY() {
}
roadPointY *roada = (roadPointY*) malloc(sizeof(roadPointY));
+ roadPointY *roadb = (roadPointY*) malloc(sizeof(roadPointY));
roadNodeY *rn;
Vertex *v;
+ roadNodeY *common = NULL;
- for(i=0;i<30;i++) {
+ for(i=0;i<40;i++) {
rn = (roadNodeY*)malloc(sizeof(roadNodeY));
v = (Vertex*) malloc(sizeof(Vertex));
v->x = (i+1)*16;
v->y = ((i+1)%3)*(61%(i+1))+100;
rn->v = v;
+ if(i == 18) common = rn;
addRoadNode(roada,rn);
}
+ for(i=0;i<40;i++) {
+ rn = (roadNodeY*)malloc(sizeof(roadNodeY));
+ v = (Vertex*) malloc(sizeof(Vertex));
+
+ v->x = (i+1)*22;
+ v->y = ((i+1)%5)*(61%(i+2))+160;
+ rn->v = v;
+ if(i == 12) rn = common;
+ addRoadNode(roadb,rn);
+ }
+
roadPointY *rd = roada;
while(rd->next != NULL) {
svg_line(rd->rn->v,rd->next->rn->v);
@@ -121,6 +135,13 @@ void carreY() {
rd = rd->next;
}
+ rd = roadb;
+ while(rd->next != NULL) {
+ svg_line(rd->rn->v,rd->next->rn->v);
+
+ rd = rd->next;
+ }
+
size=size;
}