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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC

7 7
8#include "EXTERN.h" 8#include "EXTERN.h"
9#include "perl.h" 9#include "perl.h"
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h>
12#include <string.h> 13#include <string.h>
13#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
14 16
15#include <SDL.h> 17#include <SDL.h>
16#include <SDL_endian.h> 18#include <SDL_endian.h>
17#include <SDL_image.h> 19#include <SDL_image.h>
18#include <SDL_mixer.h> 20#include <SDL_mixer.h>
40 typedef signed int int32_t; 42 typedef signed int int32_t;
41#endif 43#endif
42 44
43#include "glext.h" 45#include "glext.h"
44 46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48
45#define FOW_DARKNESS 32 49#define FOW_DARKNESS 32
46 50
47#define MAP_EXTEND_X 32 51#define MAP_EXTEND_X 32
48#define MAP_EXTEND_Y 512 52#define MAP_EXTEND_Y 512
49 53
50#define MIN_FONT_HEIGHT 10 54#define MIN_FONT_HEIGHT 10
51 55
52#define GL_CALL(type,func,args) \ 56static struct
53 { \ 57{
54 static int init_; \ 58#define GL_FUNC(ptr,name) ptr name;
55 static type fptr_; \ 59#include "glfunc.h"
56 \ 60#undef GL_FUNC
57 if (!init_) \ 61} gl;
58 { \ 62
59 init_ = 1; \ 63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
60 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 64{
61 } \ 65 if (gl.BlendFuncSeparate)
62 \ 66 gl.BlendFuncSeparate (sa, da, saa, daa);
63 if (fptr_) \ 67 else if (gl.BlendFuncSeparateEXT)
64 fptr_ args; \ 68 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
65 } 69 else
70 glBlendFunc (sa, da);
71}
66 72
67typedef Mix_Chunk *CFClient__MixChunk; 73typedef Mix_Chunk *CFClient__MixChunk;
68typedef Mix_Music *CFClient__MixMusic; 74typedef Mix_Music *CFClient__MixMusic;
69 75
70typedef PangoFontDescription *CFClient__Font; 76typedef PangoFontDescription *CFClient__Font;
77
78static int
79shape_attr_p (PangoLayoutRun *run)
80{
81 GSList *attrs = run->item->analysis.extra_attrs;
82
83 while (attrs)
84 {
85 PangoAttribute *attr = attrs->data;
86
87 if (attr->klass->type == PANGO_ATTR_SHAPE)
88 return 1;
89
90 attrs = attrs->next;
91 }
92
93 return 0;
94}
71 95
72typedef struct cf_layout { 96typedef struct cf_layout {
73 PangoLayout *pl; // either derived from a cairo or ft2 context 97 PangoLayout *pl; // either derived from a cairo or ft2 context
74 int rgba; // wether we use rgba (cairo) or grayscale (ft2) 98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
75 float r, g, b, a; // default color for rgba mode 99 float r, g, b, a; // default color for rgba mode
82static PangoFontMap *ft2_fontmap, *cairo_fontmap; 106static PangoFontMap *ft2_fontmap, *cairo_fontmap;
83 107
84static void 108static void
85substitute_func (FcPattern *pattern, gpointer data) 109substitute_func (FcPattern *pattern, gpointer data)
86{ 110{
87 FcPatternAddBool (pattern, FC_HINTING , 1); 111 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif
115#ifdef _WIN32
88 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
118 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
89} 120}
90 121
91static void 122static void
92layout_update_font (CFClient__Layout self) 123layout_update_font (CFClient__Layout self)
93{ 124{
289 ev.code = 1; 320 ev.code = 1;
290 ev.data1 = (void *)(long)channel; 321 ev.data1 = (void *)(long)channel;
291 ev.data2 = 0; 322 ev.data2 = 0;
292 323
293 SDL_PushEvent ((SDL_Event *)&ev); 324 SDL_PushEvent ((SDL_Event *)&ev);
325}
326
327static unsigned int
328minpot (unsigned int n)
329{
330 if (!n)
331 return 0;
332
333 --n;
334
335 n |= n >> 1;
336 n |= n >> 2;
337 n |= n >> 4;
338 n |= n >> 8;
339 n |= n >> 16;
340
341 return n + 1;
294} 342}
295 343
296MODULE = CFClient PACKAGE = CFClient 344MODULE = CFClient PACKAGE = CFClient
297 345
298PROTOTYPES: ENABLE 346PROTOTYPES: ENABLE
408 456
409 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 457 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
410 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
411} 459}
412 460
461NV floor (NV x)
462
463NV ceil (NV x)
464
413void 465void
414pango_init () 466pango_init ()
415 CODE: 467 CODE:
416{
417 // delayed, so it can pick up new fonts added by AddFontResourceEx 468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{
470 {
418 ft2_fontmap = pango_ft2_font_map_new (); 471 ft2_fontmap = pango_ft2_font_map_new ();
419 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 472 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
420 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
421 474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
422 cairo_fontmap = pango_cairo_font_map_get_default (); 477 cairo_fontmap = pango_cairo_font_map_get_default ();
423 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
424} 490}
425 491
426int 492int
427SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
428 494
438 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 506 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 507 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
442 508
509 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
510 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
511
443 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447 516
448 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
449 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
450 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
451 518
452 SDL_EnableUNICODE (1); 519 SDL_EnableUNICODE (1);
453 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454 521
455 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
464 531
465 ++m; 532 ++m;
466 } 533 }
467} 534}
468 535
536char *
537SDL_GetError ()
538
469int 539int
470SDL_SetVideoMode (int w, int h, int fullscreen) 540SDL_SetVideoMode (int w, int h, int fullscreen)
471 CODE: 541 CODE:
472 RETVAL = !!SDL_SetVideoMode ( 542 RETVAL = !!SDL_SetVideoMode (
473 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
474 ); 544 );
545 if (RETVAL)
546 {
475 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 547 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
549# include "glfunc.h"
550# undef GL_FUNC
551 }
476 OUTPUT: 552 OUTPUT:
477 RETVAL 553 RETVAL
478 554
479void 555void
480SDL_GL_SwapBuffers () 556SDL_GL_SwapBuffers ()
557
558char *
559SDL_GetKeyName (int sym)
481 560
482void 561void
483SDL_PollEvent () 562SDL_PollEvent ()
484 PPCODE: 563 PPCODE:
485{ 564{
504 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 584 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506 break; 585 break;
507 586
508 case SDL_MOUSEMOTION: 587 case SDL_MOUSEMOTION:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
509 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 590 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
510 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 591 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
511 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 592 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
512 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 593 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
513 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 594 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
514 break; 595 break;
515 596
516 case SDL_MOUSEBUTTONDOWN: 597 case SDL_MOUSEBUTTONDOWN:
517 case SDL_MOUSEBUTTONUP: 598 case SDL_MOUSEBUTTONUP:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
600
518 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 601 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 603 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 604 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522 break; 605 break;
548lowdelay (int fd, int val = 1) 631lowdelay (int fd, int val = 1)
549 CODE: 632 CODE:
550#ifndef _WIN32 633#ifndef _WIN32
551 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
552#endif 635#endif
553
554char *
555gl_version ()
556 CODE:
557 RETVAL = (char *)glGetString (GL_VERSION);
558 OUTPUT:
559 RETVAL
560
561char *
562gl_extensions ()
563 CODE:
564 RETVAL = (char *)glGetString (GL_EXTENSIONS);
565 OUTPUT:
566 RETVAL
567 636
568void 637void
569add_font (char *file) 638add_font (char *file)
570 CODE: 639 CODE:
571 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
664} 733}
665 734
666void 735void
667error (char *message) 736error (char *message)
668 CODE: 737 CODE:
738 fprintf (stderr, "ERROR: %s\n", message);
669#ifdef _WIN32 739#ifdef _WIN32
670 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 740 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
671#else
672 fprintf (stderr, "ERROR: %s\n", message);
673#endif 741#endif
674 742
675void 743void
676fatal (char *message) 744fatal (char *message)
677 CODE: 745 CODE:
746 fprintf (stderr, "FATAL: %s\n", message);
678#ifdef _WIN32 747#ifdef _WIN32
679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
680#else
681 fprintf (stderr, "FATAL: %s\n", message);
682#endif 749#endif
683 exit (1); 750 _exit (1);
751
752void
753_exit (int retval)
754 CODE:
755 _exit (retval);
684 756
685MODULE = CFClient PACKAGE = CFClient::Font 757MODULE = CFClient PACKAGE = CFClient::Font
686 758
687CFClient::Font 759CFClient::Font
688new_from_file (SV *class, char *path, int id = 0) 760new_from_file (SV *class, char *path, int id = 0)
758 char *text = SvPVutf8 (text_, textlen); 830 char *text = SvPVutf8 (text_, textlen);
759 831
760 pango_layout_set_markup (self->pl, text, textlen); 832 pango_layout_set_markup (self->pl, text, textlen);
761} 833}
762 834
835void
836set_shapes (CFClient::Layout self, ...)
837 CODE:
838{
839 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text;
842 int arg = 4;
843
844 while (arg < items && (pos = strstr (pos, OBJ_STR)))
845 {
846 PangoRectangle inkrect, rect;
847 PangoAttribute *attr;
848
849 int x = SvIV (ST (arg - 3));
850 int y = SvIV (ST (arg - 2));
851 int w = SvIV (ST (arg - 1));
852 int h = SvIV (ST (arg ));
853
854 inkrect.x = 0;
855 inkrect.y = 0;
856 inkrect.width = 0;
857 inkrect.height = 0;
858
859 rect.x = x * PANGO_SCALE;
860 rect.y = y * PANGO_SCALE;
861 rect.width = w * PANGO_SCALE;
862 rect.height = h * PANGO_SCALE;
863
864 if (!attrs)
865 attrs = pango_layout_get_attributes (self->pl);
866
867 attr = pango_attr_shape_new (&inkrect, &rect);
868 attr->start_index = pos - text;
869 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
870 pango_attr_list_insert (attrs, attr);
871
872 arg += 4;
873 pos += sizeof (OBJ_STR) - 1;
874 }
875
876 if (attrs)
877 pango_layout_set_attributes (self->pl, attrs);
878}
879
880void
881get_shapes (CFClient::Layout self)
882 PPCODE:
883{
884 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885
886 do
887 {
888 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
889
890 if (run && shape_attr_p (run))
891 {
892 PangoRectangle extents;
893 pango_layout_iter_get_run_extents (iter, 0, &extents);
894
895 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897 }
898 }
899 while (pango_layout_iter_next_run (iter));
900
901 pango_layout_iter_free (iter);
902}
903
904int
905has_wrapped (CFClient::Layout self)
906 CODE:
907{
908 int lines = 1;
909 const char *text = pango_layout_get_text (self->pl);
910
911 while (*text)
912 lines += *text++ == '\n';
913
914 RETVAL = lines < pango_layout_get_line_count (self->pl);
915}
916 OUTPUT:
917 RETVAL
918
763SV * 919SV *
764get_text (CFClient::Layout self) 920get_text (CFClient::Layout self)
765 CODE: 921 CODE:
766 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 922 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
767 SvUTF8_on (RETVAL); 923 sv_utf8_decode (RETVAL);
768 OUTPUT: 924 OUTPUT:
769 RETVAL 925 RETVAL
770 926
771void 927void
772set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 928set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
798set_width (CFClient::Layout self, int max_width = -1) 954set_width (CFClient::Layout self, int max_width = -1)
799 CODE: 955 CODE:
800 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 956 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
801 957
802void 958void
959set_indent (CFClient::Layout self, int indent)
960 CODE:
961 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962
963void
964set_spacing (CFClient::Layout self, int spacing)
965 CODE:
966 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967
968void
969set_ellipsise (CFClient::Layout self, int ellipsise)
970 CODE:
971 pango_layout_set_ellipsize (self->pl,
972 ellipsise == 1 ? PANGO_ELLIPSIZE_START
973 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
975 : PANGO_ELLIPSIZE_NONE
976 );
977
978void
979set_single_paragraph_mode (CFClient::Layout self, int spm)
980 CODE:
981 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982
983void
803size (CFClient::Layout self) 984size (CFClient::Layout self)
804 PPCODE: 985 PPCODE:
805{ 986{
806 int w, h; 987 int w, h;
807 988
809 990
810 EXTEND (SP, 2); 991 EXTEND (SP, 2);
811 PUSHs (sv_2mortal (newSViv (w))); 992 PUSHs (sv_2mortal (newSViv (w)));
812 PUSHs (sv_2mortal (newSViv (h))); 993 PUSHs (sv_2mortal (newSViv (h)));
813} 994}
995
996int
997descent (CFClient::Layout self)
998 CODE:
999{
1000 PangoRectangle rect;
1001 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002 pango_layout_line_get_pixel_extents (line, 0, &rect);
1003 RETVAL = PANGO_DESCENT (rect);
1004}
1005 OUTPUT:
1006 RETVAL
814 1007
815int 1008int
816xy_to_index (CFClient::Layout self, int x, int y) 1009xy_to_index (CFClient::Layout self, int x, int y)
817 CODE: 1010 CODE:
818{ 1011{
873 1066
874 while (p < e) 1067 while (p < e)
875 { 1068 {
876 uint32_t rgba = *p; 1069 uint32_t rgba = *p;
877 rgba = (rgba >> 24) | (rgba << 8); 1070 rgba = (rgba >> 24) | (rgba << 8);
1071#if 0
1072#ifdef _WIN32
1073 {//D
1074 uint8_t r = rgba >> 24;
1075 uint8_t g = rgba >> 16;
1076 uint8_t b = rgba >> 8;
1077 uint8_t a = rgba >> 0;
1078
1079 rgba = (rgba & 0xffffff00) | a;
1080 }
1081#endif
1082#endif
878 rgba = SDL_SwapBE32 (rgba); 1083 rgba = SDL_SwapBE32 (rgba);
879 *p++ = rgba; 1084 *p++ = rgba;
880 } 1085 }
881 } 1086 }
882 1087
916} 1121}
917 1122
918MODULE = CFClient PACKAGE = CFClient::Texture 1123MODULE = CFClient PACKAGE = CFClient::Texture
919 1124
920void 1125void
1126pad2pot (SV *data_, SV *w_, SV *h_)
1127 CODE:
1128{
1129 int ow = SvIV (w_);
1130 int oh = SvIV (h_);
1131
1132 if (ow && oh)
1133 {
1134 int nw = minpot (ow);
1135 int nh = minpot (oh);
1136
1137 if (nw != ow || nh != oh)
1138 {
1139 if (SvOK (data_))
1140 {
1141 STRLEN datalen;
1142 char *data = SvPVbyte (data_, datalen);
1143 int bpp = datalen / (ow * oh);
1144 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1145
1146 SvPOK_only (result_);
1147 SvCUR_set (result_, nw * nh * bpp);
1148
1149 memset (SvPVX (result_), 0, nw * nh * bpp);
1150 while (oh--)
1151 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1152
1153 sv_setsv (data_, result_);
1154 }
1155
1156 sv_setiv (w_, nw);
1157 sv_setiv (h_, nh);
1158 }
1159 }
1160}
1161
1162void
921draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1163draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
922 PROTOTYPE: $$$;$$ 1164 PROTOTYPE: $$$;$$
923 ALIAS: 1165 ALIAS:
924 draw_quad_alpha = 1 1166 draw_quad_alpha = 1
925 draw_quad_alpha_premultiplied = 2 1167 draw_quad_alpha_premultiplied = 2
926 CODE: 1168 CODE:
927{ 1169{
928 HV *hv = (HV *)SvRV (self); 1170 HV *hv = (HV *)SvRV (self);
929 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1171 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1172 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1173 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933 1174
934 if (items < 5) 1175 if (items < 5)
935 { 1176 {
936 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1177 w = SvNV (*hv_fetch (hv, "w", 1, 1));
937 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1178 h = SvNV (*hv_fetch (hv, "h", 1, 1));
938 } 1179 }
939 1180
940 if (ix) 1181 if (ix)
941 { 1182 {
942 glEnable (GL_BLEND); 1183 glEnable (GL_BLEND);
1184
1185 if (ix == 2)
943 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1186 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1187 else
1188 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1189 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1190
1191 glEnable (GL_ALPHA_TEST);
1192 glAlphaFunc (GL_GREATER, 0.01f);
944 } 1193 }
945 1194
946 glBindTexture (GL_TEXTURE_2D, name); 1195 glBindTexture (GL_TEXTURE_2D, name);
947
948 if (wrap_mode)
949 {
950 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
952 }
953 1196
954 glBegin (GL_QUADS); 1197 glBegin (GL_QUADS);
955 glTexCoord2f (0, 0); glVertex2f (x , y ); 1198 glTexCoord2f (0, 0); glVertex2f (x , y );
956 glTexCoord2f (0, t); glVertex2f (x , y + h); 1199 glTexCoord2f (0, t); glVertex2f (x , y + h);
957 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1200 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1201 glTexCoord2f (s, 0); glVertex2f (x + w, y );
959 glEnd (); 1202 glEnd ();
960 1203
961 if (ix) 1204 if (ix)
1205 {
1206 glDisable (GL_ALPHA_TEST);
962 glDisable (GL_BLEND); 1207 glDisable (GL_BLEND);
1208 }
963} 1209}
964 1210
965MODULE = CFClient PACKAGE = CFClient::Map 1211MODULE = CFClient PACKAGE = CFClient::Map
966 1212
967CFClient::Map 1213CFClient::Map
987DESTROY (CFClient::Map self) 1233DESTROY (CFClient::Map self)
988 CODE: 1234 CODE:
989{ 1235{
990 map_clear (self); 1236 map_clear (self);
991 Safefree (self->face); 1237 Safefree (self->face);
1238 Safefree (self->tex);
992 Safefree (self); 1239 Safefree (self);
993} 1240}
994 1241
995void 1242void
996clear (CFClient::Map self) 1243clear (CFClient::Map self)
1031 tex->r = r; 1278 tex->r = r;
1032 tex->g = g; 1279 tex->g = g;
1033 tex->b = b; 1280 tex->b = b;
1034 tex->a = a; 1281 tex->a = a;
1035 } 1282 }
1283
1284 // somewhat hackish, but for textures that require it, it really
1285 // improves the look, and most others don't suffer.
1286 glBindTexture (GL_TEXTURE_2D, name);
1287 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1288 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1289 // use uglier nearest interpolation because linear suffers
1290 // from transparent color bleeding and ugly wrapping effects.
1291 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1036} 1292}
1037 1293
1038int 1294int
1039ox (CFClient::Map self) 1295ox (CFClient::Map self)
1040 ALIAS: 1296 ALIAS:
1041 oy = 1 1297 oy = 1
1298 x = 2
1299 y = 3
1300 w = 4
1301 h = 5
1042 CODE: 1302 CODE:
1043 switch (ix) 1303 switch (ix)
1044 { 1304 {
1045 case 0: RETVAL = self->ox; break; 1305 case 0: RETVAL = self->ox; break;
1046 case 1: RETVAL = self->oy; break; 1306 case 1: RETVAL = self->oy; break;
1307 case 2: RETVAL = self->x; break;
1308 case 3: RETVAL = self->y; break;
1309 case 4: RETVAL = self->w; break;
1310 case 5: RETVAL = self->h; break;
1047 } 1311 }
1048 OUTPUT: 1312 OUTPUT:
1049 RETVAL 1313 RETVAL
1050 1314
1051void 1315void
1085 1349
1086 while (data < data_end) 1350 while (data < data_end)
1087 { 1351 {
1088 flags = (data [0] << 8) + data [1]; data += 2; 1352 flags = (data [0] << 8) + data [1]; data += 2;
1089 1353
1090 x = ((flags >> 10) & 63) + self->x; 1354 x = self->x + ((flags >> 10) & 63);
1091 y = ((flags >> 4) & 63) + self->y; 1355 y = self->y + ((flags >> 4) & 63);
1092 1356
1093 cell = map_get_cell (self, x, y); 1357 cell = map_get_cell (self, x, y);
1094 1358
1095 if (flags & 15) 1359 if (flags & 15)
1096 { 1360 {
1186 OUTPUT: 1450 OUTPUT:
1187 RETVAL 1451 RETVAL
1188 1452
1189void 1453void
1190draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1454draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1191 PPCODE: 1455 CODE:
1192{ 1456{
1193 int vx, vy; 1457 int vx, vy;
1194 int x, y, z; 1458 int x, y, z;
1195 int last_name; 1459 int last_name;
1196 mapface face; 1460 mapface face;
1197 int sw4 = (sw + 3) & ~3;
1198 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1199 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1200 1461
1201 memset (darkness, 255, sw4 * sh);
1202 SvPOK_only (darkness_sv);
1203 SvCUR_set (darkness_sv, sw4 * sh);
1204
1205 vx = self->x + (self->w - sw) / 2 - shift_x; 1462 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1206 vy = self->y + (self->h - sh) / 2 - shift_y; 1463 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1207 1464
1208 /* 1465 /*
1209 int vx = self->vx = self->w >= sw 1466 int vx = self->vx = self->w >= sw
1210 ? self->x + (self->w - sw) / 2 1467 ? self->x + (self->w - sw) / 2
1211 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1468 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1215 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1472 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1216 */ 1473 */
1217 1474
1218 glColor4ub (255, 255, 255, 255); 1475 glColor4ub (255, 255, 255, 255);
1219 1476
1477 glEnable (GL_BLEND);
1220 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1478 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1221 glEnable (GL_BLEND);
1222 glEnable (GL_TEXTURE_2D); 1479 glEnable (GL_TEXTURE_2D);
1223 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1480 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1224 1481
1225 glBegin (GL_QUADS); 1482 glBegin (GL_QUADS);
1226 1483
1234 1491
1235 for (x = 0; x < sw; x++) 1492 for (x = 0; x < sw; x++)
1236 if (row->c0 <= x + vx && x + vx < row->c1) 1493 if (row->c0 <= x + vx && x + vx < row->c1)
1237 { 1494 {
1238 mapcell *cell = row->col + (x + vx - row->c0); 1495 mapcell *cell = row->col + (x + vx - row->c0);
1239
1240 darkness[y * sw4 + x] = cell->darkness < 0
1241 ? 255 - FOW_DARKNESS
1242 : 255 - cell->darkness;
1243 1496
1244 face = cell->face [z]; 1497 face = cell->face [z];
1245 1498
1246 if (face) 1499 if (face)
1247 { 1500 {
1268 1521
1269 glEnd (); 1522 glEnd ();
1270 1523
1271 glDisable (GL_TEXTURE_2D); 1524 glDisable (GL_TEXTURE_2D);
1272 glDisable (GL_BLEND); 1525 glDisable (GL_BLEND);
1526}
1527
1528void
1529draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530 CODE:
1531{
1532 static float color[16][3] = {
1533 { 0.00F, 0.00F, 0.00F },
1534 { 1.00F, 1.00F, 1.00F },
1535 { 0.00F, 0.00F, 0.55F },
1536 { 1.00F, 0.00F, 0.00F },
1537
1538 { 1.00F, 0.54F, 0.00F },
1539 { 0.11F, 0.56F, 1.00F },
1540 { 0.93F, 0.46F, 0.00F },
1541 { 0.18F, 0.54F, 0.34F },
1542
1543 { 0.56F, 0.73F, 0.56F },
1544 { 0.80F, 0.80F, 0.80F },
1545 { 0.55F, 0.41F, 0.13F },
1546 { 0.99F, 0.77F, 0.26F },
1547
1548 { 0.74F, 0.65F, 0.41F },
1549
1550 { 0.00F, 1.00F, 1.00F },
1551 { 1.00F, 0.00F, 1.00F },
1552 { 1.00F, 1.00F, 0.00F },
1553 };
1554
1555 int x, y;
1556
1557 glEnable (GL_TEXTURE_2D);
1558 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1559 glEnable (GL_BLEND);
1560 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1561 glBegin (GL_QUADS);
1562
1563 for (y = 0; y < h; y++)
1564 for (x = 0; x < w; x++)
1565 {
1566 unsigned char m = data [x + y * w];
1567
1568 if (m)
1569 {
1570 float *c = color [m & 15];
1571
1572 float tx1 = m & 0x40 ? 0.5 : 0.;
1573 float tx2 = tx1 + 0.5;
1574
1575 glColor4f (c[0], c[1], c[2], 0.75);
1576 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1577 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1578 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1579 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1580 }
1581 }
1582
1583 glEnd ();
1584 glDisable (GL_BLEND);
1585 glDisable (GL_TEXTURE_2D);
1586}
1587
1588void
1589fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1590 PPCODE:
1591{
1592 int vx, vy;
1593 int x, y;
1594 int sw4 = (sw + 3) & ~3;
1595 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1596 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1597
1598 memset (darkness, 255, sw4 * sh);
1599 SvPOK_only (darkness_sv);
1600 SvCUR_set (darkness_sv, sw4 * sh);
1601
1602 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1603 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1604
1605 for (y = 0; y < sh; y++)
1606 if (0 <= y + vy && y + vy < self->rows)
1607 {
1608 maprow *row = self->row + (y + vy);
1609
1610 for (x = 0; x < sw; x++)
1611 if (row->c0 <= x + vx && x + vx < row->c1)
1612 {
1613 mapcell *cell = row->col + (x + vx - row->c0);
1614
1615 darkness[y * sw4 + x] = cell->darkness < 0
1616 ? 255 - FOW_DARKNESS
1617 : 255 - cell->darkness;
1618 }
1619 }
1273 1620
1274 EXTEND (SP, 3); 1621 EXTEND (SP, 3);
1275 PUSHs (sv_2mortal (newSViv (sw4))); 1622 PUSHs (sv_2mortal (newSViv (sw4)));
1276 PUSHs (sv_2mortal (newSViv (sh))); 1623 PUSHs (sv_2mortal (newSViv (sh)));
1277 PUSHs (darkness_sv); 1624 PUSHs (darkness_sv);
1478 const_iv (GL_COLOR_MATERIAL), 1825 const_iv (GL_COLOR_MATERIAL),
1479 const_iv (GL_SMOOTH), 1826 const_iv (GL_SMOOTH),
1480 const_iv (GL_FLAT), 1827 const_iv (GL_FLAT),
1481 const_iv (GL_DITHER), 1828 const_iv (GL_DITHER),
1482 const_iv (GL_BLEND), 1829 const_iv (GL_BLEND),
1830 const_iv (GL_CULL_FACE),
1483 const_iv (GL_SCISSOR_TEST), 1831 const_iv (GL_SCISSOR_TEST),
1832 const_iv (GL_DEPTH_TEST),
1833 const_iv (GL_ALPHA_TEST),
1834 const_iv (GL_NORMALIZE),
1835 const_iv (GL_RESCALE_NORMAL),
1836 const_iv (GL_FRONT),
1837 const_iv (GL_BACK),
1484 const_iv (GL_AND), 1838 const_iv (GL_AND),
1485 const_iv (GL_ONE), 1839 const_iv (GL_ONE),
1486 const_iv (GL_ZERO), 1840 const_iv (GL_ZERO),
1487 const_iv (GL_SRC_ALPHA), 1841 const_iv (GL_SRC_ALPHA),
1488 const_iv (GL_SRC_ALPHA_SATURATE), 1842 const_iv (GL_DST_ALPHA),
1489 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1843 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490 const_iv (GL_ONE_MINUS_DST_ALPHA), 1844 const_iv (GL_ONE_MINUS_DST_ALPHA),
1845 const_iv (GL_SRC_ALPHA_SATURATE),
1491 const_iv (GL_RGB), 1846 const_iv (GL_RGB),
1492 const_iv (GL_RGBA), 1847 const_iv (GL_RGBA),
1848 const_iv (GL_RGBA4),
1849 const_iv (GL_RGBA8),
1850 const_iv (GL_RGB5_A1),
1493 const_iv (GL_UNSIGNED_BYTE), 1851 const_iv (GL_UNSIGNED_BYTE),
1852 const_iv (GL_UNSIGNED_SHORT),
1853 const_iv (GL_UNSIGNED_INT),
1494 const_iv (GL_ALPHA), 1854 const_iv (GL_ALPHA),
1855 const_iv (GL_INTENSITY),
1495 const_iv (GL_LUMINANCE), 1856 const_iv (GL_LUMINANCE),
1857 const_iv (GL_LUMINANCE_ALPHA),
1496 const_iv (GL_FLOAT), 1858 const_iv (GL_FLOAT),
1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1859 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498 const_iv (GL_COMPILE), 1860 const_iv (GL_COMPILE),
1499 const_iv (GL_TEXTURE_1D), 1861 const_iv (GL_TEXTURE_1D),
1500 const_iv (GL_TEXTURE_2D), 1862 const_iv (GL_TEXTURE_2D),
1502 const_iv (GL_TEXTURE_MAG_FILTER), 1864 const_iv (GL_TEXTURE_MAG_FILTER),
1503 const_iv (GL_TEXTURE_MIN_FILTER), 1865 const_iv (GL_TEXTURE_MIN_FILTER),
1504 const_iv (GL_TEXTURE_ENV_MODE), 1866 const_iv (GL_TEXTURE_ENV_MODE),
1505 const_iv (GL_TEXTURE_WRAP_S), 1867 const_iv (GL_TEXTURE_WRAP_S),
1506 const_iv (GL_TEXTURE_WRAP_T), 1868 const_iv (GL_TEXTURE_WRAP_T),
1869 const_iv (GL_REPEAT),
1507 const_iv (GL_CLAMP), 1870 const_iv (GL_CLAMP),
1508 const_iv (GL_REPEAT), 1871 const_iv (GL_CLAMP_TO_EDGE),
1509 const_iv (GL_NEAREST), 1872 const_iv (GL_NEAREST),
1510 const_iv (GL_LINEAR), 1873 const_iv (GL_LINEAR),
1511 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1874 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1875 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1876 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1877 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515 const_iv (GL_GENERATE_MIPMAP), 1878 const_iv (GL_GENERATE_MIPMAP),
1516 const_iv (GL_MODULATE), 1879 const_iv (GL_MODULATE),
1517 const_iv (GL_DECAL), 1880 const_iv (GL_DECAL),
1518 const_iv (GL_REPLACE), 1881 const_iv (GL_REPLACE),
1882 const_iv (GL_DEPTH_BUFFER_BIT),
1519 const_iv (GL_COLOR_BUFFER_BIT), 1883 const_iv (GL_COLOR_BUFFER_BIT),
1520 const_iv (GL_PROJECTION), 1884 const_iv (GL_PROJECTION),
1521 const_iv (GL_MODELVIEW), 1885 const_iv (GL_MODELVIEW),
1522 const_iv (GL_COLOR_LOGIC_OP), 1886 const_iv (GL_COLOR_LOGIC_OP),
1523 const_iv (GL_SEPARABLE_2D), 1887 const_iv (GL_SEPARABLE_2D),
1524 const_iv (GL_CONVOLUTION_2D), 1888 const_iv (GL_CONVOLUTION_2D),
1525 const_iv (GL_CONVOLUTION_BORDER_MODE), 1889 const_iv (GL_CONVOLUTION_BORDER_MODE),
1526 const_iv (GL_CONSTANT_BORDER), 1890 const_iv (GL_CONSTANT_BORDER),
1527 const_iv (GL_LINES), 1891 const_iv (GL_LINES),
1892 const_iv (GL_LINE_LOOP),
1528 const_iv (GL_QUADS), 1893 const_iv (GL_QUADS),
1529 const_iv (GL_LINE_LOOP), 1894 const_iv (GL_QUAD_STRIP),
1895 const_iv (GL_TRIANGLES),
1896 const_iv (GL_TRIANGLE_STRIP),
1897 const_iv (GL_TRIANGLE_FAN),
1530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1898 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531 const_iv (GL_FASTEST), 1899 const_iv (GL_FASTEST),
1900 const_iv (GL_V2F),
1901 const_iv (GL_V3F),
1902 const_iv (GL_T2F_V3F),
1903 const_iv (GL_T2F_N3F_V3F),
1532# undef const_iv 1904# undef const_iv
1533 }; 1905 };
1534 1906
1535 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1907 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1536 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1908 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1537} 1909}
1538 1910
1911char *
1912gl_vendor ()
1913 CODE:
1914 RETVAL = (char *)glGetString (GL_VENDOR);
1915 OUTPUT:
1916 RETVAL
1917
1918char *
1919gl_version ()
1920 CODE:
1921 RETVAL = (char *)glGetString (GL_VERSION);
1922 OUTPUT:
1923 RETVAL
1924
1925char *
1926gl_extensions ()
1927 CODE:
1928 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1929 OUTPUT:
1930 RETVAL
1931
1539int glGetError () 1932int glGetError ()
1933
1934void glFinish ()
1540 1935
1541void glClear (int mask) 1936void glClear (int mask)
1542 1937
1543void glClearColor (float r, float g, float b, float a = 1.0) 1938void glClearColor (float r, float g, float b, float a = 1.0)
1544 PROTOTYPE: @ 1939 PROTOTYPE: @
1551 1946
1552void glHint (int target, int mode) 1947void glHint (int target, int mode)
1553 1948
1554void glBlendFunc (int sfactor, int dfactor) 1949void glBlendFunc (int sfactor, int dfactor)
1555 1950
1951void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1952 CODE:
1953 gl_BlendFuncSeparate (sa, da, saa, daa);
1954
1955void glDepthMask (int flag)
1956
1556void glLogicOp (int opcode) 1957void glLogicOp (int opcode)
1557 1958
1558void glColorMask (int red, int green, int blue, int alpha) 1959void glColorMask (int red, int green, int blue, int alpha)
1559 1960
1560void glMatrixMode (int mode) 1961void glMatrixMode (int mode)
1563 1964
1564void glPopMatrix () 1965void glPopMatrix ()
1565 1966
1566void glLoadIdentity () 1967void glLoadIdentity ()
1567 1968
1969void glDrawBuffer (int buffer)
1970
1971void glReadBuffer (int buffer)
1972
1568# near and far are due to microsofts buggy c compiler 1973# near_ and far_ are due to microsofts buggy "c" compiler
1974void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1975
1976# near_ and far_ are due to microsofts buggy "c" compiler
1569void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1977void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1570 1978
1571void glViewport (int x, int y, int width, int height) 1979void glViewport (int x, int y, int width, int height)
1572 1980
1573void glScissor (int x, int y, int width, int height) 1981void glScissor (int x, int y, int width, int height)
1588 1996
1589void glEnd () 1997void glEnd ()
1590 1998
1591void glColor (float r, float g, float b, float a = 1.0) 1999void glColor (float r, float g, float b, float a = 1.0)
1592 PROTOTYPE: @ 2000 PROTOTYPE: @
2001 ALIAS:
2002 glColor_premultiply = 1
1593 CODE: 2003 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp) 2004 if (ix)
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 2005 {
2006 r *= a;
2007 g *= a;
2008 b *= a;
2009 }
2010 // microsoft visual "c" rounds instead of truncating...
2011 glColor4ub (MIN ((int)(r * 256.f), 255),
2012 MIN ((int)(g * 256.f), 255),
2013 MIN ((int)(b * 256.f), 255),
2014 MIN ((int)(a * 256.f), 255));
2015
2016void glInterleavedArrays (int format, int stride, char *data)
2017
2018void glDrawElements (int mode, int count, int type, char *indices)
2019
2020# 1.2 void glDrawRangeElements (int mode, int start, int end
2021
2022void glRasterPos (float x, float y, float z = 0.)
2023 CODE:
2024 glRasterPos3f (0, 0, z);
2025 glBitmap (0, 0, 0, 0, x, y, 0);
1596 2026
1597void glVertex (float x, float y, float z = 0.) 2027void glVertex (float x, float y, float z = 0.)
1598 CODE: 2028 CODE:
1599 glVertex3f (x, y, z); 2029 glVertex3f (x, y, z);
1600 2030
1612 2042
1613void glBindTexture (int target, int name) 2043void glBindTexture (int target, int name)
1614 2044
1615void glConvolutionParameter (int target, int pname, float params) 2045void glConvolutionParameter (int target, int pname, float params)
1616 CODE: 2046 CODE:
1617 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2047 if (gl.ConvolutionParameterf)
2048 gl.ConvolutionParameterf (target, pname, params);
1618 2049
1619void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2050void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1620 CODE: 2051 CODE:
1621 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2052 if (gl.ConvolutionFilter2D)
1622 (target, internalformat, width, height, format, type, data)); 2053 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623 2054
1624void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2055void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1625 CODE: 2056 CODE:
1626 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2057 if (gl.SeparableFilter2D)
1627 (target, internalformat, width, height, format, type, row, column)); 2058 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628 2059
1629void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2060void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1630 2061
1631void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2062void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1632 2063
1633void glRasterPos (int x, int y) 2064void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634 CODE:
1635 glRasterPos2i (x, y);
1636 2065
1637void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2066void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1638 2067
1639int glGenTexture () 2068int glGenTexture ()
1640 CODE: 2069 CODE:
1667 2096
1668void glEndList () 2097void glEndList ()
1669 2098
1670void glCallList (int list) 2099void glCallList (int list)
1671 2100
2101

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines