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.103 by root, Sun Jun 4 23:05:05 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines