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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines