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.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines