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.138 by root, Mon Aug 14 01:21:01 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{
113 pango_layout_get_pixel_size (self->pl, w, h); 149 pango_layout_get_pixel_size (self->pl, w, h);
114 150
115 if (!*w) *w = 1; 151 if (!*w) *w = 1;
116 if (!*h) *h = 1; 152 if (!*h) *h = 1;
146 int texs; 182 int texs;
147 maptex *tex; 183 maptex *tex;
148 184
149 int32_t rows; 185 int32_t rows;
150 maprow *row; 186 maprow *row;
151} *CFClient__Map; 187} *CFPlus__Map;
152 188
153static char * 189static char *
154prepend (char *ptr, int sze, int inc) 190prepend (char *ptr, int sze, int inc)
155{ 191{
156 char *p; 192 char *p;
174 210
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 211#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)) 212#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 213
178static maprow * 214static maprow *
179map_get_row (CFClient__Map self, int y) 215map_get_row (CFPlus__Map self, int y)
180{ 216{
181 if (0 > y) 217 if (0 > y)
182 { 218 {
183 int extend = - y + MAP_EXTEND_Y; 219 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 220 Prepend (maprow, self->row, self->rows, extend);
222 258
223 return row->col + (x - row->c0); 259 return row->col + (x - row->c0);
224} 260}
225 261
226static mapcell * 262static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 263map_get_cell (CFPlus__Map self, int x, int y)
228{ 264{
229 return row_get_cell (map_get_row (self, y), x); 265 return row_get_cell (map_get_row (self, y), x);
230} 266}
231 267
232static void 268static void
233map_clear (CFClient__Map self) 269map_clear (CFPlus__Map self)
234{ 270{
235 int r; 271 int r;
236 272
237 for (r = 0; r < self->rows; r++) 273 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 274 Safefree (self->row[r].col);
246 self->row = 0; 282 self->row = 0;
247 self->rows = 0; 283 self->rows = 0;
248} 284}
249 285
250static void 286static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 287map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 288{
253 int x, y; 289 int x, y;
254 maprow *row; 290 maprow *row;
255 291
256 for (y = y0; y < y0 + h; y++) 292 for (y = y0; y < y0 + h; y++)
296 ev.data2 = 0; 332 ev.data2 = 0;
297 333
298 SDL_PushEvent ((SDL_Event *)&ev); 334 SDL_PushEvent ((SDL_Event *)&ev);
299} 335}
300 336
337static unsigned int
338minpot (unsigned int n)
339{
340 if (!n)
341 return 0;
342
343 --n;
344
345 n |= n >> 1;
346 n |= n >> 2;
347 n |= n >> 4;
348 n |= n >> 8;
349 n |= n >> 16;
350
351 return n + 1;
352}
353
301MODULE = CFClient PACKAGE = CFClient 354MODULE = CFPlus PACKAGE = CFPlus
302 355
303PROTOTYPES: ENABLE 356PROTOTYPES: ENABLE
304 357
305BOOT: 358BOOT:
306{ 359{
307 HV *stash = gv_stashpv ("CFClient", 1); 360 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 361 static const struct {
309 const char *name; 362 const char *name;
310 IV iv; 363 IV iv;
311 } *civ, const_iv[] = { 364 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 365# define const_iv(name) { # name, (IV)name }
413 466
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 467 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 469}
417 470
471int
472in_destruct ()
473 CODE:
474 RETVAL = PL_main_cv == Nullcv;
475 OUTPUT:
476 RETVAL
477
478NV floor (NV x)
479
480NV ceil (NV x)
481
418void 482void
419pango_init () 483pango_init ()
420 CODE: 484 CODE:
421{ 485{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 486 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 487 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); 488 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} 489}
430 490
431int 491int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 493
434void 494void
435SDL_Quit () 495SDL_Quit ()
436 496
437void 497void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 507
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 510
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 515
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10)
518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif
457 521
458 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 524
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 543SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 544 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 545 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 547 );
548 if (RETVAL)
549 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 550 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
551# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
552# include "glfunc.h"
553# undef GL_FUNC
554 }
485 OUTPUT: 555 OUTPUT:
486 RETVAL 556 RETVAL
487 557
488void 558void
489SDL_GL_SwapBuffers () 559SDL_GL_SwapBuffers ()
560
561char *
562SDL_GetKeyName (int sym)
490 563
491void 564void
492SDL_PollEvent () 565SDL_PollEvent ()
493 PPCODE: 566 PPCODE:
494{ 567{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 588 break;
516 589
517 case SDL_MOUSEMOTION: 590 case SDL_MOUSEMOTION:
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 598 break;
524 599
525 case SDL_MOUSEBUTTONDOWN: 600 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 601 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
603
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 604 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 608 break;
535 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 612 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 613 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537 break; 614 break;
538 } 615 }
539 616
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541 } 618 }
542} 619}
543 620
544int 621int
545Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 622Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
558 CODE: 635 CODE:
559#ifndef _WIN32 636#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 638#endif
562 639
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 640void
585add_font (char *file) 641add_font (char *file)
586 CODE: 642 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 643 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
588#ifdef _WIN32
589 // cairo... sigh... requires win2000
590 AddFontResourceEx (file, FR_PRIVATE, 0);
591#endif
592 644
593void 645void
594load_image_inline (SV *image_) 646load_image_inline (SV *image_)
595 ALIAS: 647 ALIAS:
596 load_image_file = 1 648 load_image_file = 1
638 690
639 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 691 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
640 692
641 assert (surface2->pitch == surface2->w * 4); 693 assert (surface2->pitch == surface2->w * 4);
642 694
695 SDL_LockSurface (surface2);
643 EXTEND (SP, 5); 696 EXTEND (SP, 6);
644 PUSHs (sv_2mortal (newSViv (surface2->w))); 697 PUSHs (sv_2mortal (newSViv (surface2->w)));
645 PUSHs (sv_2mortal (newSViv (surface2->h))); 698 PUSHs (sv_2mortal (newSViv (surface2->h)));
646 SDL_LockSurface (surface2);
647 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 699 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))); 700 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
650 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 701 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
651 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 702 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
703 SDL_UnlockSurface (surface2);
652 704
653 SDL_FreeSurface (surface); 705 SDL_FreeSurface (surface);
654 SDL_FreeSurface (surface2); 706 SDL_FreeSurface (surface2);
655} 707}
656 708
692 CODE: 744 CODE:
693 fprintf (stderr, "FATAL: %s\n", message); 745 fprintf (stderr, "FATAL: %s\n", message);
694#ifdef _WIN32 746#ifdef _WIN32
695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
696#endif 748#endif
697 exit (1); 749 _exit (1);
698 750
751void
752_exit (int retval)
753 CODE:
754 _exit (retval);
755
699MODULE = CFClient PACKAGE = CFClient::Font 756MODULE = CFPlus PACKAGE = CFPlus::Font
700 757
701CFClient::Font 758CFPlus::Font
702new_from_file (SV *class, char *path, int id = 0) 759new_from_file (SV *class, char *path, int id = 0)
703 CODE: 760 CODE:
704{ 761{
705 int count; 762 int count;
706 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
709} 766}
710 OUTPUT: 767 OUTPUT:
711 RETVAL 768 RETVAL
712 769
713void 770void
714DESTROY (CFClient::Font self) 771DESTROY (CFPlus::Font self)
715 CODE: 772 CODE:
716 pango_font_description_free (self); 773 pango_font_description_free (self);
717 774
718void 775void
719make_default (CFClient::Font self) 776make_default (CFPlus::Font self)
720 CODE: 777 CODE:
721 default_font = self; 778 default_font = self;
722 779
723MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
724 781
725CFClient::Layout 782void
726new (SV *class, int rgba = 0) 783reset_glyph_cache ()
727 CODE: 784 CODE:
728#if _WIN32 785 tc_clear ();
729 rgba = 0;//D 786
730#endif 787CFPlus::Layout
788new (SV *class)
789 CODE:
731 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
732 791
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 792 RETVAL->pl = pango_layout_new (opengl_context);
734 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 793 RETVAL->r = 1.;
736 RETVAL->g = 1.; 794 RETVAL->g = 1.;
737 RETVAL->b = 1.; 795 RETVAL->b = 1.;
738 RETVAL->a = 1.; 796 RETVAL->a = 1.;
739 RETVAL->base_height = MIN_FONT_HEIGHT; 797 RETVAL->base_height = MIN_FONT_HEIGHT;
743 layout_update_font (RETVAL); 801 layout_update_font (RETVAL);
744 OUTPUT: 802 OUTPUT:
745 RETVAL 803 RETVAL
746 804
747void 805void
748DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
749 CODE: 807 CODE:
750 g_object_unref (self->pl); 808 g_object_unref (self->pl);
751 Safefree (self); 809 Safefree (self);
752 810
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
760void 811void
761set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
762 CODE: 813 CODE:
763{ 814{
764 STRLEN textlen; 815 STRLEN textlen;
765 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
766 817
767 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
768} 819}
769 820
770void 821void
771set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
772 CODE: 823 CODE:
773{ 824{
774 STRLEN textlen; 825 STRLEN textlen;
775 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
776 827
777 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
778} 829}
779 830
831void
832set_shapes (CFPlus::Layout self, ...)
833 CODE:
834{
835 PangoAttrList *attrs = 0;
836 const char *text = pango_layout_get_text (self->pl);
837 const char *pos = text;
838 int arg = 4;
839
840 while (arg < items && (pos = strstr (pos, OBJ_STR)))
841 {
842 PangoRectangle inkrect, rect;
843 PangoAttribute *attr;
844
845 int x = SvIV (ST (arg - 3));
846 int y = SvIV (ST (arg - 2));
847 int w = SvIV (ST (arg - 1));
848 int h = SvIV (ST (arg ));
849
850 inkrect.x = 0;
851 inkrect.y = 0;
852 inkrect.width = 0;
853 inkrect.height = 0;
854
855 rect.x = x * PANGO_SCALE;
856 rect.y = y * PANGO_SCALE;
857 rect.width = w * PANGO_SCALE;
858 rect.height = h * PANGO_SCALE;
859
860 if (!attrs)
861 attrs = pango_layout_get_attributes (self->pl);
862
863 attr = pango_attr_shape_new (&inkrect, &rect);
864 attr->start_index = pos - text;
865 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
866 pango_attr_list_insert (attrs, attr);
867
868 arg += 4;
869 pos += sizeof (OBJ_STR) - 1;
870 }
871
872 if (attrs)
873 pango_layout_set_attributes (self->pl, attrs);
874}
875
876void
877get_shapes (CFPlus::Layout self)
878 PPCODE:
879{
880 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
881
882 do
883 {
884 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
885
886 if (run && shape_attr_p (run))
887 {
888 PangoRectangle extents;
889 pango_layout_iter_get_run_extents (iter, 0, &extents);
890
891 EXTEND (SP, 2);
892 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
893 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
894 }
895 }
896 while (pango_layout_iter_next_run (iter));
897
898 pango_layout_iter_free (iter);
899}
900
901int
902has_wrapped (CFPlus::Layout self)
903 CODE:
904{
905 int lines = 1;
906 const char *text = pango_layout_get_text (self->pl);
907
908 while (*text)
909 lines += *text++ == '\n';
910
911 RETVAL = lines < pango_layout_get_line_count (self->pl);
912}
913 OUTPUT:
914 RETVAL
915
780SV * 916SV *
781get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
782 CODE: 918 CODE:
783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784 SvUTF8_on (RETVAL); 920 sv_utf8_decode (RETVAL);
785 OUTPUT: 921 OUTPUT:
786 RETVAL 922 RETVAL
787 923
788void 924void
789set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 925set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
790 CODE: 926 CODE:
791 self->r = r; 927 self->r = r;
792 self->g = g; 928 self->g = g;
793 self->b = b; 929 self->b = b;
794 self->a = a; 930 self->a = a;
795 931
796void 932void
797set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
798 CODE: 934 CODE:
799 if (self->font != font) 935 if (self->font != font)
800 { 936 {
801 self->font = font; 937 self->font = font;
802 layout_update_font (self); 938 layout_update_font (self);
803 } 939 }
804 940
805void 941void
806set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
807 CODE: 943 CODE:
808 if (self->base_height != base_height) 944 if (self->base_height != base_height)
809 { 945 {
810 self->base_height = base_height; 946 self->base_height = base_height;
811 layout_update_font (self); 947 layout_update_font (self);
812 } 948 }
813 949
814void 950void
815set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
816 CODE: 952 CODE:
817 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 953 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
818 954
819void 955void
820set_indent (CFClient::Layout self, int indent) 956set_indent (CFPlus::Layout self, int indent)
821 CODE: 957 CODE:
822 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 958 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823 959
824void 960void
825set_spacing (CFClient::Layout self, int spacing) 961set_spacing (CFPlus::Layout self, int spacing)
826 CODE: 962 CODE:
827 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 963 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828 964
829void 965void
830set_ellipsise (CFClient::Layout self, int ellipsise) 966set_ellipsise (CFPlus::Layout self, int ellipsise)
831 CODE: 967 CODE:
832 pango_layout_set_ellipsize (self->pl, 968 pango_layout_set_ellipsize (self->pl,
833 ellipsise == 1 ? PANGO_ELLIPSIZE_START 969 ellipsise == 1 ? PANGO_ELLIPSIZE_START
834 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 970 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 971 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
836 : PANGO_ELLIPSIZE_NONE 972 : PANGO_ELLIPSIZE_NONE
837 ); 973 );
838 974
839void 975void
840set_single_paragraph_mode (CFClient::Layout self, int spm) 976set_single_paragraph_mode (CFPlus::Layout self, int spm)
841 CODE: 977 CODE:
842 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 978 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843 979
844void 980void
845size (CFClient::Layout self) 981size (CFPlus::Layout self)
846 PPCODE: 982 PPCODE:
847{ 983{
848 int w, h; 984 int w, h;
849 985
850 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
853 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
854 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
855} 991}
856 992
857int 993int
994descent (CFPlus::Layout self)
995 CODE:
996{
997 PangoRectangle rect;
998 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
999 pango_layout_line_get_pixel_extents (line, 0, &rect);
1000 RETVAL = PANGO_DESCENT (rect);
1001}
1002 OUTPUT:
1003 RETVAL
1004
1005int
858xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
859 CODE: 1007 CODE:
860{ 1008{
861 int index, trailing; 1009 int index, trailing;
862 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
863 RETVAL = index; 1011 RETVAL = index;
864} 1012}
865 OUTPUT: 1013 OUTPUT:
866 RETVAL 1014 RETVAL
867 1015
868void 1016void
869cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
870 PPCODE: 1018 PPCODE:
871{ 1019{
872 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
873 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
874 1022
877 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879} 1027}
880 1028
881void 1029void
882render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y, int flags = 0)
883 PPCODE: 1031 PPCODE:
884{ 1032 pango_opengl_render_layout_subpixel (
885 SV *retval; 1033 self->pl,
886 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
1035 self->r, self->g, self->b, self->a,
1036 flags
1037 );
887 1038
888 layout_get_pixel_size (self, &w, &h); 1039MODULE = CFPlus PACKAGE = CFPlus::Texture
889 1040
890 if (self->rgba) 1041void
1042pad2pot (SV *data_, SV *w_, SV *h_)
1043 CODE:
1044{
1045 int ow = SvIV (w_);
1046 int oh = SvIV (h_);
1047
1048 if (ow && oh)
891 { 1049 {
892 cairo_surface_t *surface; 1050 int nw = minpot (ow);
893 cairo_t *cairo; 1051 int nh = minpot (oh);
894 1052
895 retval = newSV (w * h * 4); 1053 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 { 1054 {
913 uint32_t *p = (uint32_t *)SvPVX (retval); 1055 if (SvOK (data_))
914 uint32_t *e = p + w * h;
915
916 while (p < e)
917 { 1056 {
918 uint32_t rgba = *p; 1057 STRLEN datalen;
919 rgba = (rgba >> 24) | (rgba << 8); 1058 char *data = SvPVbyte (data_, datalen);
920#if 0 1059 int bpp = datalen / (ow * oh);
921#ifdef _WIN32 1060 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 1061
928 rgba = (rgba & 0xffffff00) | a; 1062 SvPOK_only (result_);
1063 SvCUR_set (result_, nw * nh * bpp);
1064
1065 memset (SvPVX (result_), 0, nw * nh * bpp);
1066 while (oh--)
1067 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1068
1069 sv_setsv (data_, result_);
929 } 1070 }
930#endif 1071
931#endif 1072 sv_setiv (w_, nw);
932 rgba = SDL_SwapBE32 (rgba); 1073 sv_setiv (h_, nh);
933 *p++ = rgba;
934 } 1074 }
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 } 1075 }
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} 1076}
971 1077
972MODULE = CFClient PACKAGE = CFClient::Texture
973
974void 1078void
975draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1079draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
976 PROTOTYPE: $$$;$$ 1080 PROTOTYPE: $$$;$$
977 ALIAS: 1081 ALIAS:
978 draw_quad_alpha = 1 1082 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2 1083 draw_quad_alpha_premultiplied = 2
980 CODE: 1084 CODE:
981{ 1085{
982 HV *hv = (HV *)SvRV (self); 1086 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1087 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1088 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1089 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 1090
988 if (items < 5) 1091 if (items < 5)
989 { 1092 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1093 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1094 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 1095 }
993 1096
994 if (ix) 1097 if (ix)
995 { 1098 {
996 glEnable (GL_BLEND); 1099 glEnable (GL_BLEND);
1100
1101 if (ix == 2)
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1102 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1103 else
1104 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1105 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1106
998 glEnable (GL_ALPHA_TEST); 1107 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1108 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1109 }
1001 1110
1002 glBindTexture (GL_TEXTURE_2D, name); 1111 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 1112
1010 glBegin (GL_QUADS); 1113 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1114 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1115 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1116 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1019 glDisable (GL_ALPHA_TEST); 1122 glDisable (GL_ALPHA_TEST);
1020 glDisable (GL_BLEND); 1123 glDisable (GL_BLEND);
1021 } 1124 }
1022} 1125}
1023 1126
1024MODULE = CFClient PACKAGE = CFClient::Map 1127MODULE = CFPlus PACKAGE = CFPlus::Map
1025 1128
1026CFClient::Map 1129CFPlus::Map
1027new (SV *class, int map_width, int map_height) 1130new (SV *class, int map_width, int map_height)
1028 CODE: 1131 CODE:
1029 New (0, RETVAL, 1, struct map); 1132 New (0, RETVAL, 1, struct map);
1030 RETVAL->x = 0; 1133 RETVAL->x = 0;
1031 RETVAL->y = 0; 1134 RETVAL->y = 0;
1041 RETVAL->row = 0; 1144 RETVAL->row = 0;
1042 OUTPUT: 1145 OUTPUT:
1043 RETVAL 1146 RETVAL
1044 1147
1045void 1148void
1046DESTROY (CFClient::Map self) 1149DESTROY (CFPlus::Map self)
1047 CODE: 1150 CODE:
1048{ 1151{
1049 map_clear (self); 1152 map_clear (self);
1050 Safefree (self->face); 1153 Safefree (self->face);
1154 Safefree (self->tex);
1051 Safefree (self); 1155 Safefree (self);
1052} 1156}
1053 1157
1054void 1158void
1055clear (CFClient::Map self) 1159clear (CFPlus::Map self)
1056 CODE: 1160 CODE:
1057 map_clear (self); 1161 map_clear (self);
1058 1162
1059void 1163void
1060set_face (CFClient::Map self, int face, int texid) 1164set_face (CFPlus::Map self, int face, int texid)
1061 CODE: 1165 CODE:
1062{ 1166{
1063 while (self->faces <= face) 1167 while (self->faces <= face)
1064 { 1168 {
1065 Append (mapface, self->face, self->faces, self->faces); 1169 Append (mapface, self->face, self->faces, self->faces);
1068 1172
1069 self->face [face] = texid; 1173 self->face [face] = texid;
1070} 1174}
1071 1175
1072void 1176void
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) 1177set_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: 1178 CODE:
1075{ 1179{
1076 while (self->texs <= texid) 1180 while (self->texs <= texid)
1077 { 1181 {
1078 Append (maptex, self->tex, self->texs, self->texs); 1182 Append (maptex, self->tex, self->texs, self->texs);
1090 tex->r = r; 1194 tex->r = r;
1091 tex->g = g; 1195 tex->g = g;
1092 tex->b = b; 1196 tex->b = b;
1093 tex->a = a; 1197 tex->a = a;
1094 } 1198 }
1199
1200 // somewhat hackish, but for textures that require it, it really
1201 // improves the look, and most others don't suffer.
1202 glBindTexture (GL_TEXTURE_2D, name);
1203 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1204 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1205 // use uglier nearest interpolation because linear suffers
1206 // from transparent color bleeding and ugly wrapping effects.
1207 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095} 1208}
1096 1209
1097int 1210int
1098ox (CFClient::Map self) 1211ox (CFPlus::Map self)
1099 ALIAS: 1212 ALIAS:
1100 oy = 1 1213 oy = 1
1214 x = 2
1215 y = 3
1216 w = 4
1217 h = 5
1101 CODE: 1218 CODE:
1102 switch (ix) 1219 switch (ix)
1103 { 1220 {
1104 case 0: RETVAL = self->ox; break; 1221 case 0: RETVAL = self->ox; break;
1105 case 1: RETVAL = self->oy; break; 1222 case 1: RETVAL = self->oy; break;
1223 case 2: RETVAL = self->x; break;
1224 case 3: RETVAL = self->y; break;
1225 case 4: RETVAL = self->w; break;
1226 case 5: RETVAL = self->h; break;
1106 } 1227 }
1107 OUTPUT: 1228 OUTPUT:
1108 RETVAL 1229 RETVAL
1109 1230
1110void 1231void
1111scroll (CFClient::Map self, int dx, int dy) 1232scroll (CFPlus::Map self, int dx, int dy)
1112 CODE: 1233 CODE:
1113{ 1234{
1114 if (dx > 0) 1235 if (dx > 0)
1115 map_blank (self, self->x, self->y, dx - 1, self->h); 1236 map_blank (self, self->x, self->y, dx - 1, self->h);
1116 else if (dx < 0) 1237 else if (dx < 0)
1132 self->y += MAP_EXTEND_Y; 1253 self->y += MAP_EXTEND_Y;
1133 } 1254 }
1134} 1255}
1135 1256
1136void 1257void
1137map1a_update (CFClient::Map self, SV *data_) 1258map1a_update (CFPlus::Map self, SV *data_)
1138 CODE: 1259 CODE:
1139{ 1260{
1140 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1141 uint8_t *data_end = (uint8_t *)SvEND (data_); 1262 uint8_t *data_end = (uint8_t *)SvEND (data_);
1142 mapcell *cell; 1263 mapcell *cell;
1144 1265
1145 while (data < data_end) 1266 while (data < data_end)
1146 { 1267 {
1147 flags = (data [0] << 8) + data [1]; data += 2; 1268 flags = (data [0] << 8) + data [1]; data += 2;
1148 1269
1149 x = ((flags >> 10) & 63) + self->x; 1270 x = self->x + ((flags >> 10) & 63);
1150 y = ((flags >> 4) & 63) + self->y; 1271 y = self->y + ((flags >> 4) & 63);
1151 1272
1152 cell = map_get_cell (self, x, y); 1273 cell = map_get_cell (self, x, y);
1153 1274
1154 if (flags & 15) 1275 if (flags & 15)
1155 { 1276 {
1184 cell->darkness = -1; 1305 cell->darkness = -1;
1185 } 1306 }
1186} 1307}
1187 1308
1188SV * 1309SV *
1189mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1190 CODE: 1311 CODE:
1191{ 1312{
1192 int x1, x; 1313 int x1, x;
1193 int y1, y; 1314 int y1, y;
1194 int z; 1315 int z;
1244} 1365}
1245 OUTPUT: 1366 OUTPUT:
1246 RETVAL 1367 RETVAL
1247 1368
1248void 1369void
1249draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1370draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1250 PPCODE: 1371 CODE:
1251{ 1372{
1252 int vx, vy; 1373 int vx, vy;
1253 int x, y, z; 1374 int x, y, z;
1254 int last_name; 1375 int last_name;
1255 mapface face; 1376 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 1377
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; 1378 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1265 vy = self->y + (self->h - sh) / 2 - shift_y; 1379 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1266 1380
1267 /* 1381 /*
1268 int vx = self->vx = self->w >= sw 1382 int vx = self->vx = self->w >= sw
1269 ? self->x + (self->w - sw) / 2 1383 ? self->x + (self->w - sw) / 2
1270 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1384 : 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)); 1388 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275 */ 1389 */
1276 1390
1277 glColor4ub (255, 255, 255, 255); 1391 glColor4ub (255, 255, 255, 255);
1278 1392
1393 glEnable (GL_BLEND);
1279 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1394 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280 glEnable (GL_BLEND);
1281 glEnable (GL_TEXTURE_2D); 1395 glEnable (GL_TEXTURE_2D);
1282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1396 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283 1397
1284 glBegin (GL_QUADS); 1398 glBegin (GL_QUADS);
1285 1399
1293 1407
1294 for (x = 0; x < sw; x++) 1408 for (x = 0; x < sw; x++)
1295 if (row->c0 <= x + vx && x + vx < row->c1) 1409 if (row->c0 <= x + vx && x + vx < row->c1)
1296 { 1410 {
1297 mapcell *cell = row->col + (x + vx - row->c0); 1411 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 1412
1303 face = cell->face [z]; 1413 face = cell->face [z];
1304 1414
1305 if (face) 1415 if (face)
1306 { 1416 {
1327 1437
1328 glEnd (); 1438 glEnd ();
1329 1439
1330 glDisable (GL_TEXTURE_2D); 1440 glDisable (GL_TEXTURE_2D);
1331 glDisable (GL_BLEND); 1441 glDisable (GL_BLEND);
1442}
1443
1444void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE:
1447{
1448 static float color[16][3] = {
1449 { 0.00F, 0.00F, 0.00F },
1450 { 1.00F, 1.00F, 1.00F },
1451 { 0.00F, 0.00F, 0.55F },
1452 { 1.00F, 0.00F, 0.00F },
1453
1454 { 1.00F, 0.54F, 0.00F },
1455 { 0.11F, 0.56F, 1.00F },
1456 { 0.93F, 0.46F, 0.00F },
1457 { 0.18F, 0.54F, 0.34F },
1458
1459 { 0.56F, 0.73F, 0.56F },
1460 { 0.80F, 0.80F, 0.80F },
1461 { 0.55F, 0.41F, 0.13F },
1462 { 0.99F, 0.77F, 0.26F },
1463
1464 { 0.74F, 0.65F, 0.41F },
1465
1466 { 0.00F, 1.00F, 1.00F },
1467 { 1.00F, 0.00F, 1.00F },
1468 { 1.00F, 1.00F, 0.00F },
1469 };
1470
1471 int x, y;
1472
1473 glEnable (GL_TEXTURE_2D);
1474 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1475 glEnable (GL_BLEND);
1476 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1477 glBegin (GL_QUADS);
1478
1479 for (y = 0; y < h; y++)
1480 for (x = 0; x < w; x++)
1481 {
1482 unsigned char m = data [x + y * w];
1483
1484 if (m)
1485 {
1486 float *c = color [m & 15];
1487
1488 float tx1 = m & 0x40 ? 0.5 : 0.;
1489 float tx2 = tx1 + 0.5;
1490
1491 glColor4f (c[0], c[1], c[2], 0.75);
1492 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1493 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1494 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1495 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1496 }
1497 }
1498
1499 glEnd ();
1500 glDisable (GL_BLEND);
1501 glDisable (GL_TEXTURE_2D);
1502}
1503
1504void
1505fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1506 PPCODE:
1507{
1508 int vx, vy;
1509 int x, y;
1510 int sw4 = (sw + 3) & ~3;
1511 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1512 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1513
1514 memset (darkness, 255, sw4 * sh);
1515 SvPOK_only (darkness_sv);
1516 SvCUR_set (darkness_sv, sw4 * sh);
1517
1518 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1519 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1520
1521 for (y = 0; y < sh; y++)
1522 if (0 <= y + vy && y + vy < self->rows)
1523 {
1524 maprow *row = self->row + (y + vy);
1525
1526 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1)
1528 {
1529 mapcell *cell = row->col + (x + vx - row->c0);
1530
1531 darkness[y * sw4 + x] = cell->darkness < 0
1532 ? 255 - FOW_DARKNESS
1533 : 255 - cell->darkness;
1534 }
1535 }
1332 1536
1333 EXTEND (SP, 3); 1537 EXTEND (SP, 3);
1334 PUSHs (sv_2mortal (newSViv (sw4))); 1538 PUSHs (sv_2mortal (newSViv (sw4)));
1335 PUSHs (sv_2mortal (newSViv (sh))); 1539 PUSHs (sv_2mortal (newSViv (sh)));
1336 PUSHs (darkness_sv); 1540 PUSHs (darkness_sv);
1337} 1541}
1338 1542
1339SV * 1543SV *
1340get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1544get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1341 CODE: 1545 CODE:
1342{ 1546{
1343 int x, y, x1, y1; 1547 int x, y, x1, y1;
1344 SV *data_sv = newSV (w * h * 7 + 5); 1548 SV *data_sv = newSV (w * h * 7 + 5);
1345 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1549 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1407} 1611}
1408 OUTPUT: 1612 OUTPUT:
1409 RETVAL 1613 RETVAL
1410 1614
1411void 1615void
1412set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1616set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1413 PPCODE: 1617 PPCODE:
1414{ 1618{
1415 int x, y, z; 1619 int x, y, z;
1416 int w, h; 1620 int w, h;
1417 int x1, y1; 1621 int x1, y1;
1466 } 1670 }
1467 } 1671 }
1468 } 1672 }
1469} 1673}
1470 1674
1471MODULE = CFClient PACKAGE = CFClient::MixChunk 1675MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1472 1676
1473CFClient::MixChunk 1677CFPlus::MixChunk
1474new_from_file (SV *class, char *path) 1678new_from_file (SV *class, char *path)
1475 CODE: 1679 CODE:
1476 RETVAL = Mix_LoadWAV (path); 1680 RETVAL = Mix_LoadWAV (path);
1477 OUTPUT: 1681 OUTPUT:
1478 RETVAL 1682 RETVAL
1479 1683
1480void 1684void
1481DESTROY (CFClient::MixChunk self) 1685DESTROY (CFPlus::MixChunk self)
1482 CODE: 1686 CODE:
1483 Mix_FreeChunk (self); 1687 Mix_FreeChunk (self);
1484 1688
1485int 1689int
1486volume (CFClient::MixChunk self, int volume = -1) 1690volume (CFPlus::MixChunk self, int volume = -1)
1487 CODE: 1691 CODE:
1488 RETVAL = Mix_VolumeChunk (self, volume); 1692 RETVAL = Mix_VolumeChunk (self, volume);
1489 OUTPUT: 1693 OUTPUT:
1490 RETVAL 1694 RETVAL
1491 1695
1492int 1696int
1493play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1697play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1494 CODE: 1698 CODE:
1495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1699 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1496 OUTPUT: 1700 OUTPUT:
1497 RETVAL 1701 RETVAL
1498 1702
1499MODULE = CFClient PACKAGE = CFClient::MixMusic 1703MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1500 1704
1501int 1705int
1502volume (int volume = -1) 1706volume (int volume = -1)
1503 CODE: 1707 CODE:
1504 RETVAL = Mix_VolumeMusic (volume); 1708 RETVAL = Mix_VolumeMusic (volume);
1505 OUTPUT: 1709 OUTPUT:
1506 RETVAL 1710 RETVAL
1507 1711
1508CFClient::MixMusic 1712CFPlus::MixMusic
1509new_from_file (SV *class, char *path) 1713new_from_file (SV *class, char *path)
1510 CODE: 1714 CODE:
1511 RETVAL = Mix_LoadMUS (path); 1715 RETVAL = Mix_LoadMUS (path);
1512 OUTPUT: 1716 OUTPUT:
1513 RETVAL 1717 RETVAL
1514 1718
1515void 1719void
1516DESTROY (CFClient::MixMusic self) 1720DESTROY (CFPlus::MixMusic self)
1517 CODE: 1721 CODE:
1518 Mix_FreeMusic (self); 1722 Mix_FreeMusic (self);
1519 1723
1520int 1724int
1521play (CFClient::MixMusic self, int loops = -1) 1725play (CFPlus::MixMusic self, int loops = -1)
1522 CODE: 1726 CODE:
1523 RETVAL = Mix_PlayMusic (self, loops); 1727 RETVAL = Mix_PlayMusic (self, loops);
1524 OUTPUT: 1728 OUTPUT:
1525 RETVAL 1729 RETVAL
1526 1730
1527MODULE = CFClient PACKAGE = CFClient::OpenGL 1731MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1528 1732
1529BOOT: 1733BOOT:
1530{ 1734{
1531 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1735 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1532 static const struct { 1736 static const struct {
1533 const char *name; 1737 const char *name;
1534 IV iv; 1738 IV iv;
1535 } *civ, const_iv[] = { 1739 } *civ, const_iv[] = {
1536# define const_iv(name) { # name, (IV)name } 1740# define const_iv(name) { # name, (IV)name }
1543 const_iv (GL_SCISSOR_TEST), 1747 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST), 1748 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST), 1749 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE), 1750 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL), 1751 const_iv (GL_RESCALE_NORMAL),
1752 const_iv (GL_FRONT),
1753 const_iv (GL_BACK),
1548 const_iv (GL_AND), 1754 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1755 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1756 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1757 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1758 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1759 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1760 const_iv (GL_ONE_MINUS_DST_ALPHA),
1761 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1762 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1763 const_iv (GL_RGBA),
1764 const_iv (GL_RGBA4),
1765 const_iv (GL_RGBA8),
1766 const_iv (GL_RGB5_A1),
1557 const_iv (GL_UNSIGNED_BYTE), 1767 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1768 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1769 const_iv (GL_UNSIGNED_INT),
1560 const_iv (GL_ALPHA), 1770 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY), 1771 const_iv (GL_INTENSITY),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1780 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1781 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1782 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1783 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1784 const_iv (GL_TEXTURE_WRAP_T),
1785 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1786 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1787 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1788 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1789 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1790 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1791 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1792 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1592 const_iv (GL_SEPARABLE_2D), 1803 const_iv (GL_SEPARABLE_2D),
1593 const_iv (GL_CONVOLUTION_2D), 1804 const_iv (GL_CONVOLUTION_2D),
1594 const_iv (GL_CONVOLUTION_BORDER_MODE), 1805 const_iv (GL_CONVOLUTION_BORDER_MODE),
1595 const_iv (GL_CONSTANT_BORDER), 1806 const_iv (GL_CONSTANT_BORDER),
1596 const_iv (GL_LINES), 1807 const_iv (GL_LINES),
1808 const_iv (GL_LINE_STRIP),
1597 const_iv (GL_LINE_LOOP), 1809 const_iv (GL_LINE_LOOP),
1598 const_iv (GL_QUADS), 1810 const_iv (GL_QUADS),
1599 const_iv (GL_QUAD_STRIP), 1811 const_iv (GL_QUAD_STRIP),
1600 const_iv (GL_TRIANGLES), 1812 const_iv (GL_TRIANGLES),
1601 const_iv (GL_TRIANGLE_STRIP), 1813 const_iv (GL_TRIANGLE_STRIP),
1611 1823
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1826}
1615 1827
1828char *
1829gl_vendor ()
1830 CODE:
1831 RETVAL = (char *)glGetString (GL_VENDOR);
1832 OUTPUT:
1833 RETVAL
1834
1835char *
1836gl_version ()
1837 CODE:
1838 RETVAL = (char *)glGetString (GL_VERSION);
1839 OUTPUT:
1840 RETVAL
1841
1842char *
1843gl_extensions ()
1844 CODE:
1845 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1846 OUTPUT:
1847 RETVAL
1848
1616int glGetError () 1849int glGetError ()
1850
1851void glFinish ()
1617 1852
1618void glClear (int mask) 1853void glClear (int mask)
1619 1854
1620void glClearColor (float r, float g, float b, float a = 1.0) 1855void glClearColor (float r, float g, float b, float a = 1.0)
1621 PROTOTYPE: @ 1856 PROTOTYPE: @
1628 1863
1629void glHint (int target, int mode) 1864void glHint (int target, int mode)
1630 1865
1631void glBlendFunc (int sfactor, int dfactor) 1866void glBlendFunc (int sfactor, int dfactor)
1632 1867
1868void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1869 CODE:
1870 gl_BlendFuncSeparate (sa, da, saa, daa);
1871
1633void glDepthMask (int flag) 1872void glDepthMask (int flag)
1634 1873
1635void glLogicOp (int opcode) 1874void glLogicOp (int opcode)
1636 1875
1637void glColorMask (int red, int green, int blue, int alpha) 1876void glColorMask (int red, int green, int blue, int alpha)
1641void glPushMatrix () 1880void glPushMatrix ()
1642 1881
1643void glPopMatrix () 1882void glPopMatrix ()
1644 1883
1645void glLoadIdentity () 1884void glLoadIdentity ()
1885
1886void glDrawBuffer (int buffer)
1887
1888void glReadBuffer (int buffer)
1646 1889
1647# near_ and far_ are due to microsofts buggy "c" compiler 1890# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1891void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649 1892
1650# near_ and far_ are due to microsofts buggy "c" compiler 1893# near_ and far_ are due to microsofts buggy "c" compiler
1670 1913
1671void glEnd () 1914void glEnd ()
1672 1915
1673void glColor (float r, float g, float b, float a = 1.0) 1916void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 1917 PROTOTYPE: @
1918 ALIAS:
1919 glColor_premultiply = 1
1675 CODE: 1920 CODE:
1921 if (ix)
1922 {
1923 r *= a;
1924 g *= a;
1925 b *= a;
1926 }
1676 // microsoft visual "c" rounds instead of truncating... 1927 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 1928 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 1929
1682void glInterleavedArrays (int format, int stride, char *data) 1930void glInterleavedArrays (int format, int stride, char *data)
1683 1931
1684void glDrawElements (int mode, int count, int type, char *indices) 1932void glDrawElements (int mode, int count, int type, char *indices)
1685 1933
1708 1956
1709void glBindTexture (int target, int name) 1957void glBindTexture (int target, int name)
1710 1958
1711void glConvolutionParameter (int target, int pname, float params) 1959void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 1960 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1961 if (gl.ConvolutionParameterf)
1962 gl.ConvolutionParameterf (target, pname, params);
1714 1963
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1964void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 1965 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1966 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 1967 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 1968
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1969void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 1970 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1971 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 1972 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 1973
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1974void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 1975
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1976void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 1977
1761 2010
1762void glEndList () 2011void glEndList ()
1763 2012
1764void glCallList (int list) 2013void glCallList (int list)
1765 2014
1766

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines