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.55 by root, Thu Apr 20 08:11:56 2006 UTC vs.
Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
6# pragma warning(disable:4244)
3#endif 7#endif
4 8
5#include "EXTERN.h" 9#include "EXTERN.h"
6#include "perl.h" 10#include "perl.h"
7#include "XSUB.h" 11#include "XSUB.h"
8 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
17#include <math.h>
9#include <string.h> 18#include <string.h>
10#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
11 21
12#include <SDL.h> 22#include <SDL.h>
23#include <SDL_endian.h>
13#include <SDL_image.h> 24#include <SDL_image.h>
14#include <SDL_mixer.h> 25#include <SDL_mixer.h>
15#include <SDL_opengl.h> 26#include <SDL_opengl.h>
16 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
17#include <glib/gmacros.h> 31#include <glib/gmacros.h>
18 32
19#include <pango/pango.h> 33#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 34
23#ifndef _WIN32 35#ifndef _WIN32
24# include <sys/types.h> 36# include <sys/types.h>
25# include <sys/socket.h> 37# include <sys/socket.h>
26# include <netinet/in.h> 38# include <netinet/in.h>
33 typedef signed char int8_t; 45 typedef signed char int8_t;
34 typedef signed short int16_t; 46 typedef signed short int16_t;
35 typedef signed int int32_t; 47 typedef signed int int32_t;
36#endif 48#endif
37 49
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
51
38#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
39 53
40#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
42 56
57#define MIN_FONT_HEIGHT 10
58
59#if 0
60# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else
62# define PARACHUTE 0
63#endif
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
43typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
45 90
46static PangoContext *context; 91typedef PangoFontDescription *CFPlus__Font;
47static PangoFontMap *fontmap; 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}
48 110
49typedef struct cf_layout { 111typedef struct cf_layout {
50 PangoLayout *pl; 112 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode
51 int base_height; 114 int base_height;
115 CFPlus__Font font;
52} *CFClient__Layout; 116} *CFPlus__Layout;
117
118static CFPlus__Font default_font;
119static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap;
53 121
54static void 122static void
55substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
56{ 124{
57 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
126#ifdef FC_HINT_STYLE
127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
128#endif
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59} 130}
60 131
61static void 132static void
62layout_update (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
63{ 134{
64 /* 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
65 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
66 */ 137 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 138 PangoFontDescription *font = self->font ? self->font : default_font;
68 139
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 140 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 141 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 142
143 pango_layout_set_font_description (self->pl, font);
76} 144}
77 145
78static void 146static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
80{ 148{
81 layout_update (self); 149 PangoRectangle rect;
82 150
151 // get_pixel_* wrongly rounds down
83 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
84 153
85 *w = (*w + 3) & ~3; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
86 if (!*w) *w = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
87 if (!*h) *h = 1; 156
157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
88} 162}
89 163
90typedef uint16_t mapface; 164typedef uint16_t mapface;
91 165
92typedef struct { 166typedef struct {
115 int texs; 189 int texs;
116 maptex *tex; 190 maptex *tex;
117 191
118 int32_t rows; 192 int32_t rows;
119 maprow *row; 193 maprow *row;
120} *CFClient__Map; 194} *CFPlus__Map;
121 195
122static char * 196static char *
123prepend (char *ptr, int sze, int inc) 197prepend (char *ptr, int sze, int inc)
124{ 198{
125 char *p; 199 char *p;
143 217
144#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 218#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
145#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
146 220
147static maprow * 221static maprow *
148map_get_row (CFClient__Map self, int y) 222map_get_row (CFPlus__Map self, int y)
149{ 223{
150 if (0 > y) 224 if (0 > y)
151 { 225 {
152 int extend = - y + MAP_EXTEND_Y; 226 int extend = - y + MAP_EXTEND_Y;
153 Prepend (maprow, self->row, self->rows, extend); 227 Prepend (maprow, self->row, self->rows, extend);
191 265
192 return row->col + (x - row->c0); 266 return row->col + (x - row->c0);
193} 267}
194 268
195static mapcell * 269static mapcell *
196map_get_cell (CFClient__Map self, int x, int y) 270map_get_cell (CFPlus__Map self, int x, int y)
197{ 271{
198 return row_get_cell (map_get_row (self, y), x); 272 return row_get_cell (map_get_row (self, y), x);
199} 273}
200 274
201static void 275static void
202map_clear (CFClient__Map self) 276map_clear (CFPlus__Map self)
203{ 277{
204 int r; 278 int r;
205 279
206 for (r = 0; r < self->rows; r++) 280 for (r = 0; r < self->rows; r++)
207 Safefree (self->row[r].col); 281 Safefree (self->row[r].col);
215 self->row = 0; 289 self->row = 0;
216 self->rows = 0; 290 self->rows = 0;
217} 291}
218 292
219static void 293static void
220map_blank (CFClient__Map self, int x0, int y0, int w, int h) 294map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
221{ 295{
222 int x, y; 296 int x, y;
223 maprow *row; 297 maprow *row;
224 298
225 for (y = y0; y < y0 + h; y++) 299 for (y = y0; y < y0 + h; y++)
239 row->col[x - row->c0].darkness = -1; 313 row->col[x - row->c0].darkness = -1;
240 } 314 }
241 } 315 }
242} 316}
243 317
318static void
319music_finished (void)
320{
321 SDL_UserEvent ev;
322
323 ev.type = SDL_USEREVENT;
324 ev.code = 0;
325 ev.data1 = 0;
326 ev.data2 = 0;
327
328 SDL_PushEvent ((SDL_Event *)&ev);
329}
330
331static void
332channel_finished (int channel)
333{
334 SDL_UserEvent ev;
335
336 ev.type = SDL_USEREVENT;
337 ev.code = 1;
338 ev.data1 = (void *)(long)channel;
339 ev.data2 = 0;
340
341 SDL_PushEvent ((SDL_Event *)&ev);
342}
343
344static unsigned int
345minpot (unsigned int n)
346{
347 if (!n)
348 return 0;
349
350 --n;
351
352 n |= n >> 1;
353 n |= n >> 2;
354 n |= n >> 4;
355 n |= n >> 8;
356 n |= n >> 16;
357
358 return n + 1;
359}
360
244MODULE = CFClient PACKAGE = CFClient 361MODULE = CFPlus PACKAGE = CFPlus
245 362
246PROTOTYPES: ENABLE 363PROTOTYPES: ENABLE
247 364
248BOOT: 365BOOT:
249{ 366{
250 HV *stash = gv_stashpv ("CFClient", 1); 367 HV *stash = gv_stashpv ("CFPlus", 1);
251 static const struct { 368 static const struct {
252 const char *name; 369 const char *name;
253 IV iv; 370 IV iv;
254 } *civ, const_iv[] = { 371 } *civ, const_iv[] = {
255# define const_iv(name) { # name, (IV)name } 372# define const_iv(name) { # name, (IV)name }
354# undef const_iv 471# undef const_iv
355 }; 472 };
356 473
357 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 474 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
358 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 475 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
359
360 fontmap = pango_ft2_font_map_new ();
361 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
362 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
363} 476}
364 477
365int 478int
479in_destruct ()
480 CODE:
481 RETVAL = PL_main_cv == Nullcv;
482 OUTPUT:
483 RETVAL
484
485NV floor (NV x)
486
487NV ceil (NV x)
488
489void
490pango_init ()
491 CODE:
492{
493 opengl_fontmap = pango_opengl_font_map_new ();
494 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
495 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
496}
497
498int
366SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 499SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
367 500
368void 501void
369SDL_Quit () 502SDL_Quit ()
370 503
371void 504void
377 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 510 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 511 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 513 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
381 514
515 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
516 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
517
382 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 518 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
386 522
387 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 523 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
524#if SDL_VERSION_ATLEAST(1,2,10)
388 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 525 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
389 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
527#endif
390 528
391 SDL_EnableUNICODE (1); 529 SDL_EnableUNICODE (1);
392 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 530 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
393 531
394 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 532 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
403 541
404 ++m; 542 ++m;
405 } 543 }
406} 544}
407 545
546char *
547SDL_GetError ()
548
408int 549int
409SDL_SetVideoMode (int w, int h, int fullscreen) 550SDL_SetVideoMode (int w, int h, int fullscreen)
410 CODE: 551 CODE:
411 RETVAL = !!SDL_SetVideoMode ( 552 RETVAL = !!SDL_SetVideoMode (
412 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 553 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
413 ); 554 );
555 if (RETVAL)
556 {
414 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 557 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
558# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
559# include "glfunc.h"
560# undef GL_FUNC
561 }
415 OUTPUT: 562 OUTPUT:
416 RETVAL 563 RETVAL
417 564
418void 565void
419SDL_GL_SwapBuffers () 566SDL_GL_SwapBuffers ()
567
568char *
569SDL_GetKeyName (int sym)
420 570
421void 571void
422SDL_PollEvent () 572SDL_PollEvent ()
423 PPCODE: 573 PPCODE:
424{ 574{
426 576
427 while (SDL_PollEvent (&ev)) 577 while (SDL_PollEvent (&ev))
428 { 578 {
429 HV *hv = newHV (); 579 HV *hv = newHV ();
430 hv_store (hv, "type", 4, newSViv (ev.type), 0); 580 hv_store (hv, "type", 4, newSViv (ev.type), 0);
581
431 switch (ev.type) 582 switch (ev.type)
432 { 583 {
433 case SDL_KEYDOWN: 584 case SDL_KEYDOWN:
434 case SDL_KEYUP: 585 case SDL_KEYUP:
435 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 586 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
442 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 593 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
443 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 594 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
444 break; 595 break;
445 596
446 case SDL_MOUSEMOTION: 597 case SDL_MOUSEMOTION:
598 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
599
447 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 600 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
448 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 601 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
449 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 602 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
450 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 603 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
451 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 604 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
452 break; 605 break;
453 606
454 case SDL_MOUSEBUTTONDOWN: 607 case SDL_MOUSEBUTTONDOWN:
455 case SDL_MOUSEBUTTONUP: 608 case SDL_MOUSEBUTTONUP:
609 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
610
456 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 611 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 613 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 614 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
615 break;
616
617 case SDL_USEREVENT:
618 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
619 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
620 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
621 break;
460 } 622 }
461 623
462 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 624 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
463 } 625 }
464} 626}
465 627
466int 628int
467Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 629Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
630 POSTCALL:
631 Mix_HookMusicFinished (music_finished);
632 Mix_ChannelFinished (channel_finished);
468 633
469void 634void
470Mix_CloseAudio () 635Mix_CloseAudio ()
471 636
472int 637int
477 CODE: 642 CODE:
478#ifndef _WIN32 643#ifndef _WIN32
479 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 644 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
480#endif 645#endif
481 646
482char *
483gl_version ()
484 CODE:
485 RETVAL = (char *)glGetString (GL_VERSION);
486 OUTPUT:
487 RETVAL
488
489char *
490gl_extensions ()
491 CODE:
492 RETVAL = (char *)glGetString (GL_EXTENSIONS);
493 OUTPUT:
494 RETVAL
495
496void 647void
497add_font (char *file) 648add_font (char *file)
498 CODE: 649 CODE:
499 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 650 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
500
501void
502set_font (char *file)
503 CODE:
504{
505 int count;
506 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
507 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508 FcPatternDestroy (pattern);
509 pango_context_set_font_description (context, font);
510}
511 651
512void 652void
513load_image_inline (SV *image_) 653load_image_inline (SV *image_)
514 ALIAS: 654 ALIAS:
515 load_image_file = 1 655 load_image_file = 1
557 697
558 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 698 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
559 699
560 assert (surface2->pitch == surface2->w * 4); 700 assert (surface2->pitch == surface2->w * 4);
561 701
702 SDL_LockSurface (surface2);
562 EXTEND (SP, 5); 703 EXTEND (SP, 6);
563 PUSHs (sv_2mortal (newSViv (surface2->w))); 704 PUSHs (sv_2mortal (newSViv (surface2->w)));
564 PUSHs (sv_2mortal (newSViv (surface2->h))); 705 PUSHs (sv_2mortal (newSViv (surface2->h)));
565 SDL_LockSurface (surface2);
566 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 706 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
567 SDL_UnlockSurface (surface2);
568 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 707 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
569 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 708 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
570 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 709 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
710 SDL_UnlockSurface (surface2);
571 711
572 SDL_FreeSurface (surface); 712 SDL_FreeSurface (surface);
573 SDL_FreeSurface (surface2); 713 SDL_FreeSurface (surface2);
574} 714}
575 715
597 PUSHs (sv_2mortal (newSViv (b / y))); 737 PUSHs (sv_2mortal (newSViv (b / y)));
598 PUSHs (sv_2mortal (newSViv (a / y))); 738 PUSHs (sv_2mortal (newSViv (a / y)));
599} 739}
600 740
601void 741void
742error (char *message)
743 CODE:
744 fprintf (stderr, "ERROR: %s\n", message);
745#ifdef _WIN32
746 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
747#endif
748
749void
602fatal (char *message) 750fatal (char *message)
603 CODE: 751 CODE:
752 fprintf (stderr, "FATAL: %s\n", message);
604#ifdef _WIN32 753#ifdef _WIN32
605 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 754 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
606#else
607 fprintf (stderr, "FATAL: %s\n", message);
608#endif 755#endif
609 exit (1); 756 _exit (1);
610 757
758void
759_exit (int retval)
760 CODE:
761 _exit (retval);
762
763MODULE = CFPlus PACKAGE = CFPlus::Font
764
765CFPlus::Font
766new_from_file (SV *class, char *path, int id = 0)
767 CODE:
768{
769 int count;
770 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
771 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
772 FcPatternDestroy (pattern);
773}
774 OUTPUT:
775 RETVAL
776
777void
778DESTROY (CFPlus::Font self)
779 CODE:
780 pango_font_description_free (self);
781
782void
783make_default (CFPlus::Font self)
784 CODE:
785 default_font = self;
786
611MODULE = CFClient PACKAGE = CFClient::Layout 787MODULE = CFPlus PACKAGE = CFPlus::Layout
612 788
613CFClient::Layout 789void
614new (SV *class, int base_height = 10) 790reset_glyph_cache ()
791 CODE:
792 tc_clear ();
793
794CFPlus::Layout
795new (SV *class)
615 CODE: 796 CODE:
616 New (0, RETVAL, 1, struct cf_layout); 797 New (0, RETVAL, 1, struct cf_layout);
617 RETVAL->base_height = base_height; 798
618 RETVAL->pl = pango_layout_new (context); 799 RETVAL->pl = pango_layout_new (opengl_context);
800 RETVAL->r = 1.;
801 RETVAL->g = 1.;
802 RETVAL->b = 1.;
803 RETVAL->a = 1.;
804 RETVAL->base_height = MIN_FONT_HEIGHT;
805 RETVAL->font = 0;
806
619 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 807 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
808 layout_update_font (RETVAL);
620 OUTPUT: 809 OUTPUT:
621 RETVAL 810 RETVAL
622 811
623void 812void
624DESTROY (CFClient::Layout self) 813DESTROY (CFPlus::Layout self)
625 CODE: 814 CODE:
626 g_object_unref (self->pl); 815 g_object_unref (self->pl);
627 Safefree (self); 816 Safefree (self);
628 817
629void 818void
630set_text (CFClient::Layout self, SV *text_) 819set_text (CFPlus::Layout self, SV *text_)
631 CODE: 820 CODE:
632{ 821{
633 STRLEN textlen; 822 STRLEN textlen;
634 char *text = SvPVutf8 (text_, textlen); 823 char *text = SvPVutf8 (text_, textlen);
635 824
636 pango_layout_set_text (self->pl, text, textlen); 825 pango_layout_set_text (self->pl, text, textlen);
637} 826}
638 827
639void 828void
640set_markup (CFClient::Layout self, SV *text_) 829set_markup (CFPlus::Layout self, SV *text_)
641 CODE: 830 CODE:
642{ 831{
643 STRLEN textlen; 832 STRLEN textlen;
644 char *text = SvPVutf8 (text_, textlen); 833 char *text = SvPVutf8 (text_, textlen);
645 834
646 pango_layout_set_markup (self->pl, text, textlen); 835 pango_layout_set_markup (self->pl, text, textlen);
647} 836}
648 837
838void
839set_shapes (CFPlus::Layout self, ...)
840 CODE:
841{
842 PangoAttrList *attrs = 0;
843 const char *text = pango_layout_get_text (self->pl);
844 const char *pos = text;
845 int arg = 4;
846
847 while (arg < items && (pos = strstr (pos, OBJ_STR)))
848 {
849 PangoRectangle inkrect, rect;
850 PangoAttribute *attr;
851
852 int x = SvIV (ST (arg - 3));
853 int y = SvIV (ST (arg - 2));
854 int w = SvIV (ST (arg - 1));
855 int h = SvIV (ST (arg ));
856
857 inkrect.x = 0;
858 inkrect.y = 0;
859 inkrect.width = 0;
860 inkrect.height = 0;
861
862 rect.x = x * PANGO_SCALE;
863 rect.y = y * PANGO_SCALE;
864 rect.width = w * PANGO_SCALE;
865 rect.height = h * PANGO_SCALE;
866
867 if (!attrs)
868 attrs = pango_layout_get_attributes (self->pl);
869
870 attr = pango_attr_shape_new (&inkrect, &rect);
871 attr->start_index = pos - text;
872 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
873 pango_attr_list_insert (attrs, attr);
874
875 arg += 4;
876 pos += sizeof (OBJ_STR) - 1;
877 }
878
879 if (attrs)
880 pango_layout_set_attributes (self->pl, attrs);
881}
882
883void
884get_shapes (CFPlus::Layout self)
885 PPCODE:
886{
887 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
888
889 do
890 {
891 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
892
893 if (run && shape_attr_p (run))
894 {
895 PangoRectangle extents;
896 pango_layout_iter_get_run_extents (iter, 0, &extents);
897
898 EXTEND (SP, 2);
899 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
901 }
902 }
903 while (pango_layout_iter_next_run (iter));
904
905 pango_layout_iter_free (iter);
906}
907
908int
909has_wrapped (CFPlus::Layout self)
910 CODE:
911{
912 int lines = 1;
913 const char *text = pango_layout_get_text (self->pl);
914
915 while (*text)
916 lines += *text++ == '\n';
917
918 RETVAL = lines < pango_layout_get_line_count (self->pl);
919}
920 OUTPUT:
921 RETVAL
922
649SV * 923SV *
650get_text (CFClient::Layout self) 924get_text (CFPlus::Layout self)
651 CODE: 925 CODE:
652 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 926 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
653 SvUTF8_on (RETVAL); 927 sv_utf8_decode (RETVAL);
654 OUTPUT: 928 OUTPUT:
655 RETVAL 929 RETVAL
656 930
657void 931void
932set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
933 CODE:
934 self->r = r;
935 self->g = g;
936 self->b = b;
937 self->a = a;
938
939void
940set_font (CFPlus::Layout self, CFPlus::Font font = 0)
941 CODE:
942 if (self->font != font)
943 {
944 self->font = font;
945 layout_update_font (self);
946 }
947
948void
658set_height (CFClient::Layout self, int base_height) 949set_height (CFPlus::Layout self, int base_height)
659 CODE: 950 CODE:
951 if (self->base_height != base_height)
952 {
660 self->base_height = base_height; 953 self->base_height = base_height;
954 layout_update_font (self);
955 }
661 956
662void 957void
663set_width (CFClient::Layout self, int max_width = -1) 958set_width (CFPlus::Layout self, int max_width = -1)
664 CODE: 959 CODE:
665 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 960 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
666 961
667void 962void
963set_indent (CFPlus::Layout self, int indent)
964 CODE:
965 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
966
967void
968set_spacing (CFPlus::Layout self, int spacing)
969 CODE:
970 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
971
972void
973set_ellipsise (CFPlus::Layout self, int ellipsise)
974 CODE:
975 pango_layout_set_ellipsize (self->pl,
976 ellipsise == 1 ? PANGO_ELLIPSIZE_START
977 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
978 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
979 : PANGO_ELLIPSIZE_NONE
980 );
981
982void
983set_single_paragraph_mode (CFPlus::Layout self, int spm)
984 CODE:
985 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
986
987void
668size (CFClient::Layout self) 988size (CFPlus::Layout self)
669 PPCODE: 989 PPCODE:
670{ 990{
671 int w, h; 991 int w, h;
672 992
673 layout_update (self);
674 layout_get_pixel_size (self, &w, &h); 993 layout_get_pixel_size (self, &w, &h);
675 994
676 EXTEND (SP, 2); 995 EXTEND (SP, 2);
677 PUSHs (sv_2mortal (newSViv (w))); 996 PUSHs (sv_2mortal (newSViv (w)));
678 PUSHs (sv_2mortal (newSViv (h))); 997 PUSHs (sv_2mortal (newSViv (h)));
679} 998}
680 999
681int 1000int
1001descent (CFPlus::Layout self)
1002 CODE:
1003{
1004 PangoRectangle rect;
1005 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1006 pango_layout_line_get_pixel_extents (line, 0, &rect);
1007 RETVAL = PANGO_DESCENT (rect);
1008}
1009 OUTPUT:
1010 RETVAL
1011
1012int
682xy_to_index (CFClient::Layout self, int x, int y) 1013xy_to_index (CFPlus::Layout self, int x, int y)
683 CODE: 1014 CODE:
684{ 1015{
685 int index, trailing; 1016 int index, trailing;
686
687 layout_update (self);
688 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1017 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690 RETVAL = index; 1018 RETVAL = index;
691} 1019}
692 OUTPUT: 1020 OUTPUT:
693 RETVAL 1021 RETVAL
694 1022
695void 1023void
696cursor_pos (CFClient::Layout self, int index) 1024cursor_pos (CFPlus::Layout self, int index)
697 PPCODE: 1025 PPCODE:
698{ 1026{
699 PangoRectangle strong_pos; 1027 PangoRectangle strong_pos;
700 layout_update (self);
701 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1028 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702 1029
703 EXTEND (SP, 3); 1030 EXTEND (SP, 3);
704 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1031 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1032 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
706 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
707} 1034}
708 1035
709void 1036void
710render (CFClient::Layout self) 1037render (CFPlus::Layout self, float x, float y, int flags = 0)
711 PPCODE: 1038 PPCODE:
712{ 1039 pango_opengl_render_layout_subpixel (
713 SV *retval; 1040 self->pl,
714 int w, h; 1041 x * PANGO_SCALE, y * PANGO_SCALE,
715 FT_Bitmap bitmap; 1042 self->r, self->g, self->b, self->a,
1043 flags
1044 );
716 1045
717 layout_update (self); 1046MODULE = CFPlus PACKAGE = CFPlus::Texture
718 layout_get_pixel_size (self, &w, &h);
719 1047
720 retval = newSV (w * h); 1048void
721 SvPOK_only (retval); 1049pad2pot (SV *data_, SV *w_, SV *h_)
722 SvCUR_set (retval, w * h); 1050 CODE:
1051{
1052 int ow = SvIV (w_);
1053 int oh = SvIV (h_);
723 1054
724 bitmap.rows = h; 1055 if (ow && oh)
725 bitmap.width = w; 1056 {
726 bitmap.pitch = w; 1057 int nw = minpot (ow);
727 bitmap.buffer = (unsigned char*)SvPVX (retval); 1058 int nh = minpot (oh);
728 bitmap.num_grays = 256;
729 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730 1059
731 memset (bitmap.buffer, 0, w * h); 1060 if (nw != ow || nh != oh)
732 1061 {
733 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 1062 if (SvOK (data_))
1063 {
1064 STRLEN datalen;
1065 char *data = SvPVbyte (data_, datalen);
1066 int bpp = datalen / (ow * oh);
1067 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
734 1068
735 EXTEND (SP, 3); 1069 SvPOK_only (result_);
736 PUSHs (sv_2mortal (newSViv (w))); 1070 SvCUR_set (result_, nw * nh * bpp);
737 PUSHs (sv_2mortal (newSViv (h)));
738 PUSHs (sv_2mortal (retval));
739}
740 1071
741MODULE = CFClient PACKAGE = CFClient::Texture 1072 memset (SvPVX (result_), 0, nw * nh * bpp);
1073 while (oh--)
1074 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
742 1075
1076 sv_setsv (data_, result_);
1077 }
1078
1079 sv_setiv (w_, nw);
1080 sv_setiv (h_, nh);
1081 }
1082 }
1083}
1084
743void 1085void
744draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1086draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
745 PROTOTYPE: $$$;$$ 1087 PROTOTYPE: $$$;$$
1088 ALIAS:
1089 draw_quad_alpha = 1
1090 draw_quad_alpha_premultiplied = 2
746 CODE: 1091 CODE:
747{ 1092{
748 HV *hv = (HV *)SvRV (self); 1093 HV *hv = (HV *)SvRV (self);
749 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1094 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1095 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
751 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1096 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
752 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
753 1097
754 if (items < 5) 1098 if (items < 5)
755 { 1099 {
756 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1100 w = SvNV (*hv_fetch (hv, "w", 1, 1));
757 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1101 h = SvNV (*hv_fetch (hv, "h", 1, 1));
758 } 1102 }
759 1103
1104 if (ix)
1105 {
1106 glEnable (GL_BLEND);
1107
1108 if (ix == 2)
1109 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1110 else
1111 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1112 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1113
1114 glEnable (GL_ALPHA_TEST);
1115 glAlphaFunc (GL_GREATER, 0.01f);
1116 }
1117
760 glBindTexture (GL_TEXTURE_2D, name); 1118 glBindTexture (GL_TEXTURE_2D, name);
761 if (wrap_mode) { 1119
762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764 }
765 glBegin (GL_QUADS); 1120 glBegin (GL_QUADS);
766 glTexCoord2f (0, 0); glVertex2f (x , y ); 1121 glTexCoord2f (0, 0); glVertex2f (x , y );
767 glTexCoord2f (0, t); glVertex2f (x , y + h); 1122 glTexCoord2f (0, t); glVertex2f (x , y + h);
768 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1123 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1124 glTexCoord2f (s, 0); glVertex2f (x + w, y );
770 glEnd (); 1125 glEnd ();
771}
772 1126
1127 if (ix)
1128 {
1129 glDisable (GL_ALPHA_TEST);
1130 glDisable (GL_BLEND);
1131 }
1132}
1133
773MODULE = CFClient PACKAGE = CFClient::Map 1134MODULE = CFPlus PACKAGE = CFPlus::Map
774 1135
775CFClient::Map 1136CFPlus::Map
776new (SV *class, int map_width, int map_height) 1137new (SV *class, int map_width, int map_height)
777 CODE: 1138 CODE:
778 New (0, RETVAL, 1, struct map); 1139 New (0, RETVAL, 1, struct map);
779 RETVAL->x = 0; 1140 RETVAL->x = 0;
780 RETVAL->y = 0; 1141 RETVAL->y = 0;
790 RETVAL->row = 0; 1151 RETVAL->row = 0;
791 OUTPUT: 1152 OUTPUT:
792 RETVAL 1153 RETVAL
793 1154
794void 1155void
795DESTROY (CFClient::Map self) 1156DESTROY (CFPlus::Map self)
796 CODE: 1157 CODE:
797{ 1158{
798 map_clear (self); 1159 map_clear (self);
799 Safefree (self->face); 1160 Safefree (self->face);
1161 Safefree (self->tex);
800 Safefree (self); 1162 Safefree (self);
801} 1163}
802 1164
803void 1165void
804clear (CFClient::Map self) 1166clear (CFPlus::Map self)
805 CODE: 1167 CODE:
806 map_clear (self); 1168 map_clear (self);
807 1169
808void 1170void
809set_face (CFClient::Map self, int face, int texid) 1171set_face (CFPlus::Map self, int face, int texid)
810 CODE: 1172 CODE:
811{ 1173{
812 while (self->faces <= face) 1174 while (self->faces <= face)
813 { 1175 {
814 Append (mapface, self->face, self->faces, self->faces); 1176 Append (mapface, self->face, self->faces, self->faces);
817 1179
818 self->face [face] = texid; 1180 self->face [face] = texid;
819} 1181}
820 1182
821void 1183void
822set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1184set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
823 CODE: 1185 CODE:
824{ 1186{
825 while (self->texs <= texid) 1187 while (self->texs <= texid)
826 { 1188 {
827 Append (maptex, self->tex, self->texs, self->texs); 1189 Append (maptex, self->tex, self->texs, self->texs);
839 tex->r = r; 1201 tex->r = r;
840 tex->g = g; 1202 tex->g = g;
841 tex->b = b; 1203 tex->b = b;
842 tex->a = a; 1204 tex->a = a;
843 } 1205 }
1206
1207 // somewhat hackish, but for textures that require it, it really
1208 // improves the look, and most others don't suffer.
1209 glBindTexture (GL_TEXTURE_2D, name);
1210 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1211 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1212 // use uglier nearest interpolation because linear suffers
1213 // from transparent color bleeding and ugly wrapping effects.
1214 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
844} 1215}
845 1216
846int 1217int
847ox (CFClient::Map self) 1218ox (CFPlus::Map self)
848 ALIAS: 1219 ALIAS:
849 oy = 1 1220 oy = 1
1221 x = 2
1222 y = 3
1223 w = 4
1224 h = 5
850 CODE: 1225 CODE:
851 switch (ix) 1226 switch (ix)
852 { 1227 {
853 case 0: RETVAL = self->ox; break; 1228 case 0: RETVAL = self->ox; break;
854 case 1: RETVAL = self->oy; break; 1229 case 1: RETVAL = self->oy; break;
1230 case 2: RETVAL = self->x; break;
1231 case 3: RETVAL = self->y; break;
1232 case 4: RETVAL = self->w; break;
1233 case 5: RETVAL = self->h; break;
855 } 1234 }
856 OUTPUT: 1235 OUTPUT:
857 RETVAL 1236 RETVAL
858 1237
859void 1238void
860scroll (CFClient::Map self, int dx, int dy) 1239scroll (CFPlus::Map self, int dx, int dy)
861 CODE: 1240 CODE:
862{ 1241{
863 if (dx > 0) 1242 if (dx > 0)
864 map_blank (self, self->x, self->y, dx - 1, self->h); 1243 map_blank (self, self->x, self->y, dx - 1, self->h);
865 else if (dx < 0) 1244 else if (dx < 0)
881 self->y += MAP_EXTEND_Y; 1260 self->y += MAP_EXTEND_Y;
882 } 1261 }
883} 1262}
884 1263
885void 1264void
886map1a_update (CFClient::Map self, SV *data_) 1265map1a_update (CFPlus::Map self, SV *data_)
887 CODE: 1266 CODE:
888{ 1267{
889 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1268 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
890 uint8_t *data_end = (uint8_t *)SvEND (data_); 1269 uint8_t *data_end = (uint8_t *)SvEND (data_);
891 mapcell *cell; 1270 mapcell *cell;
893 1272
894 while (data < data_end) 1273 while (data < data_end)
895 { 1274 {
896 flags = (data [0] << 8) + data [1]; data += 2; 1275 flags = (data [0] << 8) + data [1]; data += 2;
897 1276
898 x = ((flags >> 10) & 63) + self->x; 1277 x = self->x + ((flags >> 10) & 63);
899 y = ((flags >> 4) & 63) + self->y; 1278 y = self->y + ((flags >> 4) & 63);
900 1279
901 cell = map_get_cell (self, x, y); 1280 cell = map_get_cell (self, x, y);
902 1281
903 if (flags & 15) 1282 if (flags & 15)
904 { 1283 {
933 cell->darkness = -1; 1312 cell->darkness = -1;
934 } 1313 }
935} 1314}
936 1315
937SV * 1316SV *
938mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1317mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
939 CODE: 1318 CODE:
940{ 1319{
941 int x1, x; 1320 int x1, x;
942 int y1, y; 1321 int y1, y;
943 int z; 1322 int z;
993} 1372}
994 OUTPUT: 1373 OUTPUT:
995 RETVAL 1374 RETVAL
996 1375
997void 1376void
998draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1377draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
999 PPCODE: 1378 CODE:
1000{ 1379{
1001 int vx, vy; 1380 int vx, vy;
1002 int x, y, z; 1381 int x, y, z;
1003 int last_name; 1382 int last_name;
1004 mapface face; 1383 mapface face;
1005 int sw4 = (sw + 3) & ~3;
1006 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1007 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1008 1384
1009 memset (darkness, 255, sw4 * sh);
1010 SvPOK_only (darkness_sv);
1011 SvCUR_set (darkness_sv, sw4 * sh);
1012
1013 vx = self->x + (self->w - sw) / 2 - shift_x; 1385 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1014 vy = self->y + (self->h - sh) / 2 - shift_y; 1386 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1015 1387
1016 /* 1388 /*
1017 int vx = self->vx = self->w >= sw 1389 int vx = self->vx = self->w >= sw
1018 ? self->x + (self->w - sw) / 2 1390 ? self->x + (self->w - sw) / 2
1019 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1391 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1023 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1395 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1024 */ 1396 */
1025 1397
1026 glColor4ub (255, 255, 255, 255); 1398 glColor4ub (255, 255, 255, 255);
1027 1399
1400 glEnable (GL_BLEND);
1028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1401 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1029 glEnable (GL_BLEND);
1030 glEnable (GL_TEXTURE_2D); 1402 glEnable (GL_TEXTURE_2D);
1031 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1403 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1032 1404
1033 glBegin (GL_QUADS); 1405 glBegin (GL_QUADS);
1034 1406
1042 1414
1043 for (x = 0; x < sw; x++) 1415 for (x = 0; x < sw; x++)
1044 if (row->c0 <= x + vx && x + vx < row->c1) 1416 if (row->c0 <= x + vx && x + vx < row->c1)
1045 { 1417 {
1046 mapcell *cell = row->col + (x + vx - row->c0); 1418 mapcell *cell = row->col + (x + vx - row->c0);
1047
1048 darkness[y * sw4 + x] = cell->darkness < 0
1049 ? 255 - FOW_DARKNESS
1050 : 255 - cell->darkness;
1051 1419
1052 face = cell->face [z]; 1420 face = cell->face [z];
1053 1421
1054 if (face) 1422 if (face)
1055 { 1423 {
1076 1444
1077 glEnd (); 1445 glEnd ();
1078 1446
1079 glDisable (GL_TEXTURE_2D); 1447 glDisable (GL_TEXTURE_2D);
1080 glDisable (GL_BLEND); 1448 glDisable (GL_BLEND);
1449}
1450
1451void
1452draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1453 CODE:
1454{
1455 static float color[16][3] = {
1456 { 0.00F, 0.00F, 0.00F },
1457 { 1.00F, 1.00F, 1.00F },
1458 { 0.00F, 0.00F, 0.55F },
1459 { 1.00F, 0.00F, 0.00F },
1460
1461 { 1.00F, 0.54F, 0.00F },
1462 { 0.11F, 0.56F, 1.00F },
1463 { 0.93F, 0.46F, 0.00F },
1464 { 0.18F, 0.54F, 0.34F },
1465
1466 { 0.56F, 0.73F, 0.56F },
1467 { 0.80F, 0.80F, 0.80F },
1468 { 0.55F, 0.41F, 0.13F },
1469 { 0.99F, 0.77F, 0.26F },
1470
1471 { 0.74F, 0.65F, 0.41F },
1472
1473 { 0.00F, 1.00F, 1.00F },
1474 { 1.00F, 0.00F, 1.00F },
1475 { 1.00F, 1.00F, 0.00F },
1476 };
1477
1478 int x, y;
1479
1480 glEnable (GL_TEXTURE_2D);
1481 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1482 glEnable (GL_BLEND);
1483 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1484 glBegin (GL_QUADS);
1485
1486 for (y = 0; y < h; y++)
1487 for (x = 0; x < w; x++)
1488 {
1489 unsigned char m = data [x + y * w];
1490
1491 if (m)
1492 {
1493 float *c = color [m & 15];
1494
1495 float tx1 = m & 0x40 ? 0.5 : 0.;
1496 float tx2 = tx1 + 0.5;
1497
1498 glColor4f (c[0], c[1], c[2], 0.75);
1499 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1500 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1501 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1502 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1503 }
1504 }
1505
1506 glEnd ();
1507 glDisable (GL_BLEND);
1508 glDisable (GL_TEXTURE_2D);
1509}
1510
1511void
1512fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1513 PPCODE:
1514{
1515 int vx, vy;
1516 int x, y;
1517 int sw4 = (sw + 3) & ~3;
1518 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1519 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1520
1521 memset (darkness, 255, sw4 * sh);
1522 SvPOK_only (darkness_sv);
1523 SvCUR_set (darkness_sv, sw4 * sh);
1524
1525 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1526 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1527
1528 for (y = 0; y < sh; y++)
1529 if (0 <= y + vy && y + vy < self->rows)
1530 {
1531 maprow *row = self->row + (y + vy);
1532
1533 for (x = 0; x < sw; x++)
1534 if (row->c0 <= x + vx && x + vx < row->c1)
1535 {
1536 mapcell *cell = row->col + (x + vx - row->c0);
1537
1538 darkness[y * sw4 + x] = cell->darkness < 0
1539 ? 255 - FOW_DARKNESS
1540 : 255 - cell->darkness;
1541 }
1542 }
1081 1543
1082 EXTEND (SP, 3); 1544 EXTEND (SP, 3);
1083 PUSHs (sv_2mortal (newSViv (sw4))); 1545 PUSHs (sv_2mortal (newSViv (sw4)));
1084 PUSHs (sv_2mortal (newSViv (sh))); 1546 PUSHs (sv_2mortal (newSViv (sh)));
1085 PUSHs (darkness_sv); 1547 PUSHs (darkness_sv);
1086} 1548}
1087 1549
1088SV * 1550SV *
1089get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1551get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1090 CODE: 1552 CODE:
1091{ 1553{
1092 int x, y, x1, y1; 1554 int x, y, x1, y1;
1093 SV *data_sv = newSV (w * h * 7 + 5); 1555 SV *data_sv = newSV (w * h * 7 + 5);
1094 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1556 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1156} 1618}
1157 OUTPUT: 1619 OUTPUT:
1158 RETVAL 1620 RETVAL
1159 1621
1160void 1622void
1161set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1623set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1162 PPCODE: 1624 PPCODE:
1163{ 1625{
1164 int x, y, z; 1626 int x, y, z;
1165 int w, h; 1627 int w, h;
1166 int x1, y1; 1628 int x1, y1;
1215 } 1677 }
1216 } 1678 }
1217 } 1679 }
1218} 1680}
1219 1681
1220MODULE = CFClient PACKAGE = CFClient::MixChunk 1682MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1221 1683
1222CFClient::MixChunk 1684CFPlus::MixChunk
1223new_from_file (SV *class, char *path) 1685new_from_file (SV *class, char *path)
1224 CODE: 1686 CODE:
1225 RETVAL = Mix_LoadWAV (path); 1687 RETVAL = Mix_LoadWAV (path);
1226 OUTPUT: 1688 OUTPUT:
1227 RETVAL 1689 RETVAL
1228 1690
1229void 1691void
1230DESTROY (CFClient::MixChunk self) 1692DESTROY (CFPlus::MixChunk self)
1231 CODE: 1693 CODE:
1232 Mix_FreeChunk (self); 1694 Mix_FreeChunk (self);
1233 1695
1234int 1696int
1235volume (CFClient::MixChunk self, int volume = -1) 1697volume (CFPlus::MixChunk self, int volume = -1)
1236 CODE: 1698 CODE:
1237 RETVAL = Mix_VolumeChunk (self, volume); 1699 RETVAL = Mix_VolumeChunk (self, volume);
1238 OUTPUT: 1700 OUTPUT:
1239 RETVAL 1701 RETVAL
1240 1702
1241int 1703int
1242play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1704play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1243 CODE: 1705 CODE:
1244 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1706 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1245 OUTPUT: 1707 OUTPUT:
1246 RETVAL 1708 RETVAL
1247 1709
1248MODULE = CFClient PACKAGE = CFClient::MixMusic 1710MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1249 1711
1250int 1712int
1251volume (int volume = -1) 1713volume (int volume = -1)
1252 CODE: 1714 CODE:
1253 RETVAL = Mix_VolumeMusic (volume); 1715 RETVAL = Mix_VolumeMusic (volume);
1254 OUTPUT: 1716 OUTPUT:
1255 RETVAL 1717 RETVAL
1256 1718
1257CFClient::MixMusic 1719CFPlus::MixMusic
1258new_from_file (SV *class, char *path) 1720new_from_file (SV *class, char *path)
1259 CODE: 1721 CODE:
1260 RETVAL = Mix_LoadMUS (path); 1722 RETVAL = Mix_LoadMUS (path);
1261 OUTPUT: 1723 OUTPUT:
1262 RETVAL 1724 RETVAL
1263 1725
1264void 1726void
1265DESTROY (CFClient::MixMusic self) 1727DESTROY (CFPlus::MixMusic self)
1266 CODE: 1728 CODE:
1267 Mix_FreeMusic (self); 1729 Mix_FreeMusic (self);
1268 1730
1269int 1731int
1270play (CFClient::MixMusic self, int loops = -1) 1732play (CFPlus::MixMusic self, int loops = -1)
1271 CODE: 1733 CODE:
1272 RETVAL = Mix_PlayMusic (self, loops); 1734 RETVAL = Mix_PlayMusic (self, loops);
1273 OUTPUT: 1735 OUTPUT:
1274 RETVAL 1736 RETVAL
1275 1737
1276MODULE = CFClient PACKAGE = CFClient::OpenGL 1738MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1277 1739
1278BOOT: 1740BOOT:
1279{ 1741{
1280 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1742 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1281 static const struct { 1743 static const struct {
1282 const char *name; 1744 const char *name;
1283 IV iv; 1745 IV iv;
1284 } *civ, const_iv[] = { 1746 } *civ, const_iv[] = {
1285# define const_iv(name) { # name, (IV)name } 1747# define const_iv(name) { # name, (IV)name }
1286 const_iv (GL_COLOR_MATERIAL), 1748 const_iv (GL_COLOR_MATERIAL),
1287 const_iv (GL_SMOOTH), 1749 const_iv (GL_SMOOTH),
1288 const_iv (GL_FLAT), 1750 const_iv (GL_FLAT),
1751 const_iv (GL_DITHER),
1289 const_iv (GL_BLEND), 1752 const_iv (GL_BLEND),
1753 const_iv (GL_CULL_FACE),
1754 const_iv (GL_SCISSOR_TEST),
1755 const_iv (GL_DEPTH_TEST),
1756 const_iv (GL_ALPHA_TEST),
1757 const_iv (GL_NORMALIZE),
1758 const_iv (GL_RESCALE_NORMAL),
1759 const_iv (GL_FRONT),
1760 const_iv (GL_BACK),
1290 const_iv (GL_AND), 1761 const_iv (GL_AND),
1762 const_iv (GL_ONE),
1763 const_iv (GL_ZERO),
1291 const_iv (GL_SRC_ALPHA), 1764 const_iv (GL_SRC_ALPHA),
1765 const_iv (GL_DST_ALPHA),
1292 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1766 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1767 const_iv (GL_ONE_MINUS_DST_ALPHA),
1768 const_iv (GL_SRC_ALPHA_SATURATE),
1293 const_iv (GL_RGB), 1769 const_iv (GL_RGB),
1294 const_iv (GL_RGBA), 1770 const_iv (GL_RGBA),
1771 const_iv (GL_RGBA4),
1772 const_iv (GL_RGBA8),
1773 const_iv (GL_RGB5_A1),
1295 const_iv (GL_UNSIGNED_BYTE), 1774 const_iv (GL_UNSIGNED_BYTE),
1296 const_iv (GL_ALPHA4), 1775 const_iv (GL_UNSIGNED_SHORT),
1776 const_iv (GL_UNSIGNED_INT),
1297 const_iv (GL_ALPHA), 1777 const_iv (GL_ALPHA),
1778 const_iv (GL_INTENSITY),
1779 const_iv (GL_LUMINANCE),
1780 const_iv (GL_LUMINANCE_ALPHA),
1298 const_iv (GL_FLOAT), 1781 const_iv (GL_FLOAT),
1299 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1782 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300 const_iv (GL_COMPILE), 1783 const_iv (GL_COMPILE),
1301 const_iv (GL_TEXTURE_1D), 1784 const_iv (GL_TEXTURE_1D),
1302 const_iv (GL_TEXTURE_2D), 1785 const_iv (GL_TEXTURE_2D),
1304 const_iv (GL_TEXTURE_MAG_FILTER), 1787 const_iv (GL_TEXTURE_MAG_FILTER),
1305 const_iv (GL_TEXTURE_MIN_FILTER), 1788 const_iv (GL_TEXTURE_MIN_FILTER),
1306 const_iv (GL_TEXTURE_ENV_MODE), 1789 const_iv (GL_TEXTURE_ENV_MODE),
1307 const_iv (GL_TEXTURE_WRAP_S), 1790 const_iv (GL_TEXTURE_WRAP_S),
1308 const_iv (GL_TEXTURE_WRAP_T), 1791 const_iv (GL_TEXTURE_WRAP_T),
1792 const_iv (GL_REPEAT),
1309 const_iv (GL_CLAMP), 1793 const_iv (GL_CLAMP),
1310 const_iv (GL_REPEAT), 1794 const_iv (GL_CLAMP_TO_EDGE),
1311 const_iv (GL_NEAREST), 1795 const_iv (GL_NEAREST),
1312 const_iv (GL_LINEAR), 1796 const_iv (GL_LINEAR),
1797 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1798 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1799 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1800 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1801 const_iv (GL_GENERATE_MIPMAP),
1313 const_iv (GL_MODULATE), 1802 const_iv (GL_MODULATE),
1803 const_iv (GL_DECAL),
1314 const_iv (GL_REPLACE), 1804 const_iv (GL_REPLACE),
1805 const_iv (GL_DEPTH_BUFFER_BIT),
1315 const_iv (GL_COLOR_BUFFER_BIT), 1806 const_iv (GL_COLOR_BUFFER_BIT),
1316 const_iv (GL_PROJECTION), 1807 const_iv (GL_PROJECTION),
1317 const_iv (GL_MODELVIEW), 1808 const_iv (GL_MODELVIEW),
1318 const_iv (GL_COLOR_LOGIC_OP), 1809 const_iv (GL_COLOR_LOGIC_OP),
1810 const_iv (GL_SEPARABLE_2D),
1319 const_iv (GL_CONVOLUTION_2D), 1811 const_iv (GL_CONVOLUTION_2D),
1320 const_iv (GL_CONVOLUTION_BORDER_MODE), 1812 const_iv (GL_CONVOLUTION_BORDER_MODE),
1321 const_iv (GL_CONSTANT_BORDER), 1813 const_iv (GL_CONSTANT_BORDER),
1322 const_iv (GL_LINES), 1814 const_iv (GL_LINES),
1815 const_iv (GL_LINE_STRIP),
1816 const_iv (GL_LINE_LOOP),
1323 const_iv (GL_QUADS), 1817 const_iv (GL_QUADS),
1324 const_iv (GL_LINE_LOOP), 1818 const_iv (GL_QUAD_STRIP),
1819 const_iv (GL_TRIANGLES),
1820 const_iv (GL_TRIANGLE_STRIP),
1821 const_iv (GL_TRIANGLE_FAN),
1325 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1822 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1326 const_iv (GL_FASTEST), 1823 const_iv (GL_FASTEST),
1824 const_iv (GL_V2F),
1825 const_iv (GL_V3F),
1826 const_iv (GL_T2F_V3F),
1827 const_iv (GL_T2F_N3F_V3F),
1327# undef const_iv 1828# undef const_iv
1328 }; 1829 };
1329 1830
1330 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1831 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1331 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1832 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1332} 1833}
1333 1834
1835char *
1836gl_vendor ()
1837 CODE:
1838 RETVAL = (char *)glGetString (GL_VENDOR);
1839 OUTPUT:
1840 RETVAL
1841
1842char *
1843gl_version ()
1844 CODE:
1845 RETVAL = (char *)glGetString (GL_VERSION);
1846 OUTPUT:
1847 RETVAL
1848
1849char *
1850gl_extensions ()
1851 CODE:
1852 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1853 OUTPUT:
1854 RETVAL
1855
1334int glGetError () 1856int glGetError ()
1857
1858void glFinish ()
1335 1859
1336void glClear (int mask) 1860void glClear (int mask)
1337 1861
1338void glClearColor (float r, float g, float b, float a = 1.0) 1862void glClearColor (float r, float g, float b, float a = 1.0)
1339 PROTOTYPE: @ 1863 PROTOTYPE: @
1346 1870
1347void glHint (int target, int mode) 1871void glHint (int target, int mode)
1348 1872
1349void glBlendFunc (int sfactor, int dfactor) 1873void glBlendFunc (int sfactor, int dfactor)
1350 1874
1875void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1876 CODE:
1877 gl_BlendFuncSeparate (sa, da, saa, daa);
1878
1879void glDepthMask (int flag)
1880
1351void glLogicOp (int opcode) 1881void glLogicOp (int opcode)
1352 1882
1883void glColorMask (int red, int green, int blue, int alpha)
1884
1353void glMatrixMode (int mode) 1885void glMatrixMode (int mode)
1354 1886
1355void glPushMatrix () 1887void glPushMatrix ()
1356 1888
1357void glPopMatrix () 1889void glPopMatrix ()
1358 1890
1359void glLoadIdentity () 1891void glLoadIdentity ()
1360 1892
1893void glDrawBuffer (int buffer)
1894
1895void glReadBuffer (int buffer)
1896
1897# near_ and far_ are due to microsofts buggy "c" compiler
1898void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1899
1900# near_ and far_ are due to microsofts buggy "c" compiler
1361void glOrtho (double left, double right, double bottom, double top, double near, double far) 1901void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1362 1902
1363void glViewport (int x, int y, int width, int height) 1903void glViewport (int x, int y, int width, int height)
1904
1905void glScissor (int x, int y, int width, int height)
1364 1906
1365void glTranslate (float x, float y, float z = 0.) 1907void glTranslate (float x, float y, float z = 0.)
1366 CODE: 1908 CODE:
1367 glTranslatef (x, y, z); 1909 glTranslatef (x, y, z);
1368 1910
1369void glScale (float x, float y, float z) 1911void glScale (float x, float y, float z = 1.)
1370 CODE: 1912 CODE:
1371 glScalef (x, y, z); 1913 glScalef (x, y, z);
1372 1914
1373void glRotate (float angle, float x, float y, float z) 1915void glRotate (float angle, float x, float y, float z)
1374 CODE: 1916 CODE:
1378 1920
1379void glEnd () 1921void glEnd ()
1380 1922
1381void glColor (float r, float g, float b, float a = 1.0) 1923void glColor (float r, float g, float b, float a = 1.0)
1382 PROTOTYPE: @ 1924 PROTOTYPE: @
1925 ALIAS:
1926 glColor_premultiply = 1
1383 CODE: 1927 CODE:
1928 if (ix)
1929 {
1930 r *= a;
1931 g *= a;
1932 b *= a;
1933 }
1934 // microsoft visual "c" rounds instead of truncating...
1384 glColor4f (r, g, b, a); 1935 glColor4f (r, g, b, a);
1936
1937void glInterleavedArrays (int format, int stride, char *data)
1938
1939void glDrawElements (int mode, int count, int type, char *indices)
1940
1941# 1.2 void glDrawRangeElements (int mode, int start, int end
1942
1943void glRasterPos (float x, float y, float z = 0.)
1944 CODE:
1945 glRasterPos3f (0, 0, z);
1946 glBitmap (0, 0, 0, 0, x, y, 0);
1385 1947
1386void glVertex (float x, float y, float z = 0.) 1948void glVertex (float x, float y, float z = 0.)
1387 CODE: 1949 CODE:
1388 glVertex3f (x, y, z); 1950 glVertex3f (x, y, z);
1389 1951
1401 1963
1402void glBindTexture (int target, int name) 1964void glBindTexture (int target, int name)
1403 1965
1404void glConvolutionParameter (int target, int pname, float params) 1966void glConvolutionParameter (int target, int pname, float params)
1405 CODE: 1967 CODE:
1968 if (gl.ConvolutionParameterf)
1406 glConvolutionParameterf (target, pname, params); 1969 gl.ConvolutionParameterf (target, pname, params);
1407 1970
1408void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1971void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1972 CODE:
1973 if (gl.ConvolutionFilter2D)
1974 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1975
1976void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1977 CODE:
1978 if (gl.SeparableFilter2D)
1979 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1409 1980
1410void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1981void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1411 1982
1412void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1983void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1984
1985void glDrawPixels (int width, int height, int format, int type, char *pixels)
1986
1987void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1413 1988
1414int glGenTexture () 1989int glGenTexture ()
1415 CODE: 1990 CODE:
1416{ 1991{
1417 GLuint name; 1992 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines