ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 3# include <malloc.h>
4# include <windows.h>
5# pragma warning(disable:4244)
3#endif 6#endif
4 7
5#include "EXTERN.h" 8#include "EXTERN.h"
6#include "perl.h" 9#include "perl.h"
7#include "XSUB.h" 10#include "XSUB.h"
8 11
12#include <math.h>
9#include <string.h> 13#include <string.h>
10#include <stdio.h> 14#include <stdio.h>
11 15
12#include <SDL.h> 16#include <SDL.h>
17#include <SDL_endian.h>
13#include <SDL_image.h> 18#include <SDL_image.h>
14#include <SDL_mixer.h> 19#include <SDL_mixer.h>
15#include <SDL_opengl.h> 20#include <SDL_opengl.h>
16 21
17#include <glib/gmacros.h> 22#include <glib/gmacros.h>
18 23
19#include <pango/pango.h> 24#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h> 25#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h> 26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
22 28
23#ifndef _WIN32 29#ifndef _WIN32
24# include <sys/types.h> 30# include <sys/types.h>
25# include <sys/socket.h> 31# include <sys/socket.h>
26# include <netinet/in.h> 32# include <netinet/in.h>
40#define FOW_DARKNESS 32 46#define FOW_DARKNESS 32
41 47
42#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
44 50
45#define MIN_FONT_HEIGHT 8 * PANGO_SCALE 51#define MIN_FONT_HEIGHT 10
52
53static struct
54{
55#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h"
57#undef GL_FUNC
58} gl;
59
60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61{
62 if (gl.BlendFuncSeparate)
63 gl.BlendFuncSeparate (sa, da, saa, daa);
64 else if (gl.BlendFuncSeparateEXT)
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else
67 glBlendFunc (sa, da);
68}
46 69
47typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
49 72
50static PangoContext *context; 73typedef PangoFontDescription *CFClient__Font;
51static PangoFontMap *fontmap;
52 74
53typedef struct cf_layout { 75typedef struct cf_layout {
54 PangoLayout *pl; 76 PangoLayout *pl; // either derived from a cairo or ft2 context
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode
55 int base_height; 79 int base_height;
80 CFClient__Font font;
56} *CFClient__Layout; 81} *CFClient__Layout;
82
83static CFClient__Font default_font;
84static PangoContext *ft2_context, *cairo_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap;
57 86
58static void 87static void
59substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
60{ 89{
61 FcPatternAddBool (pattern, FC_HINTING , 1); 90 FcPatternAddBool (pattern, FC_HINTING , 1);
91#ifdef _WIN32
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93#else
62 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 94 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
63} 96}
64 97
65static void 98static void
66layout_update (CFClient__Layout self) 99layout_update_font (CFClient__Layout self)
67{ 100{
68 /* use a random scale factor to account for unknown descenders, 0.8 works 101 /* use a random scale factor to account for unknown descenders, 0.8 works
69 * reasonably well with bitstream vera 102 * reasonably well with bitstream vera
70 */ 103 */
71 PangoFontDescription *font = (PangoFontDescription *) 104 PangoFontDescription *font = self->font ? self->font : default_font;
72 pango_layout_get_font_description (self->pl);
73 105
74 int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76 if (height < MIN_FONT_HEIGHT)
77 height = MIN_FONT_HEIGHT;
78
79 if (pango_font_description_get_size (font) != height)
80 {
81 font = pango_font_description_copy (font);
82 pango_font_description_set_absolute_size (font, height); 106 pango_font_description_set_absolute_size (font,
107 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
108
83 pango_layout_set_font_description (self->pl, font); 109 pango_layout_set_font_description (self->pl, font);
84 }
85} 110}
86 111
87static void 112static void
88layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 113layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
89{ 114{
90 layout_update (self);
91
92 pango_layout_get_pixel_size (self->pl, w, h); 115 pango_layout_get_pixel_size (self->pl, w, h);
93 116
94 *w = (*w + 3) & ~3;
95 if (!*w) *w = 1; 117 if (!*w) *w = 1;
96 if (!*h) *h = 1; 118 if (!*h) *h = 1;
119
120 *w = (*w + 3) & ~3;
97} 121}
98 122
99typedef uint16_t mapface; 123typedef uint16_t mapface;
100 124
101typedef struct { 125typedef struct {
249 } 273 }
250 } 274 }
251} 275}
252 276
253static void 277static void
254music_finished () 278music_finished (void)
255{ 279{
256 SDL_UserEvent ev; 280 SDL_UserEvent ev;
257 281
258 ev.type = SDL_USEREVENT; 282 ev.type = SDL_USEREVENT;
259 ev.code = 0; 283 ev.code = 0;
260 ev.data1 = 0; 284 ev.data1 = 0;
285 ev.data2 = 0;
286
287 SDL_PushEvent ((SDL_Event *)&ev);
288}
289
290static void
291channel_finished (int channel)
292{
293 SDL_UserEvent ev;
294
295 ev.type = SDL_USEREVENT;
296 ev.code = 1;
297 ev.data1 = (void *)(long)channel;
261 ev.data2 = 0; 298 ev.data2 = 0;
262 299
263 SDL_PushEvent ((SDL_Event *)&ev); 300 SDL_PushEvent ((SDL_Event *)&ev);
264} 301}
265 302
376# undef const_iv 413# undef const_iv
377 }; 414 };
378 415
379 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
380 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418}
381 419
420void
421pango_init ()
422 CODE:
423 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{
425 {
382 fontmap = pango_ft2_font_map_new (); 426 ft2_fontmap = pango_ft2_font_map_new ();
383 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 427 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
384 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); 428 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
429 }
430 {
431 cairo_font_options_t *fopt = cairo_font_options_create ();
432 cairo_fontmap = pango_cairo_font_map_get_default ();
433 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434#ifdef _WIN32
435 // cairo looks like shit eaten twice on windows
436 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437#else
438 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439#endif
440 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442 pango_cairo_context_set_font_options (cairo_context, fopt);
443 cairo_font_options_destroy (fopt);
444 }
385} 445}
386 446
387int 447int
388SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 448SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
389 449
399 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 459 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
400 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 460 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
401 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 461 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
402 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 462 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
403 463
464 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
466
404 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 467 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
405 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 468 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
406 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 469 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
407 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 470 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
408 471
409 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 472 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
410 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
411 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
412 473
413 SDL_EnableUNICODE (1); 474 SDL_EnableUNICODE (1);
414 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 475 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
415 476
416 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 477 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
425 486
426 ++m; 487 ++m;
427 } 488 }
428} 489}
429 490
491char *
492SDL_GetError ()
493
430int 494int
431SDL_SetVideoMode (int w, int h, int fullscreen) 495SDL_SetVideoMode (int w, int h, int fullscreen)
432 CODE: 496 CODE:
433 RETVAL = !!SDL_SetVideoMode ( 497 RETVAL = !!SDL_SetVideoMode (
434 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 498 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
435 ); 499 );
500 if (RETVAL)
501 {
436 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 502 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
503# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
504# include "glfunc.h"
505# undef GL_FUNC
506 }
437 OUTPUT: 507 OUTPUT:
438 RETVAL 508 RETVAL
439 509
440void 510void
441SDL_GL_SwapBuffers () 511SDL_GL_SwapBuffers ()
512
513char *
514SDL_GetKeyName (int sym)
442 515
443void 516void
444SDL_PollEvent () 517SDL_PollEvent ()
445 PPCODE: 518 PPCODE:
446{ 519{
448 521
449 while (SDL_PollEvent (&ev)) 522 while (SDL_PollEvent (&ev))
450 { 523 {
451 HV *hv = newHV (); 524 HV *hv = newHV ();
452 hv_store (hv, "type", 4, newSViv (ev.type), 0); 525 hv_store (hv, "type", 4, newSViv (ev.type), 0);
526
453 switch (ev.type) 527 switch (ev.type)
454 { 528 {
455 case SDL_KEYDOWN: 529 case SDL_KEYDOWN:
456 case SDL_KEYUP: 530 case SDL_KEYUP:
457 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 531 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
464 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 538 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
465 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 539 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
466 break; 540 break;
467 541
468 case SDL_MOUSEMOTION: 542 case SDL_MOUSEMOTION:
543 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
544
469 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 545 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
470 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 546 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
471 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 547 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
472 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 548 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
473 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 549 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
474 break; 550 break;
475 551
476 case SDL_MOUSEBUTTONDOWN: 552 case SDL_MOUSEBUTTONDOWN:
477 case SDL_MOUSEBUTTONUP: 553 case SDL_MOUSEBUTTONUP:
554 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
555
478 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 556 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 557 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 558 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 559 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
560 break;
561
562 case SDL_USEREVENT:
563 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
564 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
565 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
566 break;
482 } 567 }
483 568
484 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 569 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
485 } 570 }
486} 571}
487 572
488int 573int
489Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 574Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
490 POSTCALL: 575 POSTCALL:
491 Mix_HookMusicFinished (music_finished); 576 Mix_HookMusicFinished (music_finished);
577 Mix_ChannelFinished (channel_finished);
492 578
493void 579void
494Mix_CloseAudio () 580Mix_CloseAudio ()
495 581
496int 582int
501 CODE: 587 CODE:
502#ifndef _WIN32 588#ifndef _WIN32
503 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 589 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
504#endif 590#endif
505 591
506char *
507gl_version ()
508 CODE:
509 RETVAL = (char *)glGetString (GL_VERSION);
510 OUTPUT:
511 RETVAL
512
513char *
514gl_extensions ()
515 CODE:
516 RETVAL = (char *)glGetString (GL_EXTENSIONS);
517 OUTPUT:
518 RETVAL
519
520void 592void
521add_font (char *file) 593add_font (char *file)
522 CODE: 594 CODE:
523 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
524 596#ifdef _WIN32
525void 597 // cairo... sigh... requires win2000
526set_font (char *file) 598 AddFontResourceEx (file, FR_PRIVATE, 0);
527 CODE: 599#endif
528{
529 int count;
530 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
531 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532 FcPatternDestroy (pattern);
533 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534 pango_context_set_font_description (context, font);
535}
536 600
537void 601void
538load_image_inline (SV *image_) 602load_image_inline (SV *image_)
539 ALIAS: 603 ALIAS:
540 load_image_file = 1 604 load_image_file = 1
622 PUSHs (sv_2mortal (newSViv (b / y))); 686 PUSHs (sv_2mortal (newSViv (b / y)));
623 PUSHs (sv_2mortal (newSViv (a / y))); 687 PUSHs (sv_2mortal (newSViv (a / y)));
624} 688}
625 689
626void 690void
691error (char *message)
692 CODE:
693 fprintf (stderr, "ERROR: %s\n", message);
694#ifdef _WIN32
695 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
696#endif
697
698void
627fatal (char *message) 699fatal (char *message)
628 CODE: 700 CODE:
701 fprintf (stderr, "FATAL: %s\n", message);
629#ifdef _WIN32 702#ifdef _WIN32
630 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
631#else
632 fprintf (stderr, "FATAL: %s\n", message);
633#endif 704#endif
634 exit (1); 705 exit (1);
635 706
707MODULE = CFClient PACKAGE = CFClient::Font
708
709CFClient::Font
710new_from_file (SV *class, char *path, int id = 0)
711 CODE:
712{
713 int count;
714 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
715 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
716 FcPatternDestroy (pattern);
717}
718 OUTPUT:
719 RETVAL
720
721void
722DESTROY (CFClient::Font self)
723 CODE:
724 pango_font_description_free (self);
725
726void
727make_default (CFClient::Font self)
728 CODE:
729 default_font = self;
730
636MODULE = CFClient PACKAGE = CFClient::Layout 731MODULE = CFClient PACKAGE = CFClient::Layout
637 732
638CFClient::Layout 733CFClient::Layout
639new (SV *class, int base_height = 10) 734new (SV *class, int rgba = 0)
640 CODE: 735 CODE:
641 New (0, RETVAL, 1, struct cf_layout); 736 New (0, RETVAL, 1, struct cf_layout);
642 RETVAL->base_height = base_height; 737
643 RETVAL->pl = pango_layout_new (context); 738 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
739 RETVAL->rgba = rgba;
740 RETVAL->r = 1.;
741 RETVAL->g = 1.;
742 RETVAL->b = 1.;
743 RETVAL->a = 1.;
744 RETVAL->base_height = MIN_FONT_HEIGHT;
745 RETVAL->font = 0;
746
644 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 747 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645 pango_layout_set_font_description (RETVAL->pl, 748 layout_update_font (RETVAL);
646 pango_font_description_copy (
647 pango_context_get_font_description (context)));
648 OUTPUT: 749 OUTPUT:
649 RETVAL 750 RETVAL
650 751
651void 752void
652DESTROY (CFClient::Layout self) 753DESTROY (CFClient::Layout self)
653 CODE: 754 CODE:
654 g_object_unref (self->pl); 755 g_object_unref (self->pl);
655 Safefree (self); 756 Safefree (self);
656 757
758int
759is_rgba (CFClient::Layout self)
760 CODE:
761 RETVAL = self->rgba;
762 OUTPUT:
763 RETVAL
764
657void 765void
658set_text (CFClient::Layout self, SV *text_) 766set_text (CFClient::Layout self, SV *text_)
659 CODE: 767 CODE:
660{ 768{
661 STRLEN textlen; 769 STRLEN textlen;
681 SvUTF8_on (RETVAL); 789 SvUTF8_on (RETVAL);
682 OUTPUT: 790 OUTPUT:
683 RETVAL 791 RETVAL
684 792
685void 793void
794set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
795 CODE:
796 self->r = r;
797 self->g = g;
798 self->b = b;
799 self->a = a;
800
801void
802set_font (CFClient::Layout self, CFClient::Font font = 0)
803 CODE:
804 if (self->font != font)
805 {
806 self->font = font;
807 layout_update_font (self);
808 }
809
810void
686set_height (CFClient::Layout self, int base_height) 811set_height (CFClient::Layout self, int base_height)
687 CODE: 812 CODE:
813 if (self->base_height != base_height)
814 {
688 self->base_height = base_height; 815 self->base_height = base_height;
816 layout_update_font (self);
817 }
689 818
690void 819void
691set_width (CFClient::Layout self, int max_width = -1) 820set_width (CFClient::Layout self, int max_width = -1)
692 CODE: 821 CODE:
693 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 822 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
823
824void
825set_indent (CFClient::Layout self, int indent)
826 CODE:
827 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
828
829void
830set_spacing (CFClient::Layout self, int spacing)
831 CODE:
832 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
833
834void
835set_ellipsise (CFClient::Layout self, int ellipsise)
836 CODE:
837 pango_layout_set_ellipsize (self->pl,
838 ellipsise == 1 ? PANGO_ELLIPSIZE_START
839 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
840 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
841 : PANGO_ELLIPSIZE_NONE
842 );
843
844void
845set_single_paragraph_mode (CFClient::Layout self, int spm)
846 CODE:
847 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
694 848
695void 849void
696size (CFClient::Layout self) 850size (CFClient::Layout self)
697 PPCODE: 851 PPCODE:
698{ 852{
699 int w, h; 853 int w, h;
700 854
701 layout_update (self);
702 layout_get_pixel_size (self, &w, &h); 855 layout_get_pixel_size (self, &w, &h);
703 856
704 EXTEND (SP, 2); 857 EXTEND (SP, 2);
705 PUSHs (sv_2mortal (newSViv (w))); 858 PUSHs (sv_2mortal (newSViv (w)));
706 PUSHs (sv_2mortal (newSViv (h))); 859 PUSHs (sv_2mortal (newSViv (h)));
709int 862int
710xy_to_index (CFClient::Layout self, int x, int y) 863xy_to_index (CFClient::Layout self, int x, int y)
711 CODE: 864 CODE:
712{ 865{
713 int index, trailing; 866 int index, trailing;
714
715 layout_update (self);
716 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 867 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
717
718 RETVAL = index; 868 RETVAL = index;
719} 869}
720 OUTPUT: 870 OUTPUT:
721 RETVAL 871 RETVAL
722 872
723void 873void
724cursor_pos (CFClient::Layout self, int index) 874cursor_pos (CFClient::Layout self, int index)
725 PPCODE: 875 PPCODE:
726{ 876{
727 PangoRectangle strong_pos; 877 PangoRectangle strong_pos;
728 layout_update (self);
729 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 878 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730 879
731 EXTEND (SP, 3); 880 EXTEND (SP, 3);
732 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 881 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 882 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
738render (CFClient::Layout self) 887render (CFClient::Layout self)
739 PPCODE: 888 PPCODE:
740{ 889{
741 SV *retval; 890 SV *retval;
742 int w, h; 891 int w, h;
743 FT_Bitmap bitmap;
744 892
745 layout_update (self);
746 layout_get_pixel_size (self, &w, &h); 893 layout_get_pixel_size (self, &w, &h);
747 894
895 if (self->rgba)
896 {
897 cairo_surface_t *surface;
898 cairo_t *cairo;
899
900 retval = newSV (w * h * 4);
901 SvPOK_only (retval);
902 SvCUR_set (retval, w * h * 4);
903
904 memset (SvPVX (retval), 0, w * h * 4);
905
906 surface = cairo_image_surface_create_for_data (
907 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
908 cairo = cairo_create (surface);
909 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
910
911 pango_cairo_show_layout (cairo, self->pl);
912
913 cairo_destroy (cairo);
914 cairo_surface_destroy (surface);
915
916 // what a mess, and its premultiplied, too :(
917 {
918 uint32_t *p = (uint32_t *)SvPVX (retval);
919 uint32_t *e = p + w * h;
920
921 while (p < e)
922 {
923 uint32_t rgba = *p;
924 rgba = (rgba >> 24) | (rgba << 8);
925#if 0
926#ifdef _WIN32
927 {//D
928 uint8_t r = rgba >> 24;
929 uint8_t g = rgba >> 16;
930 uint8_t b = rgba >> 8;
931 uint8_t a = rgba >> 0;
932
933 rgba = (rgba & 0xffffff00) | a;
934 }
935#endif
936#endif
937 rgba = SDL_SwapBE32 (rgba);
938 *p++ = rgba;
939 }
940 }
941
942 EXTEND (SP, 5);
943 PUSHs (sv_2mortal (newSViv (w)));
944 PUSHs (sv_2mortal (newSViv (h)));
945 PUSHs (sv_2mortal (retval));
946 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
947 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
948 }
949 else
950 {
951 FT_Bitmap bitmap;
952
748 retval = newSV (w * h); 953 retval = newSV (w * h);
749 SvPOK_only (retval); 954 SvPOK_only (retval);
750 SvCUR_set (retval, w * h); 955 SvCUR_set (retval, w * h);
751 956
752 bitmap.rows = h; 957 bitmap.rows = h;
753 bitmap.width = w; 958 bitmap.width = w;
754 bitmap.pitch = w; 959 bitmap.pitch = w;
755 bitmap.buffer = (unsigned char*)SvPVX (retval); 960 bitmap.buffer = (unsigned char*)SvPVX (retval);
756 bitmap.num_grays = 256; 961 bitmap.num_grays = 256;
757 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 962 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
758 963
759 memset (bitmap.buffer, 0, w * h); 964 memset (bitmap.buffer, 0, w * h);
760 965
761 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 966 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
762 967
763 EXTEND (SP, 3); 968 EXTEND (SP, 5);
764 PUSHs (sv_2mortal (newSViv (w))); 969 PUSHs (sv_2mortal (newSViv (w)));
765 PUSHs (sv_2mortal (newSViv (h))); 970 PUSHs (sv_2mortal (newSViv (h)));
766 PUSHs (sv_2mortal (retval)); 971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
973 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
974 }
767} 975}
768 976
769MODULE = CFClient PACKAGE = CFClient::Texture 977MODULE = CFClient PACKAGE = CFClient::Texture
770 978
771void 979void
772draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 980draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
773 PROTOTYPE: $$$;$$ 981 PROTOTYPE: $$$;$$
982 ALIAS:
983 draw_quad_alpha = 1
984 draw_quad_alpha_premultiplied = 2
774 CODE: 985 CODE:
775{ 986{
776 HV *hv = (HV *)SvRV (self); 987 HV *hv = (HV *)SvRV (self);
777 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 988 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
778 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 989 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
779 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 990 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
780 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
781 991
782 if (items < 5) 992 if (items < 5)
783 { 993 {
784 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 994 w = SvNV (*hv_fetch (hv, "w", 1, 1));
785 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 995 h = SvNV (*hv_fetch (hv, "h", 1, 1));
786 } 996 }
787 997
998 if (ix)
999 {
1000 glEnable (GL_BLEND);
1001
1002 if (ix == 2)
1003 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1004 else
1005 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1006 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1007
1008 glEnable (GL_ALPHA_TEST);
1009 glAlphaFunc (GL_GREATER, 0.01f);
1010 }
1011
788 glBindTexture (GL_TEXTURE_2D, name); 1012 glBindTexture (GL_TEXTURE_2D, name);
789 if (wrap_mode) { 1013
790 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
791 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
792 }
793 glBegin (GL_QUADS); 1014 glBegin (GL_QUADS);
794 glTexCoord2f (0, 0); glVertex2f (x , y ); 1015 glTexCoord2f (0, 0); glVertex2f (x , y );
795 glTexCoord2f (0, t); glVertex2f (x , y + h); 1016 glTexCoord2f (0, t); glVertex2f (x , y + h);
796 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1017 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
797 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1018 glTexCoord2f (s, 0); glVertex2f (x + w, y );
798 glEnd (); 1019 glEnd ();
1020
1021 if (ix)
1022 {
1023 glDisable (GL_ALPHA_TEST);
1024 glDisable (GL_BLEND);
1025 }
799} 1026}
800 1027
801MODULE = CFClient PACKAGE = CFClient::Map 1028MODULE = CFClient PACKAGE = CFClient::Map
802 1029
803CFClient::Map 1030CFClient::Map
867 tex->r = r; 1094 tex->r = r;
868 tex->g = g; 1095 tex->g = g;
869 tex->b = b; 1096 tex->b = b;
870 tex->a = a; 1097 tex->a = a;
871 } 1098 }
1099
1100 // somewhat hackish, but for textures that require it, it really
1101 // improves the look, and most others don't suffer.
1102 glBindTexture (GL_TEXTURE_2D, name);
1103 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1104 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1105 // use uglier nearest interpolation because linear suffers
1106 // from transparent color bleeding and ugly wrapping effects.
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
872} 1108}
873 1109
874int 1110int
875ox (CFClient::Map self) 1111ox (CFClient::Map self)
876 ALIAS: 1112 ALIAS:
877 oy = 1 1113 oy = 1
1114 x = 2
1115 y = 3
1116 w = 4
1117 h = 5
878 CODE: 1118 CODE:
879 switch (ix) 1119 switch (ix)
880 { 1120 {
881 case 0: RETVAL = self->ox; break; 1121 case 0: RETVAL = self->ox; break;
882 case 1: RETVAL = self->oy; break; 1122 case 1: RETVAL = self->oy; break;
1123 case 2: RETVAL = self->x; break;
1124 case 3: RETVAL = self->y; break;
1125 case 4: RETVAL = self->w; break;
1126 case 5: RETVAL = self->h; break;
883 } 1127 }
884 OUTPUT: 1128 OUTPUT:
885 RETVAL 1129 RETVAL
886 1130
887void 1131void
1312 } *civ, const_iv[] = { 1556 } *civ, const_iv[] = {
1313# define const_iv(name) { # name, (IV)name } 1557# define const_iv(name) { # name, (IV)name }
1314 const_iv (GL_COLOR_MATERIAL), 1558 const_iv (GL_COLOR_MATERIAL),
1315 const_iv (GL_SMOOTH), 1559 const_iv (GL_SMOOTH),
1316 const_iv (GL_FLAT), 1560 const_iv (GL_FLAT),
1561 const_iv (GL_DITHER),
1317 const_iv (GL_BLEND), 1562 const_iv (GL_BLEND),
1563 const_iv (GL_CULL_FACE),
1564 const_iv (GL_SCISSOR_TEST),
1565 const_iv (GL_DEPTH_TEST),
1566 const_iv (GL_ALPHA_TEST),
1567 const_iv (GL_NORMALIZE),
1568 const_iv (GL_RESCALE_NORMAL),
1318 const_iv (GL_AND), 1569 const_iv (GL_AND),
1570 const_iv (GL_ONE),
1571 const_iv (GL_ZERO),
1319 const_iv (GL_SRC_ALPHA), 1572 const_iv (GL_SRC_ALPHA),
1573 const_iv (GL_DST_ALPHA),
1320 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1574 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE),
1321 const_iv (GL_RGB), 1577 const_iv (GL_RGB),
1322 const_iv (GL_RGBA), 1578 const_iv (GL_RGBA),
1323 const_iv (GL_UNSIGNED_BYTE), 1579 const_iv (GL_UNSIGNED_BYTE),
1324 const_iv (GL_ALPHA4), 1580 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT),
1325 const_iv (GL_ALPHA), 1582 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY),
1584 const_iv (GL_LUMINANCE),
1585 const_iv (GL_LUMINANCE_ALPHA),
1326 const_iv (GL_FLOAT), 1586 const_iv (GL_FLOAT),
1327 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1587 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328 const_iv (GL_COMPILE), 1588 const_iv (GL_COMPILE),
1329 const_iv (GL_TEXTURE_1D), 1589 const_iv (GL_TEXTURE_1D),
1330 const_iv (GL_TEXTURE_2D), 1590 const_iv (GL_TEXTURE_2D),
1332 const_iv (GL_TEXTURE_MAG_FILTER), 1592 const_iv (GL_TEXTURE_MAG_FILTER),
1333 const_iv (GL_TEXTURE_MIN_FILTER), 1593 const_iv (GL_TEXTURE_MIN_FILTER),
1334 const_iv (GL_TEXTURE_ENV_MODE), 1594 const_iv (GL_TEXTURE_ENV_MODE),
1335 const_iv (GL_TEXTURE_WRAP_S), 1595 const_iv (GL_TEXTURE_WRAP_S),
1336 const_iv (GL_TEXTURE_WRAP_T), 1596 const_iv (GL_TEXTURE_WRAP_T),
1597 const_iv (GL_REPEAT),
1337 const_iv (GL_CLAMP), 1598 const_iv (GL_CLAMP),
1338 const_iv (GL_REPEAT), 1599 const_iv (GL_CLAMP_TO_EDGE),
1339 const_iv (GL_NEAREST), 1600 const_iv (GL_NEAREST),
1340 const_iv (GL_LINEAR), 1601 const_iv (GL_LINEAR),
1341 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1602 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1603 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1604 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1605 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345 const_iv (GL_GENERATE_MIPMAP), 1606 const_iv (GL_GENERATE_MIPMAP),
1346 const_iv (GL_LINEAR),
1347 const_iv (GL_MODULATE), 1607 const_iv (GL_MODULATE),
1608 const_iv (GL_DECAL),
1348 const_iv (GL_REPLACE), 1609 const_iv (GL_REPLACE),
1610 const_iv (GL_DEPTH_BUFFER_BIT),
1349 const_iv (GL_COLOR_BUFFER_BIT), 1611 const_iv (GL_COLOR_BUFFER_BIT),
1350 const_iv (GL_PROJECTION), 1612 const_iv (GL_PROJECTION),
1351 const_iv (GL_MODELVIEW), 1613 const_iv (GL_MODELVIEW),
1352 const_iv (GL_COLOR_LOGIC_OP), 1614 const_iv (GL_COLOR_LOGIC_OP),
1615 const_iv (GL_SEPARABLE_2D),
1353 const_iv (GL_CONVOLUTION_2D), 1616 const_iv (GL_CONVOLUTION_2D),
1354 const_iv (GL_CONVOLUTION_BORDER_MODE), 1617 const_iv (GL_CONVOLUTION_BORDER_MODE),
1355 const_iv (GL_CONSTANT_BORDER), 1618 const_iv (GL_CONSTANT_BORDER),
1356 const_iv (GL_LINES), 1619 const_iv (GL_LINES),
1620 const_iv (GL_LINE_LOOP),
1357 const_iv (GL_QUADS), 1621 const_iv (GL_QUADS),
1358 const_iv (GL_LINE_LOOP), 1622 const_iv (GL_QUAD_STRIP),
1623 const_iv (GL_TRIANGLES),
1624 const_iv (GL_TRIANGLE_STRIP),
1625 const_iv (GL_TRIANGLE_FAN),
1359 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1626 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1360 const_iv (GL_FASTEST), 1627 const_iv (GL_FASTEST),
1628 const_iv (GL_V2F),
1629 const_iv (GL_V3F),
1630 const_iv (GL_T2F_V3F),
1631 const_iv (GL_T2F_N3F_V3F),
1361# undef const_iv 1632# undef const_iv
1362 }; 1633 };
1363 1634
1364 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1365 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1366} 1637}
1367 1638
1639char *
1640gl_vendor ()
1641 CODE:
1642 RETVAL = (char *)glGetString (GL_VENDOR);
1643 OUTPUT:
1644 RETVAL
1645
1646char *
1647gl_version ()
1648 CODE:
1649 RETVAL = (char *)glGetString (GL_VERSION);
1650 OUTPUT:
1651 RETVAL
1652
1653char *
1654gl_extensions ()
1655 CODE:
1656 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1657 OUTPUT:
1658 RETVAL
1659
1368int glGetError () 1660int glGetError ()
1369 1661
1370void glClear (int mask) 1662void glClear (int mask)
1371 1663
1372void glClearColor (float r, float g, float b, float a = 1.0) 1664void glClearColor (float r, float g, float b, float a = 1.0)
1380 1672
1381void glHint (int target, int mode) 1673void glHint (int target, int mode)
1382 1674
1383void glBlendFunc (int sfactor, int dfactor) 1675void glBlendFunc (int sfactor, int dfactor)
1384 1676
1677void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1678 CODE:
1679 gl_BlendFuncSeparate (sa, da, saa, daa);
1680
1681void glDepthMask (int flag)
1682
1385void glLogicOp (int opcode) 1683void glLogicOp (int opcode)
1386 1684
1685void glColorMask (int red, int green, int blue, int alpha)
1686
1387void glMatrixMode (int mode) 1687void glMatrixMode (int mode)
1388 1688
1389void glPushMatrix () 1689void glPushMatrix ()
1390 1690
1391void glPopMatrix () 1691void glPopMatrix ()
1392 1692
1393void glLoadIdentity () 1693void glLoadIdentity ()
1394 1694
1695# near_ and far_ are due to microsofts buggy "c" compiler
1696void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697
1698# near_ and far_ are due to microsofts buggy "c" compiler
1395void glOrtho (double left, double right, double bottom, double top, double near, double far) 1699void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1396 1700
1397void glViewport (int x, int y, int width, int height) 1701void glViewport (int x, int y, int width, int height)
1702
1703void glScissor (int x, int y, int width, int height)
1398 1704
1399void glTranslate (float x, float y, float z = 0.) 1705void glTranslate (float x, float y, float z = 0.)
1400 CODE: 1706 CODE:
1401 glTranslatef (x, y, z); 1707 glTranslatef (x, y, z);
1402 1708
1403void glScale (float x, float y, float z) 1709void glScale (float x, float y, float z = 1.)
1404 CODE: 1710 CODE:
1405 glScalef (x, y, z); 1711 glScalef (x, y, z);
1406 1712
1407void glRotate (float angle, float x, float y, float z) 1713void glRotate (float angle, float x, float y, float z)
1408 CODE: 1714 CODE:
1412 1718
1413void glEnd () 1719void glEnd ()
1414 1720
1415void glColor (float r, float g, float b, float a = 1.0) 1721void glColor (float r, float g, float b, float a = 1.0)
1416 PROTOTYPE: @ 1722 PROTOTYPE: @
1723 ALIAS:
1724 glColor_premultiply = 1
1417 CODE: 1725 CODE:
1418 glColor4f (r, g, b, a); 1726 if (ix)
1727 {
1728 r *= a;
1729 g *= a;
1730 b *= a;
1731 }
1732 // microsoft visual "c" rounds instead of truncating...
1733 glColor4ub (MIN ((int)(r * 256.f), 255),
1734 MIN ((int)(g * 256.f), 255),
1735 MIN ((int)(b * 256.f), 255),
1736 MIN ((int)(a * 256.f), 255));
1737
1738void glInterleavedArrays (int format, int stride, char *data)
1739
1740void glDrawElements (int mode, int count, int type, char *indices)
1741
1742# 1.2 void glDrawRangeElements (int mode, int start, int end
1743
1744void glRasterPos (float x, float y, float z = 0.)
1745 CODE:
1746 glRasterPos3f (0, 0, z);
1747 glBitmap (0, 0, 0, 0, x, y, 0);
1419 1748
1420void glVertex (float x, float y, float z = 0.) 1749void glVertex (float x, float y, float z = 0.)
1421 CODE: 1750 CODE:
1422 glVertex3f (x, y, z); 1751 glVertex3f (x, y, z);
1423 1752
1435 1764
1436void glBindTexture (int target, int name) 1765void glBindTexture (int target, int name)
1437 1766
1438void glConvolutionParameter (int target, int pname, float params) 1767void glConvolutionParameter (int target, int pname, float params)
1439 CODE: 1768 CODE:
1769 if (gl.ConvolutionParameterf)
1440 glConvolutionParameterf (target, pname, params); 1770 gl.ConvolutionParameterf (target, pname, params);
1441 1771
1442void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1772void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1773 CODE:
1774 if (gl.ConvolutionFilter2D)
1775 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1776
1777void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1778 CODE:
1779 if (gl.SeparableFilter2D)
1780 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1443 1781
1444void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1782void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1445 1783
1446void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1784void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1785
1786void glDrawPixels (int width, int height, int format, int type, char *pixels)
1787
1788void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1447 1789
1448int glGenTexture () 1790int glGenTexture ()
1449 CODE: 1791 CODE:
1450{ 1792{
1451 GLuint name; 1793 GLuint name;
1476 1818
1477void glEndList () 1819void glEndList ()
1478 1820
1479void glCallList (int list) 1821void glCallList (int list)
1480 1822
1823

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines