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.59 by root, Sun Apr 23 04:41:33 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 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# include <wininet.h>
7# pragma warning(disable:4244)
3#endif 8#endif
4 9
5#include "EXTERN.h" 10#include "EXTERN.h"
6#include "perl.h" 11#include "perl.h"
7#include "XSUB.h" 12#include "XSUB.h"
8 13
14#ifdef _WIN32
15# undef pipe
16#endif
17
18#include <math.h>
9#include <string.h> 19#include <string.h>
10#include <stdio.h> 20#include <stdio.h>
21#include <stdlib.h>
11 22
12#include <SDL.h> 23#include <SDL.h>
24#include <SDL_endian.h>
13#include <SDL_image.h> 25#include <SDL_image.h>
14#include <SDL_mixer.h> 26#include <SDL_mixer.h>
15#include <SDL_opengl.h> 27#include <SDL_opengl.h>
16 28
29#define PANGO_ENABLE_BACKEND
30#define G_DISABLE_CAST_CHECKS
31
17#include <glib/gmacros.h> 32#include <glib/gmacros.h>
18 33
19#include <pango/pango.h> 34#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 35
23#ifndef _WIN32 36#ifndef _WIN32
24# include <sys/types.h> 37# include <sys/types.h>
25# include <sys/socket.h> 38# include <sys/socket.h>
26# include <netinet/in.h> 39# include <netinet/in.h>
33 typedef signed char int8_t; 46 typedef signed char int8_t;
34 typedef signed short int16_t; 47 typedef signed short int16_t;
35 typedef signed int int32_t; 48 typedef signed int int32_t;
36#endif 49#endif
37 50
38#include "glext.h" 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39 52
40#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
41 54
42#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
44 57
45#define MIN_FONT_HEIGHT 8 * PANGO_SCALE 58#define MIN_FONT_HEIGHT 10
46 59
60#if 0
61# define PARACHUTE SDL_INIT_NOPARACHUTE
62#else
63# define PARACHUTE 0
64#endif
65
66static struct
67{
68#define GL_FUNC(ptr,name) ptr name;
69#include "glfunc.h"
70#undef GL_FUNC
71} gl;
72
73static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
74{
75 if (gl.BlendFuncSeparate)
76 gl.BlendFuncSeparate (sa, da, saa, daa);
77 else if (gl.BlendFuncSeparateEXT)
78 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
79 else
80 glBlendFunc (sa, da);
81}
82
83#include "texcache.c"
84
85#include "pango-font.c"
86#include "pango-fontmap.c"
87#include "pango-render.c"
88
47typedef Mix_Chunk *CFClient__MixChunk; 89typedef Mix_Chunk *CFPlus__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 90typedef Mix_Music *CFPlus__MixMusic;
49 91
50static PangoContext *context; 92typedef PangoFontDescription *CFPlus__Font;
51static PangoFontMap *fontmap; 93
94static int
95shape_attr_p (PangoLayoutRun *run)
96{
97 GSList *attrs = run->item->analysis.extra_attrs;
98
99 while (attrs)
100 {
101 PangoAttribute *attr = attrs->data;
102
103 if (attr->klass->type == PANGO_ATTR_SHAPE)
104 return 1;
105
106 attrs = attrs->next;
107 }
108
109 return 0;
110}
52 111
53typedef struct cf_layout { 112typedef struct cf_layout {
54 PangoLayout *pl; 113 PangoLayout *pl;
114 float r, g, b, a; // default color for rgba mode
55 int base_height; 115 int base_height;
116 CFPlus__Font font;
56} *CFClient__Layout; 117} *CFPlus__Layout;
118
119static CFPlus__Font default_font;
120static PangoContext *opengl_context;
121static PangoFontMap *opengl_fontmap;
57 122
58static void 123static void
59substitute_func (FcPattern *pattern, gpointer data) 124substitute_func (FcPattern *pattern, gpointer data)
60{ 125{
61 FcPatternAddBool (pattern, FC_HINTING , 1); 126 FcPatternAddBool (pattern, FC_HINTING, 1);
127#ifdef FC_HINT_STYLE
128 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
129#endif
62 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 130 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63} 131}
64 132
65static void 133static void
66layout_update (CFClient__Layout self) 134layout_update_font (CFPlus__Layout self)
67{ 135{
68 /* use a random scale factor to account for unknown descenders, 0.8 works 136 /* use a random scale factor to account for unknown descenders, 0.8 works
69 * reasonably well with bitstream vera 137 * reasonably well with bitstream vera
70 */ 138 */
71 PangoFontDescription *font = pango_layout_get_font_description (self->pl); 139 PangoFontDescription *font = self->font ? self->font : default_font;
72 140
73 int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75 if (height < MIN_FONT_HEIGHT)
76 height = MIN_FONT_HEIGHT;
77
78 if (pango_font_description_get_size (font) != height)
79 {
80 font = pango_font_description_copy (font);
81 pango_font_description_set_absolute_size (font, height); 141 pango_font_description_set_absolute_size (font,
142 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
143
82 pango_layout_set_font_description (self->pl, font); 144 pango_layout_set_font_description (self->pl, font);
83 }
84} 145}
85 146
86static void 147static void
87layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 148layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
88{ 149{
89 layout_update (self); 150 PangoRectangle rect;
90 151
152 // get_pixel_* wrongly rounds down
91 pango_layout_get_pixel_size (self->pl, w, h); 153 pango_layout_get_extents (self->pl, 0, &rect);
92 154
93 *w = (*w + 3) & ~3; 155 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
94 if (!*w) *w = 1; 156 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
95 if (!*h) *h = 1; 157
158 if (!rect.width) rect.width = 1;
159 if (!rect.height) rect.height = 1;
160
161 *w = rect.width;
162 *h = rect.height;
96} 163}
97 164
98typedef uint16_t mapface; 165typedef uint16_t mapface;
99 166
100typedef struct { 167typedef struct {
103 float s, t; 170 float s, t;
104 uint8_t r, g, b, a; 171 uint8_t r, g, b, a;
105} maptex; 172} maptex;
106 173
107typedef struct { 174typedef struct {
108 int16_t darkness; 175 uint32_t player;
109 mapface face[3]; 176 mapface face[3];
177 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags;
110} mapcell; 179} mapcell;
111 180
112typedef struct { 181typedef struct {
113 int32_t c0, c1; 182 int32_t c0, c1;
114 mapcell *col; 183 mapcell *col;
123 int texs; 192 int texs;
124 maptex *tex; 193 maptex *tex;
125 194
126 int32_t rows; 195 int32_t rows;
127 maprow *row; 196 maprow *row;
128} *CFClient__Map; 197} *CFPlus__Map;
129 198
130static char * 199static char *
131prepend (char *ptr, int sze, int inc) 200prepend (char *ptr, int sze, int inc)
132{ 201{
133 char *p; 202 char *p;
151 220
152#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 221#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
153#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 222#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
154 223
155static maprow * 224static maprow *
156map_get_row (CFClient__Map self, int y) 225map_get_row (CFPlus__Map self, int y)
157{ 226{
158 if (0 > y) 227 if (0 > y)
159 { 228 {
160 int extend = - y + MAP_EXTEND_Y; 229 int extend = - y + MAP_EXTEND_Y;
161 Prepend (maprow, self->row, self->rows, extend); 230 Prepend (maprow, self->row, self->rows, extend);
199 268
200 return row->col + (x - row->c0); 269 return row->col + (x - row->c0);
201} 270}
202 271
203static mapcell * 272static mapcell *
204map_get_cell (CFClient__Map self, int x, int y) 273map_get_cell (CFPlus__Map self, int x, int y)
205{ 274{
206 return row_get_cell (map_get_row (self, y), x); 275 return row_get_cell (map_get_row (self, y), x);
207} 276}
208 277
209static void 278static void
210map_clear (CFClient__Map self) 279map_clear (CFPlus__Map self)
211{ 280{
212 int r; 281 int r;
213 282
214 for (r = 0; r < self->rows; r++) 283 for (r = 0; r < self->rows; r++)
215 Safefree (self->row[r].col); 284 Safefree (self->row[r].col);
223 self->row = 0; 292 self->row = 0;
224 self->rows = 0; 293 self->rows = 0;
225} 294}
226 295
227static void 296static void
228map_blank (CFClient__Map self, int x0, int y0, int w, int h) 297map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
229{ 298{
230 int x, y; 299 int x, y;
231 maprow *row; 300 maprow *row;
301 mapcell *cell;
232 302
233 for (y = y0; y < y0 + h; y++) 303 for (y = y0; y < y0 + h; y++)
234 if (y >= 0) 304 if (y >= 0)
235 { 305 {
236 if (y >= self->rows) 306 if (y >= self->rows)
242 if (x >= row->c0) 312 if (x >= row->c0)
243 { 313 {
244 if (x >= row->c1) 314 if (x >= row->c1)
245 break; 315 break;
246 316
247 row->col[x - row->c0].darkness = -1; 317 cell = row->col + x - row->c0;
318
319 cell->darkness = 0;
320 cell->stat_hp = 0;
321 cell->flags = 0;
322 cell->player = 0;
248 } 323 }
249 } 324 }
250} 325}
251 326
252static void 327static void
253music_finished () 328music_finished (void)
254{ 329{
255 SDL_UserEvent ev; 330 SDL_UserEvent ev;
256 331
257 ev.type = SDL_USEREVENT; 332 ev.type = SDL_USEREVENT;
258 ev.code = 0; 333 ev.code = 0;
260 ev.data2 = 0; 335 ev.data2 = 0;
261 336
262 SDL_PushEvent ((SDL_Event *)&ev); 337 SDL_PushEvent ((SDL_Event *)&ev);
263} 338}
264 339
340static void
341channel_finished (int channel)
342{
343 SDL_UserEvent ev;
344
345 ev.type = SDL_USEREVENT;
346 ev.code = 1;
347 ev.data1 = (void *)(long)channel;
348 ev.data2 = 0;
349
350 SDL_PushEvent ((SDL_Event *)&ev);
351}
352
353static unsigned int
354minpot (unsigned int n)
355{
356 if (!n)
357 return 0;
358
359 --n;
360
361 n |= n >> 1;
362 n |= n >> 2;
363 n |= n >> 4;
364 n |= n >> 8;
365 n |= n >> 16;
366
367 return n + 1;
368}
369
265MODULE = CFClient PACKAGE = CFClient 370MODULE = CFPlus PACKAGE = CFPlus
266 371
267PROTOTYPES: ENABLE 372PROTOTYPES: ENABLE
268 373
269BOOT: 374BOOT:
270{ 375{
271 HV *stash = gv_stashpv ("CFClient", 1); 376 HV *stash = gv_stashpv ("CFPlus", 1);
272 static const struct { 377 static const struct {
273 const char *name; 378 const char *name;
274 IV iv; 379 IV iv;
275 } *civ, const_iv[] = { 380 } *civ, const_iv[] = {
276# define const_iv(name) { # name, (IV)name } 381# define const_iv(name) { # name, (IV)name }
375# undef const_iv 480# undef const_iv
376 }; 481 };
377 482
378 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 483 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
379 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
380
381 fontmap = pango_ft2_font_map_new ();
382 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
383 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
384} 485}
385 486
386int 487int
488in_destruct ()
489 CODE:
490 RETVAL = PL_main_cv == Nullcv;
491 OUTPUT:
492 RETVAL
493
494NV floor (NV x)
495
496NV ceil (NV x)
497
498void
499pango_init ()
500 CODE:
501{
502 opengl_fontmap = pango_opengl_font_map_new ();
503 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
504 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
505}
506
507int
387SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 508SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
388 509
389void 510void
390SDL_Quit () 511SDL_Quit ()
391 512
392void 513void
398 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 519 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
399 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 520 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
400 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 521 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
401 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 522 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
402 523
524 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
525 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
526
403 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
404 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
405 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
406 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
407 531
408 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 532 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
533#if SDL_VERSION_ATLEAST(1,2,10)
409 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 534 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
410 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 535 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
536#endif
411 537
412 SDL_EnableUNICODE (1); 538 SDL_EnableUNICODE (1);
413 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
414 540
415 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
424 550
425 ++m; 551 ++m;
426 } 552 }
427} 553}
428 554
555char *
556SDL_GetError ()
557
429int 558int
430SDL_SetVideoMode (int w, int h, int fullscreen) 559SDL_SetVideoMode (int w, int h, int fullscreen)
431 CODE: 560 CODE:
432 RETVAL = !!SDL_SetVideoMode ( 561 RETVAL = !!SDL_SetVideoMode (
433 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 562 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
434 ); 563 );
564 if (RETVAL)
565 {
435 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 566 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
567# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
568# include "glfunc.h"
569# undef GL_FUNC
570 }
436 OUTPUT: 571 OUTPUT:
437 RETVAL 572 RETVAL
438 573
439void 574void
440SDL_GL_SwapBuffers () 575SDL_GL_SwapBuffers ()
576
577char *
578SDL_GetKeyName (int sym)
441 579
442void 580void
443SDL_PollEvent () 581SDL_PollEvent ()
444 PPCODE: 582 PPCODE:
445{ 583{
447 585
448 while (SDL_PollEvent (&ev)) 586 while (SDL_PollEvent (&ev))
449 { 587 {
450 HV *hv = newHV (); 588 HV *hv = newHV ();
451 hv_store (hv, "type", 4, newSViv (ev.type), 0); 589 hv_store (hv, "type", 4, newSViv (ev.type), 0);
590
452 switch (ev.type) 591 switch (ev.type)
453 { 592 {
454 case SDL_KEYDOWN: 593 case SDL_KEYDOWN:
455 case SDL_KEYUP: 594 case SDL_KEYUP:
456 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
463 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
464 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 603 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
465 break; 604 break;
466 605
467 case SDL_MOUSEMOTION: 606 case SDL_MOUSEMOTION:
607 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
608
468 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 609 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
469 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 610 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
470 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 611 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
471 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 612 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
472 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 613 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
473 break; 614 break;
474 615
475 case SDL_MOUSEBUTTONDOWN: 616 case SDL_MOUSEBUTTONDOWN:
476 case SDL_MOUSEBUTTONUP: 617 case SDL_MOUSEBUTTONUP:
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
619
477 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 620 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
478 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 621 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
479 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 622 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
480 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 623 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
624 break;
625
626 case SDL_USEREVENT:
627 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
628 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
629 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
630 break;
481 } 631 }
482 632
483 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 633 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
484 } 634 }
485} 635}
486 636
487int 637int
488Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 638Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
489 POSTCALL: 639 POSTCALL:
490 Mix_HookMusicFinished (music_finished); 640 Mix_HookMusicFinished (music_finished);
641 Mix_ChannelFinished (channel_finished);
491 642
492void 643void
493Mix_CloseAudio () 644Mix_CloseAudio ()
494 645
495int 646int
500 CODE: 651 CODE:
501#ifndef _WIN32 652#ifndef _WIN32
502 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
503#endif 654#endif
504 655
505char * 656void
506gl_version () 657win32_proxy_info ()
507 CODE: 658 PPCODE:
508 RETVAL = (char *)glGetString (GL_VERSION); 659{
509 OUTPUT: 660#ifdef _WIN32
510 RETVAL 661 char buffer[2048];
662 DWORD buflen;
511 663
512char * 664 EXTEND (SP, 3);
513gl_extensions () 665
514 CODE: 666 buflen = sizeof (buffer);
515 RETVAL = (char *)glGetString (GL_EXTENSIONS); 667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
516 OUTPUT: 668 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
517 RETVAL 669 {
670 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
671
672 buflen = sizeof (buffer);
673 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
674 {
675 PUSHs (newSVpv (buffer, 0));
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
679 PUSHs (newSVpv (buffer, 0));
680 }
681 }
682#endif
683}
518 684
519void 685void
520add_font (char *file) 686add_font (char *file)
521 CODE: 687 CODE:
522 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
523
524void
525set_font (char *file)
526 CODE:
527{
528 int count;
529 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
530 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
531 FcPatternDestroy (pattern);
532 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
533 pango_context_set_font_description (context, font);
534}
535 689
536void 690void
537load_image_inline (SV *image_) 691load_image_inline (SV *image_)
538 ALIAS: 692 ALIAS:
539 load_image_file = 1 693 load_image_file = 1
581 735
582 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
583 737
584 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
585 739
740 SDL_LockSurface (surface2);
586 EXTEND (SP, 5); 741 EXTEND (SP, 6);
587 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
588 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
589 SDL_LockSurface (surface2);
590 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
591 SDL_UnlockSurface (surface2);
592 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 745 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
593 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
594 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
595 749
596 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
597 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
598} 752}
599 753
621 PUSHs (sv_2mortal (newSViv (b / y))); 775 PUSHs (sv_2mortal (newSViv (b / y)));
622 PUSHs (sv_2mortal (newSViv (a / y))); 776 PUSHs (sv_2mortal (newSViv (a / y)));
623} 777}
624 778
625void 779void
780error (char *message)
781 CODE:
782 fprintf (stderr, "ERROR: %s\n", message);
783#ifdef _WIN32
784 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
785#endif
786
787void
626fatal (char *message) 788fatal (char *message)
627 CODE: 789 CODE:
790 fprintf (stderr, "FATAL: %s\n", message);
628#ifdef _WIN32 791#ifdef _WIN32
629 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
630#else
631 fprintf (stderr, "FATAL: %s\n", message);
632#endif 793#endif
633 exit (1); 794 _exit (1);
634 795
796void
797_exit (int retval = 0)
798 CODE:
799 _exit (retval);
800
801MODULE = CFPlus PACKAGE = CFPlus::Font
802
803CFPlus::Font
804new_from_file (SV *class, char *path, int id = 0)
805 CODE:
806{
807 int count;
808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
809 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
810 FcPatternDestroy (pattern);
811}
812 OUTPUT:
813 RETVAL
814
815void
816DESTROY (CFPlus::Font self)
817 CODE:
818 pango_font_description_free (self);
819
820void
821make_default (CFPlus::Font self)
822 CODE:
823 default_font = self;
824
635MODULE = CFClient PACKAGE = CFClient::Layout 825MODULE = CFPlus PACKAGE = CFPlus::Layout
636 826
637CFClient::Layout 827void
638new (SV *class, int base_height = 10) 828reset_glyph_cache ()
829 CODE:
830 tc_clear ();
831
832CFPlus::Layout
833new (SV *class)
639 CODE: 834 CODE:
640 New (0, RETVAL, 1, struct cf_layout); 835 New (0, RETVAL, 1, struct cf_layout);
641 RETVAL->base_height = base_height; 836
642 RETVAL->pl = pango_layout_new (context); 837 RETVAL->pl = pango_layout_new (opengl_context);
838 RETVAL->r = 1.;
839 RETVAL->g = 1.;
840 RETVAL->b = 1.;
841 RETVAL->a = 1.;
842 RETVAL->base_height = MIN_FONT_HEIGHT;
843 RETVAL->font = 0;
844
643 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 845 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
644 pango_layout_set_font_description (RETVAL->pl, 846 layout_update_font (RETVAL);
645 pango_font_description_copy (
646 pango_context_get_font_description (context)));
647 OUTPUT: 847 OUTPUT:
648 RETVAL 848 RETVAL
649 849
650void 850void
651DESTROY (CFClient::Layout self) 851DESTROY (CFPlus::Layout self)
652 CODE: 852 CODE:
653 g_object_unref (self->pl); 853 g_object_unref (self->pl);
654 Safefree (self); 854 Safefree (self);
655 855
656void 856void
657set_text (CFClient::Layout self, SV *text_) 857set_text (CFPlus::Layout self, SV *text_)
658 CODE: 858 CODE:
659{ 859{
660 STRLEN textlen; 860 STRLEN textlen;
661 char *text = SvPVutf8 (text_, textlen); 861 char *text = SvPVutf8 (text_, textlen);
662 862
663 pango_layout_set_text (self->pl, text, textlen); 863 pango_layout_set_text (self->pl, text, textlen);
664} 864}
665 865
666void 866void
667set_markup (CFClient::Layout self, SV *text_) 867set_markup (CFPlus::Layout self, SV *text_)
668 CODE: 868 CODE:
669{ 869{
670 STRLEN textlen; 870 STRLEN textlen;
671 char *text = SvPVutf8 (text_, textlen); 871 char *text = SvPVutf8 (text_, textlen);
672 872
673 pango_layout_set_markup (self->pl, text, textlen); 873 pango_layout_set_markup (self->pl, text, textlen);
674} 874}
675 875
876void
877set_shapes (CFPlus::Layout self, ...)
878 CODE:
879{
880 PangoAttrList *attrs = 0;
881 const char *text = pango_layout_get_text (self->pl);
882 const char *pos = text;
883 int arg = 4;
884
885 while (arg < items && (pos = strstr (pos, OBJ_STR)))
886 {
887 PangoRectangle inkrect, rect;
888 PangoAttribute *attr;
889
890 int x = SvIV (ST (arg - 3));
891 int y = SvIV (ST (arg - 2));
892 int w = SvIV (ST (arg - 1));
893 int h = SvIV (ST (arg ));
894
895 inkrect.x = 0;
896 inkrect.y = 0;
897 inkrect.width = 0;
898 inkrect.height = 0;
899
900 rect.x = x * PANGO_SCALE;
901 rect.y = y * PANGO_SCALE;
902 rect.width = w * PANGO_SCALE;
903 rect.height = h * PANGO_SCALE;
904
905 if (!attrs)
906 attrs = pango_layout_get_attributes (self->pl);
907
908 attr = pango_attr_shape_new (&inkrect, &rect);
909 attr->start_index = pos - text;
910 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
911 pango_attr_list_insert (attrs, attr);
912
913 arg += 4;
914 pos += sizeof (OBJ_STR) - 1;
915 }
916
917 if (attrs)
918 pango_layout_set_attributes (self->pl, attrs);
919}
920
921void
922get_shapes (CFPlus::Layout self)
923 PPCODE:
924{
925 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
926
927 do
928 {
929 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
930
931 if (run && shape_attr_p (run))
932 {
933 PangoRectangle extents;
934 pango_layout_iter_get_run_extents (iter, 0, &extents);
935
936 EXTEND (SP, 2);
937 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
938 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
939 }
940 }
941 while (pango_layout_iter_next_run (iter));
942
943 pango_layout_iter_free (iter);
944}
945
946int
947has_wrapped (CFPlus::Layout self)
948 CODE:
949{
950 int lines = 1;
951 const char *text = pango_layout_get_text (self->pl);
952
953 while (*text)
954 lines += *text++ == '\n';
955
956 RETVAL = lines < pango_layout_get_line_count (self->pl);
957}
958 OUTPUT:
959 RETVAL
960
676SV * 961SV *
677get_text (CFClient::Layout self) 962get_text (CFPlus::Layout self)
678 CODE: 963 CODE:
679 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
680 SvUTF8_on (RETVAL); 965 sv_utf8_decode (RETVAL);
681 OUTPUT: 966 OUTPUT:
682 RETVAL 967 RETVAL
683 968
684void 969void
970set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
971 CODE:
972 self->r = r;
973 self->g = g;
974 self->b = b;
975 self->a = a;
976
977void
978set_font (CFPlus::Layout self, CFPlus::Font font = 0)
979 CODE:
980 if (self->font != font)
981 {
982 self->font = font;
983 layout_update_font (self);
984 }
985
986void
685set_height (CFClient::Layout self, int base_height) 987set_height (CFPlus::Layout self, int base_height)
686 CODE: 988 CODE:
989 if (self->base_height != base_height)
990 {
687 self->base_height = base_height; 991 self->base_height = base_height;
992 layout_update_font (self);
993 }
688 994
689void 995void
690set_width (CFClient::Layout self, int max_width = -1) 996set_width (CFPlus::Layout self, int max_width = -1)
691 CODE: 997 CODE:
692 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 998 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
693 999
694void 1000void
1001set_indent (CFPlus::Layout self, int indent)
1002 CODE:
1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1004
1005void
1006set_spacing (CFPlus::Layout self, int spacing)
1007 CODE:
1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1009
1010void
1011set_ellipsise (CFPlus::Layout self, int ellipsise)
1012 CODE:
1013 pango_layout_set_ellipsize (self->pl,
1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1017 : PANGO_ELLIPSIZE_NONE
1018 );
1019
1020void
1021set_single_paragraph_mode (CFPlus::Layout self, int spm)
1022 CODE:
1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1024
1025void
695size (CFClient::Layout self) 1026size (CFPlus::Layout self)
696 PPCODE: 1027 PPCODE:
697{ 1028{
698 int w, h; 1029 int w, h;
699 1030
700 layout_update (self);
701 layout_get_pixel_size (self, &w, &h); 1031 layout_get_pixel_size (self, &w, &h);
702 1032
703 EXTEND (SP, 2); 1033 EXTEND (SP, 2);
704 PUSHs (sv_2mortal (newSViv (w))); 1034 PUSHs (sv_2mortal (newSViv (w)));
705 PUSHs (sv_2mortal (newSViv (h))); 1035 PUSHs (sv_2mortal (newSViv (h)));
706} 1036}
707 1037
708int 1038int
1039descent (CFPlus::Layout self)
1040 CODE:
1041{
1042 PangoRectangle rect;
1043 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1044 pango_layout_line_get_pixel_extents (line, 0, &rect);
1045 RETVAL = PANGO_DESCENT (rect);
1046}
1047 OUTPUT:
1048 RETVAL
1049
1050int
709xy_to_index (CFClient::Layout self, int x, int y) 1051xy_to_index (CFPlus::Layout self, int x, int y)
710 CODE: 1052 CODE:
711{ 1053{
712 int index, trailing; 1054 int index, trailing;
713
714 layout_update (self);
715 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1055 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
716
717 RETVAL = index; 1056 RETVAL = index;
718} 1057}
719 OUTPUT: 1058 OUTPUT:
720 RETVAL 1059 RETVAL
721 1060
722void 1061void
723cursor_pos (CFClient::Layout self, int index) 1062cursor_pos (CFPlus::Layout self, int index)
724 PPCODE: 1063 PPCODE:
725{ 1064{
726 PangoRectangle strong_pos; 1065 PangoRectangle strong_pos;
727 layout_update (self);
728 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
729 1067
730 EXTEND (SP, 3); 1068 EXTEND (SP, 3);
731 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
732 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
733 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
734} 1072}
735 1073
736void 1074void
737render (CFClient::Layout self) 1075render (CFPlus::Layout self, float x, float y, int flags = 0)
738 PPCODE: 1076 PPCODE:
739{ 1077 pango_opengl_render_layout_subpixel (
740 SV *retval; 1078 self->pl,
741 int w, h; 1079 x * PANGO_SCALE, y * PANGO_SCALE,
742 FT_Bitmap bitmap; 1080 self->r, self->g, self->b, self->a,
1081 flags
1082 );
743 1083
744 layout_update (self); 1084MODULE = CFPlus PACKAGE = CFPlus::Texture
745 layout_get_pixel_size (self, &w, &h);
746 1085
747 retval = newSV (w * h); 1086void
748 SvPOK_only (retval); 1087pad2pot (SV *data_, SV *w_, SV *h_)
749 SvCUR_set (retval, w * h); 1088 CODE:
1089{
1090 int ow = SvIV (w_);
1091 int oh = SvIV (h_);
750 1092
751 bitmap.rows = h; 1093 if (ow && oh)
752 bitmap.width = w; 1094 {
753 bitmap.pitch = w; 1095 int nw = minpot (ow);
754 bitmap.buffer = (unsigned char*)SvPVX (retval); 1096 int nh = minpot (oh);
755 bitmap.num_grays = 256;
756 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
757 1097
758 memset (bitmap.buffer, 0, w * h); 1098 if (nw != ow || nh != oh)
759 1099 {
760 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 1100 if (SvOK (data_))
1101 {
1102 STRLEN datalen;
1103 char *data = SvPVbyte (data_, datalen);
1104 int bpp = datalen / (ow * oh);
1105 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
761 1106
762 EXTEND (SP, 3); 1107 SvPOK_only (result_);
763 PUSHs (sv_2mortal (newSViv (w))); 1108 SvCUR_set (result_, nw * nh * bpp);
764 PUSHs (sv_2mortal (newSViv (h)));
765 PUSHs (sv_2mortal (retval));
766}
767 1109
768MODULE = CFClient PACKAGE = CFClient::Texture 1110 memset (SvPVX (result_), 0, nw * nh * bpp);
1111 while (oh--)
1112 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
769 1113
1114 sv_setsv (data_, result_);
1115 }
1116
1117 sv_setiv (w_, nw);
1118 sv_setiv (h_, nh);
1119 }
1120 }
1121}
1122
770void 1123void
771draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1124draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
772 PROTOTYPE: $$$;$$ 1125 PROTOTYPE: $$$;$$
1126 ALIAS:
1127 draw_quad_alpha = 1
1128 draw_quad_alpha_premultiplied = 2
773 CODE: 1129 CODE:
774{ 1130{
775 HV *hv = (HV *)SvRV (self); 1131 HV *hv = (HV *)SvRV (self);
776 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1132 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
777 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1133 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
778 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1134 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
779 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
780 1135
781 if (items < 5) 1136 if (items < 5)
782 { 1137 {
783 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1138 w = SvNV (*hv_fetch (hv, "w", 1, 1));
784 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1139 h = SvNV (*hv_fetch (hv, "h", 1, 1));
785 } 1140 }
786 1141
1142 if (ix)
1143 {
1144 glEnable (GL_BLEND);
1145
1146 if (ix == 2)
1147 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1148 else
1149 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1150 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1151
1152 glEnable (GL_ALPHA_TEST);
1153 glAlphaFunc (GL_GREATER, 0.01f);
1154 }
1155
787 glBindTexture (GL_TEXTURE_2D, name); 1156 glBindTexture (GL_TEXTURE_2D, name);
788 if (wrap_mode) { 1157
789 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
790 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
791 }
792 glBegin (GL_QUADS); 1158 glBegin (GL_QUADS);
793 glTexCoord2f (0, 0); glVertex2f (x , y ); 1159 glTexCoord2f (0, 0); glVertex2f (x , y );
794 glTexCoord2f (0, t); glVertex2f (x , y + h); 1160 glTexCoord2f (0, t); glVertex2f (x , y + h);
795 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1161 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
796 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1162 glTexCoord2f (s, 0); glVertex2f (x + w, y );
797 glEnd (); 1163 glEnd ();
798}
799 1164
1165 if (ix)
1166 {
1167 glDisable (GL_ALPHA_TEST);
1168 glDisable (GL_BLEND);
1169 }
1170}
1171
800MODULE = CFClient PACKAGE = CFClient::Map 1172MODULE = CFPlus PACKAGE = CFPlus::Map
801 1173
802CFClient::Map 1174CFPlus::Map
803new (SV *class, int map_width, int map_height) 1175new (SV *class, int map_width, int map_height)
804 CODE: 1176 CODE:
805 New (0, RETVAL, 1, struct map); 1177 New (0, RETVAL, 1, struct map);
806 RETVAL->x = 0; 1178 RETVAL->x = 0;
807 RETVAL->y = 0; 1179 RETVAL->y = 0;
817 RETVAL->row = 0; 1189 RETVAL->row = 0;
818 OUTPUT: 1190 OUTPUT:
819 RETVAL 1191 RETVAL
820 1192
821void 1193void
822DESTROY (CFClient::Map self) 1194DESTROY (CFPlus::Map self)
823 CODE: 1195 CODE:
824{ 1196{
825 map_clear (self); 1197 map_clear (self);
826 Safefree (self->face); 1198 Safefree (self->face);
1199 Safefree (self->tex);
827 Safefree (self); 1200 Safefree (self);
828} 1201}
829 1202
830void 1203void
831clear (CFClient::Map self) 1204clear (CFPlus::Map self)
832 CODE: 1205 CODE:
833 map_clear (self); 1206 map_clear (self);
834 1207
835void 1208void
836set_face (CFClient::Map self, int face, int texid) 1209set_face (CFPlus::Map self, int face, int texid)
837 CODE: 1210 CODE:
838{ 1211{
839 while (self->faces <= face) 1212 while (self->faces <= face)
840 { 1213 {
841 Append (mapface, self->face, self->faces, self->faces); 1214 Append (mapface, self->face, self->faces, self->faces);
844 1217
845 self->face [face] = texid; 1218 self->face [face] = texid;
846} 1219}
847 1220
848void 1221void
849set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1222set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
850 CODE: 1223 CODE:
851{ 1224{
852 while (self->texs <= texid) 1225 while (self->texs <= texid)
853 { 1226 {
854 Append (maptex, self->tex, self->texs, self->texs); 1227 Append (maptex, self->tex, self->texs, self->texs);
866 tex->r = r; 1239 tex->r = r;
867 tex->g = g; 1240 tex->g = g;
868 tex->b = b; 1241 tex->b = b;
869 tex->a = a; 1242 tex->a = a;
870 } 1243 }
1244
1245 // somewhat hackish, but for textures that require it, it really
1246 // improves the look, and most others don't suffer.
1247 glBindTexture (GL_TEXTURE_2D, name);
1248 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1249 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1250 // use uglier nearest interpolation because linear suffers
1251 // from transparent color bleeding and ugly wrapping effects.
1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
871} 1253}
872 1254
873int 1255int
874ox (CFClient::Map self) 1256ox (CFPlus::Map self)
875 ALIAS: 1257 ALIAS:
876 oy = 1 1258 oy = 1
1259 x = 2
1260 y = 3
1261 w = 4
1262 h = 5
877 CODE: 1263 CODE:
878 switch (ix) 1264 switch (ix)
879 { 1265 {
880 case 0: RETVAL = self->ox; break; 1266 case 0: RETVAL = self->ox; break;
881 case 1: RETVAL = self->oy; break; 1267 case 1: RETVAL = self->oy; break;
1268 case 2: RETVAL = self->x; break;
1269 case 3: RETVAL = self->y; break;
1270 case 4: RETVAL = self->w; break;
1271 case 5: RETVAL = self->h; break;
882 } 1272 }
883 OUTPUT: 1273 OUTPUT:
884 RETVAL 1274 RETVAL
885 1275
886void 1276void
887scroll (CFClient::Map self, int dx, int dy) 1277scroll (CFPlus::Map self, int dx, int dy)
888 CODE: 1278 CODE:
889{ 1279{
890 if (dx > 0) 1280 if (dx > 0)
891 map_blank (self, self->x, self->y, dx - 1, self->h); 1281 map_blank (self, self->x, self->y, dx, self->h);
892 else if (dx < 0) 1282 else if (dx < 0)
893 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1283 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
894 1284
895 if (dy > 0) 1285 if (dy > 0)
896 map_blank (self, self->x, self->y, self->w, dy - 1); 1286 map_blank (self, self->x, self->y, self->w, dy);
897 else if (dy < 0) 1287 else if (dy < 0)
898 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1288 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
899 1289
900 self->ox += dx; self->x += dx; 1290 self->ox += dx; self->x += dx;
901 self->oy += dy; self->y += dy; 1291 self->oy += dy; self->y += dy;
902 1292
903 while (self->y < 0) 1293 while (self->y < 0)
908 self->y += MAP_EXTEND_Y; 1298 self->y += MAP_EXTEND_Y;
909 } 1299 }
910} 1300}
911 1301
912void 1302void
913map1a_update (CFClient::Map self, SV *data_) 1303map1a_update (CFPlus::Map self, SV *data_, int extmap)
914 CODE: 1304 CODE:
915{ 1305{
916 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
917 uint8_t *data_end = (uint8_t *)SvEND (data_); 1307 uint8_t *data_end = (uint8_t *)SvEND (data_);
918 mapcell *cell; 1308 mapcell *cell;
919 int x, y, flags; 1309 int x, y, flags;
920 1310
921 while (data < data_end) 1311 while (data < data_end - 1)
922 { 1312 {
923 flags = (data [0] << 8) + data [1]; data += 2; 1313 flags = (data [0] << 8) + data [1]; data += 2;
924 1314
925 x = ((flags >> 10) & 63) + self->x; 1315 x = self->x + ((flags >> 10) & 63);
926 y = ((flags >> 4) & 63) + self->y; 1316 y = self->y + ((flags >> 4) & 63);
927 1317
928 cell = map_get_cell (self, x, y); 1318 cell = map_get_cell (self, x, y);
929 1319
930 if (flags & 15) 1320 if (flags & 15)
931 { 1321 {
932 if (cell->darkness < 0) 1322 if (!cell->darkness)
933 { 1323 {
1324 memset (cell, 0, sizeof (*cell));
934 cell->darkness = 0; 1325 cell->darkness = 256;
935 cell->face [0] = 0;
936 cell->face [1] = 0;
937 cell->face [2] = 0;
938 } 1326 }
939 1327
940 cell->darkness = flags & 8 ? *data++ : 255;
941
942 //TODO: don't trust server data to be in-range(!) 1328 //TODO: don't trust server data to be in-range(!)
1329
1330 if (flags & 8)
1331 {
1332 if (extmap)
1333 {
1334 uint8_t ext, cmd;
1335
1336 do
1337 {
1338 ext = *data++;
1339 cmd = ext & 0x3f;
1340
1341 if (cmd < 4)
1342 cell->darkness = 255 - ext * 64 + 1;
1343 else if (cmd == 5) // health
1344 {
1345 cell->stat_width = 1;
1346 cell->stat_hp = *data++;
1347 }
1348 else if (cmd == 6) // monster width
1349 cell->stat_width = *data++ + 1;
1350 else if (cmd == 0x47) // monster width
1351 {
1352 if (*data == 4)
1353 ; // decode player tag
1354
1355 data += *data + 1;
1356 }
1357 else if (cmd == 8) // cell flags
1358 cell->flags = *data++;
1359 else if (ext & 0x40) // unknown, multibyte => skip
1360 data += *data + 1;
1361 else
1362 data++;
1363 }
1364 while (ext & 0x80);
1365 }
1366 else
1367 cell->darkness = *data++ + 1;
1368 }
943 1369
944 if (flags & 4) 1370 if (flags & 4)
945 { 1371 {
946 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1372 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
947 } 1373 }
955 { 1381 {
956 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1382 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
957 } 1383 }
958 } 1384 }
959 else 1385 else
960 cell->darkness = -1; 1386 cell->darkness = 0;
961 } 1387 }
962} 1388}
963 1389
964SV * 1390SV *
965mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
966 CODE: 1392 CODE:
967{ 1393{
968 int x1, x; 1394 int x1, x;
969 int y1, y; 1395 int y1, y;
970 int z; 1396 int z;
1020} 1446}
1021 OUTPUT: 1447 OUTPUT:
1022 RETVAL 1448 RETVAL
1023 1449
1024void 1450void
1025draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1026 PPCODE: 1452 CODE:
1027{ 1453{
1028 int vx, vy; 1454 int vx, vy;
1029 int x, y, z; 1455 int x, y, z;
1030 int last_name; 1456 int last_name;
1031 mapface face; 1457 mapface face;
1032 int sw4 = (sw + 3) & ~3;
1033 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1034 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1035 1458
1036 memset (darkness, 255, sw4 * sh);
1037 SvPOK_only (darkness_sv);
1038 SvCUR_set (darkness_sv, sw4 * sh);
1039
1040 vx = self->x + (self->w - sw) / 2 - shift_x; 1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1041 vy = self->y + (self->h - sh) / 2 - shift_y; 1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1042 1461
1043 /* 1462 /*
1044 int vx = self->vx = self->w >= sw 1463 int vx = self->vx = self->w >= sw
1045 ? self->x + (self->w - sw) / 2 1464 ? self->x + (self->w - sw) / 2
1046 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1465 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1050 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1051 */ 1470 */
1052 1471
1053 glColor4ub (255, 255, 255, 255); 1472 glColor4ub (255, 255, 255, 255);
1054 1473
1474 glEnable (GL_BLEND);
1055 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1056 glEnable (GL_BLEND);
1057 glEnable (GL_TEXTURE_2D); 1476 glEnable (GL_TEXTURE_2D);
1058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1059 1478
1060 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1061 1480
1070 for (x = 0; x < sw; x++) 1489 for (x = 0; x < sw; x++)
1071 if (row->c0 <= x + vx && x + vx < row->c1) 1490 if (row->c0 <= x + vx && x + vx < row->c1)
1072 { 1491 {
1073 mapcell *cell = row->col + (x + vx - row->c0); 1492 mapcell *cell = row->col + (x + vx - row->c0);
1074 1493
1075 darkness[y * sw4 + x] = cell->darkness < 0
1076 ? 255 - FOW_DARKNESS
1077 : 255 - cell->darkness;
1078
1079 face = cell->face [z]; 1494 face = cell->face [z];
1080 1495
1081 if (face) 1496 if (face && face < self->texs)
1082 { 1497 {
1083 maptex tex = self->tex [face]; 1498 maptex tex = self->tex [face];
1084
1085 int px = (x + 1) * 32 - tex.w; 1499 int px = (x + 1) * 32 - tex.w;
1086 int py = (y + 1) * 32 - tex.h; 1500 int py = (y + 1) * 32 - tex.h;
1087 1501
1088 if (last_name != tex.name) 1502 if (last_name != tex.name)
1089 { 1503 {
1090 glEnd (); 1504 glEnd ();
1091 last_name = tex.name;
1092 glBindTexture (GL_TEXTURE_2D, last_name); 1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1093 glBegin (GL_QUADS); 1506 glBegin (GL_QUADS);
1094 } 1507 }
1095 1508
1096 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1097 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1098 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1511 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1099 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1100 } 1513 }
1514
1515 if (cell->flags && z == 2)
1516 {
1517 if (cell->flags & 1)
1518 {
1519 maptex tex = self->tex [1];
1520 int px = (x + 1) * 32 - tex.w + 2;
1521 int py = (y + 1) * 32 - tex.h - 6;
1522
1523 glEnd ();
1524 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1525 glBegin (GL_QUADS);
1526
1527 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1528 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1529 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1530 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1531 }
1532 }
1101 } 1533 }
1102 } 1534 }
1103 1535
1104 glEnd (); 1536 glEnd ();
1105 1537
1106 glDisable (GL_TEXTURE_2D); 1538 glDisable (GL_TEXTURE_2D);
1107 glDisable (GL_BLEND); 1539 glDisable (GL_BLEND);
1540
1541 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows)
1544 {
1545 maprow *row = self->row + (y + vy);
1546
1547 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1)
1549 {
1550 mapcell *cell = row->col + (x + vx - row->c0);
1551
1552 int px = x * 32;
1553 int py = y * 32;
1554
1555 if (cell->stat_hp)
1556 {
1557 int width = cell->stat_width * 32;
1558 int thick = sh / 28 + 1 + cell->stat_width;
1559
1560 glColor3ub (0, 0, 0);
1561 glRectf (px + 1, py - thick - 2,
1562 px + width - 1, py);
1563
1564 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1565 glRectf (px + 2,
1566 py - thick - 1,
1567 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1568 }
1569 }
1570 }
1571}
1572
1573void
1574draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1575 CODE:
1576{
1577 static float color[16][3] = {
1578 { 0.00F, 0.00F, 0.00F },
1579 { 1.00F, 1.00F, 1.00F },
1580 { 0.00F, 0.00F, 0.55F },
1581 { 1.00F, 0.00F, 0.00F },
1582
1583 { 1.00F, 0.54F, 0.00F },
1584 { 0.11F, 0.56F, 1.00F },
1585 { 0.93F, 0.46F, 0.00F },
1586 { 0.18F, 0.54F, 0.34F },
1587
1588 { 0.56F, 0.73F, 0.56F },
1589 { 0.80F, 0.80F, 0.80F },
1590 { 0.55F, 0.41F, 0.13F },
1591 { 0.99F, 0.77F, 0.26F },
1592
1593 { 0.74F, 0.65F, 0.41F },
1594
1595 { 0.00F, 1.00F, 1.00F },
1596 { 1.00F, 0.00F, 1.00F },
1597 { 1.00F, 1.00F, 0.00F },
1598 };
1599
1600 int x, y;
1601
1602 glEnable (GL_TEXTURE_2D);
1603 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1604 glEnable (GL_BLEND);
1605 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1606 glBegin (GL_QUADS);
1607
1608 for (y = 0; y < h; y++)
1609 for (x = 0; x < w; x++)
1610 {
1611 unsigned char m = data [x + y * w];
1612
1613 if (m)
1614 {
1615 float *c = color [m & 15];
1616
1617 float tx1 = m & 0x40 ? 0.5 : 0.;
1618 float tx2 = tx1 + 0.5;
1619
1620 glColor4f (c[0], c[1], c[2], 0.75);
1621 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1622 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1623 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1624 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1625 }
1626 }
1627
1628 glEnd ();
1629 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D);
1631}
1632
1633void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1635 PPCODE:
1636{
1637 int vx, vy;
1638 int x, y;
1639 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642
1643 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh);
1646
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1649
1650 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows)
1652 {
1653 maprow *row = self->row + (y + vy);
1654
1655 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1)
1657 {
1658 mapcell *cell = row->col + (x + vx - row->c0);
1659
1660 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS;
1663 }
1664 }
1108 1665
1109 EXTEND (SP, 3); 1666 EXTEND (SP, 3);
1110 PUSHs (sv_2mortal (newSViv (sw4))); 1667 PUSHs (sv_2mortal (newSViv (sw4)));
1111 PUSHs (sv_2mortal (newSViv (sh))); 1668 PUSHs (sv_2mortal (newSViv (sh)));
1112 PUSHs (darkness_sv); 1669 PUSHs (darkness_sv);
1113} 1670}
1114 1671
1115SV * 1672SV *
1116get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1673get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1117 CODE: 1674 CODE:
1118{ 1675{
1119 int x, y, x1, y1; 1676 int x, y, x1, y1;
1120 SV *data_sv = newSV (w * h * 7 + 5); 1677 SV *data_sv = newSV (w * h * 7 + 5);
1121 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1183} 1740}
1184 OUTPUT: 1741 OUTPUT:
1185 RETVAL 1742 RETVAL
1186 1743
1187void 1744void
1188set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1189 PPCODE: 1746 PPCODE:
1190{ 1747{
1191 int x, y, z; 1748 int x, y, z;
1192 int w, h; 1749 int w, h;
1193 int x1, y1; 1750 int x1, y1;
1225 1782
1226 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1227 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1228 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1229 1786
1230 if (cell->darkness <= 0) 1787 if (cell->darkness == 0)
1231 { 1788 {
1232 cell->darkness = -1; 1789 cell->darkness = 0;
1233 1790
1234 for (z = 0; z <= 2; z++) 1791 for (z = 0; z <= 2; z++)
1235 { 1792 {
1236 cell->face[z] = face[z]; 1793 cell->face[z] = face[z];
1237 1794
1242 } 1799 }
1243 } 1800 }
1244 } 1801 }
1245} 1802}
1246 1803
1247MODULE = CFClient PACKAGE = CFClient::MixChunk 1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1248 1805
1249CFClient::MixChunk 1806CFPlus::MixChunk
1250new_from_file (SV *class, char *path) 1807new_from_file (SV *class, char *path)
1251 CODE: 1808 CODE:
1252 RETVAL = Mix_LoadWAV (path); 1809 RETVAL = Mix_LoadWAV (path);
1253 OUTPUT: 1810 OUTPUT:
1254 RETVAL 1811 RETVAL
1255 1812
1256void 1813void
1257DESTROY (CFClient::MixChunk self) 1814DESTROY (CFPlus::MixChunk self)
1258 CODE: 1815 CODE:
1259 Mix_FreeChunk (self); 1816 Mix_FreeChunk (self);
1260 1817
1261int 1818int
1262volume (CFClient::MixChunk self, int volume = -1) 1819volume (CFPlus::MixChunk self, int volume = -1)
1263 CODE: 1820 CODE:
1264 RETVAL = Mix_VolumeChunk (self, volume); 1821 RETVAL = Mix_VolumeChunk (self, volume);
1265 OUTPUT: 1822 OUTPUT:
1266 RETVAL 1823 RETVAL
1267 1824
1268int 1825int
1269play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1826play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1270 CODE: 1827 CODE:
1271 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1828 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1272 OUTPUT: 1829 OUTPUT:
1273 RETVAL 1830 RETVAL
1274 1831
1275MODULE = CFClient PACKAGE = CFClient::MixMusic 1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1276 1833
1277int 1834int
1278volume (int volume = -1) 1835volume (int volume = -1)
1279 CODE: 1836 CODE:
1280 RETVAL = Mix_VolumeMusic (volume); 1837 RETVAL = Mix_VolumeMusic (volume);
1281 OUTPUT: 1838 OUTPUT:
1282 RETVAL 1839 RETVAL
1283 1840
1284CFClient::MixMusic 1841CFPlus::MixMusic
1285new_from_file (SV *class, char *path) 1842new_from_file (SV *class, char *path)
1286 CODE: 1843 CODE:
1287 RETVAL = Mix_LoadMUS (path); 1844 RETVAL = Mix_LoadMUS (path);
1288 OUTPUT: 1845 OUTPUT:
1289 RETVAL 1846 RETVAL
1290 1847
1291void 1848void
1292DESTROY (CFClient::MixMusic self) 1849DESTROY (CFPlus::MixMusic self)
1293 CODE: 1850 CODE:
1294 Mix_FreeMusic (self); 1851 Mix_FreeMusic (self);
1295 1852
1296int 1853int
1297play (CFClient::MixMusic self, int loops = -1) 1854play (CFPlus::MixMusic self, int loops = -1)
1298 CODE: 1855 CODE:
1299 RETVAL = Mix_PlayMusic (self, loops); 1856 RETVAL = Mix_PlayMusic (self, loops);
1300 OUTPUT: 1857 OUTPUT:
1301 RETVAL 1858 RETVAL
1302 1859
1303MODULE = CFClient PACKAGE = CFClient::OpenGL 1860MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1304 1861
1305BOOT: 1862BOOT:
1306{ 1863{
1307 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1308 static const struct { 1865 static const struct {
1309 const char *name; 1866 const char *name;
1310 IV iv; 1867 IV iv;
1311 } *civ, const_iv[] = { 1868 } *civ, const_iv[] = {
1312# define const_iv(name) { # name, (IV)name } 1869# define const_iv(name) { # name, (IV)name }
1313 const_iv (GL_COLOR_MATERIAL), 1870 const_iv (GL_COLOR_MATERIAL),
1314 const_iv (GL_SMOOTH), 1871 const_iv (GL_SMOOTH),
1315 const_iv (GL_FLAT), 1872 const_iv (GL_FLAT),
1873 const_iv (GL_DITHER),
1316 const_iv (GL_BLEND), 1874 const_iv (GL_BLEND),
1875 const_iv (GL_CULL_FACE),
1876 const_iv (GL_SCISSOR_TEST),
1877 const_iv (GL_DEPTH_TEST),
1878 const_iv (GL_ALPHA_TEST),
1879 const_iv (GL_NORMALIZE),
1880 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT),
1882 const_iv (GL_BACK),
1317 const_iv (GL_AND), 1883 const_iv (GL_AND),
1884 const_iv (GL_ONE),
1885 const_iv (GL_ZERO),
1318 const_iv (GL_SRC_ALPHA), 1886 const_iv (GL_SRC_ALPHA),
1887 const_iv (GL_DST_ALPHA),
1319 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1888 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1889 const_iv (GL_ONE_MINUS_DST_ALPHA),
1890 const_iv (GL_SRC_ALPHA_SATURATE),
1320 const_iv (GL_RGB), 1891 const_iv (GL_RGB),
1321 const_iv (GL_RGBA), 1892 const_iv (GL_RGBA),
1893 const_iv (GL_RGBA4),
1894 const_iv (GL_RGBA8),
1895 const_iv (GL_RGB5_A1),
1322 const_iv (GL_UNSIGNED_BYTE), 1896 const_iv (GL_UNSIGNED_BYTE),
1323 const_iv (GL_ALPHA4), 1897 const_iv (GL_UNSIGNED_SHORT),
1898 const_iv (GL_UNSIGNED_INT),
1324 const_iv (GL_ALPHA), 1899 const_iv (GL_ALPHA),
1900 const_iv (GL_INTENSITY),
1901 const_iv (GL_LUMINANCE),
1902 const_iv (GL_LUMINANCE_ALPHA),
1325 const_iv (GL_FLOAT), 1903 const_iv (GL_FLOAT),
1326 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1904 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1327 const_iv (GL_COMPILE), 1905 const_iv (GL_COMPILE),
1328 const_iv (GL_TEXTURE_1D), 1906 const_iv (GL_TEXTURE_1D),
1329 const_iv (GL_TEXTURE_2D), 1907 const_iv (GL_TEXTURE_2D),
1331 const_iv (GL_TEXTURE_MAG_FILTER), 1909 const_iv (GL_TEXTURE_MAG_FILTER),
1332 const_iv (GL_TEXTURE_MIN_FILTER), 1910 const_iv (GL_TEXTURE_MIN_FILTER),
1333 const_iv (GL_TEXTURE_ENV_MODE), 1911 const_iv (GL_TEXTURE_ENV_MODE),
1334 const_iv (GL_TEXTURE_WRAP_S), 1912 const_iv (GL_TEXTURE_WRAP_S),
1335 const_iv (GL_TEXTURE_WRAP_T), 1913 const_iv (GL_TEXTURE_WRAP_T),
1914 const_iv (GL_REPEAT),
1336 const_iv (GL_CLAMP), 1915 const_iv (GL_CLAMP),
1337 const_iv (GL_REPEAT), 1916 const_iv (GL_CLAMP_TO_EDGE),
1338 const_iv (GL_NEAREST), 1917 const_iv (GL_NEAREST),
1339 const_iv (GL_LINEAR), 1918 const_iv (GL_LINEAR),
1340 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1919 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1341 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1920 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1342 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1921 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1343 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1922 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1344 const_iv (GL_GENERATE_MIPMAP), 1923 const_iv (GL_GENERATE_MIPMAP),
1345 const_iv (GL_LINEAR),
1346 const_iv (GL_MODULATE), 1924 const_iv (GL_MODULATE),
1925 const_iv (GL_DECAL),
1347 const_iv (GL_REPLACE), 1926 const_iv (GL_REPLACE),
1927 const_iv (GL_DEPTH_BUFFER_BIT),
1348 const_iv (GL_COLOR_BUFFER_BIT), 1928 const_iv (GL_COLOR_BUFFER_BIT),
1349 const_iv (GL_PROJECTION), 1929 const_iv (GL_PROJECTION),
1350 const_iv (GL_MODELVIEW), 1930 const_iv (GL_MODELVIEW),
1351 const_iv (GL_COLOR_LOGIC_OP), 1931 const_iv (GL_COLOR_LOGIC_OP),
1932 const_iv (GL_SEPARABLE_2D),
1352 const_iv (GL_CONVOLUTION_2D), 1933 const_iv (GL_CONVOLUTION_2D),
1353 const_iv (GL_CONVOLUTION_BORDER_MODE), 1934 const_iv (GL_CONVOLUTION_BORDER_MODE),
1354 const_iv (GL_CONSTANT_BORDER), 1935 const_iv (GL_CONSTANT_BORDER),
1355 const_iv (GL_LINES), 1936 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP),
1938 const_iv (GL_LINE_LOOP),
1356 const_iv (GL_QUADS), 1939 const_iv (GL_QUADS),
1357 const_iv (GL_LINE_LOOP), 1940 const_iv (GL_QUAD_STRIP),
1941 const_iv (GL_TRIANGLES),
1942 const_iv (GL_TRIANGLE_STRIP),
1943 const_iv (GL_TRIANGLE_FAN),
1358 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1944 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1359 const_iv (GL_FASTEST), 1945 const_iv (GL_FASTEST),
1946 const_iv (GL_V2F),
1947 const_iv (GL_V3F),
1948 const_iv (GL_T2F_V3F),
1949 const_iv (GL_T2F_N3F_V3F),
1360# undef const_iv 1950# undef const_iv
1361 }; 1951 };
1362 1952
1363 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1953 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1364 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1954 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1365} 1955}
1366 1956
1957char *
1958gl_vendor ()
1959 CODE:
1960 RETVAL = (char *)glGetString (GL_VENDOR);
1961 OUTPUT:
1962 RETVAL
1963
1964char *
1965gl_version ()
1966 CODE:
1967 RETVAL = (char *)glGetString (GL_VERSION);
1968 OUTPUT:
1969 RETVAL
1970
1971char *
1972gl_extensions ()
1973 CODE:
1974 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1975 OUTPUT:
1976 RETVAL
1977
1367int glGetError () 1978int glGetError ()
1979
1980void glFinish ()
1368 1981
1369void glClear (int mask) 1982void glClear (int mask)
1370 1983
1371void glClearColor (float r, float g, float b, float a = 1.0) 1984void glClearColor (float r, float g, float b, float a = 1.0)
1372 PROTOTYPE: @ 1985 PROTOTYPE: @
1379 1992
1380void glHint (int target, int mode) 1993void glHint (int target, int mode)
1381 1994
1382void glBlendFunc (int sfactor, int dfactor) 1995void glBlendFunc (int sfactor, int dfactor)
1383 1996
1997void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1998 CODE:
1999 gl_BlendFuncSeparate (sa, da, saa, daa);
2000
2001void glDepthMask (int flag)
2002
1384void glLogicOp (int opcode) 2003void glLogicOp (int opcode)
1385 2004
2005void glColorMask (int red, int green, int blue, int alpha)
2006
1386void glMatrixMode (int mode) 2007void glMatrixMode (int mode)
1387 2008
1388void glPushMatrix () 2009void glPushMatrix ()
1389 2010
1390void glPopMatrix () 2011void glPopMatrix ()
1391 2012
1392void glLoadIdentity () 2013void glLoadIdentity ()
1393 2014
2015void glDrawBuffer (int buffer)
2016
2017void glReadBuffer (int buffer)
2018
2019# near_ and far_ are due to microsofts buggy "c" compiler
2020void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2021
2022# near_ and far_ are due to microsofts buggy "c" compiler
1394void glOrtho (double left, double right, double bottom, double top, double near, double far) 2023void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1395 2024
1396void glViewport (int x, int y, int width, int height) 2025void glViewport (int x, int y, int width, int height)
2026
2027void glScissor (int x, int y, int width, int height)
1397 2028
1398void glTranslate (float x, float y, float z = 0.) 2029void glTranslate (float x, float y, float z = 0.)
1399 CODE: 2030 CODE:
1400 glTranslatef (x, y, z); 2031 glTranslatef (x, y, z);
1401 2032
1402void glScale (float x, float y, float z) 2033void glScale (float x, float y, float z = 1.)
1403 CODE: 2034 CODE:
1404 glScalef (x, y, z); 2035 glScalef (x, y, z);
1405 2036
1406void glRotate (float angle, float x, float y, float z) 2037void glRotate (float angle, float x, float y, float z)
1407 CODE: 2038 CODE:
1411 2042
1412void glEnd () 2043void glEnd ()
1413 2044
1414void glColor (float r, float g, float b, float a = 1.0) 2045void glColor (float r, float g, float b, float a = 1.0)
1415 PROTOTYPE: @ 2046 PROTOTYPE: @
2047 ALIAS:
2048 glColor_premultiply = 1
1416 CODE: 2049 CODE:
2050 if (ix)
2051 {
2052 r *= a;
2053 g *= a;
2054 b *= a;
2055 }
2056 // microsoft visual "c" rounds instead of truncating...
1417 glColor4f (r, g, b, a); 2057 glColor4f (r, g, b, a);
2058
2059void glInterleavedArrays (int format, int stride, char *data)
2060
2061void glDrawElements (int mode, int count, int type, char *indices)
2062
2063# 1.2 void glDrawRangeElements (int mode, int start, int end
2064
2065void glRasterPos (float x, float y, float z = 0.)
2066 CODE:
2067 glRasterPos3f (0, 0, z);
2068 glBitmap (0, 0, 0, 0, x, y, 0);
1418 2069
1419void glVertex (float x, float y, float z = 0.) 2070void glVertex (float x, float y, float z = 0.)
1420 CODE: 2071 CODE:
1421 glVertex3f (x, y, z); 2072 glVertex3f (x, y, z);
1422 2073
1434 2085
1435void glBindTexture (int target, int name) 2086void glBindTexture (int target, int name)
1436 2087
1437void glConvolutionParameter (int target, int pname, float params) 2088void glConvolutionParameter (int target, int pname, float params)
1438 CODE: 2089 CODE:
2090 if (gl.ConvolutionParameterf)
1439 glConvolutionParameterf (target, pname, params); 2091 gl.ConvolutionParameterf (target, pname, params);
1440 2092
1441void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2093void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
2094 CODE:
2095 if (gl.ConvolutionFilter2D)
2096 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2097
2098void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2099 CODE:
2100 if (gl.SeparableFilter2D)
2101 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1442 2102
1443void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2103void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1444 2104
1445void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2105void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2106
2107void glDrawPixels (int width, int height, int format, int type, char *pixels)
2108
2109void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1446 2110
1447int glGenTexture () 2111int glGenTexture ()
1448 CODE: 2112 CODE:
1449{ 2113{
1450 GLuint name; 2114 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines