diff --git a/netmapr.c b/netmapr.c index 88928d1..46bb61f 100644 --- a/netmapr.c +++ b/netmapr.c @@ -4223,76 +4223,6 @@ void drawvector(SDL_Surface *dest, vectorimg_t *vimg, int x, int y, int w, int h } floodfill(temp,(left+right)/2,(top+bottom)/2, fillcol); //drawline(temp,(left+right)/2,(top+bottom)/2, (left+right)/2 + 1, (top+bottom)/2 + 1, fillcol, 1); - /* - // do a raster fill - for (tx = 0; tx < w; tx++) { - // 0 - outside, 1 - inside, 2 - outside - int i; - int drawstate = 0; - int top[5], bottom[5],unfinished[5]; - int areacount = 0; - SDL_Color tc; - - // find top & bottom - drawstate = 0; - for (i = 0; i < 5; i++) { - top[i] = -1; - bottom[i] = -1; - unfinished[i] = -1; - } - for (ty = 0; ty < h; ty++) { - getcolor(temp, tx,ty,&tc); - switch (drawstate) { - case 0: - if (SDL_MapRGB(temp->format, tc.r, tc.g, tc.b) != bgcol) { - unfinished[areacount] = ty; - drawstate = 1; - } - break; - case 1: - if (SDL_MapRGB(temp->format, tc.r, tc.g, tc.b) == bgcol) { - top[areacount] = ty; - drawstate = 2; - } - break; - case 2: - if (SDL_MapRGB(temp->format, tc.r, tc.g, tc.b) != bgcol) { - unfinished[areacount] = 0; - bottom[areacount] = ty; - areacount++; - drawstate = 0; - } - break; - } - } - if (unfinished[areacount] != -1) areacount++; - - for (i = 0; i < areacount; i++) { - if ((top[i] != -1) && (bottom[i] != -1)) { - for (ty = top[i]; ty < bottom[i]; ty++) { - drawpixel(temp, tx, ty, fillcol); - } - //} else if ((top[i] != -1) && (bottom[i] == -1)) { - } else if (unfinished[i] != 0) { - printf("UNFINISHED\n"); - // start at bottom, go up until we hit the top - bottom[i] = unfinished[i]; - for (ty = bottom[i]; ty > 0; ty--) { - getcolor(temp, tx, ty, &tc); - if (SDL_MapRGB(temp->format, tc.r, tc.g, tc.b) != bgcol) { - top[i] = ty; - } - } - - if (top[i] != -1) { - for (ty = top[i]; ty < bottom[i]; ty++) { - drawpixel(temp, tx, ty, fillcol); - } - } - } - } - } - */ break; case VT_BOX: drawbox(temp,realx1,realy1, realx2,realy2,linecol, &fillcol); diff --git a/objects.dat b/objects.dat index 009145b..f9b2a08 100644 --- a/objects.dat +++ b/objects.dat @@ -1,8 +1,14 @@ -object router3d 200 200 +object router3d 200 205 # front -poly 170 230 255 p 0 50 0 162 10 174 30 186 60 199 100 199 140 199 170 186 190 174 199 162 199 150 199 50 0 50 f 0 120 170 +poly 0 120 170 p 1 50 1 155 199 155 199 50 1 50 f 0 120 170 # top -poly 170 230 255 p 0 50 0 38 10 26 30 14 60 0 100 0 , 140 0 170 14 190 26 199 38 199 50 , 199 62 190 74 170 86 140 99 100 99 , 60 99 30 86 10 74 0 62 0 50 f 0 180 255 +subobj 0 180 255 +circle 100 50 99 49 170 230 255 +endsub +# rounded bottom +subobj 0 120 170 +circle 100 155 99 49 0 120 170 +endsub # arrows poly 0 0 0 p 65 40 35 25 55 15 85 30 95 20 90 47 55 47 65 40 f 250 250 250 poly 0 0 0 p 45 70 75 55 95 65 65 80 75 87 40 87 45 60 45 70 f 250 250 250 @@ -412,19 +418,36 @@ subobj 0 0 255 circle 35 35 10 10 0 0 0 endsub end -object wirelessrouter 200 300 +object wirelessrouter 200 313 +#ooooooooooooooooo OLD oooooooooooooooo # front -poly 170 230 255 p 0 150 0 262 10 274 30 286 60 299 100 299 140 299 170 286 190 274 199 262 199 250 199 150 0 150 f 0 120 170 +#poly 170 230 255 p 0 150 0 262 10 274 30 286 60 299 100 299 140 299 170 286 190 274 199 262 199 250 199 150 0 150 f 0 120 170 # top -poly 170 230 255 p 0 150 0 138 10 126 30 114 60 100 100 100 , 140 100 170 114 190 126 199 138 199 150 , 199 162 190 174 170 186 140 199 100 199 , 60 199 30 186 10 174 0 162 0 150 f 0 180 255 +#poly 170 230 255 p 0 150 0 138 10 126 30 114 60 100 100 100 , 140 100 170 114 190 126 199 138 199 150 , 199 162 190 174 170 186 140 199 100 199 , 60 199 30 186 10 174 0 162 0 150 f 0 180 255 +## arrows +#poly 0 0 0 p 65 140 35 125 55 115 85 130 95 120 90 147 55 147 65 140 f 250 250 250 +#poly 0 0 0 p 45 170 75 155 95 165 65 180 75 187 40 187 45 160 45 170 f 250 250 250 +#poly 0 0 0 p 140 125 110 140 130 150 160 135 160 145 165 118 130 118 140 125 f 250 250 250 +#poly 0 0 0 p 135 165 165 180 145 190 115 175 115 185 110 158 145 158 135 165 f 250 250 250 +#ooooooooooooooooooooo +# front +poly 0 120 170 p 2 125 2 255 199 255 199 125 2 125 f 0 120 170 +# top +subobj 0 180 255 +circle 100 125 99 56 170 230 255 +endsub +# rounded bottom +subobj 0 120 170 +circle 100 255 99 56 0 120 170 +endsub # arrows -poly 0 0 0 p 65 140 35 125 55 115 85 130 95 120 90 147 55 147 65 140 f 250 250 250 -poly 0 0 0 p 45 170 75 155 95 165 65 180 75 187 40 187 45 160 45 170 f 250 250 250 -poly 0 0 0 p 140 125 110 140 130 150 160 135 160 145 165 118 130 118 140 125 f 250 250 250 -poly 0 0 0 p 135 165 165 180 145 190 115 175 115 185 110 158 145 158 135 165 f 250 250 250 +poly 0 0 0 p 65 115 35 100 55 90 85 105 95 95 90 122 55 122 65 115 f 250 250 250 +poly 0 0 0 p 45 145 75 130 95 140 65 155 75 162 40 162 45 135 45 145 f 250 250 250 +poly 0 0 0 p 140 100 110 115 130 125 160 110 160 120 165 93 130 93 140 100 f 250 250 250 +poly 0 0 0 p 135 140 165 155 145 165 115 150 115 160 110 133 145 133 135 140 f 250 250 250 # WIRELESS ANTENNAE -box 46 20 54 150 0 150 213 0 150 213 -box 146 20 154 150 0 150 213 0 150 213 +box 46 20 54 125 0 150 213 0 150 213 +box 146 20 154 125 0 150 213 0 150 213 end object dish 250 161 # back of dish