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.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines