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.112 by root, Mon Jun 12 14:55:41 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines