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.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.121 by root, Fri Jun 23 20:28:19 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>
3# pragma warning(disable:4244) 5# pragma warning(disable:4244)
4#endif 6#endif
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9 11
12#include <math.h>
10#include <string.h> 13#include <string.h>
11#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
12 16
13#include <SDL.h> 17#include <SDL.h>
14#include <SDL_endian.h> 18#include <SDL_endian.h>
15#include <SDL_image.h> 19#include <SDL_image.h>
16#include <SDL_mixer.h> 20#include <SDL_mixer.h>
38 typedef signed int int32_t; 42 typedef signed int int32_t;
39#endif 43#endif
40 44
41#include "glext.h" 45#include "glext.h"
42 46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48
43#define FOW_DARKNESS 32 49#define FOW_DARKNESS 32
44 50
45#define MAP_EXTEND_X 32 51#define MAP_EXTEND_X 32
46#define MAP_EXTEND_Y 512 52#define MAP_EXTEND_Y 512
47 53
48#define MIN_FONT_HEIGHT 10 54#define MIN_FONT_HEIGHT 10
49 55
50#define GL_CALL(type,func,args) \ 56static struct
51 { \ 57{
52 static int init_; \ 58#define GL_FUNC(ptr,name) ptr name;
53 static type fptr_; \ 59#include "glfunc.h"
54 \ 60#undef GL_FUNC
55 if (!init_) \ 61} gl;
56 { \ 62
57 init_ = 1; \ 63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
58 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 64{
59 } \ 65 if (gl.BlendFuncSeparate)
60 \ 66 gl.BlendFuncSeparate (sa, da, saa, daa);
61 if (fptr_) \ 67 else if (gl.BlendFuncSeparateEXT)
62 fptr_ args; \ 68 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
63 } 69 else
70 glBlendFunc (sa, da);
71}
64 72
65typedef Mix_Chunk *CFClient__MixChunk; 73typedef Mix_Chunk *CFClient__MixChunk;
66typedef Mix_Music *CFClient__MixMusic; 74typedef Mix_Music *CFClient__MixMusic;
67 75
68typedef 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}
69 95
70typedef struct cf_layout { 96typedef struct cf_layout {
71 PangoLayout *pl; // either derived from a cairo or ft2 context 97 PangoLayout *pl; // either derived from a cairo or ft2 context
72 int rgba; // wether we use rgba (cairo) or grayscale (ft2) 98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
73 float r, g, b, a; // default color for rgba mode 99 float r, g, b, a; // default color for rgba mode
80static PangoFontMap *ft2_fontmap, *cairo_fontmap; 106static PangoFontMap *ft2_fontmap, *cairo_fontmap;
81 107
82static void 108static void
83substitute_func (FcPattern *pattern, gpointer data) 109substitute_func (FcPattern *pattern, gpointer data)
84{ 110{
85 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
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
86 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 118 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
87} 120}
88 121
89static void 122static void
90layout_update_font (CFClient__Layout self) 123layout_update_font (CFClient__Layout self)
91{ 124{
287 ev.code = 1; 320 ev.code = 1;
288 ev.data1 = (void *)(long)channel; 321 ev.data1 = (void *)(long)channel;
289 ev.data2 = 0; 322 ev.data2 = 0;
290 323
291 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;
292} 342}
293 343
294MODULE = CFClient PACKAGE = CFClient 344MODULE = CFClient PACKAGE = CFClient
295 345
296PROTOTYPES: ENABLE 346PROTOTYPES: ENABLE
404# undef const_iv 454# undef const_iv
405 }; 455 };
406 456
407 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; )
408 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459}
409 460
461NV floor (NV x)
462
463NV ceil (NV x)
464
465void
466pango_init ()
467 CODE:
468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{
470 {
410 ft2_fontmap = pango_ft2_font_map_new (); 471 ft2_fontmap = pango_ft2_font_map_new ();
411 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);
412 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413 474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
414 cairo_fontmap = pango_cairo_font_map_get_default (); 477 cairo_fontmap = pango_cairo_font_map_get_default ();
415 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 }
416} 490}
417 491
418int 492int
419SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
420 494
430 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 506 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 507 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434 508
509 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
510 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
511
435 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439 516
440 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
441 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
442 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
443 518
444 SDL_EnableUNICODE (1); 519 SDL_EnableUNICODE (1);
445 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446 521
447 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
456 531
457 ++m; 532 ++m;
458 } 533 }
459} 534}
460 535
536char *
537SDL_GetError ()
538
461int 539int
462SDL_SetVideoMode (int w, int h, int fullscreen) 540SDL_SetVideoMode (int w, int h, int fullscreen)
463 CODE: 541 CODE:
464 RETVAL = !!SDL_SetVideoMode ( 542 RETVAL = !!SDL_SetVideoMode (
465 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
466 ); 544 );
545 if (RETVAL)
546 {
467 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 }
468 OUTPUT: 552 OUTPUT:
469 RETVAL 553 RETVAL
470 554
471void 555void
472SDL_GL_SwapBuffers () 556SDL_GL_SwapBuffers ()
557
558char *
559SDL_GetKeyName (int sym)
473 560
474void 561void
475SDL_PollEvent () 562SDL_PollEvent ()
476 PPCODE: 563 PPCODE:
477{ 564{
496 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 584 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498 break; 585 break;
499 586
500 case SDL_MOUSEMOTION: 587 case SDL_MOUSEMOTION:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
501 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 590 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 591 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 592 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 593 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 594 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506 break; 595 break;
507 596
508 case SDL_MOUSEBUTTONDOWN: 597 case SDL_MOUSEBUTTONDOWN:
509 case SDL_MOUSEBUTTONUP: 598 case SDL_MOUSEBUTTONUP:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
600
510 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 601 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 603 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 604 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514 break; 605 break;
541 CODE: 632 CODE:
542#ifndef _WIN32 633#ifndef _WIN32
543 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544#endif 635#endif
545 636
546char *
547gl_version ()
548 CODE:
549 RETVAL = (char *)glGetString (GL_VERSION);
550 OUTPUT:
551 RETVAL
552
553char *
554gl_extensions ()
555 CODE:
556 RETVAL = (char *)glGetString (GL_EXTENSIONS);
557 OUTPUT:
558 RETVAL
559
560void 637void
561add_font (char *file) 638add_font (char *file)
562 CODE: 639 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
641#ifdef _WIN32
642 // cairo... sigh... requires win2000
643 AddFontResourceEx (file, FR_PRIVATE, 0);
644#endif
564 645
565void 646void
566load_image_inline (SV *image_) 647load_image_inline (SV *image_)
567 ALIAS: 648 ALIAS:
568 load_image_file = 1 649 load_image_file = 1
652} 733}
653 734
654void 735void
655error (char *message) 736error (char *message)
656 CODE: 737 CODE:
738 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 739#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 740 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 741#endif
662 742
663void 743void
664fatal (char *message) 744fatal (char *message)
665 CODE: 745 CODE:
746 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 747#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 749#endif
671 exit (1); 750 _exit (1);
751
752void
753_exit (int retval)
754 CODE:
755 _exit (retval);
672 756
673MODULE = CFClient PACKAGE = CFClient::Font 757MODULE = CFClient PACKAGE = CFClient::Font
674 758
675CFClient::Font 759CFClient::Font
676new_from_file (SV *class, char *path, int id = 0) 760new_from_file (SV *class, char *path, int id = 0)
746 char *text = SvPVutf8 (text_, textlen); 830 char *text = SvPVutf8 (text_, textlen);
747 831
748 pango_layout_set_markup (self->pl, text, textlen); 832 pango_layout_set_markup (self->pl, text, textlen);
749} 833}
750 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 = 2;
843
844 while (arg < items && (pos = strstr (pos, OBJ_STR)))
845 {
846 PangoRectangle rect;
847 PangoAttribute *attr;
848
849 int w = SvIV (ST (arg - 1));
850 int h = SvIV (ST (arg));
851
852 arg += 2;
853
854 rect.x = 0;
855 rect.y = -h * PANGO_SCALE;
856 rect.width = w * PANGO_SCALE;
857 rect.height = h * PANGO_SCALE;
858
859 if (!attrs)
860 attrs = pango_layout_get_attributes (self->pl);
861
862 attr = pango_attr_shape_new (&rect, &rect);
863 attr->start_index = pos - text;
864 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865 pango_attr_list_insert (attrs, attr);
866
867 pos += sizeof (OBJ_STR) - 1;
868 }
869
870 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs);
872}
873
874void
875get_shapes (CFClient::Layout self)
876 PPCODE:
877{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879
880 do
881 {
882 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
883
884 if (run && shape_attr_p (run))
885 {
886 PangoRectangle extents;
887 pango_layout_iter_get_run_extents (iter, 0, &extents);
888
889 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891 }
892 }
893 while (pango_layout_iter_next_run (iter));
894
895 pango_layout_iter_free (iter);
896}
897
898int
899has_wrapped (CFClient::Layout self)
900 CODE:
901{
902 int lines = 1;
903 const char *text = pango_layout_get_text (self->pl);
904
905 while (*text)
906 lines += *text++ == '\n';
907
908 RETVAL = lines < pango_layout_get_line_count (self->pl);
909}
910 OUTPUT:
911 RETVAL
912
751SV * 913SV *
752get_text (CFClient::Layout self) 914get_text (CFClient::Layout self)
753 CODE: 915 CODE:
754 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 916 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
755 SvUTF8_on (RETVAL); 917 sv_utf8_decode (RETVAL);
756 OUTPUT: 918 OUTPUT:
757 RETVAL 919 RETVAL
758 920
759void 921void
760set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 922set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
786set_width (CFClient::Layout self, int max_width = -1) 948set_width (CFClient::Layout self, int max_width = -1)
787 CODE: 949 CODE:
788 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 950 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789 951
790void 952void
953set_indent (CFClient::Layout self, int indent)
954 CODE:
955 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956
957void
958set_spacing (CFClient::Layout self, int spacing)
959 CODE:
960 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961
962void
963set_ellipsise (CFClient::Layout self, int ellipsise)
964 CODE:
965 pango_layout_set_ellipsize (self->pl,
966 ellipsise == 1 ? PANGO_ELLIPSIZE_START
967 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
969 : PANGO_ELLIPSIZE_NONE
970 );
971
972void
973set_single_paragraph_mode (CFClient::Layout self, int spm)
974 CODE:
975 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976
977void
791size (CFClient::Layout self) 978size (CFClient::Layout self)
792 PPCODE: 979 PPCODE:
793{ 980{
794 int w, h; 981 int w, h;
795 982
861 1048
862 while (p < e) 1049 while (p < e)
863 { 1050 {
864 uint32_t rgba = *p; 1051 uint32_t rgba = *p;
865 rgba = (rgba >> 24) | (rgba << 8); 1052 rgba = (rgba >> 24) | (rgba << 8);
1053#if 0
1054#ifdef _WIN32
1055 {//D
1056 uint8_t r = rgba >> 24;
1057 uint8_t g = rgba >> 16;
1058 uint8_t b = rgba >> 8;
1059 uint8_t a = rgba >> 0;
1060
1061 rgba = (rgba & 0xffffff00) | a;
1062 }
1063#endif
1064#endif
866 rgba = SDL_SwapBE32 (rgba); 1065 rgba = SDL_SwapBE32 (rgba);
867 *p++ = rgba; 1066 *p++ = rgba;
868 } 1067 }
869 } 1068 }
870 1069
904} 1103}
905 1104
906MODULE = CFClient PACKAGE = CFClient::Texture 1105MODULE = CFClient PACKAGE = CFClient::Texture
907 1106
908void 1107void
1108pad2pot (SV *data_, SV *w_, SV *h_)
1109 CODE:
1110{
1111 int ow = SvIV (w_);
1112 int oh = SvIV (h_);
1113
1114 if (ow && oh)
1115 {
1116 int nw = minpot (ow);
1117 int nh = minpot (oh);
1118
1119 if (nw != ow || nh != oh)
1120 {
1121 if (SvOK (data_))
1122 {
1123 STRLEN datalen;
1124 char *data = SvPVbyte (data_, datalen);
1125 int bpp = datalen / (ow * oh);
1126 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1127
1128 SvPOK_only (result_);
1129 SvCUR_set (result_, nw * nh * bpp);
1130
1131 memset (SvPVX (result_), 0, nw * nh * bpp);
1132 while (oh--)
1133 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1134
1135 sv_setsv (data_, result_);
1136 }
1137
1138 sv_setiv (w_, nw);
1139 sv_setiv (h_, nh);
1140 }
1141 }
1142}
1143
1144void
909draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1145draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
910 PROTOTYPE: $$$;$$ 1146 PROTOTYPE: $$$;$$
911 ALIAS: 1147 ALIAS:
912 draw_quad_alpha = 1 1148 draw_quad_alpha = 1
913 draw_quad_alpha_premultiplied = 2 1149 draw_quad_alpha_premultiplied = 2
914 CODE: 1150 CODE:
915{ 1151{
916 HV *hv = (HV *)SvRV (self); 1152 HV *hv = (HV *)SvRV (self);
917 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1153 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1154 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1155 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921 1156
922 if (items < 5) 1157 if (items < 5)
923 { 1158 {
924 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1159 w = SvNV (*hv_fetch (hv, "w", 1, 1));
925 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1160 h = SvNV (*hv_fetch (hv, "h", 1, 1));
926 } 1161 }
927 1162
928 if (ix) 1163 if (ix)
929 { 1164 {
930 glEnable (GL_BLEND); 1165 glEnable (GL_BLEND);
1166
1167 if (ix == 2)
931 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1168 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1169 else
1170 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1171 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1172
1173 glEnable (GL_ALPHA_TEST);
1174 glAlphaFunc (GL_GREATER, 0.01f);
932 } 1175 }
933 1176
934 glBindTexture (GL_TEXTURE_2D, name); 1177 glBindTexture (GL_TEXTURE_2D, name);
935
936 if (wrap_mode)
937 {
938 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
939 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
940 }
941 1178
942 glBegin (GL_QUADS); 1179 glBegin (GL_QUADS);
943 glTexCoord2f (0, 0); glVertex2f (x , y ); 1180 glTexCoord2f (0, 0); glVertex2f (x , y );
944 glTexCoord2f (0, t); glVertex2f (x , y + h); 1181 glTexCoord2f (0, t); glVertex2f (x , y + h);
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1182 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1183 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1184 glEnd ();
948 1185
949 if (ix) 1186 if (ix)
1187 {
1188 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1189 glDisable (GL_BLEND);
1190 }
951} 1191}
952 1192
953MODULE = CFClient PACKAGE = CFClient::Map 1193MODULE = CFClient PACKAGE = CFClient::Map
954 1194
955CFClient::Map 1195CFClient::Map
975DESTROY (CFClient::Map self) 1215DESTROY (CFClient::Map self)
976 CODE: 1216 CODE:
977{ 1217{
978 map_clear (self); 1218 map_clear (self);
979 Safefree (self->face); 1219 Safefree (self->face);
1220 Safefree (self->tex);
980 Safefree (self); 1221 Safefree (self);
981} 1222}
982 1223
983void 1224void
984clear (CFClient::Map self) 1225clear (CFClient::Map self)
1019 tex->r = r; 1260 tex->r = r;
1020 tex->g = g; 1261 tex->g = g;
1021 tex->b = b; 1262 tex->b = b;
1022 tex->a = a; 1263 tex->a = a;
1023 } 1264 }
1265
1266 // somewhat hackish, but for textures that require it, it really
1267 // improves the look, and most others don't suffer.
1268 glBindTexture (GL_TEXTURE_2D, name);
1269 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1270 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1271 // use uglier nearest interpolation because linear suffers
1272 // from transparent color bleeding and ugly wrapping effects.
1273 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1024} 1274}
1025 1275
1026int 1276int
1027ox (CFClient::Map self) 1277ox (CFClient::Map self)
1028 ALIAS: 1278 ALIAS:
1029 oy = 1 1279 oy = 1
1280 x = 2
1281 y = 3
1282 w = 4
1283 h = 5
1030 CODE: 1284 CODE:
1031 switch (ix) 1285 switch (ix)
1032 { 1286 {
1033 case 0: RETVAL = self->ox; break; 1287 case 0: RETVAL = self->ox; break;
1034 case 1: RETVAL = self->oy; break; 1288 case 1: RETVAL = self->oy; break;
1289 case 2: RETVAL = self->x; break;
1290 case 3: RETVAL = self->y; break;
1291 case 4: RETVAL = self->w; break;
1292 case 5: RETVAL = self->h; break;
1035 } 1293 }
1036 OUTPUT: 1294 OUTPUT:
1037 RETVAL 1295 RETVAL
1038 1296
1039void 1297void
1073 1331
1074 while (data < data_end) 1332 while (data < data_end)
1075 { 1333 {
1076 flags = (data [0] << 8) + data [1]; data += 2; 1334 flags = (data [0] << 8) + data [1]; data += 2;
1077 1335
1078 x = ((flags >> 10) & 63) + self->x; 1336 x = self->x + ((flags >> 10) & 63);
1079 y = ((flags >> 4) & 63) + self->y; 1337 y = self->y + ((flags >> 4) & 63);
1080 1338
1081 cell = map_get_cell (self, x, y); 1339 cell = map_get_cell (self, x, y);
1082 1340
1083 if (flags & 15) 1341 if (flags & 15)
1084 { 1342 {
1174 OUTPUT: 1432 OUTPUT:
1175 RETVAL 1433 RETVAL
1176 1434
1177void 1435void
1178draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1436draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1179 PPCODE: 1437 CODE:
1180{ 1438{
1181 int vx, vy; 1439 int vx, vy;
1182 int x, y, z; 1440 int x, y, z;
1183 int last_name; 1441 int last_name;
1184 mapface face; 1442 mapface face;
1185 int sw4 = (sw + 3) & ~3;
1186 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1187 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1188 1443
1189 memset (darkness, 255, sw4 * sh);
1190 SvPOK_only (darkness_sv);
1191 SvCUR_set (darkness_sv, sw4 * sh);
1192
1193 vx = self->x + (self->w - sw) / 2 - shift_x; 1444 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1194 vy = self->y + (self->h - sh) / 2 - shift_y; 1445 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1195 1446
1196 /* 1447 /*
1197 int vx = self->vx = self->w >= sw 1448 int vx = self->vx = self->w >= sw
1198 ? self->x + (self->w - sw) / 2 1449 ? self->x + (self->w - sw) / 2
1199 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1450 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1203 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1454 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1204 */ 1455 */
1205 1456
1206 glColor4ub (255, 255, 255, 255); 1457 glColor4ub (255, 255, 255, 255);
1207 1458
1459 glEnable (GL_BLEND);
1208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1460 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1209 glEnable (GL_BLEND);
1210 glEnable (GL_TEXTURE_2D); 1461 glEnable (GL_TEXTURE_2D);
1211 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1462 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1212 1463
1213 glBegin (GL_QUADS); 1464 glBegin (GL_QUADS);
1214 1465
1222 1473
1223 for (x = 0; x < sw; x++) 1474 for (x = 0; x < sw; x++)
1224 if (row->c0 <= x + vx && x + vx < row->c1) 1475 if (row->c0 <= x + vx && x + vx < row->c1)
1225 { 1476 {
1226 mapcell *cell = row->col + (x + vx - row->c0); 1477 mapcell *cell = row->col + (x + vx - row->c0);
1227
1228 darkness[y * sw4 + x] = cell->darkness < 0
1229 ? 255 - FOW_DARKNESS
1230 : 255 - cell->darkness;
1231 1478
1232 face = cell->face [z]; 1479 face = cell->face [z];
1233 1480
1234 if (face) 1481 if (face)
1235 { 1482 {
1256 1503
1257 glEnd (); 1504 glEnd ();
1258 1505
1259 glDisable (GL_TEXTURE_2D); 1506 glDisable (GL_TEXTURE_2D);
1260 glDisable (GL_BLEND); 1507 glDisable (GL_BLEND);
1508}
1509
1510void
1511draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512 CODE:
1513{
1514 static float color[16][3] = {
1515 { 0.00, 0.00, 0.00 },
1516 { 1.00, 1.00, 1.00 },
1517 { 0.00, 0.00, 0.55 },
1518 { 1.00, 0.00, 0.00 },
1519
1520 { 1.00, 0.54, 0.00 },
1521 { 0.11, 0.56, 1.00 },
1522 { 0.93, 0.46, 0.00 },
1523 { 0.18, 0.54, 0.34 },
1524
1525 { 0.56, 0.73, 0.56 },
1526 { 0.80, 0.80, 0.80 },
1527 { 0.55, 0.41, 0.13 },
1528 { 0.99, 0.77, 0.26 },
1529
1530 { 0.74, 0.65, 0.41 },
1531
1532 { 0.00, 1.00, 1.00 },
1533 { 1.00, 0.00, 1.00 },
1534 { 1.00, 1.00, 0.00 },
1535 };
1536
1537 int x, y;
1538
1539 glEnable (GL_TEXTURE_2D);
1540 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1541 glEnable (GL_BLEND);
1542 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1543 glBegin (GL_QUADS);
1544
1545 for (y = 0; y < h; y++)
1546 for (x = 0; x < w; x++)
1547 {
1548 unsigned char m = data [x + y * w];
1549
1550 if (m)
1551 {
1552 float *c = color [m & 15];
1553
1554 float tx1 = m & 0x40 ? 0.5 : 0.;
1555 float tx2 = tx1 + 0.5;
1556
1557 glColor4f (c[0], c[1], c[2], 0.75);
1558 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1559 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1560 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1561 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1562 }
1563 }
1564
1565 glEnd ();
1566 glDisable (GL_BLEND);
1567 glDisable (GL_TEXTURE_2D);
1568}
1569
1570void
1571fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1572 PPCODE:
1573{
1574 int vx, vy;
1575 int x, y;
1576 int sw4 = (sw + 3) & ~3;
1577 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1578 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1579
1580 memset (darkness, 255, sw4 * sh);
1581 SvPOK_only (darkness_sv);
1582 SvCUR_set (darkness_sv, sw4 * sh);
1583
1584 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1585 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1586
1587 for (y = 0; y < sh; y++)
1588 if (0 <= y + vy && y + vy < self->rows)
1589 {
1590 maprow *row = self->row + (y + vy);
1591
1592 for (x = 0; x < sw; x++)
1593 if (row->c0 <= x + vx && x + vx < row->c1)
1594 {
1595 mapcell *cell = row->col + (x + vx - row->c0);
1596
1597 darkness[y * sw4 + x] = cell->darkness < 0
1598 ? 255 - FOW_DARKNESS
1599 : 255 - cell->darkness;
1600 }
1601 }
1261 1602
1262 EXTEND (SP, 3); 1603 EXTEND (SP, 3);
1263 PUSHs (sv_2mortal (newSViv (sw4))); 1604 PUSHs (sv_2mortal (newSViv (sw4)));
1264 PUSHs (sv_2mortal (newSViv (sh))); 1605 PUSHs (sv_2mortal (newSViv (sh)));
1265 PUSHs (darkness_sv); 1606 PUSHs (darkness_sv);
1466 const_iv (GL_COLOR_MATERIAL), 1807 const_iv (GL_COLOR_MATERIAL),
1467 const_iv (GL_SMOOTH), 1808 const_iv (GL_SMOOTH),
1468 const_iv (GL_FLAT), 1809 const_iv (GL_FLAT),
1469 const_iv (GL_DITHER), 1810 const_iv (GL_DITHER),
1470 const_iv (GL_BLEND), 1811 const_iv (GL_BLEND),
1812 const_iv (GL_CULL_FACE),
1471 const_iv (GL_SCISSOR_TEST), 1813 const_iv (GL_SCISSOR_TEST),
1814 const_iv (GL_DEPTH_TEST),
1815 const_iv (GL_ALPHA_TEST),
1816 const_iv (GL_NORMALIZE),
1817 const_iv (GL_RESCALE_NORMAL),
1818 const_iv (GL_FRONT),
1819 const_iv (GL_BACK),
1472 const_iv (GL_AND), 1820 const_iv (GL_AND),
1473 const_iv (GL_ONE), 1821 const_iv (GL_ONE),
1474 const_iv (GL_ZERO), 1822 const_iv (GL_ZERO),
1475 const_iv (GL_SRC_ALPHA), 1823 const_iv (GL_SRC_ALPHA),
1476 const_iv (GL_SRC_ALPHA_SATURATE), 1824 const_iv (GL_DST_ALPHA),
1477 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1825 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1826 const_iv (GL_ONE_MINUS_DST_ALPHA),
1827 const_iv (GL_SRC_ALPHA_SATURATE),
1479 const_iv (GL_RGB), 1828 const_iv (GL_RGB),
1480 const_iv (GL_RGBA), 1829 const_iv (GL_RGBA),
1830 const_iv (GL_RGBA4),
1831 const_iv (GL_RGBA8),
1832 const_iv (GL_RGB5_A1),
1481 const_iv (GL_UNSIGNED_BYTE), 1833 const_iv (GL_UNSIGNED_BYTE),
1834 const_iv (GL_UNSIGNED_SHORT),
1835 const_iv (GL_UNSIGNED_INT),
1482 const_iv (GL_ALPHA), 1836 const_iv (GL_ALPHA),
1837 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1838 const_iv (GL_LUMINANCE),
1839 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1840 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1841 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1842 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1843 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1844 const_iv (GL_TEXTURE_2D),
1490 const_iv (GL_TEXTURE_MAG_FILTER), 1846 const_iv (GL_TEXTURE_MAG_FILTER),
1491 const_iv (GL_TEXTURE_MIN_FILTER), 1847 const_iv (GL_TEXTURE_MIN_FILTER),
1492 const_iv (GL_TEXTURE_ENV_MODE), 1848 const_iv (GL_TEXTURE_ENV_MODE),
1493 const_iv (GL_TEXTURE_WRAP_S), 1849 const_iv (GL_TEXTURE_WRAP_S),
1494 const_iv (GL_TEXTURE_WRAP_T), 1850 const_iv (GL_TEXTURE_WRAP_T),
1851 const_iv (GL_REPEAT),
1495 const_iv (GL_CLAMP), 1852 const_iv (GL_CLAMP),
1496 const_iv (GL_REPEAT), 1853 const_iv (GL_CLAMP_TO_EDGE),
1497 const_iv (GL_NEAREST), 1854 const_iv (GL_NEAREST),
1498 const_iv (GL_LINEAR), 1855 const_iv (GL_LINEAR),
1499 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1856 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1857 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1858 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1859 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503 const_iv (GL_GENERATE_MIPMAP), 1860 const_iv (GL_GENERATE_MIPMAP),
1504 const_iv (GL_MODULATE), 1861 const_iv (GL_MODULATE),
1505 const_iv (GL_DECAL), 1862 const_iv (GL_DECAL),
1506 const_iv (GL_REPLACE), 1863 const_iv (GL_REPLACE),
1864 const_iv (GL_DEPTH_BUFFER_BIT),
1507 const_iv (GL_COLOR_BUFFER_BIT), 1865 const_iv (GL_COLOR_BUFFER_BIT),
1508 const_iv (GL_PROJECTION), 1866 const_iv (GL_PROJECTION),
1509 const_iv (GL_MODELVIEW), 1867 const_iv (GL_MODELVIEW),
1510 const_iv (GL_COLOR_LOGIC_OP), 1868 const_iv (GL_COLOR_LOGIC_OP),
1511 const_iv (GL_SEPARABLE_2D), 1869 const_iv (GL_SEPARABLE_2D),
1512 const_iv (GL_CONVOLUTION_2D), 1870 const_iv (GL_CONVOLUTION_2D),
1513 const_iv (GL_CONVOLUTION_BORDER_MODE), 1871 const_iv (GL_CONVOLUTION_BORDER_MODE),
1514 const_iv (GL_CONSTANT_BORDER), 1872 const_iv (GL_CONSTANT_BORDER),
1515 const_iv (GL_LINES), 1873 const_iv (GL_LINES),
1874 const_iv (GL_LINE_LOOP),
1516 const_iv (GL_QUADS), 1875 const_iv (GL_QUADS),
1517 const_iv (GL_LINE_LOOP), 1876 const_iv (GL_QUAD_STRIP),
1877 const_iv (GL_TRIANGLES),
1878 const_iv (GL_TRIANGLE_STRIP),
1879 const_iv (GL_TRIANGLE_FAN),
1518 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1880 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519 const_iv (GL_FASTEST), 1881 const_iv (GL_FASTEST),
1882 const_iv (GL_V2F),
1883 const_iv (GL_V3F),
1884 const_iv (GL_T2F_V3F),
1885 const_iv (GL_T2F_N3F_V3F),
1520# undef const_iv 1886# undef const_iv
1521 }; 1887 };
1522 1888
1523 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1889 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1524 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525} 1891}
1526 1892
1893char *
1894gl_vendor ()
1895 CODE:
1896 RETVAL = (char *)glGetString (GL_VENDOR);
1897 OUTPUT:
1898 RETVAL
1899
1900char *
1901gl_version ()
1902 CODE:
1903 RETVAL = (char *)glGetString (GL_VERSION);
1904 OUTPUT:
1905 RETVAL
1906
1907char *
1908gl_extensions ()
1909 CODE:
1910 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1911 OUTPUT:
1912 RETVAL
1913
1527int glGetError () 1914int glGetError ()
1915
1916void glFinish ()
1528 1917
1529void glClear (int mask) 1918void glClear (int mask)
1530 1919
1531void glClearColor (float r, float g, float b, float a = 1.0) 1920void glClearColor (float r, float g, float b, float a = 1.0)
1532 PROTOTYPE: @ 1921 PROTOTYPE: @
1539 1928
1540void glHint (int target, int mode) 1929void glHint (int target, int mode)
1541 1930
1542void glBlendFunc (int sfactor, int dfactor) 1931void glBlendFunc (int sfactor, int dfactor)
1543 1932
1933void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1934 CODE:
1935 gl_BlendFuncSeparate (sa, da, saa, daa);
1936
1937void glDepthMask (int flag)
1938
1544void glLogicOp (int opcode) 1939void glLogicOp (int opcode)
1545 1940
1546void glColorMask (int red, int green, int blue, int alpha) 1941void glColorMask (int red, int green, int blue, int alpha)
1547 1942
1548void glMatrixMode (int mode) 1943void glMatrixMode (int mode)
1551 1946
1552void glPopMatrix () 1947void glPopMatrix ()
1553 1948
1554void glLoadIdentity () 1949void glLoadIdentity ()
1555 1950
1951void glDrawBuffer (int buffer)
1952
1953void glReadBuffer (int buffer)
1954
1556# near and far are due to microsofts buggy c compiler 1955# near_ and far_ are due to microsofts buggy "c" compiler
1956void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1957
1958# near_ and far_ are due to microsofts buggy "c" compiler
1557void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1959void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558 1960
1559void glViewport (int x, int y, int width, int height) 1961void glViewport (int x, int y, int width, int height)
1560 1962
1561void glScissor (int x, int y, int width, int height) 1963void glScissor (int x, int y, int width, int height)
1576 1978
1577void glEnd () 1979void glEnd ()
1578 1980
1579void glColor (float r, float g, float b, float a = 1.0) 1981void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1982 PROTOTYPE: @
1983 ALIAS:
1984 glColor_premultiply = 1
1581 CODE: 1985 CODE:
1582 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1986 if (ix)
1987 {
1988 r *= a;
1989 g *= a;
1990 b *= a;
1991 }
1992 // microsoft visual "c" rounds instead of truncating...
1993 glColor4ub (MIN ((int)(r * 256.f), 255),
1994 MIN ((int)(g * 256.f), 255),
1995 MIN ((int)(b * 256.f), 255),
1996 MIN ((int)(a * 256.f), 255));
1997
1998void glInterleavedArrays (int format, int stride, char *data)
1999
2000void glDrawElements (int mode, int count, int type, char *indices)
2001
2002# 1.2 void glDrawRangeElements (int mode, int start, int end
2003
2004void glRasterPos (float x, float y, float z = 0.)
2005 CODE:
2006 glRasterPos3f (0, 0, z);
2007 glBitmap (0, 0, 0, 0, x, y, 0);
1583 2008
1584void glVertex (float x, float y, float z = 0.) 2009void glVertex (float x, float y, float z = 0.)
1585 CODE: 2010 CODE:
1586 glVertex3f (x, y, z); 2011 glVertex3f (x, y, z);
1587 2012
1599 2024
1600void glBindTexture (int target, int name) 2025void glBindTexture (int target, int name)
1601 2026
1602void glConvolutionParameter (int target, int pname, float params) 2027void glConvolutionParameter (int target, int pname, float params)
1603 CODE: 2028 CODE:
1604 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2029 if (gl.ConvolutionParameterf)
2030 gl.ConvolutionParameterf (target, pname, params);
1605 2031
1606void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2032void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1607 CODE: 2033 CODE:
1608 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2034 if (gl.ConvolutionFilter2D)
1609 (target, internalformat, width, height, format, type, data)); 2035 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1610 2036
1611void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2037void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1612 CODE: 2038 CODE:
1613 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2039 if (gl.SeparableFilter2D)
1614 (target, internalformat, width, height, format, type, row, column)); 2040 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1615 2041
1616void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2042void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1617 2043
1618void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2044void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1619 2045
1620void glRasterPos (int x, int y) 2046void glDrawPixels (int width, int height, int format, int type, char *pixels)
1621 CODE:
1622 glRasterPos2i (x, y);
1623 2047
1624void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2048void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1625 2049
1626int glGenTexture () 2050int glGenTexture ()
1627 CODE: 2051 CODE:
1654 2078
1655void glEndList () 2079void glEndList ()
1656 2080
1657void glCallList (int list) 2081void glCallList (int list)
1658 2082
2083

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines