Commit Graph

55 Commits

Author SHA1 Message Date
Carsten Haitzler 1c024508d2 bmtext dithers....
filters work.. :)


SVN revision: 4836
2001-06-19 03:01:46 +00:00
Carsten Haitzler 62ceffab44 add :)
SVN revision: 4749
2001-05-09 06:15:44 +00:00
Carsten Haitzler fee04bcdde franz's patches to support other color spaces :)
SVN revision: 4745
2001-05-08 20:29:16 +00:00
Richard Lowe 8810bb633e Please Miss, I need -lm too.
SVN revision: 4286
2001-02-25 11:31:47 +00:00
Carsten Haitzler 45ba00f3fd ewwwww - fix infinte loop bug... :)
SVN revision: 4152
2001-01-26 03:29:55 +00:00
Carsten Haitzler 571d51a852 masa's internationalization + x font support for imlib2 :)
SVN revision: 3980
2000-12-12 21:07:38 +00:00
Carsten Haitzler 490383f4d7 patch for grabbing form ximage's - plug dont segv when u set the format to
NULL.


SVN revision: 3782
2000-10-29 23:55:04 +00:00
Carsten Haitzler 1a457d0029 --without-x patch from steve
SVN revision: 3584
2000-10-13 00:11:34 +00:00
Tom Gilbert 0776d7ff0d not quite there yet
SVN revision: 3504
2000-09-17 13:23:15 +00:00
Tom Gilbert eebefe5ede Commiting what I have so far. More to do tomorrow, but it's 3am.
Polygons are now filled with antialiasing, if context_antialias is set.

So are ellipses.

I fixed some clipping bugs.

There is a bug with the AA span though, it's just a little one, but I'm too
tired to find it now. You will see it if you look closely at the top of the
filled ellipse in test/imlib2, using xmag or something.

I'll fix that tomorrow, speed things up a bit, and hopefully implement AA
drawing for ellipse outlines. Oh, I'll unroll some more loops too.

raster: your last commit broke the two test apps. a segv in _RGBA_init()
somewhere, I know it's not my new code, as I tried a fresh checkout and it
did the same thing. I don't have time to check it out tonight though.


SVN revision: 3498
2000-09-17 01:57:01 +00:00
Tom Gilbert 9fce1f5580 shuddup
SVN revision: 3481
2000-09-15 23:24:52 +00:00
Carsten Haitzler 0883f1b746 and enable the fast path again
SVN revision: 3403
2000-09-12 05:46:17 +00:00
Carsten Haitzler 9e7ce74391 simple commented demo
SVN revision: 3393
2000-09-12 00:08:25 +00:00
Tom Gilbert 82824227fc slight speedup
SVN revision: 3312
2000-09-04 15:56:59 +00:00
Tom Gilbert 6a4d800e92 imlib_image_fill_ellipse()
SVN revision: 3306
2000-09-03 19:31:03 +00:00
Tom Gilbert e3d927d32c Better API, simpler polygon struct. imlib_polygon_new() now, no type member.
Then _draw_polygon(polygon, unsigned int closed), and _fill_polygon(poly).


SVN revision: 3305
2000-09-03 19:14:02 +00:00
Tom Gilbert 222e1b5f32 Polygon filling. Right now only works for convex polygons. Works with a
clipping rect, but highly suboptimally (I'm not doing proper polygon
clipping here yet, just clipping slowly on each point drawn - really nasty).

There are probably some rounding errors in here. I need to work more on
this, but I have *so* little time for the next few weeks.

Please don't kill me for this code. It's not finished, but I'm about to move
house, and I have to get something working before I pack my PC away.


SVN revision: 3303
2000-09-03 18:04:00 +00:00
Tom Gilbert 0794fb0f14 imlib_image_draw_ellipse()
Check test/imlib2 for example. Clipped too.

TODO: Not antialiased. yet. point drawing needs to be inlined, or something.


SVN revision: 3287
2000-08-31 22:49:06 +00:00
Tom Gilbert b5ababf0b7 Polygons. Not filled ones yet =P Empty ones are easier ;-)
Hard to come up with a nice API for this, but here's what I have:

ImlibPolygon imlib_polygon_new(int type);
void imlib_polygon_free(ImlibPolygon poly);
void imlib_polygon_add_point(ImlibPolygon poly, int x, int y);
void imlib_image_draw_polygon(ImlibPolygon poly);

Clipping works with these, as demonstrated by test/imlib2

The type paramter may be: POLY_OPEN, POLY_CLOSED or POLY_FILLED (last one
not implemented yet).

I was wondering if draw_polygon should genererate updates, like draw_line.

Thoughts?


SVN revision: 3279
2000-08-30 19:52:57 +00:00
Tom Gilbert cebd7a0c23 Scratch that. Start again.
Removed all the _clipped functions.

Added imlib_context_set_cliprect(int x, int y, int w, int h) and a
corresponding _get_cliprect.

Set width to 0 to disable clipping (default).

Just use the normal _draw_ functions and it'll do the Right thing.


SVN revision: 3278
2000-08-30 18:26:49 +00:00
Tom Gilbert e423fc372d Added rectangle clipping, in the form:
void
imlib_image_draw_rectangle_clipped(int x, int y, int width, int height,
                                   int clip_xmin, int clip_xmax, int clip_ymin,
                                   int clip_ymax);

Works well. If you make install then cd test, make, ./imlib2, you'll see the
demo/test of the clipping code.

Next up: draw_polygon and draw_polygon_clipped.

Then (eeek) fill_polygon, fill_polygon_clipped, and some clipping for image
blending (fun).


SVN revision: 3276
2000-08-30 16:39:44 +00:00
Tom Gilbert 4f72d15e1e Added line drawing with clipping.
Same as _draw_line but with extra parameters for the clipping region.

Tested and seems to work well. Will check further tomorrow when I convert
geist to use this instead of doing it internally.

Imlib_Updates
imlib_image_draw_line_clipped(int x1, int y1, int x2, int y2,
                 int clip_xmin, int clip_xmax, int clip_ymin,
                 int clip_ymax, char make_updates);


SVN revision: 3273
2000-08-29 21:09:49 +00:00
Chris Ross 2f28988bc4 Argh.
SVN revision: 2758
2000-06-06 11:03:14 +00:00
Carsten Haitzler 50d5d7dc8c disable others.......
SVN revision: 2738
2000-05-31 06:23:40 +00:00
Carsten Haitzler f4f6d6ee47 turn off bump mappign for now..
SVN revision: 2737
2000-05-31 06:21:52 +00:00
Chris Ross d1fd5a3806 New pic. Got bored with the last one =).
SVN revision: 2732
2000-05-30 23:52:19 +00:00
Chris Ross f4eaa25fa7 Start of a filter test app, and applied Willem's patch for imlib2. thanks
Willem.


SVN revision: 2731
2000-05-30 22:10:01 +00:00
Chris Ross 2588c903da * forgot to mention that i've added an option to test/imlib2
-bmp2pt add this too it's command line and it'll bump map to where the
           cursor is.

  otherwise you will just get bump mapping from an infinite dist lightsource


SVN revision: 2687
2000-05-22 03:25:24 +00:00
Chris Ross bd5836823e * rewrite of the script parser, basically you can now parser a filter as a
variable to another filter as willem requested the other day.
  eg.
    filter( var=anotherfilter( var=13,var=30 ), var=blum );

  youcan have as manylevels of filters as you want.

* parser should be quicker, no need to add "NULL" to the end of a
  imlib_apply_filter() command.

* some more funky filters should be added soon, at 4.45am i decided to leave
  that job till t/m.


SVN revision: 2686
2000-05-22 03:23:03 +00:00
Chris Ross 431278a13c Added Willem patch for the bump map filter, now does proper bump mapping from
an infinet light source. Needs to be optimsed further - lookup tables or
some such..... thats for another day.


SVN revision: 2683
2000-05-21 19:20:53 +00:00
Chris Ross 2e5728f366 * Changed some of the methods to stop furutre name conflicts
* Added Willems patch for bump mapping -very vey cool, check out
  test/imllib2
* Died due to excess excitement over bump mapping


SVN revision: 2674
2000-05-20 22:33:14 +00:00
Carsten Haitzler caa073ee7b bowis's filter stuff... :)
SVN revision: 2673
2000-05-20 17:37:00 +00:00
Carsten Haitzler 01d14d7867 asm for colormod ops......... :)
SVN revision: 2600
2000-05-05 16:28:39 +00:00
Carsten Haitzler 2fbc8d2424 allow for flipping whilst scaling and rendering... :)
SVN revision: 2589
2000-05-02 17:33:23 +00:00
Carsten Haitzler 2676818732 write text at any angle............... :) patches form willem again :)
SVN revision: 2583
2000-04-30 19:15:12 +00:00
Carsten Haitzler 714e25d1d5 add -help patch and also fill in some options
SVN revision: 2572
2000-04-28 17:42:49 +00:00
Carsten Haitzler cc8e9b0183 better asm detection - there's an --enable-mmx now too if you want to
force or disable the feature by force... it will try autodetect under linux
but only on the build machine...


SVN revision: 2546
2000-04-27 02:32:28 +00:00
Carsten Haitzler 939419bbf4 slight api changes..... problem was we have a useless paramin the pixmap gen
calls - it shoudl have used the context... :)


SVN revision: 2535
2000-04-25 18:17:37 +00:00
Carsten Haitzler 54b76ea1f7 scalign code back to old scaling... new scalign code has bugs... even the C
code has segv's.. somewhere... :(


SVN revision: 2511
2000-04-20 22:29:10 +00:00
Carsten Haitzler 618cde9552 man.. more mmx asm for scaling.. thanks willem... you love this dont you? :)
SVN revision: 2490
2000-04-16 18:26:16 +00:00
Carsten Haitzler 300307782a full fix of logic in blending rgb->rgb functions in C NB: the mmx asm needs to
be chnaged to reflect this


SVN revision: 2480
2000-04-13 16:31:51 +00:00
Carsten Haitzler 0780bd87ac speedup scaling down....... but i cant seem to get any speedup for up scaling
SVN revision: 2367
2000-03-28 22:25:45 +00:00
Carsten Haitzler e65ff79503 BGR56r & BGR555 support.......... please test if u have a display like this :)
SVN revision: 2345
2000-03-27 19:17:37 +00:00
Carsten Haitzler d389ffe21e poatch main.c - but rottest doesnt work.. must fix later
SVN revision: 2176
2000-03-03 17:24:46 +00:00
Carsten Haitzler b36488c507 flum
SVN revision: 2174
2000-03-03 16:42:18 +00:00
Carsten Haitzler 02bf3b4e28 flum..........
SVN revision: 2162
2000-03-01 17:04:23 +00:00
Carsten Haitzler 7acf0a1c95 rotattion code added... :)
SVN revision: 2142
2000-02-27 18:36:26 +00:00
Carsten Haitzler 6b852c1668 fix loaders......
SVN revision: 1688
1999-12-19 23:02:56 +00:00
Carsten Haitzler 1892d80f83 test program back to normal.. nwo works with api changes...
SVN revision: 1536
1999-12-07 18:02:47 +00:00
Carsten Haitzler a48b95de30 lets break the Imlib2 api and chnage it... now its context based.. :)
SVN revision: 1533
1999-12-07 17:28:53 +00:00