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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines