Changeset 185 for libcaca/trunk/libcaca/line.c
- Timestamp:
- Nov 16, 2003, 1:33:35 AM (19 years ago)
- Location:
- libcaca/trunk/libcaca
- Files:
-
- 1 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/libcaca/line.c
r179 r185 1 1 /* 2 * lib eeASCII-Art library2 * libcaca ASCII-Art library 3 3 * Copyright (c) 2002, 2003 Sam Hocevar <sam@zoy.org> 4 4 * All Rights Reserved … … 31 31 #include <stdlib.h> 32 32 33 #include " ee.h"34 #include " ee_internals.h"33 #include "caca.h" 34 #include "caca_internals.h" 35 35 36 36 struct line … … 57 57 * \return nothing 58 58 */ 59 void ee_draw_line(int x1, int y1, int x2, int y2, char c)59 void caca_draw_line(int x1, int y1, int x2, int y2, char c) 60 60 { 61 61 struct line s; … … 69 69 } 70 70 71 void ee_draw_polyline(const int x[], const int y[], int n, char c)71 void caca_draw_polyline(const int x[], const int y[], int n, char c) 72 72 { 73 73 int i; … … 95 95 * \return nothing 96 96 */ 97 void ee_draw_thin_line(int x1, int y1, int x2, int y2)97 void caca_draw_thin_line(int x1, int y1, int x2, int y2) 98 98 { 99 99 struct line s; … … 106 106 } 107 107 108 void ee_draw_thin_polyline(const int x[], const int y[], int n)108 void caca_draw_thin_polyline(const int x[], const int y[], int n) 109 109 { 110 110 int i; … … 164 164 else if(bits1 & (1<<1)) 165 165 { 166 int xmax = ee_get_width() - 1;166 int xmax = caca_get_width() - 1; 167 167 s->y1 = s->y2 - (s->x2 - xmax) * (s->y2 - s->y1) / (s->x2 - s->x1); 168 168 s->x1 = xmax; … … 175 175 else if(bits1 & (1<<3)) 176 176 { 177 int ymax = ee_get_height() - 1;177 int ymax = caca_get_height() - 1; 178 178 s->x1 = s->x2 - (s->y2 - ymax) * (s->x2 - s->x1) / (s->y2 - s->y1); 179 179 s->y1 = ymax; … … 196 196 if(x < 0) 197 197 b |= (1<<0); 198 else if(x >= ee_get_width())198 else if(x >= caca_get_width()) 199 199 b |= (1<<1); 200 200 201 201 if(y < 0) 202 202 b |= (1<<2); 203 else if(y >= ee_get_height())203 else if(y >= caca_get_height()) 204 204 b |= (1<<3); 205 205 … … 236 236 for(; dx>=0; dx--) 237 237 { 238 ee_putchar(x1, y1, s->c);238 caca_putchar(x1, y1, s->c); 239 239 if(delta > 0) 240 240 { … … 258 258 for(; dy >= 0; dy--) 259 259 { 260 ee_putchar(x1, y1, s->c);260 caca_putchar(x1, y1, s->c); 261 261 if(delta > 0) 262 262 { … … 330 330 if(delta > 0) 331 331 { 332 ee_putchar(x1, y1, charmapy[1]);332 caca_putchar(x1, y1, charmapy[1]); 333 333 x1++; 334 334 y1 += yinc; … … 339 339 { 340 340 if(prev) 341 ee_putchar(x1, y1, charmapy[0]);341 caca_putchar(x1, y1, charmapy[0]); 342 342 else 343 ee_putchar(x1, y1, '-');343 caca_putchar(x1, y1, '-'); 344 344 x1++; 345 345 delta += dpr; … … 358 358 if(delta > 0) 359 359 { 360 ee_putchar(x1, y1, charmapx[0]);361 ee_putchar(x1 + 1, y1, charmapx[1]);360 caca_putchar(x1, y1, charmapx[0]); 361 caca_putchar(x1 + 1, y1, charmapx[1]); 362 362 x1++; 363 363 y1 += yinc; … … 366 366 else 367 367 { 368 ee_putchar(x1, y1, '|');368 caca_putchar(x1, y1, '|'); 369 369 y1 += yinc; 370 370 delta += dpr;
Note: See TracChangeset
for help on using the changeset viewer.