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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC

10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
41 typedef signed int int32_t; 42 typedef signed int int32_t;
42#endif 43#endif
43 44
44#include "glext.h" 45#include "glext.h"
45 46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48
46#define FOW_DARKNESS 32 49#define FOW_DARKNESS 32
47 50
48#define MAP_EXTEND_X 32 51#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 52#define MAP_EXTEND_Y 512
50 53
51#define MIN_FONT_HEIGHT 10 54#define MIN_FONT_HEIGHT 10
52 55
53#define GL_CALL(type,func,args) \ 56static struct
54 { \ 57{
55 static int init_; \ 58#define GL_FUNC(ptr,name) ptr name;
56 static type fptr_; \ 59#include "glfunc.h"
57 \ 60#undef GL_FUNC
58 if (!init_) \ 61} gl;
59 { \ 62
60 init_ = 1; \ 63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 64{
62 } \ 65 if (gl.BlendFuncSeparate)
63 \ 66 gl.BlendFuncSeparate (sa, da, saa, daa);
64 if (fptr_) \ 67 else if (gl.BlendFuncSeparateEXT)
65 fptr_ args; \ 68 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 } 69 else
70 glBlendFunc (sa, da);
71}
67 72
68typedef Mix_Chunk *CFClient__MixChunk; 73typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 74typedef Mix_Music *CFClient__MixMusic;
70 75
71typedef 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}
72 95
73typedef struct cf_layout { 96typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 97 PangoLayout *pl; // either derived from a cairo or ft2 context
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2) 98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 99 float r, g, b, a; // default color for rgba mode
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 106static PangoFontMap *ft2_fontmap, *cairo_fontmap;
84 107
85static void 108static void
86substitute_func (FcPattern *pattern, gpointer data) 109substitute_func (FcPattern *pattern, gpointer data)
87{ 110{
88 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
89#ifndef _WIN32 115#ifdef _WIN32
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
90 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 118 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91#endif 119#endif
92} 120}
93 121
94static void 122static void
292 ev.code = 1; 320 ev.code = 1;
293 ev.data1 = (void *)(long)channel; 321 ev.data1 = (void *)(long)channel;
294 ev.data2 = 0; 322 ev.data2 = 0;
295 323
296 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;
297} 342}
298 343
299MODULE = CFClient PACKAGE = CFClient 344MODULE = CFClient PACKAGE = CFClient
300 345
301PROTOTYPES: ENABLE 346PROTOTYPES: ENABLE
411 456
412 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; )
413 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
414} 459}
415 460
461NV floor (NV x)
462
463NV ceil (NV x)
464
416void 465void
417pango_init () 466pango_init ()
418 CODE: 467 CODE:
419{
420 // 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 {
421 ft2_fontmap = pango_ft2_font_map_new (); 471 ft2_fontmap = pango_ft2_font_map_new ();
422 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);
423 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
424 474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
425 cairo_fontmap = pango_cairo_font_map_get_default (); 477 cairo_fontmap = pango_cairo_font_map_get_default ();
426 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 }
427} 490}
428 491
429int 492int
430SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
431 494
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 506 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 507 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445 508
509 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
510 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
511
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 516
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454 518
455 SDL_EnableUNICODE (1); 519 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 521
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
467 531
468 ++m; 532 ++m;
469 } 533 }
470} 534}
471 535
536char *
537SDL_GetError ()
538
472int 539int
473SDL_SetVideoMode (int w, int h, int fullscreen) 540SDL_SetVideoMode (int w, int h, int fullscreen)
474 CODE: 541 CODE:
475 RETVAL = !!SDL_SetVideoMode ( 542 RETVAL = !!SDL_SetVideoMode (
476 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
477 ); 544 );
545 if (RETVAL)
546 {
478 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 }
479 OUTPUT: 552 OUTPUT:
480 RETVAL 553 RETVAL
481 554
482void 555void
483SDL_GL_SwapBuffers () 556SDL_GL_SwapBuffers ()
557
558char *
559SDL_GetKeyName (int sym)
484 560
485void 561void
486SDL_PollEvent () 562SDL_PollEvent ()
487 PPCODE: 563 PPCODE:
488{ 564{
507 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 584 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509 break; 585 break;
510 586
511 case SDL_MOUSEMOTION: 587 case SDL_MOUSEMOTION:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
512 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 590 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 591 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 592 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 593 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 594 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517 break; 595 break;
518 596
519 case SDL_MOUSEBUTTONDOWN: 597 case SDL_MOUSEBUTTONDOWN:
520 case SDL_MOUSEBUTTONUP: 598 case SDL_MOUSEBUTTONUP:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
600
521 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 601 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 603 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 604 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525 break; 605 break;
551lowdelay (int fd, int val = 1) 631lowdelay (int fd, int val = 1)
552 CODE: 632 CODE:
553#ifndef _WIN32 633#ifndef _WIN32
554 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555#endif 635#endif
556
557char *
558gl_version ()
559 CODE:
560 RETVAL = (char *)glGetString (GL_VERSION);
561 OUTPUT:
562 RETVAL
563
564char *
565gl_extensions ()
566 CODE:
567 RETVAL = (char *)glGetString (GL_EXTENSIONS);
568 OUTPUT:
569 RETVAL
570 636
571void 637void
572add_font (char *file) 638add_font (char *file)
573 CODE: 639 CODE:
574 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
667} 733}
668 734
669void 735void
670error (char *message) 736error (char *message)
671 CODE: 737 CODE:
738 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 739#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 740 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 741#endif
677 742
678void 743void
679fatal (char *message) 744fatal (char *message)
680 CODE: 745 CODE:
746 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 747#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 749#endif
686 exit (1); 750 _exit (1);
751
752void
753_exit (int retval)
754 CODE:
755 _exit (retval);
687 756
688MODULE = CFClient PACKAGE = CFClient::Font 757MODULE = CFClient PACKAGE = CFClient::Font
689 758
690CFClient::Font 759CFClient::Font
691new_from_file (SV *class, char *path, int id = 0) 760new_from_file (SV *class, char *path, int id = 0)
761 char *text = SvPVutf8 (text_, textlen); 830 char *text = SvPVutf8 (text_, textlen);
762 831
763 pango_layout_set_markup (self->pl, text, textlen); 832 pango_layout_set_markup (self->pl, text, textlen);
764} 833}
765 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
766SV * 919SV *
767get_text (CFClient::Layout self) 920get_text (CFClient::Layout self)
768 CODE: 921 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 922 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 923 sv_utf8_decode (RETVAL);
771 OUTPUT: 924 OUTPUT:
772 RETVAL 925 RETVAL
773 926
774void 927void
775set_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.)
801set_width (CFClient::Layout self, int max_width = -1) 954set_width (CFClient::Layout self, int max_width = -1)
802 CODE: 955 CODE:
803 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);
804 957
805void 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
806size (CFClient::Layout self) 984size (CFClient::Layout self)
807 PPCODE: 985 PPCODE:
808{ 986{
809 int w, h; 987 int w, h;
810 988
812 990
813 EXTEND (SP, 2); 991 EXTEND (SP, 2);
814 PUSHs (sv_2mortal (newSViv (w))); 992 PUSHs (sv_2mortal (newSViv (w)));
815 PUSHs (sv_2mortal (newSViv (h))); 993 PUSHs (sv_2mortal (newSViv (h)));
816} 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
817 1007
818int 1008int
819xy_to_index (CFClient::Layout self, int x, int y) 1009xy_to_index (CFClient::Layout self, int x, int y)
820 CODE: 1010 CODE:
821{ 1011{
876 1066
877 while (p < e) 1067 while (p < e)
878 { 1068 {
879 uint32_t rgba = *p; 1069 uint32_t rgba = *p;
880 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
881 rgba = SDL_SwapBE32 (rgba); 1083 rgba = SDL_SwapBE32 (rgba);
882 *p++ = rgba; 1084 *p++ = rgba;
883 } 1085 }
884 } 1086 }
885 1087
919} 1121}
920 1122
921MODULE = CFClient PACKAGE = CFClient::Texture 1123MODULE = CFClient PACKAGE = CFClient::Texture
922 1124
923void 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
924draw_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.)
925 PROTOTYPE: $$$;$$ 1164 PROTOTYPE: $$$;$$
926 ALIAS: 1165 ALIAS:
927 draw_quad_alpha = 1 1166 draw_quad_alpha = 1
928 draw_quad_alpha_premultiplied = 2 1167 draw_quad_alpha_premultiplied = 2
929 CODE: 1168 CODE:
930{ 1169{
931 HV *hv = (HV *)SvRV (self); 1170 HV *hv = (HV *)SvRV (self);
932 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1171 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
933 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1172 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
934 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1173 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
935 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
936 1174
937 if (items < 5) 1175 if (items < 5)
938 { 1176 {
939 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1177 w = SvNV (*hv_fetch (hv, "w", 1, 1));
940 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1178 h = SvNV (*hv_fetch (hv, "h", 1, 1));
941 } 1179 }
942 1180
943 if (ix) 1181 if (ix)
944 { 1182 {
945 glEnable (GL_BLEND); 1183 glEnable (GL_BLEND);
1184
1185 if (ix == 2)
946 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);
947 } 1193 }
948 1194
949 glBindTexture (GL_TEXTURE_2D, name); 1195 glBindTexture (GL_TEXTURE_2D, name);
950
951 if (wrap_mode)
952 {
953 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
954 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
955 }
956 1196
957 glBegin (GL_QUADS); 1197 glBegin (GL_QUADS);
958 glTexCoord2f (0, 0); glVertex2f (x , y ); 1198 glTexCoord2f (0, 0); glVertex2f (x , y );
959 glTexCoord2f (0, t); glVertex2f (x , y + h); 1199 glTexCoord2f (0, t); glVertex2f (x , y + h);
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1200 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1201 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1202 glEnd ();
963 1203
964 if (ix) 1204 if (ix)
1205 {
1206 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1207 glDisable (GL_BLEND);
1208 }
966} 1209}
967 1210
968MODULE = CFClient PACKAGE = CFClient::Map 1211MODULE = CFClient PACKAGE = CFClient::Map
969 1212
970CFClient::Map 1213CFClient::Map
990DESTROY (CFClient::Map self) 1233DESTROY (CFClient::Map self)
991 CODE: 1234 CODE:
992{ 1235{
993 map_clear (self); 1236 map_clear (self);
994 Safefree (self->face); 1237 Safefree (self->face);
1238 Safefree (self->tex);
995 Safefree (self); 1239 Safefree (self);
996} 1240}
997 1241
998void 1242void
999clear (CFClient::Map self) 1243clear (CFClient::Map self)
1034 tex->r = r; 1278 tex->r = r;
1035 tex->g = g; 1279 tex->g = g;
1036 tex->b = b; 1280 tex->b = b;
1037 tex->a = a; 1281 tex->a = a;
1038 } 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);
1039} 1292}
1040 1293
1041int 1294int
1042ox (CFClient::Map self) 1295ox (CFClient::Map self)
1043 ALIAS: 1296 ALIAS:
1044 oy = 1 1297 oy = 1
1298 x = 2
1299 y = 3
1300 w = 4
1301 h = 5
1045 CODE: 1302 CODE:
1046 switch (ix) 1303 switch (ix)
1047 { 1304 {
1048 case 0: RETVAL = self->ox; break; 1305 case 0: RETVAL = self->ox; break;
1049 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;
1050 } 1311 }
1051 OUTPUT: 1312 OUTPUT:
1052 RETVAL 1313 RETVAL
1053 1314
1054void 1315void
1088 1349
1089 while (data < data_end) 1350 while (data < data_end)
1090 { 1351 {
1091 flags = (data [0] << 8) + data [1]; data += 2; 1352 flags = (data [0] << 8) + data [1]; data += 2;
1092 1353
1093 x = ((flags >> 10) & 63) + self->x; 1354 x = self->x + ((flags >> 10) & 63);
1094 y = ((flags >> 4) & 63) + self->y; 1355 y = self->y + ((flags >> 4) & 63);
1095 1356
1096 cell = map_get_cell (self, x, y); 1357 cell = map_get_cell (self, x, y);
1097 1358
1098 if (flags & 15) 1359 if (flags & 15)
1099 { 1360 {
1189 OUTPUT: 1450 OUTPUT:
1190 RETVAL 1451 RETVAL
1191 1452
1192void 1453void
1193draw (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)
1194 PPCODE: 1455 CODE:
1195{ 1456{
1196 int vx, vy; 1457 int vx, vy;
1197 int x, y, z; 1458 int x, y, z;
1198 int last_name; 1459 int last_name;
1199 mapface face; 1460 mapface face;
1200 int sw4 = (sw + 3) & ~3;
1201 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1202 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1203 1461
1204 memset (darkness, 255, sw4 * sh);
1205 SvPOK_only (darkness_sv);
1206 SvCUR_set (darkness_sv, sw4 * sh);
1207
1208 vx = self->x + (self->w - sw) / 2 - shift_x; 1462 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1209 vy = self->y + (self->h - sh) / 2 - shift_y; 1463 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1210 1464
1211 /* 1465 /*
1212 int vx = self->vx = self->w >= sw 1466 int vx = self->vx = self->w >= sw
1213 ? self->x + (self->w - sw) / 2 1467 ? self->x + (self->w - sw) / 2
1214 : 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));
1218 : 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));
1219 */ 1473 */
1220 1474
1221 glColor4ub (255, 255, 255, 255); 1475 glColor4ub (255, 255, 255, 255);
1222 1476
1477 glEnable (GL_BLEND);
1223 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1478 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1224 glEnable (GL_BLEND);
1225 glEnable (GL_TEXTURE_2D); 1479 glEnable (GL_TEXTURE_2D);
1226 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1480 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1227 1481
1228 glBegin (GL_QUADS); 1482 glBegin (GL_QUADS);
1229 1483
1237 1491
1238 for (x = 0; x < sw; x++) 1492 for (x = 0; x < sw; x++)
1239 if (row->c0 <= x + vx && x + vx < row->c1) 1493 if (row->c0 <= x + vx && x + vx < row->c1)
1240 { 1494 {
1241 mapcell *cell = row->col + (x + vx - row->c0); 1495 mapcell *cell = row->col + (x + vx - row->c0);
1242
1243 darkness[y * sw4 + x] = cell->darkness < 0
1244 ? 255 - FOW_DARKNESS
1245 : 255 - cell->darkness;
1246 1496
1247 face = cell->face [z]; 1497 face = cell->face [z];
1248 1498
1249 if (face) 1499 if (face)
1250 { 1500 {
1271 1521
1272 glEnd (); 1522 glEnd ();
1273 1523
1274 glDisable (GL_TEXTURE_2D); 1524 glDisable (GL_TEXTURE_2D);
1275 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.00, 0.00, 0.00 },
1534 { 1.00, 1.00, 1.00 },
1535 { 0.00, 0.00, 0.55 },
1536 { 1.00, 0.00, 0.00 },
1537
1538 { 1.00, 0.54, 0.00 },
1539 { 0.11, 0.56, 1.00 },
1540 { 0.93, 0.46, 0.00 },
1541 { 0.18, 0.54, 0.34 },
1542
1543 { 0.56, 0.73, 0.56 },
1544 { 0.80, 0.80, 0.80 },
1545 { 0.55, 0.41, 0.13 },
1546 { 0.99, 0.77, 0.26 },
1547
1548 { 0.74, 0.65, 0.41 },
1549
1550 { 0.00, 1.00, 1.00 },
1551 { 1.00, 0.00, 1.00 },
1552 { 1.00, 1.00, 0.00 },
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 }
1276 1620
1277 EXTEND (SP, 3); 1621 EXTEND (SP, 3);
1278 PUSHs (sv_2mortal (newSViv (sw4))); 1622 PUSHs (sv_2mortal (newSViv (sw4)));
1279 PUSHs (sv_2mortal (newSViv (sh))); 1623 PUSHs (sv_2mortal (newSViv (sh)));
1280 PUSHs (darkness_sv); 1624 PUSHs (darkness_sv);
1481 const_iv (GL_COLOR_MATERIAL), 1825 const_iv (GL_COLOR_MATERIAL),
1482 const_iv (GL_SMOOTH), 1826 const_iv (GL_SMOOTH),
1483 const_iv (GL_FLAT), 1827 const_iv (GL_FLAT),
1484 const_iv (GL_DITHER), 1828 const_iv (GL_DITHER),
1485 const_iv (GL_BLEND), 1829 const_iv (GL_BLEND),
1830 const_iv (GL_CULL_FACE),
1486 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),
1487 const_iv (GL_AND), 1838 const_iv (GL_AND),
1488 const_iv (GL_ONE), 1839 const_iv (GL_ONE),
1489 const_iv (GL_ZERO), 1840 const_iv (GL_ZERO),
1490 const_iv (GL_SRC_ALPHA), 1841 const_iv (GL_SRC_ALPHA),
1491 const_iv (GL_SRC_ALPHA_SATURATE), 1842 const_iv (GL_DST_ALPHA),
1492 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1843 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1844 const_iv (GL_ONE_MINUS_DST_ALPHA),
1845 const_iv (GL_SRC_ALPHA_SATURATE),
1494 const_iv (GL_RGB), 1846 const_iv (GL_RGB),
1495 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),
1496 const_iv (GL_UNSIGNED_BYTE), 1851 const_iv (GL_UNSIGNED_BYTE),
1852 const_iv (GL_UNSIGNED_SHORT),
1853 const_iv (GL_UNSIGNED_INT),
1497 const_iv (GL_ALPHA), 1854 const_iv (GL_ALPHA),
1855 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1856 const_iv (GL_LUMINANCE),
1857 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1858 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1859 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1860 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1861 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1862 const_iv (GL_TEXTURE_2D),
1505 const_iv (GL_TEXTURE_MAG_FILTER), 1864 const_iv (GL_TEXTURE_MAG_FILTER),
1506 const_iv (GL_TEXTURE_MIN_FILTER), 1865 const_iv (GL_TEXTURE_MIN_FILTER),
1507 const_iv (GL_TEXTURE_ENV_MODE), 1866 const_iv (GL_TEXTURE_ENV_MODE),
1508 const_iv (GL_TEXTURE_WRAP_S), 1867 const_iv (GL_TEXTURE_WRAP_S),
1509 const_iv (GL_TEXTURE_WRAP_T), 1868 const_iv (GL_TEXTURE_WRAP_T),
1869 const_iv (GL_REPEAT),
1510 const_iv (GL_CLAMP), 1870 const_iv (GL_CLAMP),
1511 const_iv (GL_REPEAT), 1871 const_iv (GL_CLAMP_TO_EDGE),
1512 const_iv (GL_NEAREST), 1872 const_iv (GL_NEAREST),
1513 const_iv (GL_LINEAR), 1873 const_iv (GL_LINEAR),
1514 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1874 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1515 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1875 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1516 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1876 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1517 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1877 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518 const_iv (GL_GENERATE_MIPMAP), 1878 const_iv (GL_GENERATE_MIPMAP),
1519 const_iv (GL_MODULATE), 1879 const_iv (GL_MODULATE),
1520 const_iv (GL_DECAL), 1880 const_iv (GL_DECAL),
1521 const_iv (GL_REPLACE), 1881 const_iv (GL_REPLACE),
1882 const_iv (GL_DEPTH_BUFFER_BIT),
1522 const_iv (GL_COLOR_BUFFER_BIT), 1883 const_iv (GL_COLOR_BUFFER_BIT),
1523 const_iv (GL_PROJECTION), 1884 const_iv (GL_PROJECTION),
1524 const_iv (GL_MODELVIEW), 1885 const_iv (GL_MODELVIEW),
1525 const_iv (GL_COLOR_LOGIC_OP), 1886 const_iv (GL_COLOR_LOGIC_OP),
1526 const_iv (GL_SEPARABLE_2D), 1887 const_iv (GL_SEPARABLE_2D),
1527 const_iv (GL_CONVOLUTION_2D), 1888 const_iv (GL_CONVOLUTION_2D),
1528 const_iv (GL_CONVOLUTION_BORDER_MODE), 1889 const_iv (GL_CONVOLUTION_BORDER_MODE),
1529 const_iv (GL_CONSTANT_BORDER), 1890 const_iv (GL_CONSTANT_BORDER),
1530 const_iv (GL_LINES), 1891 const_iv (GL_LINES),
1892 const_iv (GL_LINE_LOOP),
1531 const_iv (GL_QUADS), 1893 const_iv (GL_QUADS),
1532 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),
1533 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1898 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534 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),
1535# undef const_iv 1904# undef const_iv
1536 }; 1905 };
1537 1906
1538 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; )
1539 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1908 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1540} 1909}
1541 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
1542int glGetError () 1932int glGetError ()
1933
1934void glFinish ()
1543 1935
1544void glClear (int mask) 1936void glClear (int mask)
1545 1937
1546void glClearColor (float r, float g, float b, float a = 1.0) 1938void glClearColor (float r, float g, float b, float a = 1.0)
1547 PROTOTYPE: @ 1939 PROTOTYPE: @
1554 1946
1555void glHint (int target, int mode) 1947void glHint (int target, int mode)
1556 1948
1557void glBlendFunc (int sfactor, int dfactor) 1949void glBlendFunc (int sfactor, int dfactor)
1558 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
1559void glLogicOp (int opcode) 1957void glLogicOp (int opcode)
1560 1958
1561void glColorMask (int red, int green, int blue, int alpha) 1959void glColorMask (int red, int green, int blue, int alpha)
1562 1960
1563void glMatrixMode (int mode) 1961void glMatrixMode (int mode)
1566 1964
1567void glPopMatrix () 1965void glPopMatrix ()
1568 1966
1569void glLoadIdentity () 1967void glLoadIdentity ()
1570 1968
1969void glDrawBuffer (int buffer)
1970
1971void glReadBuffer (int buffer)
1972
1571# 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
1572void 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_)
1573 1978
1574void glViewport (int x, int y, int width, int height) 1979void glViewport (int x, int y, int width, int height)
1575 1980
1576void glScissor (int x, int y, int width, int height) 1981void glScissor (int x, int y, int width, int height)
1591 1996
1592void glEnd () 1997void glEnd ()
1593 1998
1594void glColor (float r, float g, float b, float a = 1.0) 1999void glColor (float r, float g, float b, float a = 1.0)
1595 PROTOTYPE: @ 2000 PROTOTYPE: @
2001 ALIAS:
2002 glColor_premultiply = 1
1596 CODE: 2003 CODE:
2004 if (ix)
2005 {
2006 r *= a;
2007 g *= a;
2008 b *= a;
2009 }
2010 // microsoft visual "c" rounds instead of truncating...
1597 glColor4ub (MIN ((int)(r * 255.f), 255), 2011 glColor4ub (MIN ((int)(r * 256.f), 255),
1598 MIN ((int)(g * 255.f), 255), 2012 MIN ((int)(g * 256.f), 255),
1599 MIN ((int)(b * 255.f), 255), 2013 MIN ((int)(b * 256.f), 255),
1600 MIN ((int)(a * 255.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);
1601 2026
1602void glVertex (float x, float y, float z = 0.) 2027void glVertex (float x, float y, float z = 0.)
1603 CODE: 2028 CODE:
1604 glVertex3f (x, y, z); 2029 glVertex3f (x, y, z);
1605 2030
1617 2042
1618void glBindTexture (int target, int name) 2043void glBindTexture (int target, int name)
1619 2044
1620void glConvolutionParameter (int target, int pname, float params) 2045void glConvolutionParameter (int target, int pname, float params)
1621 CODE: 2046 CODE:
1622 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2047 if (gl.ConvolutionParameterf)
2048 gl.ConvolutionParameterf (target, pname, params);
1623 2049
1624void 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)
1625 CODE: 2051 CODE:
1626 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2052 if (gl.ConvolutionFilter2D)
1627 (target, internalformat, width, height, format, type, data)); 2053 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1628 2054
1629void 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)
1630 CODE: 2056 CODE:
1631 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2057 if (gl.SeparableFilter2D)
1632 (target, internalformat, width, height, format, type, row, column)); 2058 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1633 2059
1634void 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)
1635 2061
1636void 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)
1637 2063
1638void glRasterPos (int x, int y) 2064void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639 CODE:
1640 glRasterPos2i (x, y);
1641 2065
1642void 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)
1643 2067
1644int glGenTexture () 2068int glGenTexture ()
1645 CODE: 2069 CODE:
1672 2096
1673void glEndList () 2097void glEndList ()
1674 2098
1675void glCallList (int list) 2099void glCallList (int list)
1676 2100
2101

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines