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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines