ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines