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.69 by root, Sun Apr 30 08:09:44 2006 UTC vs.
Revision 1.113 by root, Wed Jun 14 16:20:21 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>
15#include <stdlib.h>
11 16
12#include <SDL.h> 17#include <SDL.h>
18#include <SDL_endian.h>
13#include <SDL_image.h> 19#include <SDL_image.h>
14#include <SDL_mixer.h> 20#include <SDL_mixer.h>
15#include <SDL_opengl.h> 21#include <SDL_opengl.h>
16 22
17#include <glib/gmacros.h> 23#include <glib/gmacros.h>
18 24
19#include <pango/pango.h> 25#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h> 26#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h> 27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
22 29
23#ifndef _WIN32 30#ifndef _WIN32
24# include <sys/types.h> 31# include <sys/types.h>
25# include <sys/socket.h> 32# include <sys/socket.h>
26# include <netinet/in.h> 33# include <netinet/in.h>
42#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
44 51
45#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
46 53
47#define GL_CALL(type,func,args) \ 54static struct
48 { \ 55{
49 static int init_; \ 56#define GL_FUNC(ptr,name) ptr name;
50 static type fptr_; \ 57#include "glfunc.h"
51 \ 58#undef GL_FUNC
52 if (!init_) \ 59} gl;
53 { \ 60
54 init_ = 1; \ 61static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
55 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 62{
56 } \ 63 if (gl.BlendFuncSeparate)
57 \ 64 gl.BlendFuncSeparate (sa, da, saa, daa);
58 if (fptr_) \ 65 else if (gl.BlendFuncSeparateEXT)
59 fptr_ args; \ 66 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
60 } 67 else
68 glBlendFunc (sa, da);
69}
61 70
62typedef Mix_Chunk *CFClient__MixChunk; 71typedef Mix_Chunk *CFClient__MixChunk;
63typedef Mix_Music *CFClient__MixMusic; 72typedef Mix_Music *CFClient__MixMusic;
64 73
65typedef PangoFontDescription *CFClient__Font; 74typedef PangoFontDescription *CFClient__Font;
66 75
67typedef struct cf_layout { 76typedef struct cf_layout {
68 PangoLayout *pl; 77 PangoLayout *pl; // either derived from a cairo or ft2 context
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode
69 int base_height; 80 int base_height;
70 CFClient__Font font; 81 CFClient__Font font;
71} *CFClient__Layout; 82} *CFClient__Layout;
72 83
73static CFClient__Font default_font; 84static CFClient__Font default_font;
74static PangoContext *context; 85static PangoContext *ft2_context, *cairo_context;
75static PangoFontMap *fontmap; 86static PangoFontMap *ft2_fontmap, *cairo_fontmap;
76 87
77static void 88static void
78substitute_func (FcPattern *pattern, gpointer data) 89substitute_func (FcPattern *pattern, gpointer data)
79{ 90{
80 FcPatternAddBool (pattern, FC_HINTING , 1); 91 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
81 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 98 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
82} 100}
83 101
84static void 102static void
85layout_update_font (CFClient__Layout self) 103layout_update_font (CFClient__Layout self)
86{ 104{
98static void 116static void
99layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 117layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
100{ 118{
101 pango_layout_get_pixel_size (self->pl, w, h); 119 pango_layout_get_pixel_size (self->pl, w, h);
102 120
103 *w = (*w + 3) & ~3;
104 if (!*w) *w = 1; 121 if (!*w) *w = 1;
105 if (!*h) *h = 1; 122 if (!*h) *h = 1;
123
124 *w = (*w + 3) & ~3;
106} 125}
107 126
108typedef uint16_t mapface; 127typedef uint16_t mapface;
109 128
110typedef struct { 129typedef struct {
258 } 277 }
259 } 278 }
260} 279}
261 280
262static void 281static void
263music_finished () 282music_finished (void)
264{ 283{
265 SDL_UserEvent ev; 284 SDL_UserEvent ev;
266 285
267 ev.type = SDL_USEREVENT; 286 ev.type = SDL_USEREVENT;
268 ev.code = 0; 287 ev.code = 0;
269 ev.data1 = 0; 288 ev.data1 = 0;
270 ev.data2 = 0; 289 ev.data2 = 0;
271 290
272 SDL_PushEvent ((SDL_Event *)&ev); 291 SDL_PushEvent ((SDL_Event *)&ev);
292}
293
294static void
295channel_finished (int channel)
296{
297 SDL_UserEvent ev;
298
299 ev.type = SDL_USEREVENT;
300 ev.code = 1;
301 ev.data1 = (void *)(long)channel;
302 ev.data2 = 0;
303
304 SDL_PushEvent ((SDL_Event *)&ev);
305}
306
307static unsigned int
308minpot (unsigned int n)
309{
310 if (!n)
311 return 0;
312
313 --n;
314
315 n |= n >> 1;
316 n |= n >> 2;
317 n |= n >> 4;
318 n |= n >> 8;
319 n |= n >> 16;
320
321 return n + 1;
273} 322}
274 323
275MODULE = CFClient PACKAGE = CFClient 324MODULE = CFClient PACKAGE = CFClient
276 325
277PROTOTYPES: ENABLE 326PROTOTYPES: ENABLE
385# undef const_iv 434# undef const_iv
386 }; 435 };
387 436
388 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439}
390 440
441void
442pango_init ()
443 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{
446 {
391 fontmap = pango_ft2_font_map_new (); 447 ft2_fontmap = pango_ft2_font_map_new ();
392 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 448 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); 449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
450 }
451 {
452 cairo_font_options_t *fopt = cairo_font_options_create ();
453 cairo_fontmap = pango_cairo_font_map_get_default ();
454 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455#ifdef _WIN32
456 // cairo looks like shit eaten twice on windows
457 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458#else
459 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460#endif
461 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463 pango_cairo_context_set_font_options (cairo_context, fopt);
464 cairo_font_options_destroy (fopt);
465 }
394} 466}
395 467
396int 468int
397SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
398 470
408 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 480 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412 484
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
487
413 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417 492
418 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 493 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
419 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
420 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
421 494
422 SDL_EnableUNICODE (1); 495 SDL_EnableUNICODE (1);
423 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424 497
425 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
434 507
435 ++m; 508 ++m;
436 } 509 }
437} 510}
438 511
512char *
513SDL_GetError ()
514
439int 515int
440SDL_SetVideoMode (int w, int h, int fullscreen) 516SDL_SetVideoMode (int w, int h, int fullscreen)
441 CODE: 517 CODE:
442 RETVAL = !!SDL_SetVideoMode ( 518 RETVAL = !!SDL_SetVideoMode (
443 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 519 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
444 ); 520 );
521 if (RETVAL)
522 {
445 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 523 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
524# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
525# include "glfunc.h"
526# undef GL_FUNC
527 }
446 OUTPUT: 528 OUTPUT:
447 RETVAL 529 RETVAL
448 530
449void 531void
450SDL_GL_SwapBuffers () 532SDL_GL_SwapBuffers ()
533
534char *
535SDL_GetKeyName (int sym)
451 536
452void 537void
453SDL_PollEvent () 538SDL_PollEvent ()
454 PPCODE: 539 PPCODE:
455{ 540{
457 542
458 while (SDL_PollEvent (&ev)) 543 while (SDL_PollEvent (&ev))
459 { 544 {
460 HV *hv = newHV (); 545 HV *hv = newHV ();
461 hv_store (hv, "type", 4, newSViv (ev.type), 0); 546 hv_store (hv, "type", 4, newSViv (ev.type), 0);
547
462 switch (ev.type) 548 switch (ev.type)
463 { 549 {
464 case SDL_KEYDOWN: 550 case SDL_KEYDOWN:
465 case SDL_KEYUP: 551 case SDL_KEYUP:
466 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 552 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
473 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 559 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
474 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 560 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
475 break; 561 break;
476 562
477 case SDL_MOUSEMOTION: 563 case SDL_MOUSEMOTION:
564 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
565
478 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 566 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
479 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 567 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
480 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 568 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
481 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 569 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
482 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 570 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
483 break; 571 break;
484 572
485 case SDL_MOUSEBUTTONDOWN: 573 case SDL_MOUSEBUTTONDOWN:
486 case SDL_MOUSEBUTTONUP: 574 case SDL_MOUSEBUTTONUP:
575 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
576
487 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 577 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 578 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 579 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 580 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
581 break;
582
583 case SDL_USEREVENT:
584 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break;
491 } 588 }
492 589
493 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494 } 591 }
495} 592}
496 593
497int 594int
498Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 595Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499 POSTCALL: 596 POSTCALL:
500 Mix_HookMusicFinished (music_finished); 597 Mix_HookMusicFinished (music_finished);
598 Mix_ChannelFinished (channel_finished);
501 599
502void 600void
503Mix_CloseAudio () 601Mix_CloseAudio ()
504 602
505int 603int
510 CODE: 608 CODE:
511#ifndef _WIN32 609#ifndef _WIN32
512 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 610 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
513#endif 611#endif
514 612
515char *
516gl_version ()
517 CODE:
518 RETVAL = (char *)glGetString (GL_VERSION);
519 OUTPUT:
520 RETVAL
521
522char *
523gl_extensions ()
524 CODE:
525 RETVAL = (char *)glGetString (GL_EXTENSIONS);
526 OUTPUT:
527 RETVAL
528
529void 613void
530add_font (char *file) 614add_font (char *file)
531 CODE: 615 CODE:
532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
533 621
534void 622void
535load_image_inline (SV *image_) 623load_image_inline (SV *image_)
536 ALIAS: 624 ALIAS:
537 load_image_file = 1 625 load_image_file = 1
621} 709}
622 710
623void 711void
624error (char *message) 712error (char *message)
625 CODE: 713 CODE:
714 fprintf (stderr, "ERROR: %s\n", message);
626#ifdef _WIN32 715#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 716 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
628#else
629 fprintf (stderr, "ERROR: %s\n", message);
630#endif 717#endif
631 718
632void 719void
633fatal (char *message) 720fatal (char *message)
634 CODE: 721 CODE:
722 fprintf (stderr, "FATAL: %s\n", message);
635#ifdef _WIN32 723#ifdef _WIN32
636 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 724 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
637#else
638 fprintf (stderr, "FATAL: %s\n", message);
639#endif 725#endif
640 exit (1); 726 _exit (1);
727
728void
729_exit (int retval)
730 CODE:
731 _exit (retval);
641 732
642MODULE = CFClient PACKAGE = CFClient::Font 733MODULE = CFClient PACKAGE = CFClient::Font
643 734
644CFClient::Font 735CFClient::Font
645new_from_file (SV *class, char *path) 736new_from_file (SV *class, char *path, int id = 0)
646 CODE: 737 CODE:
647{ 738{
648 int count; 739 int count;
649 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
650 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 741 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651 FcPatternDestroy (pattern); 742 FcPatternDestroy (pattern);
652} 743}
653 OUTPUT: 744 OUTPUT:
654 RETVAL 745 RETVAL
664 default_font = self; 755 default_font = self;
665 756
666MODULE = CFClient PACKAGE = CFClient::Layout 757MODULE = CFClient PACKAGE = CFClient::Layout
667 758
668CFClient::Layout 759CFClient::Layout
669new (SV *class, int base_height = MIN_FONT_HEIGHT) 760new (SV *class, int rgba = 0)
670 CODE: 761 CODE:
671 New (0, RETVAL, 1, struct cf_layout); 762 New (0, RETVAL, 1, struct cf_layout);
672 RETVAL->pl = pango_layout_new (context); 763
673 RETVAL->base_height = base_height; 764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.;
767 RETVAL->g = 1.;
768 RETVAL->b = 1.;
769 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT;
674 RETVAL->font = 0; 771 RETVAL->font = 0;
772
675 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 773 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676 pango_layout_set_font_description (RETVAL->pl, default_font); 774 layout_update_font (RETVAL);
677 OUTPUT: 775 OUTPUT:
678 RETVAL 776 RETVAL
679 777
680void 778void
681DESTROY (CFClient::Layout self) 779DESTROY (CFClient::Layout self)
682 CODE: 780 CODE:
683 g_object_unref (self->pl); 781 g_object_unref (self->pl);
684 Safefree (self); 782 Safefree (self);
685 783
784int
785is_rgba (CFClient::Layout self)
786 CODE:
787 RETVAL = self->rgba;
788 OUTPUT:
789 RETVAL
790
686void 791void
687set_text (CFClient::Layout self, SV *text_) 792set_text (CFClient::Layout self, SV *text_)
688 CODE: 793 CODE:
689{ 794{
690 STRLEN textlen; 795 STRLEN textlen;
705 810
706SV * 811SV *
707get_text (CFClient::Layout self) 812get_text (CFClient::Layout self)
708 CODE: 813 CODE:
709 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710 SvUTF8_on (RETVAL); 815 sv_utf8_decode (RETVAL);
711 OUTPUT: 816 OUTPUT:
712 RETVAL 817 RETVAL
818
819void
820set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
821 CODE:
822 self->r = r;
823 self->g = g;
824 self->b = b;
825 self->a = a;
713 826
714void 827void
715set_font (CFClient::Layout self, CFClient::Font font = 0) 828set_font (CFClient::Layout self, CFClient::Font font = 0)
716 CODE: 829 CODE:
717 if (self->font != font) 830 if (self->font != font)
733set_width (CFClient::Layout self, int max_width = -1) 846set_width (CFClient::Layout self, int max_width = -1)
734 CODE: 847 CODE:
735 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 848 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
736 849
737void 850void
851set_indent (CFClient::Layout self, int indent)
852 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854
855void
856set_spacing (CFClient::Layout self, int spacing)
857 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859
860void
861set_ellipsise (CFClient::Layout self, int ellipsise)
862 CODE:
863 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE
868 );
869
870void
871set_single_paragraph_mode (CFClient::Layout self, int spm)
872 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874
875void
738size (CFClient::Layout self) 876size (CFClient::Layout self)
739 PPCODE: 877 PPCODE:
740{ 878{
741 int w, h; 879 int w, h;
742 880
775render (CFClient::Layout self) 913render (CFClient::Layout self)
776 PPCODE: 914 PPCODE:
777{ 915{
778 SV *retval; 916 SV *retval;
779 int w, h; 917 int w, h;
780 FT_Bitmap bitmap;
781 918
782 layout_get_pixel_size (self, &w, &h); 919 layout_get_pixel_size (self, &w, &h);
783 920
921 if (self->rgba)
922 {
923 cairo_surface_t *surface;
924 cairo_t *cairo;
925
926 retval = newSV (w * h * 4);
927 SvPOK_only (retval);
928 SvCUR_set (retval, w * h * 4);
929
930 memset (SvPVX (retval), 0, w * h * 4);
931
932 surface = cairo_image_surface_create_for_data (
933 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934 cairo = cairo_create (surface);
935 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937 pango_cairo_show_layout (cairo, self->pl);
938
939 cairo_destroy (cairo);
940 cairo_surface_destroy (surface);
941
942 // what a mess, and its premultiplied, too :(
943 {
944 uint32_t *p = (uint32_t *)SvPVX (retval);
945 uint32_t *e = p + w * h;
946
947 while (p < e)
948 {
949 uint32_t rgba = *p;
950 rgba = (rgba >> 24) | (rgba << 8);
951#if 0
952#ifdef _WIN32
953 {//D
954 uint8_t r = rgba >> 24;
955 uint8_t g = rgba >> 16;
956 uint8_t b = rgba >> 8;
957 uint8_t a = rgba >> 0;
958
959 rgba = (rgba & 0xffffff00) | a;
960 }
961#endif
962#endif
963 rgba = SDL_SwapBE32 (rgba);
964 *p++ = rgba;
965 }
966 }
967
968 EXTEND (SP, 5);
969 PUSHs (sv_2mortal (newSViv (w)));
970 PUSHs (sv_2mortal (newSViv (h)));
971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974 }
975 else
976 {
977 FT_Bitmap bitmap;
978
784 retval = newSV (w * h); 979 retval = newSV (w * h);
785 SvPOK_only (retval); 980 SvPOK_only (retval);
786 SvCUR_set (retval, w * h); 981 SvCUR_set (retval, w * h);
787 982
788 bitmap.rows = h; 983 bitmap.rows = h;
789 bitmap.width = w; 984 bitmap.width = w;
790 bitmap.pitch = w; 985 bitmap.pitch = w;
791 bitmap.buffer = (unsigned char*)SvPVX (retval); 986 bitmap.buffer = (unsigned char*)SvPVX (retval);
792 bitmap.num_grays = 256; 987 bitmap.num_grays = 256;
793 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 988 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794 989
795 memset (bitmap.buffer, 0, w * h); 990 memset (bitmap.buffer, 0, w * h);
796 991
797 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 992 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
798 993
799 EXTEND (SP, 3); 994 EXTEND (SP, 5);
800 PUSHs (sv_2mortal (newSViv (w))); 995 PUSHs (sv_2mortal (newSViv (w)));
801 PUSHs (sv_2mortal (newSViv (h))); 996 PUSHs (sv_2mortal (newSViv (h)));
802 PUSHs (sv_2mortal (retval)); 997 PUSHs (sv_2mortal (retval));
998 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000 }
803} 1001}
804 1002
805MODULE = CFClient PACKAGE = CFClient::Texture 1003MODULE = CFClient PACKAGE = CFClient::Texture
1004
1005void
1006pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE:
1008{
1009 int ow = SvIV (w_);
1010 int oh = SvIV (h_);
1011
1012 if (ow && oh)
1013 {
1014 int nw = minpot (ow);
1015 int nh = minpot (oh);
1016
1017 if (nw != ow || nh != oh)
1018 {
1019 if (SvOK (data_))
1020 {
1021 STRLEN datalen;
1022 char *data = SvPVbyte (data_, datalen);
1023 int bpp = datalen / (ow * oh);
1024 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1025
1026 SvPOK_only (result_);
1027 SvCUR_set (result_, nw * nh * bpp);
1028
1029 memset (SvPVX (result_), 0, nw * nh * bpp);
1030 while (oh--)
1031 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1032
1033 sv_setsv (data_, result_);
1034 }
1035
1036 sv_setiv (w_, nw);
1037 sv_setiv (h_, nh);
1038 }
1039 }
1040}
806 1041
807void 1042void
808draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1043draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
809 PROTOTYPE: $$$;$$ 1044 PROTOTYPE: $$$;$$
1045 ALIAS:
1046 draw_quad_alpha = 1
1047 draw_quad_alpha_premultiplied = 2
810 CODE: 1048 CODE:
811{ 1049{
812 HV *hv = (HV *)SvRV (self); 1050 HV *hv = (HV *)SvRV (self);
813 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1051 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1052 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
815 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1053 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
816 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
817 1054
818 if (items < 5) 1055 if (items < 5)
819 { 1056 {
820 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1057 w = SvNV (*hv_fetch (hv, "w", 1, 1));
821 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1058 h = SvNV (*hv_fetch (hv, "h", 1, 1));
822 } 1059 }
823 1060
1061 if (ix)
1062 {
1063 glEnable (GL_BLEND);
1064
1065 if (ix == 2)
1066 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1067 else
1068 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1069 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1070
1071 glEnable (GL_ALPHA_TEST);
1072 glAlphaFunc (GL_GREATER, 0.01f);
1073 }
1074
824 glBindTexture (GL_TEXTURE_2D, name); 1075 glBindTexture (GL_TEXTURE_2D, name);
825 if (wrap_mode) { 1076
826 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828 }
829 glBegin (GL_QUADS); 1077 glBegin (GL_QUADS);
830 glTexCoord2f (0, 0); glVertex2f (x , y ); 1078 glTexCoord2f (0, 0); glVertex2f (x , y );
831 glTexCoord2f (0, t); glVertex2f (x , y + h); 1079 glTexCoord2f (0, t); glVertex2f (x , y + h);
832 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1080 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1081 glTexCoord2f (s, 0); glVertex2f (x + w, y );
834 glEnd (); 1082 glEnd ();
1083
1084 if (ix)
1085 {
1086 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND);
1088 }
835} 1089}
836 1090
837MODULE = CFClient PACKAGE = CFClient::Map 1091MODULE = CFClient PACKAGE = CFClient::Map
838 1092
839CFClient::Map 1093CFClient::Map
859DESTROY (CFClient::Map self) 1113DESTROY (CFClient::Map self)
860 CODE: 1114 CODE:
861{ 1115{
862 map_clear (self); 1116 map_clear (self);
863 Safefree (self->face); 1117 Safefree (self->face);
1118 Safefree (self->tex);
864 Safefree (self); 1119 Safefree (self);
865} 1120}
866 1121
867void 1122void
868clear (CFClient::Map self) 1123clear (CFClient::Map self)
903 tex->r = r; 1158 tex->r = r;
904 tex->g = g; 1159 tex->g = g;
905 tex->b = b; 1160 tex->b = b;
906 tex->a = a; 1161 tex->a = a;
907 } 1162 }
1163
1164 // somewhat hackish, but for textures that require it, it really
1165 // improves the look, and most others don't suffer.
1166 glBindTexture (GL_TEXTURE_2D, name);
1167 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1168 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1169 // use uglier nearest interpolation because linear suffers
1170 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
908} 1172}
909 1173
910int 1174int
911ox (CFClient::Map self) 1175ox (CFClient::Map self)
912 ALIAS: 1176 ALIAS:
913 oy = 1 1177 oy = 1
1178 x = 2
1179 y = 3
1180 w = 4
1181 h = 5
914 CODE: 1182 CODE:
915 switch (ix) 1183 switch (ix)
916 { 1184 {
917 case 0: RETVAL = self->ox; break; 1185 case 0: RETVAL = self->ox; break;
918 case 1: RETVAL = self->oy; break; 1186 case 1: RETVAL = self->oy; break;
1187 case 2: RETVAL = self->x; break;
1188 case 3: RETVAL = self->y; break;
1189 case 4: RETVAL = self->w; break;
1190 case 5: RETVAL = self->h; break;
919 } 1191 }
920 OUTPUT: 1192 OUTPUT:
921 RETVAL 1193 RETVAL
922 1194
923void 1195void
1350 const_iv (GL_COLOR_MATERIAL), 1622 const_iv (GL_COLOR_MATERIAL),
1351 const_iv (GL_SMOOTH), 1623 const_iv (GL_SMOOTH),
1352 const_iv (GL_FLAT), 1624 const_iv (GL_FLAT),
1353 const_iv (GL_DITHER), 1625 const_iv (GL_DITHER),
1354 const_iv (GL_BLEND), 1626 const_iv (GL_BLEND),
1627 const_iv (GL_CULL_FACE),
1355 const_iv (GL_SCISSOR_TEST), 1628 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL),
1356 const_iv (GL_AND), 1633 const_iv (GL_AND),
1357 const_iv (GL_ONE), 1634 const_iv (GL_ONE),
1358 const_iv (GL_ZERO), 1635 const_iv (GL_ZERO),
1359 const_iv (GL_SRC_ALPHA), 1636 const_iv (GL_SRC_ALPHA),
1360 const_iv (GL_SRC_ALPHA_SATURATE), 1637 const_iv (GL_DST_ALPHA),
1361 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1638 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1362 const_iv (GL_ONE_MINUS_DST_ALPHA), 1639 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE),
1363 const_iv (GL_RGB), 1641 const_iv (GL_RGB),
1364 const_iv (GL_RGBA), 1642 const_iv (GL_RGBA),
1365 const_iv (GL_UNSIGNED_BYTE), 1643 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT),
1366 const_iv (GL_ALPHA), 1646 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY),
1648 const_iv (GL_LUMINANCE),
1649 const_iv (GL_LUMINANCE_ALPHA),
1367 const_iv (GL_FLOAT), 1650 const_iv (GL_FLOAT),
1368 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1651 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1369 const_iv (GL_COMPILE), 1652 const_iv (GL_COMPILE),
1370 const_iv (GL_TEXTURE_1D), 1653 const_iv (GL_TEXTURE_1D),
1371 const_iv (GL_TEXTURE_2D), 1654 const_iv (GL_TEXTURE_2D),
1373 const_iv (GL_TEXTURE_MAG_FILTER), 1656 const_iv (GL_TEXTURE_MAG_FILTER),
1374 const_iv (GL_TEXTURE_MIN_FILTER), 1657 const_iv (GL_TEXTURE_MIN_FILTER),
1375 const_iv (GL_TEXTURE_ENV_MODE), 1658 const_iv (GL_TEXTURE_ENV_MODE),
1376 const_iv (GL_TEXTURE_WRAP_S), 1659 const_iv (GL_TEXTURE_WRAP_S),
1377 const_iv (GL_TEXTURE_WRAP_T), 1660 const_iv (GL_TEXTURE_WRAP_T),
1661 const_iv (GL_REPEAT),
1378 const_iv (GL_CLAMP), 1662 const_iv (GL_CLAMP),
1379 const_iv (GL_REPEAT), 1663 const_iv (GL_CLAMP_TO_EDGE),
1380 const_iv (GL_NEAREST), 1664 const_iv (GL_NEAREST),
1381 const_iv (GL_LINEAR), 1665 const_iv (GL_LINEAR),
1382 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1666 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1383 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1667 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1384 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1668 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1385 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1669 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1386 const_iv (GL_GENERATE_MIPMAP), 1670 const_iv (GL_GENERATE_MIPMAP),
1387 const_iv (GL_MODULATE), 1671 const_iv (GL_MODULATE),
1388 const_iv (GL_DECAL), 1672 const_iv (GL_DECAL),
1389 const_iv (GL_REPLACE), 1673 const_iv (GL_REPLACE),
1674 const_iv (GL_DEPTH_BUFFER_BIT),
1390 const_iv (GL_COLOR_BUFFER_BIT), 1675 const_iv (GL_COLOR_BUFFER_BIT),
1391 const_iv (GL_PROJECTION), 1676 const_iv (GL_PROJECTION),
1392 const_iv (GL_MODELVIEW), 1677 const_iv (GL_MODELVIEW),
1393 const_iv (GL_COLOR_LOGIC_OP), 1678 const_iv (GL_COLOR_LOGIC_OP),
1394 const_iv (GL_SEPARABLE_2D), 1679 const_iv (GL_SEPARABLE_2D),
1395 const_iv (GL_CONVOLUTION_2D), 1680 const_iv (GL_CONVOLUTION_2D),
1396 const_iv (GL_CONVOLUTION_BORDER_MODE), 1681 const_iv (GL_CONVOLUTION_BORDER_MODE),
1397 const_iv (GL_CONSTANT_BORDER), 1682 const_iv (GL_CONSTANT_BORDER),
1398 const_iv (GL_LINES), 1683 const_iv (GL_LINES),
1684 const_iv (GL_LINE_LOOP),
1399 const_iv (GL_QUADS), 1685 const_iv (GL_QUADS),
1400 const_iv (GL_LINE_LOOP), 1686 const_iv (GL_QUAD_STRIP),
1687 const_iv (GL_TRIANGLES),
1688 const_iv (GL_TRIANGLE_STRIP),
1689 const_iv (GL_TRIANGLE_FAN),
1401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1690 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1402 const_iv (GL_FASTEST), 1691 const_iv (GL_FASTEST),
1692 const_iv (GL_V2F),
1693 const_iv (GL_V3F),
1694 const_iv (GL_T2F_V3F),
1695 const_iv (GL_T2F_N3F_V3F),
1403# undef const_iv 1696# undef const_iv
1404 }; 1697 };
1405 1698
1406 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1699 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1407 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1700 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1408} 1701}
1409 1702
1703char *
1704gl_vendor ()
1705 CODE:
1706 RETVAL = (char *)glGetString (GL_VENDOR);
1707 OUTPUT:
1708 RETVAL
1709
1710char *
1711gl_version ()
1712 CODE:
1713 RETVAL = (char *)glGetString (GL_VERSION);
1714 OUTPUT:
1715 RETVAL
1716
1717char *
1718gl_extensions ()
1719 CODE:
1720 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1721 OUTPUT:
1722 RETVAL
1723
1410int glGetError () 1724int glGetError ()
1411 1725
1412void glClear (int mask) 1726void glClear (int mask)
1413 1727
1414void glClearColor (float r, float g, float b, float a = 1.0) 1728void glClearColor (float r, float g, float b, float a = 1.0)
1422 1736
1423void glHint (int target, int mode) 1737void glHint (int target, int mode)
1424 1738
1425void glBlendFunc (int sfactor, int dfactor) 1739void glBlendFunc (int sfactor, int dfactor)
1426 1740
1741void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1742 CODE:
1743 gl_BlendFuncSeparate (sa, da, saa, daa);
1744
1745void glDepthMask (int flag)
1746
1427void glLogicOp (int opcode) 1747void glLogicOp (int opcode)
1428 1748
1429void glColorMask (int red, int green, int blue, int alpha) 1749void glColorMask (int red, int green, int blue, int alpha)
1430 1750
1431void glMatrixMode (int mode) 1751void glMatrixMode (int mode)
1434 1754
1435void glPopMatrix () 1755void glPopMatrix ()
1436 1756
1437void glLoadIdentity () 1757void glLoadIdentity ()
1438 1758
1439# near and far are due to microsofts buggy c compiler 1759# near_ and far_ are due to microsofts buggy "c" compiler
1760void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761
1762# near_ and far_ are due to microsofts buggy "c" compiler
1440void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1763void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1441 1764
1442void glViewport (int x, int y, int width, int height) 1765void glViewport (int x, int y, int width, int height)
1443 1766
1444void glScissor (int x, int y, int width, int height) 1767void glScissor (int x, int y, int width, int height)
1459 1782
1460void glEnd () 1783void glEnd ()
1461 1784
1462void glColor (float r, float g, float b, float a = 1.0) 1785void glColor (float r, float g, float b, float a = 1.0)
1463 PROTOTYPE: @ 1786 PROTOTYPE: @
1787 ALIAS:
1788 glColor_premultiply = 1
1464 CODE: 1789 CODE:
1465 glColor4f (r, g, b, a); 1790 if (ix)
1791 {
1792 r *= a;
1793 g *= a;
1794 b *= a;
1795 }
1796 // microsoft visual "c" rounds instead of truncating...
1797 glColor4ub (MIN ((int)(r * 256.f), 255),
1798 MIN ((int)(g * 256.f), 255),
1799 MIN ((int)(b * 256.f), 255),
1800 MIN ((int)(a * 256.f), 255));
1801
1802void glInterleavedArrays (int format, int stride, char *data)
1803
1804void glDrawElements (int mode, int count, int type, char *indices)
1805
1806# 1.2 void glDrawRangeElements (int mode, int start, int end
1807
1808void glRasterPos (float x, float y, float z = 0.)
1809 CODE:
1810 glRasterPos3f (0, 0, z);
1811 glBitmap (0, 0, 0, 0, x, y, 0);
1466 1812
1467void glVertex (float x, float y, float z = 0.) 1813void glVertex (float x, float y, float z = 0.)
1468 CODE: 1814 CODE:
1469 glVertex3f (x, y, z); 1815 glVertex3f (x, y, z);
1470 1816
1482 1828
1483void glBindTexture (int target, int name) 1829void glBindTexture (int target, int name)
1484 1830
1485void glConvolutionParameter (int target, int pname, float params) 1831void glConvolutionParameter (int target, int pname, float params)
1486 CODE: 1832 CODE:
1487 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1833 if (gl.ConvolutionParameterf)
1834 gl.ConvolutionParameterf (target, pname, params);
1488 1835
1489void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1836void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1490 CODE: 1837 CODE:
1491 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1838 if (gl.ConvolutionFilter2D)
1492 (target, internalformat, width, height, format, type, data)); 1839 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1493 1840
1494void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1841void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1495 CODE: 1842 CODE:
1496 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1843 if (gl.SeparableFilter2D)
1497 (target, internalformat, width, height, format, type, row, column)); 1844 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1498 1845
1499void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1846void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1500 1847
1501void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1848void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1502 1849
1503void glRasterPos (int x, int y) 1850void glDrawPixels (int width, int height, int format, int type, char *pixels)
1504 CODE:
1505 glRasterPos2i (x, y);
1506 1851
1507void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1852void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1508 1853
1509int glGenTexture () 1854int glGenTexture ()
1510 CODE: 1855 CODE:
1537 1882
1538void glEndList () 1883void glEndList ()
1539 1884
1540void glCallList (int list) 1885void glCallList (int list)
1541 1886
1887

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines