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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
5# pragma warning(disable:4244) 6# pragma warning(disable:4244)
6#endif 7#endif
7 8
8#include "EXTERN.h" 9#include "EXTERN.h"
9#include "perl.h" 10#include "perl.h"
10#include "XSUB.h" 11#include "XSUB.h"
11 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
12#include <math.h> 17#include <math.h>
13#include <string.h> 18#include <string.h>
14#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
15 21
16#include <SDL.h> 22#include <SDL.h>
17#include <SDL_endian.h> 23#include <SDL_endian.h>
18#include <SDL_image.h> 24#include <SDL_image.h>
19#include <SDL_mixer.h> 25#include <SDL_mixer.h>
20#include <SDL_opengl.h> 26#include <SDL_opengl.h>
21 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
22#include <glib/gmacros.h> 31#include <glib/gmacros.h>
23 32
24#include <pango/pango.h> 33#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 34
29#ifndef _WIN32 35#ifndef _WIN32
30# include <sys/types.h> 36# include <sys/types.h>
31# include <sys/socket.h> 37# include <sys/socket.h>
32# include <netinet/in.h> 38# include <netinet/in.h>
39 typedef signed char int8_t; 45 typedef signed char int8_t;
40 typedef signed short int16_t; 46 typedef signed short int16_t;
41 typedef signed int int32_t; 47 typedef signed int int32_t;
42#endif 48#endif
43 49
44#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45 51
46#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
47 53
48#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
50 56
51#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
52 58
53#define GL_CALL(type,func,args) \ 59#if 0
54 { \ 60# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 61#else
56 static type fptr_; \ 62# define PARACHUTE 0
57 \ 63#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 64
65static struct
66{
67#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h"
69#undef GL_FUNC
70} gl;
71
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{
74 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else
79 glBlendFunc (sa, da);
80}
81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
68typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
70 90
71typedef PangoFontDescription *CFClient__Font; 91typedef PangoFontDescription *CFPlus__Font;
92
93static int
94shape_attr_p (PangoLayoutRun *run)
95{
96 GSList *attrs = run->item->analysis.extra_attrs;
97
98 while (attrs)
99 {
100 PangoAttribute *attr = attrs->data;
101
102 if (attr->klass->type == PANGO_ATTR_SHAPE)
103 return 1;
104
105 attrs = attrs->next;
106 }
107
108 return 0;
109}
72 110
73typedef struct cf_layout { 111typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
77 int base_height; 114 int base_height;
78 CFClient__Font font; 115 CFPlus__Font font;
79} *CFClient__Layout; 116} *CFPlus__Layout;
80 117
81static CFClient__Font default_font; 118static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
84 121
85static void 122static void
86substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
87{ 124{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 126#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 128#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 130}
95 131
96static void 132static void
97layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
98{ 134{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 135 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
101 */ 137 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
106 142
107 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
108} 144}
109 145
110static void 146static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
114 153
115 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 156
118 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 rect.width = (rect.width + 3) & ~3;
161
162 *w = rect.width;
163 *h = rect.height;
119} 164}
120 165
121typedef uint16_t mapface; 166typedef uint16_t mapface;
122 167
123typedef struct { 168typedef struct {
146 int texs; 191 int texs;
147 maptex *tex; 192 maptex *tex;
148 193
149 int32_t rows; 194 int32_t rows;
150 maprow *row; 195 maprow *row;
151} *CFClient__Map; 196} *CFPlus__Map;
152 197
153static char * 198static char *
154prepend (char *ptr, int sze, int inc) 199prepend (char *ptr, int sze, int inc)
155{ 200{
156 char *p; 201 char *p;
174 219
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 222
178static maprow * 223static maprow *
179map_get_row (CFClient__Map self, int y) 224map_get_row (CFPlus__Map self, int y)
180{ 225{
181 if (0 > y) 226 if (0 > y)
182 { 227 {
183 int extend = - y + MAP_EXTEND_Y; 228 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 229 Prepend (maprow, self->row, self->rows, extend);
222 267
223 return row->col + (x - row->c0); 268 return row->col + (x - row->c0);
224} 269}
225 270
226static mapcell * 271static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 272map_get_cell (CFPlus__Map self, int x, int y)
228{ 273{
229 return row_get_cell (map_get_row (self, y), x); 274 return row_get_cell (map_get_row (self, y), x);
230} 275}
231 276
232static void 277static void
233map_clear (CFClient__Map self) 278map_clear (CFPlus__Map self)
234{ 279{
235 int r; 280 int r;
236 281
237 for (r = 0; r < self->rows; r++) 282 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 283 Safefree (self->row[r].col);
246 self->row = 0; 291 self->row = 0;
247 self->rows = 0; 292 self->rows = 0;
248} 293}
249 294
250static void 295static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 296map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 297{
253 int x, y; 298 int x, y;
254 maprow *row; 299 maprow *row;
255 300
256 for (y = y0; y < y0 + h; y++) 301 for (y = y0; y < y0 + h; y++)
296 ev.data2 = 0; 341 ev.data2 = 0;
297 342
298 SDL_PushEvent ((SDL_Event *)&ev); 343 SDL_PushEvent ((SDL_Event *)&ev);
299} 344}
300 345
346static unsigned int
347minpot (unsigned int n)
348{
349 if (!n)
350 return 0;
351
352 --n;
353
354 n |= n >> 1;
355 n |= n >> 2;
356 n |= n >> 4;
357 n |= n >> 8;
358 n |= n >> 16;
359
360 return n + 1;
361}
362
301MODULE = CFClient PACKAGE = CFClient 363MODULE = CFPlus PACKAGE = CFPlus
302 364
303PROTOTYPES: ENABLE 365PROTOTYPES: ENABLE
304 366
305BOOT: 367BOOT:
306{ 368{
307 HV *stash = gv_stashpv ("CFClient", 1); 369 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 370 static const struct {
309 const char *name; 371 const char *name;
310 IV iv; 372 IV iv;
311 } *civ, const_iv[] = { 373 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 374# define const_iv(name) { # name, (IV)name }
413 475
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 476 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 477 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 478}
417 479
480int
481in_destruct ()
482 CODE:
483 RETVAL = PL_main_cv == Nullcv;
484 OUTPUT:
485 RETVAL
486
487NV floor (NV x)
488
489NV ceil (NV x)
490
418void 491void
419pango_init () 492pango_init ()
420 CODE: 493 CODE:
421{ 494{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 495 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 496 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 497 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 498}
430 499
431int 500int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 501SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 502
434void 503void
435SDL_Quit () 504SDL_Quit ()
436 505
437void 506void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 514 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 515 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 516
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 517 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 518 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 519
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 524
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 525 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
526#if SDL_VERSION_ATLEAST(1,2,10)
527 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
528 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
529#endif
457 530
458 SDL_EnableUNICODE (1); 531 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 532 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 533
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 534 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 552SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 553 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 554 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 555 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 556 );
557 if (RETVAL)
558 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 559 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
560# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
561# include "glfunc.h"
562# undef GL_FUNC
563 }
485 OUTPUT: 564 OUTPUT:
486 RETVAL 565 RETVAL
487 566
488void 567void
489SDL_GL_SwapBuffers () 568SDL_GL_SwapBuffers ()
569
570char *
571SDL_GetKeyName (int sym)
490 572
491void 573void
492SDL_PollEvent () 574SDL_PollEvent ()
493 PPCODE: 575 PPCODE:
494{ 576{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 595 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 596 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 597 break;
516 598
517 case SDL_MOUSEMOTION: 599 case SDL_MOUSEMOTION:
600 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
601
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 603 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 604 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 605 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 606 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 607 break;
524 608
525 case SDL_MOUSEBUTTONDOWN: 609 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 610 case SDL_MOUSEBUTTONUP:
611 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
612
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 613 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 614 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 615 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 616 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 617 break;
535 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 621 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 622 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537 break; 623 break;
538 } 624 }
539 625
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 626 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541 } 627 }
542} 628}
543 629
544int 630int
545Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 631Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
558 CODE: 644 CODE:
559#ifndef _WIN32 645#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 646 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 647#endif
562 648
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_version ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VERSION);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_extensions ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_EXTENSIONS);
581 OUTPUT:
582 RETVAL
583
584void 649void
585add_font (char *file) 650add_font (char *file)
586 CODE: 651 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 652 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
588#ifdef _WIN32
589 // cairo... sigh... requires win2000
590 AddFontResourceEx (file, FR_PRIVATE, 0);
591#endif
592 653
593void 654void
594load_image_inline (SV *image_) 655load_image_inline (SV *image_)
595 ALIAS: 656 ALIAS:
596 load_image_file = 1 657 load_image_file = 1
638 699
639 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 700 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
640 701
641 assert (surface2->pitch == surface2->w * 4); 702 assert (surface2->pitch == surface2->w * 4);
642 703
704 SDL_LockSurface (surface2);
643 EXTEND (SP, 5); 705 EXTEND (SP, 6);
644 PUSHs (sv_2mortal (newSViv (surface2->w))); 706 PUSHs (sv_2mortal (newSViv (surface2->w)));
645 PUSHs (sv_2mortal (newSViv (surface2->h))); 707 PUSHs (sv_2mortal (newSViv (surface2->h)));
646 SDL_LockSurface (surface2);
647 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 708 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
648 SDL_UnlockSurface (surface2);
649 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 709 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
650 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 710 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
651 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 711 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
712 SDL_UnlockSurface (surface2);
652 713
653 SDL_FreeSurface (surface); 714 SDL_FreeSurface (surface);
654 SDL_FreeSurface (surface2); 715 SDL_FreeSurface (surface2);
655} 716}
656 717
692 CODE: 753 CODE:
693 fprintf (stderr, "FATAL: %s\n", message); 754 fprintf (stderr, "FATAL: %s\n", message);
694#ifdef _WIN32 755#ifdef _WIN32
695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 756 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
696#endif 757#endif
697 exit (1); 758 _exit (1);
698 759
760void
761_exit (int retval)
762 CODE:
763 _exit (retval);
764
699MODULE = CFClient PACKAGE = CFClient::Font 765MODULE = CFPlus PACKAGE = CFPlus::Font
700 766
701CFClient::Font 767CFPlus::Font
702new_from_file (SV *class, char *path, int id = 0) 768new_from_file (SV *class, char *path, int id = 0)
703 CODE: 769 CODE:
704{ 770{
705 int count; 771 int count;
706 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 772 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
709} 775}
710 OUTPUT: 776 OUTPUT:
711 RETVAL 777 RETVAL
712 778
713void 779void
714DESTROY (CFClient::Font self) 780DESTROY (CFPlus::Font self)
715 CODE: 781 CODE:
716 pango_font_description_free (self); 782 pango_font_description_free (self);
717 783
718void 784void
719make_default (CFClient::Font self) 785make_default (CFPlus::Font self)
720 CODE: 786 CODE:
721 default_font = self; 787 default_font = self;
722 788
723MODULE = CFClient PACKAGE = CFClient::Layout 789MODULE = CFPlus PACKAGE = CFPlus::Layout
724 790
725CFClient::Layout 791void
726new (SV *class, int rgba = 0) 792reset_glyph_cache ()
727 CODE: 793 CODE:
728#if _WIN32 794 tc_clear ();
729 rgba = 0;//D 795
730#endif 796CFPlus::Layout
797new (SV *class)
798 CODE:
731 New (0, RETVAL, 1, struct cf_layout); 799 New (0, RETVAL, 1, struct cf_layout);
732 800
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 801 RETVAL->pl = pango_layout_new (opengl_context);
734 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 802 RETVAL->r = 1.;
736 RETVAL->g = 1.; 803 RETVAL->g = 1.;
737 RETVAL->b = 1.; 804 RETVAL->b = 1.;
738 RETVAL->a = 1.; 805 RETVAL->a = 1.;
739 RETVAL->base_height = MIN_FONT_HEIGHT; 806 RETVAL->base_height = MIN_FONT_HEIGHT;
743 layout_update_font (RETVAL); 810 layout_update_font (RETVAL);
744 OUTPUT: 811 OUTPUT:
745 RETVAL 812 RETVAL
746 813
747void 814void
748DESTROY (CFClient::Layout self) 815DESTROY (CFPlus::Layout self)
749 CODE: 816 CODE:
750 g_object_unref (self->pl); 817 g_object_unref (self->pl);
751 Safefree (self); 818 Safefree (self);
752 819
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
760void 820void
761set_text (CFClient::Layout self, SV *text_) 821set_text (CFPlus::Layout self, SV *text_)
762 CODE: 822 CODE:
763{ 823{
764 STRLEN textlen; 824 STRLEN textlen;
765 char *text = SvPVutf8 (text_, textlen); 825 char *text = SvPVutf8 (text_, textlen);
766 826
767 pango_layout_set_text (self->pl, text, textlen); 827 pango_layout_set_text (self->pl, text, textlen);
768} 828}
769 829
770void 830void
771set_markup (CFClient::Layout self, SV *text_) 831set_markup (CFPlus::Layout self, SV *text_)
772 CODE: 832 CODE:
773{ 833{
774 STRLEN textlen; 834 STRLEN textlen;
775 char *text = SvPVutf8 (text_, textlen); 835 char *text = SvPVutf8 (text_, textlen);
776 836
777 pango_layout_set_markup (self->pl, text, textlen); 837 pango_layout_set_markup (self->pl, text, textlen);
778} 838}
779 839
840void
841set_shapes (CFPlus::Layout self, ...)
842 CODE:
843{
844 PangoAttrList *attrs = 0;
845 const char *text = pango_layout_get_text (self->pl);
846 const char *pos = text;
847 int arg = 4;
848
849 while (arg < items && (pos = strstr (pos, OBJ_STR)))
850 {
851 PangoRectangle inkrect, rect;
852 PangoAttribute *attr;
853
854 int x = SvIV (ST (arg - 3));
855 int y = SvIV (ST (arg - 2));
856 int w = SvIV (ST (arg - 1));
857 int h = SvIV (ST (arg ));
858
859 inkrect.x = 0;
860 inkrect.y = 0;
861 inkrect.width = 0;
862 inkrect.height = 0;
863
864 rect.x = x * PANGO_SCALE;
865 rect.y = y * PANGO_SCALE;
866 rect.width = w * PANGO_SCALE;
867 rect.height = h * PANGO_SCALE;
868
869 if (!attrs)
870 attrs = pango_layout_get_attributes (self->pl);
871
872 attr = pango_attr_shape_new (&inkrect, &rect);
873 attr->start_index = pos - text;
874 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
875 pango_attr_list_insert (attrs, attr);
876
877 arg += 4;
878 pos += sizeof (OBJ_STR) - 1;
879 }
880
881 if (attrs)
882 pango_layout_set_attributes (self->pl, attrs);
883}
884
885void
886get_shapes (CFPlus::Layout self)
887 PPCODE:
888{
889 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
890
891 do
892 {
893 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
894
895 if (run && shape_attr_p (run))
896 {
897 PangoRectangle extents;
898 pango_layout_iter_get_run_extents (iter, 0, &extents);
899
900 EXTEND (SP, 2);
901 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
902 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
903 }
904 }
905 while (pango_layout_iter_next_run (iter));
906
907 pango_layout_iter_free (iter);
908}
909
910int
911has_wrapped (CFPlus::Layout self)
912 CODE:
913{
914 int lines = 1;
915 const char *text = pango_layout_get_text (self->pl);
916
917 while (*text)
918 lines += *text++ == '\n';
919
920 RETVAL = lines < pango_layout_get_line_count (self->pl);
921}
922 OUTPUT:
923 RETVAL
924
780SV * 925SV *
781get_text (CFClient::Layout self) 926get_text (CFPlus::Layout self)
782 CODE: 927 CODE:
783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 928 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784 SvUTF8_on (RETVAL); 929 sv_utf8_decode (RETVAL);
785 OUTPUT: 930 OUTPUT:
786 RETVAL 931 RETVAL
787 932
788void 933void
789set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 934set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
790 CODE: 935 CODE:
791 self->r = r; 936 self->r = r;
792 self->g = g; 937 self->g = g;
793 self->b = b; 938 self->b = b;
794 self->a = a; 939 self->a = a;
795 940
796void 941void
797set_font (CFClient::Layout self, CFClient::Font font = 0) 942set_font (CFPlus::Layout self, CFPlus::Font font = 0)
798 CODE: 943 CODE:
799 if (self->font != font) 944 if (self->font != font)
800 { 945 {
801 self->font = font; 946 self->font = font;
802 layout_update_font (self); 947 layout_update_font (self);
803 } 948 }
804 949
805void 950void
806set_height (CFClient::Layout self, int base_height) 951set_height (CFPlus::Layout self, int base_height)
807 CODE: 952 CODE:
808 if (self->base_height != base_height) 953 if (self->base_height != base_height)
809 { 954 {
810 self->base_height = base_height; 955 self->base_height = base_height;
811 layout_update_font (self); 956 layout_update_font (self);
812 } 957 }
813 958
814void 959void
815set_width (CFClient::Layout self, int max_width = -1) 960set_width (CFPlus::Layout self, int max_width = -1)
816 CODE: 961 CODE:
817 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 962 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
818 963
819void 964void
820set_indent (CFClient::Layout self, int indent) 965set_indent (CFPlus::Layout self, int indent)
821 CODE: 966 CODE:
822 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 967 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823 968
824void 969void
825set_spacing (CFClient::Layout self, int spacing) 970set_spacing (CFPlus::Layout self, int spacing)
826 CODE: 971 CODE:
827 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 972 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828 973
829void 974void
830set_ellipsise (CFClient::Layout self, int ellipsise) 975set_ellipsise (CFPlus::Layout self, int ellipsise)
831 CODE: 976 CODE:
832 pango_layout_set_ellipsize (self->pl, 977 pango_layout_set_ellipsize (self->pl,
833 ellipsise == 1 ? PANGO_ELLIPSIZE_START 978 ellipsise == 1 ? PANGO_ELLIPSIZE_START
834 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 979 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 980 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
836 : PANGO_ELLIPSIZE_NONE 981 : PANGO_ELLIPSIZE_NONE
837 ); 982 );
838 983
839void 984void
840set_single_paragraph_mode (CFClient::Layout self, int spm) 985set_single_paragraph_mode (CFPlus::Layout self, int spm)
841 CODE: 986 CODE:
842 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 987 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843 988
844void 989void
845size (CFClient::Layout self) 990size (CFPlus::Layout self)
846 PPCODE: 991 PPCODE:
847{ 992{
848 int w, h; 993 int w, h;
849 994
850 layout_get_pixel_size (self, &w, &h); 995 layout_get_pixel_size (self, &w, &h);
853 PUSHs (sv_2mortal (newSViv (w))); 998 PUSHs (sv_2mortal (newSViv (w)));
854 PUSHs (sv_2mortal (newSViv (h))); 999 PUSHs (sv_2mortal (newSViv (h)));
855} 1000}
856 1001
857int 1002int
1003descent (CFPlus::Layout self)
1004 CODE:
1005{
1006 PangoRectangle rect;
1007 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1008 pango_layout_line_get_pixel_extents (line, 0, &rect);
1009 RETVAL = PANGO_DESCENT (rect);
1010}
1011 OUTPUT:
1012 RETVAL
1013
1014int
858xy_to_index (CFClient::Layout self, int x, int y) 1015xy_to_index (CFPlus::Layout self, int x, int y)
859 CODE: 1016 CODE:
860{ 1017{
861 int index, trailing; 1018 int index, trailing;
862 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1019 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
863 RETVAL = index; 1020 RETVAL = index;
864} 1021}
865 OUTPUT: 1022 OUTPUT:
866 RETVAL 1023 RETVAL
867 1024
868void 1025void
869cursor_pos (CFClient::Layout self, int index) 1026cursor_pos (CFPlus::Layout self, int index)
870 PPCODE: 1027 PPCODE:
871{ 1028{
872 PangoRectangle strong_pos; 1029 PangoRectangle strong_pos;
873 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1030 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
874 1031
877 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1035 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879} 1036}
880 1037
881void 1038void
882render (CFClient::Layout self) 1039render (CFPlus::Layout self, float x, float y, int flags = 0)
883 PPCODE: 1040 PPCODE:
884{ 1041 pango_opengl_render_layout_subpixel (
885 SV *retval; 1042 self->pl,
886 int w, h; 1043 x * PANGO_SCALE, y * PANGO_SCALE,
1044 self->r, self->g, self->b, self->a,
1045 flags
1046 );
887 1047
888 layout_get_pixel_size (self, &w, &h); 1048MODULE = CFPlus PACKAGE = CFPlus::Texture
889 1049
890 if (self->rgba) 1050void
1051pad2pot (SV *data_, SV *w_, SV *h_)
1052 CODE:
1053{
1054 int ow = SvIV (w_);
1055 int oh = SvIV (h_);
1056
1057 if (ow && oh)
891 { 1058 {
892 cairo_surface_t *surface; 1059 int nw = minpot (ow);
893 cairo_t *cairo; 1060 int nh = minpot (oh);
894 1061
895 retval = newSV (w * h * 4); 1062 if (nw != ow || nh != oh)
896 SvPOK_only (retval);
897 SvCUR_set (retval, w * h * 4);
898
899 memset (SvPVX (retval), 0, w * h * 4);
900
901 surface = cairo_image_surface_create_for_data (
902 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
903 cairo = cairo_create (surface);
904 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
905
906 pango_cairo_show_layout (cairo, self->pl);
907
908 cairo_destroy (cairo);
909 cairo_surface_destroy (surface);
910
911 // what a mess, and its premultiplied, too :(
912 { 1063 {
913 uint32_t *p = (uint32_t *)SvPVX (retval); 1064 if (SvOK (data_))
914 uint32_t *e = p + w * h;
915
916 while (p < e)
917 { 1065 {
918 uint32_t rgba = *p; 1066 STRLEN datalen;
919 rgba = (rgba >> 24) | (rgba << 8); 1067 char *data = SvPVbyte (data_, datalen);
920#if 0 1068 int bpp = datalen / (ow * oh);
921#ifdef _WIN32 1069 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
922 {//D
923 uint8_t r = rgba >> 24;
924 uint8_t g = rgba >> 16;
925 uint8_t b = rgba >> 8;
926 uint8_t a = rgba >> 0;
927 1070
928 rgba = (rgba & 0xffffff00) | a; 1071 SvPOK_only (result_);
1072 SvCUR_set (result_, nw * nh * bpp);
1073
1074 memset (SvPVX (result_), 0, nw * nh * bpp);
1075 while (oh--)
1076 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1077
1078 sv_setsv (data_, result_);
929 } 1079 }
930#endif 1080
931#endif 1081 sv_setiv (w_, nw);
932 rgba = SDL_SwapBE32 (rgba); 1082 sv_setiv (h_, nh);
933 *p++ = rgba;
934 } 1083 }
935 }
936
937 EXTEND (SP, 5);
938 PUSHs (sv_2mortal (newSViv (w)));
939 PUSHs (sv_2mortal (newSViv (h)));
940 PUSHs (sv_2mortal (retval));
941 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 } 1084 }
944 else
945 {
946 FT_Bitmap bitmap;
947
948 retval = newSV (w * h);
949 SvPOK_only (retval);
950 SvCUR_set (retval, w * h);
951
952 bitmap.rows = h;
953 bitmap.width = w;
954 bitmap.pitch = w;
955 bitmap.buffer = (unsigned char*)SvPVX (retval);
956 bitmap.num_grays = 256;
957 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
958
959 memset (bitmap.buffer, 0, w * h);
960
961 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
962
963 EXTEND (SP, 5);
964 PUSHs (sv_2mortal (newSViv (w)));
965 PUSHs (sv_2mortal (newSViv (h)));
966 PUSHs (sv_2mortal (retval));
967 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
968 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
969 }
970} 1085}
971 1086
972MODULE = CFClient PACKAGE = CFClient::Texture
973
974void 1087void
975draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1088draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
976 PROTOTYPE: $$$;$$ 1089 PROTOTYPE: $$$;$$
977 ALIAS: 1090 ALIAS:
978 draw_quad_alpha = 1 1091 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2 1092 draw_quad_alpha_premultiplied = 2
980 CODE: 1093 CODE:
981{ 1094{
982 HV *hv = (HV *)SvRV (self); 1095 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1096 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1097 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1098 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 1099
988 if (items < 5) 1100 if (items < 5)
989 { 1101 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1102 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1103 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 1104 }
993 1105
994 if (ix) 1106 if (ix)
995 { 1107 {
996 glEnable (GL_BLEND); 1108 glEnable (GL_BLEND);
1109
1110 if (ix == 2)
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1111 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1112 else
1113 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1114 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1115
998 glEnable (GL_ALPHA_TEST); 1116 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1117 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1118 }
1001 1119
1002 glBindTexture (GL_TEXTURE_2D, name); 1120 glBindTexture (GL_TEXTURE_2D, name);
1003
1004 if (wrap_mode)
1005 {
1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008 }
1009 1121
1010 glBegin (GL_QUADS); 1122 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1123 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1124 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1125 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1019 glDisable (GL_ALPHA_TEST); 1131 glDisable (GL_ALPHA_TEST);
1020 glDisable (GL_BLEND); 1132 glDisable (GL_BLEND);
1021 } 1133 }
1022} 1134}
1023 1135
1024MODULE = CFClient PACKAGE = CFClient::Map 1136MODULE = CFPlus PACKAGE = CFPlus::Map
1025 1137
1026CFClient::Map 1138CFPlus::Map
1027new (SV *class, int map_width, int map_height) 1139new (SV *class, int map_width, int map_height)
1028 CODE: 1140 CODE:
1029 New (0, RETVAL, 1, struct map); 1141 New (0, RETVAL, 1, struct map);
1030 RETVAL->x = 0; 1142 RETVAL->x = 0;
1031 RETVAL->y = 0; 1143 RETVAL->y = 0;
1041 RETVAL->row = 0; 1153 RETVAL->row = 0;
1042 OUTPUT: 1154 OUTPUT:
1043 RETVAL 1155 RETVAL
1044 1156
1045void 1157void
1046DESTROY (CFClient::Map self) 1158DESTROY (CFPlus::Map self)
1047 CODE: 1159 CODE:
1048{ 1160{
1049 map_clear (self); 1161 map_clear (self);
1050 Safefree (self->face); 1162 Safefree (self->face);
1163 Safefree (self->tex);
1051 Safefree (self); 1164 Safefree (self);
1052} 1165}
1053 1166
1054void 1167void
1055clear (CFClient::Map self) 1168clear (CFPlus::Map self)
1056 CODE: 1169 CODE:
1057 map_clear (self); 1170 map_clear (self);
1058 1171
1059void 1172void
1060set_face (CFClient::Map self, int face, int texid) 1173set_face (CFPlus::Map self, int face, int texid)
1061 CODE: 1174 CODE:
1062{ 1175{
1063 while (self->faces <= face) 1176 while (self->faces <= face)
1064 { 1177 {
1065 Append (mapface, self->face, self->faces, self->faces); 1178 Append (mapface, self->face, self->faces, self->faces);
1068 1181
1069 self->face [face] = texid; 1182 self->face [face] = texid;
1070} 1183}
1071 1184
1072void 1185void
1073set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1186set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1074 CODE: 1187 CODE:
1075{ 1188{
1076 while (self->texs <= texid) 1189 while (self->texs <= texid)
1077 { 1190 {
1078 Append (maptex, self->tex, self->texs, self->texs); 1191 Append (maptex, self->tex, self->texs, self->texs);
1090 tex->r = r; 1203 tex->r = r;
1091 tex->g = g; 1204 tex->g = g;
1092 tex->b = b; 1205 tex->b = b;
1093 tex->a = a; 1206 tex->a = a;
1094 } 1207 }
1208
1209 // somewhat hackish, but for textures that require it, it really
1210 // improves the look, and most others don't suffer.
1211 glBindTexture (GL_TEXTURE_2D, name);
1212 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1213 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1214 // use uglier nearest interpolation because linear suffers
1215 // from transparent color bleeding and ugly wrapping effects.
1216 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095} 1217}
1096 1218
1097int 1219int
1098ox (CFClient::Map self) 1220ox (CFPlus::Map self)
1099 ALIAS: 1221 ALIAS:
1100 oy = 1 1222 oy = 1
1223 x = 2
1224 y = 3
1225 w = 4
1226 h = 5
1101 CODE: 1227 CODE:
1102 switch (ix) 1228 switch (ix)
1103 { 1229 {
1104 case 0: RETVAL = self->ox; break; 1230 case 0: RETVAL = self->ox; break;
1105 case 1: RETVAL = self->oy; break; 1231 case 1: RETVAL = self->oy; break;
1232 case 2: RETVAL = self->x; break;
1233 case 3: RETVAL = self->y; break;
1234 case 4: RETVAL = self->w; break;
1235 case 5: RETVAL = self->h; break;
1106 } 1236 }
1107 OUTPUT: 1237 OUTPUT:
1108 RETVAL 1238 RETVAL
1109 1239
1110void 1240void
1111scroll (CFClient::Map self, int dx, int dy) 1241scroll (CFPlus::Map self, int dx, int dy)
1112 CODE: 1242 CODE:
1113{ 1243{
1114 if (dx > 0) 1244 if (dx > 0)
1115 map_blank (self, self->x, self->y, dx - 1, self->h); 1245 map_blank (self, self->x, self->y, dx - 1, self->h);
1116 else if (dx < 0) 1246 else if (dx < 0)
1132 self->y += MAP_EXTEND_Y; 1262 self->y += MAP_EXTEND_Y;
1133 } 1263 }
1134} 1264}
1135 1265
1136void 1266void
1137map1a_update (CFClient::Map self, SV *data_) 1267map1a_update (CFPlus::Map self, SV *data_)
1138 CODE: 1268 CODE:
1139{ 1269{
1140 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1270 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1141 uint8_t *data_end = (uint8_t *)SvEND (data_); 1271 uint8_t *data_end = (uint8_t *)SvEND (data_);
1142 mapcell *cell; 1272 mapcell *cell;
1144 1274
1145 while (data < data_end) 1275 while (data < data_end)
1146 { 1276 {
1147 flags = (data [0] << 8) + data [1]; data += 2; 1277 flags = (data [0] << 8) + data [1]; data += 2;
1148 1278
1149 x = ((flags >> 10) & 63) + self->x; 1279 x = self->x + ((flags >> 10) & 63);
1150 y = ((flags >> 4) & 63) + self->y; 1280 y = self->y + ((flags >> 4) & 63);
1151 1281
1152 cell = map_get_cell (self, x, y); 1282 cell = map_get_cell (self, x, y);
1153 1283
1154 if (flags & 15) 1284 if (flags & 15)
1155 { 1285 {
1184 cell->darkness = -1; 1314 cell->darkness = -1;
1185 } 1315 }
1186} 1316}
1187 1317
1188SV * 1318SV *
1189mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1319mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1190 CODE: 1320 CODE:
1191{ 1321{
1192 int x1, x; 1322 int x1, x;
1193 int y1, y; 1323 int y1, y;
1194 int z; 1324 int z;
1244} 1374}
1245 OUTPUT: 1375 OUTPUT:
1246 RETVAL 1376 RETVAL
1247 1377
1248void 1378void
1249draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1379draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1250 PPCODE: 1380 CODE:
1251{ 1381{
1252 int vx, vy; 1382 int vx, vy;
1253 int x, y, z; 1383 int x, y, z;
1254 int last_name; 1384 int last_name;
1255 mapface face; 1385 mapface face;
1256 int sw4 = (sw + 3) & ~3;
1257 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1258 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1259 1386
1260 memset (darkness, 255, sw4 * sh);
1261 SvPOK_only (darkness_sv);
1262 SvCUR_set (darkness_sv, sw4 * sh);
1263
1264 vx = self->x + (self->w - sw) / 2 - shift_x; 1387 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1265 vy = self->y + (self->h - sh) / 2 - shift_y; 1388 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1266 1389
1267 /* 1390 /*
1268 int vx = self->vx = self->w >= sw 1391 int vx = self->vx = self->w >= sw
1269 ? self->x + (self->w - sw) / 2 1392 ? self->x + (self->w - sw) / 2
1270 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1393 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1274 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1397 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275 */ 1398 */
1276 1399
1277 glColor4ub (255, 255, 255, 255); 1400 glColor4ub (255, 255, 255, 255);
1278 1401
1402 glEnable (GL_BLEND);
1279 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1403 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280 glEnable (GL_BLEND);
1281 glEnable (GL_TEXTURE_2D); 1404 glEnable (GL_TEXTURE_2D);
1282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1405 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283 1406
1284 glBegin (GL_QUADS); 1407 glBegin (GL_QUADS);
1285 1408
1293 1416
1294 for (x = 0; x < sw; x++) 1417 for (x = 0; x < sw; x++)
1295 if (row->c0 <= x + vx && x + vx < row->c1) 1418 if (row->c0 <= x + vx && x + vx < row->c1)
1296 { 1419 {
1297 mapcell *cell = row->col + (x + vx - row->c0); 1420 mapcell *cell = row->col + (x + vx - row->c0);
1298
1299 darkness[y * sw4 + x] = cell->darkness < 0
1300 ? 255 - FOW_DARKNESS
1301 : 255 - cell->darkness;
1302 1421
1303 face = cell->face [z]; 1422 face = cell->face [z];
1304 1423
1305 if (face) 1424 if (face)
1306 { 1425 {
1327 1446
1328 glEnd (); 1447 glEnd ();
1329 1448
1330 glDisable (GL_TEXTURE_2D); 1449 glDisable (GL_TEXTURE_2D);
1331 glDisable (GL_BLEND); 1450 glDisable (GL_BLEND);
1451}
1452
1453void
1454draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1455 CODE:
1456{
1457 static float color[16][3] = {
1458 { 0.00F, 0.00F, 0.00F },
1459 { 1.00F, 1.00F, 1.00F },
1460 { 0.00F, 0.00F, 0.55F },
1461 { 1.00F, 0.00F, 0.00F },
1462
1463 { 1.00F, 0.54F, 0.00F },
1464 { 0.11F, 0.56F, 1.00F },
1465 { 0.93F, 0.46F, 0.00F },
1466 { 0.18F, 0.54F, 0.34F },
1467
1468 { 0.56F, 0.73F, 0.56F },
1469 { 0.80F, 0.80F, 0.80F },
1470 { 0.55F, 0.41F, 0.13F },
1471 { 0.99F, 0.77F, 0.26F },
1472
1473 { 0.74F, 0.65F, 0.41F },
1474
1475 { 0.00F, 1.00F, 1.00F },
1476 { 1.00F, 0.00F, 1.00F },
1477 { 1.00F, 1.00F, 0.00F },
1478 };
1479
1480 int x, y;
1481
1482 glEnable (GL_TEXTURE_2D);
1483 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1484 glEnable (GL_BLEND);
1485 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1486 glBegin (GL_QUADS);
1487
1488 for (y = 0; y < h; y++)
1489 for (x = 0; x < w; x++)
1490 {
1491 unsigned char m = data [x + y * w];
1492
1493 if (m)
1494 {
1495 float *c = color [m & 15];
1496
1497 float tx1 = m & 0x40 ? 0.5 : 0.;
1498 float tx2 = tx1 + 0.5;
1499
1500 glColor4f (c[0], c[1], c[2], 0.75);
1501 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1502 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1503 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1504 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1505 }
1506 }
1507
1508 glEnd ();
1509 glDisable (GL_BLEND);
1510 glDisable (GL_TEXTURE_2D);
1511}
1512
1513void
1514fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1515 PPCODE:
1516{
1517 int vx, vy;
1518 int x, y;
1519 int sw4 = (sw + 3) & ~3;
1520 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1521 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1522
1523 memset (darkness, 255, sw4 * sh);
1524 SvPOK_only (darkness_sv);
1525 SvCUR_set (darkness_sv, sw4 * sh);
1526
1527 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1528 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1529
1530 for (y = 0; y < sh; y++)
1531 if (0 <= y + vy && y + vy < self->rows)
1532 {
1533 maprow *row = self->row + (y + vy);
1534
1535 for (x = 0; x < sw; x++)
1536 if (row->c0 <= x + vx && x + vx < row->c1)
1537 {
1538 mapcell *cell = row->col + (x + vx - row->c0);
1539
1540 darkness[y * sw4 + x] = cell->darkness < 0
1541 ? 255 - FOW_DARKNESS
1542 : 255 - cell->darkness;
1543 }
1544 }
1332 1545
1333 EXTEND (SP, 3); 1546 EXTEND (SP, 3);
1334 PUSHs (sv_2mortal (newSViv (sw4))); 1547 PUSHs (sv_2mortal (newSViv (sw4)));
1335 PUSHs (sv_2mortal (newSViv (sh))); 1548 PUSHs (sv_2mortal (newSViv (sh)));
1336 PUSHs (darkness_sv); 1549 PUSHs (darkness_sv);
1337} 1550}
1338 1551
1339SV * 1552SV *
1340get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1553get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1341 CODE: 1554 CODE:
1342{ 1555{
1343 int x, y, x1, y1; 1556 int x, y, x1, y1;
1344 SV *data_sv = newSV (w * h * 7 + 5); 1557 SV *data_sv = newSV (w * h * 7 + 5);
1345 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1558 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1407} 1620}
1408 OUTPUT: 1621 OUTPUT:
1409 RETVAL 1622 RETVAL
1410 1623
1411void 1624void
1412set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1625set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1413 PPCODE: 1626 PPCODE:
1414{ 1627{
1415 int x, y, z; 1628 int x, y, z;
1416 int w, h; 1629 int w, h;
1417 int x1, y1; 1630 int x1, y1;
1466 } 1679 }
1467 } 1680 }
1468 } 1681 }
1469} 1682}
1470 1683
1471MODULE = CFClient PACKAGE = CFClient::MixChunk 1684MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1472 1685
1473CFClient::MixChunk 1686CFPlus::MixChunk
1474new_from_file (SV *class, char *path) 1687new_from_file (SV *class, char *path)
1475 CODE: 1688 CODE:
1476 RETVAL = Mix_LoadWAV (path); 1689 RETVAL = Mix_LoadWAV (path);
1477 OUTPUT: 1690 OUTPUT:
1478 RETVAL 1691 RETVAL
1479 1692
1480void 1693void
1481DESTROY (CFClient::MixChunk self) 1694DESTROY (CFPlus::MixChunk self)
1482 CODE: 1695 CODE:
1483 Mix_FreeChunk (self); 1696 Mix_FreeChunk (self);
1484 1697
1485int 1698int
1486volume (CFClient::MixChunk self, int volume = -1) 1699volume (CFPlus::MixChunk self, int volume = -1)
1487 CODE: 1700 CODE:
1488 RETVAL = Mix_VolumeChunk (self, volume); 1701 RETVAL = Mix_VolumeChunk (self, volume);
1489 OUTPUT: 1702 OUTPUT:
1490 RETVAL 1703 RETVAL
1491 1704
1492int 1705int
1493play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1706play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1494 CODE: 1707 CODE:
1495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1708 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1496 OUTPUT: 1709 OUTPUT:
1497 RETVAL 1710 RETVAL
1498 1711
1499MODULE = CFClient PACKAGE = CFClient::MixMusic 1712MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1500 1713
1501int 1714int
1502volume (int volume = -1) 1715volume (int volume = -1)
1503 CODE: 1716 CODE:
1504 RETVAL = Mix_VolumeMusic (volume); 1717 RETVAL = Mix_VolumeMusic (volume);
1505 OUTPUT: 1718 OUTPUT:
1506 RETVAL 1719 RETVAL
1507 1720
1508CFClient::MixMusic 1721CFPlus::MixMusic
1509new_from_file (SV *class, char *path) 1722new_from_file (SV *class, char *path)
1510 CODE: 1723 CODE:
1511 RETVAL = Mix_LoadMUS (path); 1724 RETVAL = Mix_LoadMUS (path);
1512 OUTPUT: 1725 OUTPUT:
1513 RETVAL 1726 RETVAL
1514 1727
1515void 1728void
1516DESTROY (CFClient::MixMusic self) 1729DESTROY (CFPlus::MixMusic self)
1517 CODE: 1730 CODE:
1518 Mix_FreeMusic (self); 1731 Mix_FreeMusic (self);
1519 1732
1520int 1733int
1521play (CFClient::MixMusic self, int loops = -1) 1734play (CFPlus::MixMusic self, int loops = -1)
1522 CODE: 1735 CODE:
1523 RETVAL = Mix_PlayMusic (self, loops); 1736 RETVAL = Mix_PlayMusic (self, loops);
1524 OUTPUT: 1737 OUTPUT:
1525 RETVAL 1738 RETVAL
1526 1739
1527MODULE = CFClient PACKAGE = CFClient::OpenGL 1740MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1528 1741
1529BOOT: 1742BOOT:
1530{ 1743{
1531 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1744 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1532 static const struct { 1745 static const struct {
1533 const char *name; 1746 const char *name;
1534 IV iv; 1747 IV iv;
1535 } *civ, const_iv[] = { 1748 } *civ, const_iv[] = {
1536# define const_iv(name) { # name, (IV)name } 1749# define const_iv(name) { # name, (IV)name }
1543 const_iv (GL_SCISSOR_TEST), 1756 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST), 1757 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST), 1758 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE), 1759 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL), 1760 const_iv (GL_RESCALE_NORMAL),
1761 const_iv (GL_FRONT),
1762 const_iv (GL_BACK),
1548 const_iv (GL_AND), 1763 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1764 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1765 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1766 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1767 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1768 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1769 const_iv (GL_ONE_MINUS_DST_ALPHA),
1770 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1771 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1772 const_iv (GL_RGBA),
1773 const_iv (GL_RGBA4),
1774 const_iv (GL_RGBA8),
1775 const_iv (GL_RGB5_A1),
1557 const_iv (GL_UNSIGNED_BYTE), 1776 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1777 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1778 const_iv (GL_UNSIGNED_INT),
1560 const_iv (GL_ALPHA), 1779 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY), 1780 const_iv (GL_INTENSITY),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1789 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1790 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1791 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1792 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1793 const_iv (GL_TEXTURE_WRAP_T),
1794 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1795 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1796 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1797 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1798 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1799 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1800 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1801 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1592 const_iv (GL_SEPARABLE_2D), 1812 const_iv (GL_SEPARABLE_2D),
1593 const_iv (GL_CONVOLUTION_2D), 1813 const_iv (GL_CONVOLUTION_2D),
1594 const_iv (GL_CONVOLUTION_BORDER_MODE), 1814 const_iv (GL_CONVOLUTION_BORDER_MODE),
1595 const_iv (GL_CONSTANT_BORDER), 1815 const_iv (GL_CONSTANT_BORDER),
1596 const_iv (GL_LINES), 1816 const_iv (GL_LINES),
1817 const_iv (GL_LINE_STRIP),
1597 const_iv (GL_LINE_LOOP), 1818 const_iv (GL_LINE_LOOP),
1598 const_iv (GL_QUADS), 1819 const_iv (GL_QUADS),
1599 const_iv (GL_QUAD_STRIP), 1820 const_iv (GL_QUAD_STRIP),
1600 const_iv (GL_TRIANGLES), 1821 const_iv (GL_TRIANGLES),
1601 const_iv (GL_TRIANGLE_STRIP), 1822 const_iv (GL_TRIANGLE_STRIP),
1611 1832
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1833 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1834 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1835}
1615 1836
1837char *
1838gl_vendor ()
1839 CODE:
1840 RETVAL = (char *)glGetString (GL_VENDOR);
1841 OUTPUT:
1842 RETVAL
1843
1844char *
1845gl_version ()
1846 CODE:
1847 RETVAL = (char *)glGetString (GL_VERSION);
1848 OUTPUT:
1849 RETVAL
1850
1851char *
1852gl_extensions ()
1853 CODE:
1854 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1855 OUTPUT:
1856 RETVAL
1857
1616int glGetError () 1858int glGetError ()
1859
1860void glFinish ()
1617 1861
1618void glClear (int mask) 1862void glClear (int mask)
1619 1863
1620void glClearColor (float r, float g, float b, float a = 1.0) 1864void glClearColor (float r, float g, float b, float a = 1.0)
1621 PROTOTYPE: @ 1865 PROTOTYPE: @
1628 1872
1629void glHint (int target, int mode) 1873void glHint (int target, int mode)
1630 1874
1631void glBlendFunc (int sfactor, int dfactor) 1875void glBlendFunc (int sfactor, int dfactor)
1632 1876
1877void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1878 CODE:
1879 gl_BlendFuncSeparate (sa, da, saa, daa);
1880
1633void glDepthMask (int flag) 1881void glDepthMask (int flag)
1634 1882
1635void glLogicOp (int opcode) 1883void glLogicOp (int opcode)
1636 1884
1637void glColorMask (int red, int green, int blue, int alpha) 1885void glColorMask (int red, int green, int blue, int alpha)
1641void glPushMatrix () 1889void glPushMatrix ()
1642 1890
1643void glPopMatrix () 1891void glPopMatrix ()
1644 1892
1645void glLoadIdentity () 1893void glLoadIdentity ()
1894
1895void glDrawBuffer (int buffer)
1896
1897void glReadBuffer (int buffer)
1646 1898
1647# near_ and far_ are due to microsofts buggy "c" compiler 1899# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1900void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649 1901
1650# near_ and far_ are due to microsofts buggy "c" compiler 1902# near_ and far_ are due to microsofts buggy "c" compiler
1670 1922
1671void glEnd () 1923void glEnd ()
1672 1924
1673void glColor (float r, float g, float b, float a = 1.0) 1925void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 1926 PROTOTYPE: @
1927 ALIAS:
1928 glColor_premultiply = 1
1675 CODE: 1929 CODE:
1930 if (ix)
1931 {
1932 r *= a;
1933 g *= a;
1934 b *= a;
1935 }
1676 // microsoft visual "c" rounds instead of truncating... 1936 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 1937 glColor4f (r, g, b, a);
1678 MIN ((int)(g * 255.f), 255),
1679 MIN ((int)(b * 255.f), 255),
1680 MIN ((int)(a * 255.f), 255));
1681 1938
1682void glInterleavedArrays (int format, int stride, char *data) 1939void glInterleavedArrays (int format, int stride, char *data)
1683 1940
1684void glDrawElements (int mode, int count, int type, char *indices) 1941void glDrawElements (int mode, int count, int type, char *indices)
1685 1942
1708 1965
1709void glBindTexture (int target, int name) 1966void glBindTexture (int target, int name)
1710 1967
1711void glConvolutionParameter (int target, int pname, float params) 1968void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 1969 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1970 if (gl.ConvolutionParameterf)
1971 gl.ConvolutionParameterf (target, pname, params);
1714 1972
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1973void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 1974 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1975 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 1976 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 1977
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1978void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 1979 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1980 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 1981 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 1982
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1983void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 1984
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1985void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 1986
1761 2019
1762void glEndList () 2020void glEndList ()
1763 2021
1764void glCallList (int list) 2022void glCallList (int list)
1765 2023
1766

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines