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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines