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.97 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.194 by root, Thu Jul 12 17:56:50 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22#endif
23
24#include <assert.h>
12#include <math.h> 25#include <math.h>
13#include <string.h> 26#include <string.h>
14#include <stdio.h> 27#include <stdio.h>
28#include <stdlib.h>
15 29
16#include <SDL.h> 30#include <SDL.h>
17#include <SDL_endian.h> 31#include <SDL_endian.h>
18#include <SDL_image.h> 32#include <SDL_image.h>
19#include <SDL_mixer.h> 33#include <SDL_mixer.h>
20#include <SDL_opengl.h> 34#include <SDL_opengl.h>
21 35
36#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS
38
22#include <glib/gmacros.h> 39#include <glib/gmacros.h>
23 40
24#include <pango/pango.h> 41#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 42
29#ifndef _WIN32 43#ifndef _WIN32
30# include <sys/types.h> 44# include <sys/types.h>
31# include <sys/socket.h> 45# include <sys/socket.h>
32# include <netinet/in.h> 46# include <netinet/in.h>
33# include <netinet/tcp.h> 47# include <netinet/tcp.h>
34# include <inttypes.h> 48# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 49#endif
43 50
44#include "glext.h" 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 52
46#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
47 54
48#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
50 57
51#define MIN_FONT_HEIGHT 10 58#define MIN_FONT_HEIGHT 10
52 59
53#define GL_CALL(type,func,args) \ 60#if 0
54 { \ 61# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 62#else
56 static type fptr_; \ 63# define PARACHUTE 0
57 \ 64#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 65
66static AV *texture_av;
67
68static struct
69{
70#define GL_FUNC(ptr,name) ptr name;
71#include "glfunc.h"
72#undef GL_FUNC
73} gl;
74
75static void
76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
77{
78 if (gl.BlendFuncSeparate)
79 gl.BlendFuncSeparate (sa, da, saa, daa);
80 else if (gl.BlendFuncSeparateEXT)
81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
82 else
83 glBlendFunc (sa, da);
84}
85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
110#include "texcache.c"
111
112#include "pango-font.c"
113#include "pango-fontmap.c"
114#include "pango-render.c"
115
68typedef Mix_Chunk *CFClient__MixChunk; 116typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 117typedef Mix_Music *CFPlus__MixMusic;
70 118
71typedef PangoFontDescription *CFClient__Font; 119typedef PangoFontDescription *CFPlus__Font;
120
121static int
122shape_attr_p (PangoLayoutRun *run)
123{
124 GSList *attrs = run->item->analysis.extra_attrs;
125
126 while (attrs)
127 {
128 PangoAttribute *attr = attrs->data;
129
130 if (attr->klass->type == PANGO_ATTR_SHAPE)
131 return 1;
132
133 attrs = attrs->next;
134 }
135
136 return 0;
137}
72 138
73typedef struct cf_layout { 139typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 140 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 141 float r, g, b, a; // default color for rgba mode
77 int base_height; 142 int base_height;
78 CFClient__Font font; 143 CFPlus__Font font;
79} *CFClient__Layout; 144} *CFPlus__Layout;
80 145
81static CFClient__Font default_font; 146static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 147static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 148static PangoFontMap *opengl_fontmap;
84 149
85static void 150static void
86substitute_func (FcPattern *pattern, gpointer data) 151substitute_func (FcPattern *pattern, gpointer data)
87{ 152{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 153 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 154#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 156#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 158}
95 159
96static void 160static void
97layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
98{ 162{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 163 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
101 */ 165 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
106 170
107 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
108} 172}
109 173
110static void 174static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
114 181
115 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 184
118 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
119} 186 if (!rect.height) rect.height = 1;
120 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
121typedef uint16_t mapface; 193typedef uint16_t faceid;
122 194
123typedef struct { 195typedef struct {
124 GLint name; 196 int name;
125 int w, h; 197 int w, h;
126 float s, t; 198 float s, t;
127 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
128} maptex; 202} maptex;
129 203
130typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
131 int16_t darkness; 207 uint16_t darkness;
132 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
133} mapcell; 209} mapcell;
134 210
135typedef struct { 211typedef struct {
136 int32_t c0, c1; 212 int32_t c0, c1;
137 mapcell *col; 213 mapcell *col;
138} maprow; 214} maprow;
139 215
140typedef struct map { 216typedef struct map {
141 int x, y, w, h; 217 int x, y, w, h;
142 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
143 int faces; 219 int faces; tileid *face2tile; // [faceid]
144 mapface *face; 220 int texs; maptex *tex; // [tileid]
145
146 int texs;
147 maptex *tex;
148 221
149 int32_t rows; 222 int32_t rows;
150 maprow *row; 223 maprow *row;
151} *CFClient__Map; 224} *CFPlus__Map;
152 225
153static char * 226static char *
154prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
155{ 228{
156 char *p; 229 char *p;
173} 246}
174 247
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
270
178static maprow * 271static maprow *
179map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
180{ 273{
181 if (0 > y) 274 if (0 > y)
182 { 275 {
183 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
222 315
223 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
224} 317}
225 318
226static mapcell * 319static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
228{ 321{
229 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
230} 323}
231 324
232static void 325static void
233map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
234{ 327{
235 int r; 328 int r;
236 329
237 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
246 self->row = 0; 339 self->row = 0;
247 self->rows = 0; 340 self->rows = 0;
248} 341}
249 342
250static void 343static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 345{
253 int x, y; 346 int x, y;
254 maprow *row; 347 maprow *row;
348 mapcell *cell;
255 349
256 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 351 if (y >= 0)
258 { 352 {
259 if (y >= self->rows) 353 if (y >= self->rows)
265 if (x >= row->c0) 359 if (x >= row->c0)
266 { 360 {
267 if (x >= row->c1) 361 if (x >= row->c1)
268 break; 362 break;
269 363
270 row->col[x - row->c0].darkness = -1; 364 cell = row->col + x - row->c0;
365
366 cell->darkness = 0;
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
271 } 370 }
272 } 371 }
372}
373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
273} 388}
274 389
275static void 390static void
276music_finished (void) 391music_finished (void)
277{ 392{
296 ev.data2 = 0; 411 ev.data2 = 0;
297 412
298 SDL_PushEvent ((SDL_Event *)&ev); 413 SDL_PushEvent ((SDL_Event *)&ev);
299} 414}
300 415
416static unsigned int
417minpot (unsigned int n)
418{
419 if (!n)
420 return 0;
421
422 --n;
423
424 n |= n >> 1;
425 n |= n >> 2;
426 n |= n >> 4;
427 n |= n >> 8;
428 n |= n >> 16;
429
430 return n + 1;
431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
436
301MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
302 438
303PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
304 440
305BOOT: 441BOOT:
306{ 442{
307 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 444 static const struct {
309 const char *name; 445 const char *name;
310 IV iv; 446 IV iv;
311 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
313 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
314 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
315 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
316 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
317 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
326 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
327 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
328 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
329 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
330 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
331 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
332 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
333 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
334 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
335 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
390 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
391 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
392 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
393 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
394 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
395 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
397 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
398 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
399 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
400 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
401 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
402 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
403 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
404 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
405 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
406 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
407 const_iv (KMOD_CTRL),
408 const_iv (KMOD_SHIFT),
409 const_iv (KMOD_ALT),
410 const_iv (KMOD_META)
411# undef const_iv 556# undef const_iv
412 }; 557 };
413 558
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
571
572int
573in_destruct ()
574 CODE:
575 RETVAL = PL_main_cv == Nullcv;
576 OUTPUT:
577 RETVAL
578
579NV floor (NV x)
580
581NV ceil (NV x)
417 582
418void 583void
419pango_init () 584pango_init ()
420 CODE: 585 CODE:
421{ 586{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 590}
430 591
431int 592int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 594
434void 595void
435SDL_Quit () 596SDL_Quit ()
436 597
437void 598void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 608
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 611
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 616
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
457 622
458 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 625
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 644SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 645 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 648 );
649 if (RETVAL)
650 {
651 av_clear (texture_av);
652
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
655# include "glfunc.h"
656# undef GL_FUNC
657
658 }
485 OUTPUT: 659 OUTPUT:
486 RETVAL 660 RETVAL
487 661
488void 662void
489SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
507 case SDL_KEYDOWN: 681 case SDL_KEYDOWN:
508 case SDL_KEYUP: 682 case SDL_KEYUP:
509 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
510 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
511 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 685 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
686 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
512 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 687 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
513 break; 688 break;
514 689
515 case SDL_ACTIVEEVENT: 690 case SDL_ACTIVEEVENT:
516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
542 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 717 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 718 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544 break; 719 break;
545 } 720 }
546 721
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 722 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548 } 723 }
549} 724}
550 725
551int 726int
552Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 727Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
561Mix_AllocateChannels (int numchans = -1) 736Mix_AllocateChannels (int numchans = -1)
562 737
563void 738void
564lowdelay (int fd, int val = 1) 739lowdelay (int fd, int val = 1)
565 CODE: 740 CODE:
741 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
742
743void
744win32_proxy_info ()
745 PPCODE:
746{
566#ifndef _WIN32 747#ifdef _WIN32
567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 748 char buffer[2048];
749 DWORD buflen;
750
751 EXTEND (SP, 3);
752
753 buflen = sizeof (buffer);
754 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
755 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
756 {
757 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
758
759 buflen = sizeof (buffer);
760 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
761 {
762 PUSHs (newSVpv (buffer, 0));
763
764 buflen = sizeof (buffer);
765 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
766 PUSHs (newSVpv (buffer, 0));
767 }
768 }
568#endif 769#endif
770}
569 771
570void 772void
571add_font (char *file) 773add_font (char *file)
572 CODE: 774 CODE:
573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 775 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574#ifdef _WIN32
575 // cairo... sigh... requires win2000
576 AddFontResourceEx (file, FR_PRIVATE, 0);
577#endif
578 776
579void 777void
580load_image_inline (SV *image_) 778load_image_inline (SV *image_)
581 ALIAS: 779 ALIAS:
582 load_image_file = 1 780 load_image_file = 1
624 822
625 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 823 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626 824
627 assert (surface2->pitch == surface2->w * 4); 825 assert (surface2->pitch == surface2->w * 4);
628 826
827 SDL_LockSurface (surface2);
629 EXTEND (SP, 5); 828 EXTEND (SP, 6);
630 PUSHs (sv_2mortal (newSViv (surface2->w))); 829 PUSHs (sv_2mortal (newSViv (surface2->w)));
631 PUSHs (sv_2mortal (newSViv (surface2->h))); 830 PUSHs (sv_2mortal (newSViv (surface2->h)));
632 SDL_LockSurface (surface2);
633 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 831 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634 SDL_UnlockSurface (surface2);
635 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 832 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 833 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 834 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
835 SDL_UnlockSurface (surface2);
638 836
639 SDL_FreeSurface (surface); 837 SDL_FreeSurface (surface);
640 SDL_FreeSurface (surface2); 838 SDL_FreeSurface (surface2);
641} 839}
642 840
678 CODE: 876 CODE:
679 fprintf (stderr, "FATAL: %s\n", message); 877 fprintf (stderr, "FATAL: %s\n", message);
680#ifdef _WIN32 878#ifdef _WIN32
681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 879 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
682#endif 880#endif
683 exit (1); 881 _exit (1);
684 882
883void
884_exit (int retval = 0)
885 CODE:
886#ifdef WIN32
887 ExitThread (retval); // unclean, please beam me up
888#else
889 _exit (retval);
890#endif
891
892void
893debug ()
894 CODE:
895{
896#if DEBUG
897 VALGRIND_DO_LEAK_CHECK;
898#endif
899}
900
685MODULE = CFClient PACKAGE = CFClient::Font 901MODULE = CFPlus PACKAGE = CFPlus::Font
686 902
687CFClient::Font 903CFPlus::Font
688new_from_file (SV *class, char *path, int id = 0) 904new_from_file (SV *class, char *path, int id = 0)
689 CODE: 905 CODE:
690{ 906{
691 int count; 907 int count;
692 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 908 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
695} 911}
696 OUTPUT: 912 OUTPUT:
697 RETVAL 913 RETVAL
698 914
699void 915void
700DESTROY (CFClient::Font self) 916DESTROY (CFPlus::Font self)
701 CODE: 917 CODE:
702 pango_font_description_free (self); 918 pango_font_description_free (self);
703 919
704void 920void
705make_default (CFClient::Font self) 921make_default (CFPlus::Font self)
706 CODE: 922 CODE:
707 default_font = self; 923 default_font = self;
708 924
709MODULE = CFClient PACKAGE = CFClient::Layout 925MODULE = CFPlus PACKAGE = CFPlus::Layout
710 926
711CFClient::Layout 927void
712new (SV *class, int rgba = 0) 928reset_glyph_cache ()
713 CODE: 929 CODE:
714#if _WIN32 930 tc_clear ();
715 //rgba = 0;//D make stext nicer, breaks TextView 931
716#endif 932CFPlus::Layout
933new (SV *class)
934 CODE:
717 New (0, RETVAL, 1, struct cf_layout); 935 New (0, RETVAL, 1, struct cf_layout);
718 936
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 937 RETVAL->pl = pango_layout_new (opengl_context);
720 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 938 RETVAL->r = 1.;
722 RETVAL->g = 1.; 939 RETVAL->g = 1.;
723 RETVAL->b = 1.; 940 RETVAL->b = 1.;
724 RETVAL->a = 1.; 941 RETVAL->a = 1.;
725 RETVAL->base_height = MIN_FONT_HEIGHT; 942 RETVAL->base_height = MIN_FONT_HEIGHT;
729 layout_update_font (RETVAL); 946 layout_update_font (RETVAL);
730 OUTPUT: 947 OUTPUT:
731 RETVAL 948 RETVAL
732 949
733void 950void
734DESTROY (CFClient::Layout self) 951DESTROY (CFPlus::Layout self)
735 CODE: 952 CODE:
736 g_object_unref (self->pl); 953 g_object_unref (self->pl);
737 Safefree (self); 954 Safefree (self);
738 955
956void
957set_text (CFPlus::Layout self, SV *text_)
958 CODE:
959{
960 STRLEN textlen;
961 char *text = SvPVutf8 (text_, textlen);
962
963 pango_layout_set_text (self->pl, text, textlen);
964}
965
966void
967set_markup (CFPlus::Layout self, SV *text_)
968 CODE:
969{
970 STRLEN textlen;
971 char *text = SvPVutf8 (text_, textlen);
972
973 pango_layout_set_markup (self->pl, text, textlen);
974}
975
976void
977set_shapes (CFPlus::Layout self, ...)
978 CODE:
979{
980 PangoAttrList *attrs = 0;
981 const char *text = pango_layout_get_text (self->pl);
982 const char *pos = text;
983 int arg = 4;
984
985 while (arg < items && (pos = strstr (pos, OBJ_STR)))
986 {
987 PangoRectangle inkrect, rect;
988 PangoAttribute *attr;
989
990 int x = SvIV (ST (arg - 3));
991 int y = SvIV (ST (arg - 2));
992 int w = SvIV (ST (arg - 1));
993 int h = SvIV (ST (arg ));
994
995 inkrect.x = 0;
996 inkrect.y = 0;
997 inkrect.width = 0;
998 inkrect.height = 0;
999
1000 rect.x = x * PANGO_SCALE;
1001 rect.y = y * PANGO_SCALE;
1002 rect.width = w * PANGO_SCALE;
1003 rect.height = h * PANGO_SCALE;
1004
1005 if (!attrs)
1006 attrs = pango_layout_get_attributes (self->pl);
1007
1008 attr = pango_attr_shape_new (&inkrect, &rect);
1009 attr->start_index = pos - text;
1010 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1011 pango_attr_list_insert (attrs, attr);
1012
1013 arg += 4;
1014 pos += sizeof (OBJ_STR) - 1;
1015 }
1016
1017 if (attrs)
1018 pango_layout_set_attributes (self->pl, attrs);
1019}
1020
1021void
1022get_shapes (CFPlus::Layout self)
1023 PPCODE:
1024{
1025 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1026
1027 do
1028 {
1029 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1030
1031 if (run && shape_attr_p (run))
1032 {
1033 PangoRectangle extents;
1034 pango_layout_iter_get_run_extents (iter, 0, &extents);
1035
1036 EXTEND (SP, 2);
1037 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1038 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1039 }
1040 }
1041 while (pango_layout_iter_next_run (iter));
1042
1043 pango_layout_iter_free (iter);
1044}
1045
739int 1046int
740is_rgba (CFClient::Layout self) 1047has_wrapped (CFPlus::Layout self)
741 CODE: 1048 CODE:
742 RETVAL = self->rgba; 1049{
1050 int lines = 1;
1051 const char *text = pango_layout_get_text (self->pl);
1052
1053 while (*text)
1054 lines += *text++ == '\n';
1055
1056 RETVAL = lines < pango_layout_get_line_count (self->pl);
1057}
743 OUTPUT: 1058 OUTPUT:
744 RETVAL 1059 RETVAL
745 1060
746void
747set_text (CFClient::Layout self, SV *text_)
748 CODE:
749{
750 STRLEN textlen;
751 char *text = SvPVutf8 (text_, textlen);
752
753 pango_layout_set_text (self->pl, text, textlen);
754}
755
756void
757set_markup (CFClient::Layout self, SV *text_)
758 CODE:
759{
760 STRLEN textlen;
761 char *text = SvPVutf8 (text_, textlen);
762
763 pango_layout_set_markup (self->pl, text, textlen);
764}
765
766SV * 1061SV *
767get_text (CFClient::Layout self) 1062get_text (CFPlus::Layout self)
768 CODE: 1063 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1064 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 1065 sv_utf8_decode (RETVAL);
771 OUTPUT: 1066 OUTPUT:
772 RETVAL 1067 RETVAL
773 1068
774void 1069void
775set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1070set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776 CODE: 1071 CODE:
777 self->r = r; 1072 self->r = r;
778 self->g = g; 1073 self->g = g;
779 self->b = b; 1074 self->b = b;
780 self->a = a; 1075 self->a = a;
781 1076
782void 1077void
783set_font (CFClient::Layout self, CFClient::Font font = 0) 1078set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784 CODE: 1079 CODE:
785 if (self->font != font) 1080 if (self->font != font)
786 { 1081 {
787 self->font = font; 1082 self->font = font;
788 layout_update_font (self); 1083 layout_update_font (self);
789 } 1084 }
790 1085
791void 1086void
792set_height (CFClient::Layout self, int base_height) 1087set_height (CFPlus::Layout self, int base_height)
793 CODE: 1088 CODE:
794 if (self->base_height != base_height) 1089 if (self->base_height != base_height)
795 { 1090 {
796 self->base_height = base_height; 1091 self->base_height = base_height;
797 layout_update_font (self); 1092 layout_update_font (self);
798 } 1093 }
799 1094
800void 1095void
801set_width (CFClient::Layout self, int max_width = -1) 1096set_width (CFPlus::Layout self, int max_width = -1)
802 CODE: 1097 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1098 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 1099
805void 1100void
806set_indent (CFClient::Layout self, int indent) 1101set_indent (CFPlus::Layout self, int indent)
807 CODE: 1102 CODE:
808 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1103 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809 1104
810void 1105void
811set_spacing (CFClient::Layout self, int spacing) 1106set_spacing (CFPlus::Layout self, int spacing)
812 CODE: 1107 CODE:
813 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1108 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814 1109
815void 1110void
816set_ellipsise (CFClient::Layout self, int ellipsise) 1111set_ellipsise (CFPlus::Layout self, int ellipsise)
817 CODE: 1112 CODE:
818 pango_layout_set_ellipsize (self->pl, 1113 pango_layout_set_ellipsize (self->pl,
819 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1114 ellipsise == 1 ? PANGO_ELLIPSIZE_START
820 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1115 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1116 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
822 : PANGO_ELLIPSIZE_NONE 1117 : PANGO_ELLIPSIZE_NONE
823 ); 1118 );
824 1119
825void 1120void
826set_single_paragraph_mode (CFClient::Layout self, int spm) 1121set_single_paragraph_mode (CFPlus::Layout self, int spm)
827 CODE: 1122 CODE:
828 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1123 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829 1124
830void 1125void
831size (CFClient::Layout self) 1126size (CFPlus::Layout self)
832 PPCODE: 1127 PPCODE:
833{ 1128{
834 int w, h; 1129 int w, h;
835 1130
836 layout_get_pixel_size (self, &w, &h); 1131 layout_get_pixel_size (self, &w, &h);
839 PUSHs (sv_2mortal (newSViv (w))); 1134 PUSHs (sv_2mortal (newSViv (w)));
840 PUSHs (sv_2mortal (newSViv (h))); 1135 PUSHs (sv_2mortal (newSViv (h)));
841} 1136}
842 1137
843int 1138int
1139descent (CFPlus::Layout self)
1140 CODE:
1141{
1142 PangoRectangle rect;
1143 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1144 pango_layout_line_get_pixel_extents (line, 0, &rect);
1145 RETVAL = PANGO_DESCENT (rect);
1146}
1147 OUTPUT:
1148 RETVAL
1149
1150int
844xy_to_index (CFClient::Layout self, int x, int y) 1151xy_to_index (CFPlus::Layout self, int x, int y)
845 CODE: 1152 CODE:
846{ 1153{
847 int index, trailing; 1154 int index, trailing;
848 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1155 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849 RETVAL = index; 1156 RETVAL = index + trailing;
850} 1157}
851 OUTPUT: 1158 OUTPUT:
852 RETVAL 1159 RETVAL
853 1160
854void 1161void
855cursor_pos (CFClient::Layout self, int index) 1162cursor_pos (CFPlus::Layout self, int index)
856 PPCODE: 1163 PPCODE:
857{ 1164{
858 PangoRectangle strong_pos; 1165 PangoRectangle strong_pos;
859 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1166 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860 1167
863 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1170 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1171 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865} 1172}
866 1173
867void 1174void
868render (CFClient::Layout self) 1175index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
869 PPCODE: 1176 PPCODE:
870{ 1177{
871 SV *retval; 1178 int line, x;
872 int w, h;
873 1179
874 layout_get_pixel_size (self, &w, &h); 1180 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1181 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
875 1182
876 if (self->rgba)
877 {
878 cairo_surface_t *surface;
879 cairo_t *cairo;
880
881 retval = newSV (w * h * 4);
882 SvPOK_only (retval);
883 SvCUR_set (retval, w * h * 4);
884
885 memset (SvPVX (retval), 0, w * h * 4);
886
887 surface = cairo_image_surface_create_for_data (
888 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
889 cairo = cairo_create (surface);
890 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
891
892 pango_cairo_show_layout (cairo, self->pl);
893
894 cairo_destroy (cairo);
895 cairo_surface_destroy (surface);
896
897 // what a mess, and its premultiplied, too :(
898 {
899 uint32_t *p = (uint32_t *)SvPVX (retval);
900 uint32_t *e = p + w * h;
901
902 while (p < e)
903 {
904 uint32_t rgba = *p;
905 rgba = (rgba >> 24) | (rgba << 8);
906#if 0
907#ifdef _WIN32
908 {//D
909 uint8_t r = rgba >> 24;
910 uint8_t g = rgba >> 16;
911 uint8_t b = rgba >> 8;
912 uint8_t a = rgba >> 0;
913
914 rgba = (rgba & 0xffffff00) | a;
915 }
916#endif
917#endif
918 rgba = SDL_SwapBE32 (rgba);
919 *p++ = rgba;
920 }
921 }
922
923 EXTEND (SP, 5); 1183 EXTEND (SP, 2);
924 PUSHs (sv_2mortal (newSViv (w))); 1184 PUSHs (sv_2mortal (newSViv (line - 1)));
1185 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1186}
1187
1188void
1189line_x_to_index (CFPlus::Layout self, int line, int x)
1190 PPCODE:
1191{
1192 PangoLayoutLine *lp;
1193 int index, trailing;
1194
1195 if (line < 0)
1196 XSRETURN_EMPTY;
1197
1198 if (!(lp = pango_layout_get_line (self->pl, line)))
1199 XSRETURN_EMPTY; /* do better */
1200
1201 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1202
1203 EXTEND (SP, 2);
1204 if (GIMME_V == G_SCALAR)
925 PUSHs (sv_2mortal (newSViv (h))); 1205 PUSHs (sv_2mortal (newSViv (index + trailing)));
926 PUSHs (sv_2mortal (retval));
927 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
928 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
929 }
930 else 1206 else
931 { 1207 {
932 FT_Bitmap bitmap;
933
934 retval = newSV (w * h);
935 SvPOK_only (retval);
936 SvCUR_set (retval, w * h);
937
938 bitmap.rows = h;
939 bitmap.width = w;
940 bitmap.pitch = w;
941 bitmap.buffer = (unsigned char*)SvPVX (retval);
942 bitmap.num_grays = 256;
943 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945 memset (bitmap.buffer, 0, w * h);
946
947 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949 EXTEND (SP, 5);
950 PUSHs (sv_2mortal (newSViv (w))); 1208 PUSHs (sv_2mortal (newSViv (index)));
951 PUSHs (sv_2mortal (newSViv (h))); 1209 PUSHs (sv_2mortal (newSViv (trailing)));
952 PUSHs (sv_2mortal (retval));
953 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955 } 1210 }
956} 1211}
957 1212
1213void
1214render (CFPlus::Layout self, float x, float y, int flags = 0)
1215 PPCODE:
1216 pango_opengl_render_layout_subpixel (
1217 self->pl,
1218 x * PANGO_SCALE, y * PANGO_SCALE,
1219 self->r, self->g, self->b, self->a,
1220 flags
1221 );
1222
958MODULE = CFClient PACKAGE = CFClient::Texture 1223MODULE = CFPlus PACKAGE = CFPlus::Texture
959 1224
960void 1225void
1226pad2pot (SV *data_, SV *w_, SV *h_)
1227 CODE:
1228{
1229 int ow = SvIV (w_);
1230 int oh = SvIV (h_);
1231
1232 if (ow && oh)
1233 {
1234 int nw = minpot (ow);
1235 int nh = minpot (oh);
1236
1237 if (nw != ow || nh != oh)
1238 {
1239 if (SvOK (data_))
1240 {
1241 STRLEN datalen;
1242 char *data = SvPVbyte (data_, datalen);
1243 int bpp = datalen / (ow * oh);
1244 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1245
1246 SvPOK_only (result_);
1247 SvCUR_set (result_, nw * nh * bpp);
1248
1249 memset (SvPVX (result_), 0, nw * nh * bpp);
1250 while (oh--)
1251 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1252
1253 sv_setsv (data_, result_);
1254 }
1255
1256 sv_setiv (w_, nw);
1257 sv_setiv (h_, nh);
1258 }
1259 }
1260}
1261
1262void
961draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1263draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962 PROTOTYPE: $$$;$$ 1264 PROTOTYPE: $$$;$$
963 ALIAS: 1265 ALIAS:
964 draw_quad_alpha = 1 1266 draw_quad_alpha = 1
965 draw_quad_alpha_premultiplied = 2 1267 draw_quad_alpha_premultiplied = 2
966 CODE: 1268 CODE:
967{ 1269{
968 HV *hv = (HV *)SvRV (self); 1270 HV *hv = (HV *)SvRV (self);
969 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1271 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
970 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1272 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
971 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1273 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
972 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
973 1274
974 if (items < 5) 1275 if (items < 5)
975 { 1276 {
976 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1277 w = SvNV (*hv_fetch (hv, "w", 1, 1));
977 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1278 h = SvNV (*hv_fetch (hv, "h", 1, 1));
978 } 1279 }
979 1280
980 if (ix) 1281 if (ix)
981 { 1282 {
982 glEnable (GL_BLEND); 1283 glEnable (GL_BLEND);
1284
1285 if (ix == 2)
983 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1286 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1287 else
1288 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1289 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1290
984 glEnable (GL_ALPHA_TEST); 1291 glEnable (GL_ALPHA_TEST);
985 glAlphaFunc (GL_GREATER, 0.01f); 1292 glAlphaFunc (GL_GREATER, 0.01f);
986 } 1293 }
987 1294
988 glBindTexture (GL_TEXTURE_2D, name); 1295 glBindTexture (GL_TEXTURE_2D, name);
989
990 if (wrap_mode)
991 {
992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
993 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
994 }
995 1296
996 glBegin (GL_QUADS); 1297 glBegin (GL_QUADS);
997 glTexCoord2f (0, 0); glVertex2f (x , y ); 1298 glTexCoord2f (0, 0); glVertex2f (x , y );
998 glTexCoord2f (0, t); glVertex2f (x , y + h); 1299 glTexCoord2f (0, t); glVertex2f (x , y + h);
999 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1300 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1005 glDisable (GL_ALPHA_TEST); 1306 glDisable (GL_ALPHA_TEST);
1006 glDisable (GL_BLEND); 1307 glDisable (GL_BLEND);
1007 } 1308 }
1008} 1309}
1009 1310
1010MODULE = CFClient PACKAGE = CFClient::Map 1311MODULE = CFPlus PACKAGE = CFPlus::Map
1011 1312
1012CFClient::Map 1313CFPlus::Map
1013new (SV *class, int map_width, int map_height) 1314new (SV *class)
1014 CODE: 1315 CODE:
1015 New (0, RETVAL, 1, struct map); 1316 New (0, RETVAL, 1, struct map);
1016 RETVAL->x = 0; 1317 RETVAL->x = 0;
1017 RETVAL->y = 0; 1318 RETVAL->y = 0;
1018 RETVAL->w = map_width; 1319 RETVAL->w = 0;
1019 RETVAL->h = map_height; 1320 RETVAL->h = 0;
1020 RETVAL->ox = 0; 1321 RETVAL->ox = 0;
1021 RETVAL->oy = 0; 1322 RETVAL->oy = 0;
1022 RETVAL->faces = 8192; 1323 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1023 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1324 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1024 RETVAL->texs = 8192;
1025 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1026 RETVAL->rows = 0; 1325 RETVAL->rows = 0;
1027 RETVAL->row = 0; 1326 RETVAL->row = 0;
1028 OUTPUT: 1327 OUTPUT:
1029 RETVAL 1328 RETVAL
1030 1329
1031void 1330void
1032DESTROY (CFClient::Map self) 1331DESTROY (CFPlus::Map self)
1033 CODE: 1332 CODE:
1034{ 1333{
1035 map_clear (self); 1334 map_clear (self);
1036 Safefree (self->face); 1335 Safefree (self->face2tile);
1336 Safefree (self->tex);
1037 Safefree (self); 1337 Safefree (self);
1038} 1338}
1039 1339
1040void 1340void
1341resize (CFPlus::Map self, int map_width, int map_height)
1342 CODE:
1343 self->w = map_width;
1344 self->h = map_height;
1345
1346void
1041clear (CFClient::Map self) 1347clear (CFPlus::Map self)
1042 CODE: 1348 CODE:
1043 map_clear (self); 1349 map_clear (self);
1044 1350
1045void 1351void
1046set_face (CFClient::Map self, int face, int texid) 1352set_tileid (CFPlus::Map self, int face, int tile)
1047 CODE: 1353 CODE:
1048{ 1354{
1049 while (self->faces <= face) 1355 need_facenum (self, face); self->face2tile [face] = tile;
1050 { 1356 need_texid (self, tile);
1051 Append (mapface, self->face, self->faces, self->faces);
1052 self->faces *= 2;
1053 }
1054
1055 self->face [face] = texid;
1056} 1357}
1057 1358
1058void 1359void
1360set_smooth (CFPlus::Map self, int face, int smooth, int level)
1361 CODE:
1362{
1363 tileid texid;
1364 maptex *tex;
1365
1366 if (face < 0 || face >= self->faces)
1367 return;
1368
1369 if (smooth < 0 || smooth >= self->faces)
1370 return;
1371
1372 texid = self->face2tile [face];
1373
1374 if (!texid)
1375 return;
1376
1377 tex = self->tex + texid;
1378 tex->smoothtile = self->face2tile [smooth];
1379 tex->smoothlevel = level;
1380}
1381
1382void
1059set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1383set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1060 CODE: 1384 CODE:
1061{ 1385{
1062 while (self->texs <= texid) 1386 need_texid (self, texid);
1063 {
1064 Append (maptex, self->tex, self->texs, self->texs);
1065 self->texs *= 2;
1066 }
1067 1387
1068 { 1388 {
1069 maptex *tex = self->tex + texid; 1389 maptex *tex = self->tex + texid;
1070 1390
1071 tex->name = name; 1391 tex->name = name;
1080 } 1400 }
1081 1401
1082 // somewhat hackish, but for textures that require it, it really 1402 // somewhat hackish, but for textures that require it, it really
1083 // improves the look, and most others don't suffer. 1403 // improves the look, and most others don't suffer.
1084 glBindTexture (GL_TEXTURE_2D, name); 1404 glBindTexture (GL_TEXTURE_2D, name);
1085 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1405 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1086 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1406 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1407 // use uglier nearest interpolation because linear suffers
1408 // from transparent color bleeding and ugly wrapping effects.
1409 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1087} 1410}
1088 1411
1089int 1412int
1090ox (CFClient::Map self) 1413ox (CFPlus::Map self)
1091 ALIAS: 1414 ALIAS:
1092 oy = 1 1415 oy = 1
1416 x = 2
1417 y = 3
1418 w = 4
1419 h = 5
1093 CODE: 1420 CODE:
1094 switch (ix) 1421 switch (ix)
1095 { 1422 {
1096 case 0: RETVAL = self->ox; break; 1423 case 0: RETVAL = self->ox; break;
1097 case 1: RETVAL = self->oy; break; 1424 case 1: RETVAL = self->oy; break;
1425 case 2: RETVAL = self->x; break;
1426 case 3: RETVAL = self->y; break;
1427 case 4: RETVAL = self->w; break;
1428 case 5: RETVAL = self->h; break;
1098 } 1429 }
1099 OUTPUT: 1430 OUTPUT:
1100 RETVAL 1431 RETVAL
1101 1432
1102void 1433void
1103scroll (CFClient::Map self, int dx, int dy) 1434scroll (CFPlus::Map self, int dx, int dy)
1104 CODE: 1435 CODE:
1105{ 1436{
1106 if (dx > 0) 1437 if (dx > 0)
1107 map_blank (self, self->x, self->y, dx - 1, self->h); 1438 map_blank (self, self->x, self->y, dx, self->h);
1108 else if (dx < 0) 1439 else if (dx < 0)
1109 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1440 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1110 1441
1111 if (dy > 0) 1442 if (dy > 0)
1112 map_blank (self, self->x, self->y, self->w, dy - 1); 1443 map_blank (self, self->x, self->y, self->w, dy);
1113 else if (dy < 0) 1444 else if (dy < 0)
1114 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1445 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1115 1446
1116 self->ox += dx; self->x += dx; 1447 self->ox += dx; self->x += dx;
1117 self->oy += dy; self->y += dy; 1448 self->oy += dy; self->y += dy;
1118 1449
1119 while (self->y < 0) 1450 while (self->y < 0)
1124 self->y += MAP_EXTEND_Y; 1455 self->y += MAP_EXTEND_Y;
1125 } 1456 }
1126} 1457}
1127 1458
1128void 1459void
1129map1a_update (CFClient::Map self, SV *data_) 1460map1a_update (CFPlus::Map self, SV *data_, int extmap)
1130 CODE: 1461 CODE:
1131{ 1462{
1132 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1463 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1133 uint8_t *data_end = (uint8_t *)SvEND (data_); 1464 uint8_t *data_end = (uint8_t *)SvEND (data_);
1134 mapcell *cell; 1465 mapcell *cell;
1135 int x, y, flags; 1466 int x, y, flags;
1136 1467
1137 while (data < data_end) 1468 while (data < data_end - 1)
1138 { 1469 {
1139 flags = (data [0] << 8) + data [1]; data += 2; 1470 flags = (data [0] << 8) + data [1]; data += 2;
1140 1471
1141 x = ((flags >> 10) & 63) + self->x; 1472 x = self->x + ((flags >> 10) & 63);
1142 y = ((flags >> 4) & 63) + self->y; 1473 y = self->y + ((flags >> 4) & 63);
1143 1474
1144 cell = map_get_cell (self, x, y); 1475 cell = map_get_cell (self, x, y);
1145 1476
1146 if (flags & 15) 1477 if (flags & 15)
1147 { 1478 {
1148 if (cell->darkness < 0) 1479 if (!cell->darkness)
1149 { 1480 {
1481 memset (cell, 0, sizeof (*cell));
1150 cell->darkness = 0; 1482 cell->darkness = 256;
1151 cell->face [0] = 0;
1152 cell->face [1] = 0;
1153 cell->face [2] = 0;
1154 } 1483 }
1155 1484
1156 cell->darkness = flags & 8 ? *data++ : 255;
1157
1158 //TODO: don't trust server data to be in-range(!) 1485 //TODO: don't trust server data to be in-range(!)
1486
1487 if (flags & 8)
1488 {
1489 if (extmap)
1490 {
1491 uint8_t ext, cmd;
1492
1493 do
1494 {
1495 ext = *data++;
1496 cmd = ext & 0x3f;
1497
1498 if (cmd < 4)
1499 cell->darkness = 255 - ext * 64 + 1;
1500 else if (cmd == 5) // health
1501 {
1502 cell->stat_width = 1;
1503 cell->stat_hp = *data++;
1504 }
1505 else if (cmd == 6) // monster width
1506 cell->stat_width = *data++ + 1;
1507 else if (cmd == 0x47)
1508 {
1509 if (*data == 4)
1510 ; // decode player count
1511
1512 data += *data + 1;
1513 }
1514 else if (cmd == 8) // cell flags
1515 cell->flags = *data++;
1516 else if (ext & 0x40) // unknown, multibyte => skip
1517 data += *data + 1;
1518 else
1519 data++;
1520 }
1521 while (ext & 0x80);
1522 }
1523 else
1524 cell->darkness = *data++ + 1;
1525 }
1159 1526
1160 if (flags & 4) 1527 if (flags & 4)
1161 { 1528 {
1162 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1529 faceid face = (data [0] << 8) + data [1]; data += 2;
1530 need_facenum (self, face);
1531 cell->tile [0] = self->face2tile [face];
1163 } 1532 }
1164 1533
1165 if (flags & 2) 1534 if (flags & 2)
1166 { 1535 {
1167 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1536 faceid face = (data [0] << 8) + data [1]; data += 2;
1537 need_facenum (self, face);
1538 cell->tile [1] = self->face2tile [face];
1168 } 1539 }
1169 1540
1170 if (flags & 1) 1541 if (flags & 1)
1171 { 1542 {
1172 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1543 faceid face = (data [0] << 8) + data [1]; data += 2;
1544 need_facenum (self, face);
1545 cell->tile [2] = self->face2tile [face];
1173 } 1546 }
1174 } 1547 }
1175 else 1548 else
1176 cell->darkness = -1; 1549 cell->darkness = 0;
1177 } 1550 }
1178} 1551}
1179 1552
1180SV * 1553SV *
1181mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1554mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1182 CODE: 1555 CODE:
1183{ 1556{
1184 int x1, x; 1557 int x1, x;
1185 int y1, y; 1558 int y1, y;
1186 int z; 1559 int z;
1207 { 1580 {
1208 mapcell *cell = row->col + (x - row->c0); 1581 mapcell *cell = row->col + (x - row->c0);
1209 1582
1210 for (z = 0; z <= 0; z++) 1583 for (z = 0; z <= 0; z++)
1211 { 1584 {
1212 mapface face = cell->face [z];
1213
1214 if (face)
1215 {
1216 maptex tex = self->tex [face]; 1585 maptex tex = self->tex [cell->tile [z]];
1217 int a0 = 255 - tex.a; 1586 int a0 = 255 - tex.a;
1218 int a1 = tex.a; 1587 int a1 = tex.a;
1219 1588
1220 r = (r * a0 + tex.r * a1) / 255; 1589 r = (r * a0 + tex.r * a1) / 255;
1221 g = (g * a0 + tex.g * a1) / 255; 1590 g = (g * a0 + tex.g * a1) / 255;
1222 b = (b * a0 + tex.b * a1) / 255; 1591 b = (b * a0 + tex.b * a1) / 255;
1223 a = (a * a0 + tex.a * a1) / 255; 1592 a = (a * a0 + tex.a * a1) / 255;
1224 }
1225 } 1593 }
1226 } 1594 }
1227 1595
1228 *map++ = (r ) 1596 *map++ = (r )
1229 | (g << 8) 1597 | (g << 8)
1236} 1604}
1237 OUTPUT: 1605 OUTPUT:
1238 RETVAL 1606 RETVAL
1239 1607
1240void 1608void
1241draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1609draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1242 PPCODE: 1610 CODE:
1243{ 1611{
1244 int vx, vy; 1612 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1613 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1614 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1615 smooth_key skey;
1245 int x, y, z; 1616 int x, y, z;
1246 int last_name; 1617 int last_name;
1247 mapface face; 1618
1619 // thats current max. sorry.
1620 if (sw > 255) sw = 255;
1621 if (sh > 255) sh = 255;
1622
1623 // clear key, in case of extra padding
1624 memset (&skey, 0, sizeof (skey));
1625
1626 glColor4ub (255, 255, 255, 255);
1627
1628 glEnable (GL_BLEND);
1629 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1630 glEnable (GL_TEXTURE_2D);
1631 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1632
1633 glBegin (GL_QUADS);
1634
1635 last_name = 0;
1636
1637 mx += self->x;
1638 my += self->y;
1639
1640 // first pass: determine smooth_max
1641 // rather ugly, if you ask me
1642 // could also be stored inside mapcell and updated on change
1643 memset (smooth_max, 0, sizeof (smooth_max));
1644
1645 for (y = 0; y < sh; y++)
1646 if (0 <= y + my && y + my < self->rows)
1647 {
1648 maprow *row = self->row + (y + my);
1649
1650 for (x = 0; x < sw; x++)
1651 if (row->c0 <= x + mx && x + mx < row->c1)
1652 {
1653 mapcell *cell = row->col + (x + mx - row->c0);
1654
1655 smooth_max[x + 1][y + 1] =
1656 MAX (self->tex [cell->tile [0]].smoothlevel,
1657 MAX (self->tex [cell->tile [1]].smoothlevel,
1658 self->tex [cell->tile [2]].smoothlevel));
1659 }
1660 }
1661
1662 for (z = 0; z <= 2; z++)
1663 {
1664 memset (smooth_level, 0, sizeof (smooth_level));
1665
1666 for (y = 0; y < sh; y++)
1667 if (0 <= y + my && y + my < self->rows)
1668 {
1669 maprow *row = self->row + (y + my);
1670
1671 for (x = 0; x < sw; x++)
1672 if (row->c0 <= x + mx && x + mx < row->c1)
1673 {
1674 mapcell *cell = row->col + (x + mx - row->c0);
1675 tileid tile = cell->tile [z];
1676
1677 if (tile)
1678 {
1679 maptex tex = self->tex [tile];
1680 int px = (x + 1) * T - tex.w;
1681 int py = (y + 1) * T - tex.h;
1682
1683 // suppressing texture state switches here
1684 // is only moderately effective, but worth the extra effort
1685 if (last_name != tex.name)
1686 {
1687 if (!tex.name)
1688 tex = self->tex [2]; /* missing, replace by noface */
1689
1690 glEnd ();
1691 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1692 glBegin (GL_QUADS);
1693 }
1694
1695 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1696 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1697 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1698 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1699
1700 if (cell->flags && z == 2)
1701 {
1702 if (cell->flags & 1)
1703 {
1704 maptex tex = self->tex [1];
1705 int px = x * T + T * 2 / 32;
1706 int py = y * T - T * 6 / 32;
1707
1708 glEnd ();
1709 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1710 glBegin (GL_QUADS);
1711
1712 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1713 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1714 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1715 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1716 }
1717 }
1718
1719 // update smooth hash
1720 if (tex.smoothtile)
1721 {
1722 skey.tile = tex.smoothtile;
1723 skey.level = tex.smoothlevel;
1724
1725 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1726
1727 // add bits to current tile and all neighbours. skey.x|y is
1728 // shifted +1|+1 so we always stay positive.
1729
1730 // bits is ___n cccc CCCC bbbb
1731 // n do not draw borders&corners
1732 // c draw these corners, but...
1733 // C ... not these
1734 // b draw these borders
1735
1736 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1737 // ┃· ·· ·┃ ━━
1738
1739 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1740 // ·· ·· ·┏ ┓·
1741
1742 // full tile
1743 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1744
1745 // borders
1746 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1747 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1748 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1749 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1750
1751 // corners
1752 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1753 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1754 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1755 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1756 }
1757 }
1758 }
1759 }
1760
1761 // go through all smoothlevels, lowest to highest, then draw.
1762 // this is basically counting sort
1763 {
1764 int w, b;
1765
1766 for (w = 0; w < 256 / 32; ++w)
1767 {
1768 uint32_t smask = smooth_level [w];
1769 if (smask)
1770 for (b = 0; b < 32; ++b)
1771 if (smask & (((uint32_t)1) << b))
1772 {
1773 int level = (w << 5) | b;
1774 HE *he;
1775
1776 hv_iterinit (smooth);
1777 while ((he = hv_iternext (smooth)))
1778 {
1779 smooth_key *skey = (smooth_key *)HeKEY (he);
1780 IV bits = SvIVX (HeVAL (he));
1781
1782 if (!(bits & 0x1000)
1783 && skey->level == level
1784 && level > smooth_max [skey->x][skey->y])
1785 {
1786 maptex tex = self->tex [skey->tile];
1787 int px = (((int)skey->x) - 1) * T;
1788 int py = (((int)skey->y) - 1) * T;
1789 int border = bits & 15;
1790 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1791 float dx = tex.s * .0625f; // 16 images/row
1792 float dy = tex.t * .5f ; // 2 images/column
1793
1794 // this time naively avoiding texture state changes
1795 // save gobs of state changes.
1796 if (last_name != tex.name)
1797 {
1798 if (!tex.name)
1799 continue; // smoothing not yet available
1800
1801 glEnd ();
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1803 glBegin (GL_QUADS);
1804 }
1805
1806 if (border)
1807 {
1808 float ox = border * dx;
1809
1810 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1811 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1812 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1813 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1814 }
1815
1816 if (corner)
1817 {
1818 float ox = corner * dx;
1819
1820 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1821 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1822 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1823 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1824 }
1825 }
1826 }
1827 }
1828 }
1829 }
1830
1831 hv_clear (smooth);
1832 }
1833
1834 glEnd ();
1835
1836 glDisable (GL_TEXTURE_2D);
1837 glDisable (GL_BLEND);
1838
1839 // top layer: overlays such as the health bar
1840 for (y = 0; y < sh; y++)
1841 if (0 <= y + my && y + my < self->rows)
1842 {
1843 maprow *row = self->row + (y + my);
1844
1845 for (x = 0; x < sw; x++)
1846 if (row->c0 <= x + mx && x + mx < row->c1)
1847 {
1848 mapcell *cell = row->col + (x + mx - row->c0);
1849
1850 int px = x * T;
1851 int py = y * T;
1852
1853 if (cell->stat_hp)
1854 {
1855 int width = cell->stat_width * T;
1856 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1857
1858 glColor3ub (0, 0, 0);
1859 glRectf (px + 1, py - thick - 2,
1860 px + width - 1, py);
1861
1862 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1863 glRectf (px + 2,
1864 py - thick - 1,
1865 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1866 }
1867 }
1868 }
1869}
1870
1871void
1872draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1873 CODE:
1874{
1875 static float color[16][3] = {
1876 { 0.00F, 0.00F, 0.00F },
1877 { 1.00F, 1.00F, 1.00F },
1878 { 0.00F, 0.00F, 0.55F },
1879 { 1.00F, 0.00F, 0.00F },
1880
1881 { 1.00F, 0.54F, 0.00F },
1882 { 0.11F, 0.56F, 1.00F },
1883 { 0.93F, 0.46F, 0.00F },
1884 { 0.18F, 0.54F, 0.34F },
1885
1886 { 0.56F, 0.73F, 0.56F },
1887 { 0.80F, 0.80F, 0.80F },
1888 { 0.55F, 0.41F, 0.13F },
1889 { 0.99F, 0.77F, 0.26F },
1890
1891 { 0.74F, 0.65F, 0.41F },
1892
1893 { 0.00F, 1.00F, 1.00F },
1894 { 1.00F, 0.00F, 1.00F },
1895 { 1.00F, 1.00F, 0.00F },
1896 };
1897
1898 int x, y;
1899
1900 glEnable (GL_TEXTURE_2D);
1901 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1902 glEnable (GL_BLEND);
1903 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1904 glBegin (GL_QUADS);
1905
1906 for (y = 0; y < h; y++)
1907 for (x = 0; x < w; x++)
1908 {
1909 unsigned char m = data [x + y * w];
1910
1911 if (m)
1912 {
1913 float *c = color [m & 15];
1914
1915 float tx1 = m & 0x40 ? 0.5 : 0.;
1916 float tx2 = tx1 + 0.5;
1917
1918 glColor4f (c[0], c[1], c[2], 0.75);
1919 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1920 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1921 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1922 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1923 }
1924 }
1925
1926 glEnd ();
1927 glDisable (GL_BLEND);
1928 glDisable (GL_TEXTURE_2D);
1929}
1930
1931void
1932fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1933 PPCODE:
1934{
1935 int x, y;
1248 int sw4 = (sw + 3) & ~3; 1936 int sw4 = (sw + 3) & ~3;
1249 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1937 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1250 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1938 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1251 1939
1252 memset (darkness, 255, sw4 * sh); 1940 memset (darkness, 255, sw4 * sh);
1253 SvPOK_only (darkness_sv); 1941 SvPOK_only (darkness_sv);
1254 SvCUR_set (darkness_sv, sw4 * sh); 1942 SvCUR_set (darkness_sv, sw4 * sh);
1255 1943
1256 vx = self->x + (self->w - sw) / 2 - shift_x; 1944 mx += self->x;
1257 vy = self->y + (self->h - sh) / 2 - shift_y; 1945 my += self->y;
1258 1946
1259 /*
1260 int vx = self->vx = self->w >= sw
1261 ? self->x + (self->w - sw) / 2
1262 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1263
1264 int vy = self->vy = self->h >= sh
1265 ? self->y + (self->h - sh) / 2
1266 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1267 */
1268
1269 glColor4ub (255, 255, 255, 255);
1270
1271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1272 glEnable (GL_BLEND);
1273 glEnable (GL_TEXTURE_2D);
1274 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1275
1276 glBegin (GL_QUADS);
1277
1278 last_name = 0;
1279
1280 for (z = 0; z < 3; z++)
1281 for (y = 0; y < sh; y++) 1947 for (y = 0; y < sh; y++)
1282 if (0 <= y + vy && y + vy < self->rows) 1948 if (0 <= y + my && y + my < self->rows)
1283 { 1949 {
1284 maprow *row = self->row + (y + vy); 1950 maprow *row = self->row + (y + my);
1285 1951
1286 for (x = 0; x < sw; x++) 1952 for (x = 0; x < sw; x++)
1287 if (row->c0 <= x + vx && x + vx < row->c1) 1953 if (row->c0 <= x + mx && x + mx < row->c1)
1288 { 1954 {
1289 mapcell *cell = row->col + (x + vx - row->c0); 1955 mapcell *cell = row->col + (x + mx - row->c0);
1290 1956
1291 darkness[y * sw4 + x] = cell->darkness < 0 1957 darkness[y * sw4 + x] = cell->darkness
1958 ? 255 - (cell->darkness - 1)
1292 ? 255 - FOW_DARKNESS 1959 : 255 - FOW_DARKNESS;
1293 : 255 - cell->darkness;
1294
1295 face = cell->face [z];
1296
1297 if (face)
1298 {
1299 maptex tex = self->tex [face];
1300
1301 int px = (x + 1) * 32 - tex.w;
1302 int py = (y + 1) * 32 - tex.h;
1303
1304 if (last_name != tex.name)
1305 {
1306 glEnd ();
1307 last_name = tex.name;
1308 glBindTexture (GL_TEXTURE_2D, last_name);
1309 glBegin (GL_QUADS);
1310 }
1311
1312 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1313 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1314 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1315 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1316 }
1317 } 1960 }
1318 } 1961 }
1319
1320 glEnd ();
1321
1322 glDisable (GL_TEXTURE_2D);
1323 glDisable (GL_BLEND);
1324 1962
1325 EXTEND (SP, 3); 1963 EXTEND (SP, 3);
1326 PUSHs (sv_2mortal (newSViv (sw4))); 1964 PUSHs (sv_2mortal (newSViv (sw4)));
1327 PUSHs (sv_2mortal (newSViv (sh))); 1965 PUSHs (sv_2mortal (newSViv (sh)));
1328 PUSHs (darkness_sv); 1966 PUSHs (darkness_sv);
1329} 1967}
1330 1968
1331SV * 1969SV *
1332get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1970get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1333 CODE: 1971 CODE:
1334{ 1972{
1335 int x, y, x1, y1; 1973 int x, y, x1, y1;
1336 SV *data_sv = newSV (w * h * 7 + 5); 1974 SV *data_sv = newSV (w * h * 7 + 5);
1337 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1975 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1362 if (row && row->c0 <= x && x < row->c1) 2000 if (row && row->c0 <= x && x < row->c1)
1363 { 2001 {
1364 mapcell *cell = row->col + (x - row->c0); 2002 mapcell *cell = row->col + (x - row->c0);
1365 uint8_t flags = 0; 2003 uint8_t flags = 0;
1366 2004
1367 if (cell->face [0]) flags |= 1; 2005 if (cell->tile [0]) flags |= 1;
1368 if (cell->face [1]) flags |= 2; 2006 if (cell->tile [1]) flags |= 2;
1369 if (cell->face [2]) flags |= 4; 2007 if (cell->tile [2]) flags |= 4;
1370 2008
1371 *data++ = flags; 2009 *data++ = flags;
1372 2010
1373 if (flags & 1) 2011 if (flags & 1)
1374 { 2012 {
2013 tileid tile = cell->tile [0];
1375 *data++ = cell->face [0] >> 8; 2014 *data++ = tile >> 8;
1376 *data++ = cell->face [0]; 2015 *data++ = tile;
1377 } 2016 }
1378 2017
1379 if (flags & 2) 2018 if (flags & 2)
1380 { 2019 {
2020 tileid tile = cell->tile [1];
1381 *data++ = cell->face [1] >> 8; 2021 *data++ = tile >> 8;
1382 *data++ = cell->face [1]; 2022 *data++ = tile;
1383 } 2023 }
1384 2024
1385 if (flags & 4) 2025 if (flags & 4)
1386 { 2026 {
2027 tileid tile = cell->tile [2];
1387 *data++ = cell->face [2] >> 8; 2028 *data++ = tile >> 8;
1388 *data++ = cell->face [2]; 2029 *data++ = tile;
1389 } 2030 }
1390 } 2031 }
1391 else 2032 else
1392 *data++ = 0; 2033 *data++ = 0;
1393 } 2034 }
1399} 2040}
1400 OUTPUT: 2041 OUTPUT:
1401 RETVAL 2042 RETVAL
1402 2043
1403void 2044void
1404set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2045set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1405 PPCODE: 2046 PPCODE:
1406{ 2047{
1407 int x, y, z; 2048 int x, y, z;
1408 int w, h; 2049 int w, h;
1409 int x1, y1; 2050 int x1, y1;
1433 { 2074 {
1434 uint8_t flags = *data++; 2075 uint8_t flags = *data++;
1435 2076
1436 if (flags) 2077 if (flags)
1437 { 2078 {
1438 mapface face[3] = { 0, 0, 0 };
1439
1440 mapcell *cell = row_get_cell (row, x); 2079 mapcell *cell = row_get_cell (row, x);
2080 tileid tile[3] = { 0, 0, 0 };
1441 2081
1442 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2082 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1443 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2083 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1444 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2084 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1445 2085
1446 if (cell->darkness <= 0) 2086 if (cell->darkness == 0)
1447 { 2087 {
1448 cell->darkness = -1; 2088 cell->darkness = 0;
1449 2089
1450 for (z = 0; z <= 2; z++) 2090 for (z = 0; z <= 2; z++)
1451 { 2091 {
1452 cell->face[z] = face[z]; 2092 tileid t = tile [z];
1453 2093
1454 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2094 if (t >= self->texs || (t && !self->tex [t].name))
2095 {
1455 XPUSHs (sv_2mortal (newSViv (face[z]))); 2096 XPUSHs (sv_2mortal (newSViv (t)));
2097 need_texid (self, t);
2098 }
2099
2100 cell->tile [z] = t;
1456 } 2101 }
1457 } 2102 }
1458 } 2103 }
1459 } 2104 }
1460 } 2105 }
1461} 2106}
1462 2107
1463MODULE = CFClient PACKAGE = CFClient::MixChunk 2108MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1464 2109
1465CFClient::MixChunk 2110CFPlus::MixChunk
1466new_from_file (SV *class, char *path) 2111new_from_file (SV *class, char *path)
1467 CODE: 2112 CODE:
1468 RETVAL = Mix_LoadWAV (path); 2113 RETVAL = Mix_LoadWAV (path);
1469 OUTPUT: 2114 OUTPUT:
1470 RETVAL 2115 RETVAL
1471 2116
1472void 2117void
1473DESTROY (CFClient::MixChunk self) 2118DESTROY (CFPlus::MixChunk self)
1474 CODE: 2119 CODE:
1475 Mix_FreeChunk (self); 2120 Mix_FreeChunk (self);
1476 2121
1477int 2122int
1478volume (CFClient::MixChunk self, int volume = -1) 2123volume (CFPlus::MixChunk self, int volume = -1)
1479 CODE: 2124 CODE:
1480 RETVAL = Mix_VolumeChunk (self, volume); 2125 RETVAL = Mix_VolumeChunk (self, volume);
1481 OUTPUT: 2126 OUTPUT:
1482 RETVAL 2127 RETVAL
1483 2128
1484int 2129int
1485play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2130play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1486 CODE: 2131 CODE:
1487 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2132 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1488 OUTPUT: 2133 OUTPUT:
1489 RETVAL 2134 RETVAL
1490 2135
1491MODULE = CFClient PACKAGE = CFClient::MixMusic 2136MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1492 2137
1493int 2138int
1494volume (int volume = -1) 2139volume (int volume = -1)
1495 CODE: 2140 CODE:
1496 RETVAL = Mix_VolumeMusic (volume); 2141 RETVAL = Mix_VolumeMusic (volume);
1497 OUTPUT: 2142 OUTPUT:
1498 RETVAL 2143 RETVAL
1499 2144
2145int
2146fade_out (int ms)
2147 CODE:
2148 RETVAL = Mix_FadeOutMusic (ms);
2149 OUTPUT:
2150 RETVAL
2151
1500CFClient::MixMusic 2152CFPlus::MixMusic
1501new_from_file (SV *class, char *path) 2153new_from_file (SV *class, char *path)
1502 CODE: 2154 CODE:
1503 RETVAL = Mix_LoadMUS (path); 2155 RETVAL = Mix_LoadMUS (path);
1504 OUTPUT: 2156 OUTPUT:
1505 RETVAL 2157 RETVAL
1506 2158
1507void 2159void
1508DESTROY (CFClient::MixMusic self) 2160DESTROY (CFPlus::MixMusic self)
1509 CODE: 2161 CODE:
1510 Mix_FreeMusic (self); 2162 Mix_FreeMusic (self);
1511 2163
1512int 2164int
1513play (CFClient::MixMusic self, int loops = -1) 2165play (CFPlus::MixMusic self, int loops = -1)
1514 CODE: 2166 CODE:
1515 RETVAL = Mix_PlayMusic (self, loops); 2167 RETVAL = Mix_PlayMusic (self, loops);
1516 OUTPUT: 2168 OUTPUT:
1517 RETVAL 2169 RETVAL
1518 2170
1519MODULE = CFClient PACKAGE = CFClient::OpenGL 2171MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1520 2172
1521BOOT: 2173BOOT:
1522{ 2174{
1523 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2175 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1524 static const struct { 2176 static const struct {
1525 const char *name; 2177 const char *name;
1526 IV iv; 2178 IV iv;
1527 } *civ, const_iv[] = { 2179 } *civ, const_iv[] = {
1528# define const_iv(name) { # name, (IV)name } 2180# define const_iv(name) { # name, (IV)name }
1535 const_iv (GL_SCISSOR_TEST), 2187 const_iv (GL_SCISSOR_TEST),
1536 const_iv (GL_DEPTH_TEST), 2188 const_iv (GL_DEPTH_TEST),
1537 const_iv (GL_ALPHA_TEST), 2189 const_iv (GL_ALPHA_TEST),
1538 const_iv (GL_NORMALIZE), 2190 const_iv (GL_NORMALIZE),
1539 const_iv (GL_RESCALE_NORMAL), 2191 const_iv (GL_RESCALE_NORMAL),
2192 const_iv (GL_FRONT),
2193 const_iv (GL_BACK),
1540 const_iv (GL_AND), 2194 const_iv (GL_AND),
1541 const_iv (GL_ONE), 2195 const_iv (GL_ONE),
1542 const_iv (GL_ZERO), 2196 const_iv (GL_ZERO),
1543 const_iv (GL_SRC_ALPHA), 2197 const_iv (GL_SRC_ALPHA),
1544 const_iv (GL_SRC_ALPHA_SATURATE), 2198 const_iv (GL_DST_ALPHA),
1545 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2199 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1546 const_iv (GL_ONE_MINUS_DST_ALPHA), 2200 const_iv (GL_ONE_MINUS_DST_ALPHA),
2201 const_iv (GL_SRC_ALPHA_SATURATE),
1547 const_iv (GL_RGB), 2202 const_iv (GL_RGB),
1548 const_iv (GL_RGBA), 2203 const_iv (GL_RGBA),
2204 const_iv (GL_RGBA4),
2205 const_iv (GL_RGBA8),
2206 const_iv (GL_RGB5_A1),
1549 const_iv (GL_UNSIGNED_BYTE), 2207 const_iv (GL_UNSIGNED_BYTE),
1550 const_iv (GL_UNSIGNED_SHORT), 2208 const_iv (GL_UNSIGNED_SHORT),
1551 const_iv (GL_UNSIGNED_INT), 2209 const_iv (GL_UNSIGNED_INT),
1552 const_iv (GL_ALPHA), 2210 const_iv (GL_ALPHA),
1553 const_iv (GL_INTENSITY), 2211 const_iv (GL_INTENSITY),
1562 const_iv (GL_TEXTURE_MAG_FILTER), 2220 const_iv (GL_TEXTURE_MAG_FILTER),
1563 const_iv (GL_TEXTURE_MIN_FILTER), 2221 const_iv (GL_TEXTURE_MIN_FILTER),
1564 const_iv (GL_TEXTURE_ENV_MODE), 2222 const_iv (GL_TEXTURE_ENV_MODE),
1565 const_iv (GL_TEXTURE_WRAP_S), 2223 const_iv (GL_TEXTURE_WRAP_S),
1566 const_iv (GL_TEXTURE_WRAP_T), 2224 const_iv (GL_TEXTURE_WRAP_T),
2225 const_iv (GL_REPEAT),
1567 const_iv (GL_CLAMP), 2226 const_iv (GL_CLAMP),
1568 const_iv (GL_REPEAT), 2227 const_iv (GL_CLAMP_TO_EDGE),
1569 const_iv (GL_NEAREST), 2228 const_iv (GL_NEAREST),
1570 const_iv (GL_LINEAR), 2229 const_iv (GL_LINEAR),
1571 const_iv (GL_NEAREST_MIPMAP_NEAREST), 2230 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1572 const_iv (GL_LINEAR_MIPMAP_NEAREST), 2231 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1573 const_iv (GL_NEAREST_MIPMAP_LINEAR), 2232 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1584 const_iv (GL_SEPARABLE_2D), 2243 const_iv (GL_SEPARABLE_2D),
1585 const_iv (GL_CONVOLUTION_2D), 2244 const_iv (GL_CONVOLUTION_2D),
1586 const_iv (GL_CONVOLUTION_BORDER_MODE), 2245 const_iv (GL_CONVOLUTION_BORDER_MODE),
1587 const_iv (GL_CONSTANT_BORDER), 2246 const_iv (GL_CONSTANT_BORDER),
1588 const_iv (GL_LINES), 2247 const_iv (GL_LINES),
2248 const_iv (GL_LINE_STRIP),
1589 const_iv (GL_LINE_LOOP), 2249 const_iv (GL_LINE_LOOP),
1590 const_iv (GL_QUADS), 2250 const_iv (GL_QUADS),
1591 const_iv (GL_QUAD_STRIP), 2251 const_iv (GL_QUAD_STRIP),
1592 const_iv (GL_TRIANGLES), 2252 const_iv (GL_TRIANGLES),
1593 const_iv (GL_TRIANGLE_STRIP), 2253 const_iv (GL_TRIANGLE_STRIP),
1601# undef const_iv 2261# undef const_iv
1602 }; 2262 };
1603 2263
1604 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2264 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1605 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2265 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2266
2267 texture_av = newAV ();
2268 AvREAL_off (texture_av);
1606} 2269}
1607 2270
1608char * 2271char *
1609gl_vendor () 2272gl_vendor ()
1610 CODE: 2273 CODE:
1626 OUTPUT: 2289 OUTPUT:
1627 RETVAL 2290 RETVAL
1628 2291
1629int glGetError () 2292int glGetError ()
1630 2293
2294void glFinish ()
2295
1631void glClear (int mask) 2296void glClear (int mask)
1632 2297
1633void glClearColor (float r, float g, float b, float a = 1.0) 2298void glClearColor (float r, float g, float b, float a = 1.0)
1634 PROTOTYPE: @ 2299 PROTOTYPE: @
1635 2300
1641 2306
1642void glHint (int target, int mode) 2307void glHint (int target, int mode)
1643 2308
1644void glBlendFunc (int sfactor, int dfactor) 2309void glBlendFunc (int sfactor, int dfactor)
1645 2310
2311void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2312 CODE:
2313 gl_BlendFuncSeparate (sa, da, saa, daa);
2314
1646void glDepthMask (int flag) 2315void glDepthMask (int flag)
1647 2316
1648void glLogicOp (int opcode) 2317void glLogicOp (int opcode)
1649 2318
1650void glColorMask (int red, int green, int blue, int alpha) 2319void glColorMask (int red, int green, int blue, int alpha)
1654void glPushMatrix () 2323void glPushMatrix ()
1655 2324
1656void glPopMatrix () 2325void glPopMatrix ()
1657 2326
1658void glLoadIdentity () 2327void glLoadIdentity ()
2328
2329void glDrawBuffer (int buffer)
2330
2331void glReadBuffer (int buffer)
1659 2332
1660# near_ and far_ are due to microsofts buggy "c" compiler 2333# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2334void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662 2335
1663# near_ and far_ are due to microsofts buggy "c" compiler 2336# near_ and far_ are due to microsofts buggy "c" compiler
1683 2356
1684void glEnd () 2357void glEnd ()
1685 2358
1686void glColor (float r, float g, float b, float a = 1.0) 2359void glColor (float r, float g, float b, float a = 1.0)
1687 PROTOTYPE: @ 2360 PROTOTYPE: @
2361 ALIAS:
2362 glColor_premultiply = 1
1688 CODE: 2363 CODE:
2364 if (ix)
2365 {
2366 r *= a;
2367 g *= a;
2368 b *= a;
2369 }
1689 // microsoft visual "c" rounds instead of truncating... 2370 // microsoft visual "c" rounds instead of truncating...
1690 glColor4ub (MIN ((int)(r * 255.f), 255), 2371 glColor4f (r, g, b, a);
1691 MIN ((int)(g * 255.f), 255),
1692 MIN ((int)(b * 255.f), 255),
1693 MIN ((int)(a * 255.f), 255));
1694 2372
1695void glInterleavedArrays (int format, int stride, char *data) 2373void glInterleavedArrays (int format, int stride, char *data)
1696 2374
1697void glDrawElements (int mode, int count, int type, char *indices) 2375void glDrawElements (int mode, int count, int type, char *indices)
1698 2376
1721 2399
1722void glBindTexture (int target, int name) 2400void glBindTexture (int target, int name)
1723 2401
1724void glConvolutionParameter (int target, int pname, float params) 2402void glConvolutionParameter (int target, int pname, float params)
1725 CODE: 2403 CODE:
1726 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2404 if (gl.ConvolutionParameterf)
2405 gl.ConvolutionParameterf (target, pname, params);
1727 2406
1728void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2407void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729 CODE: 2408 CODE:
1730 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2409 if (gl.ConvolutionFilter2D)
1731 (target, internalformat, width, height, format, type, data)); 2410 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732 2411
1733void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2412void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1734 CODE: 2413 CODE:
1735 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2414 if (gl.SeparableFilter2D)
1736 (target, internalformat, width, height, format, type, row, column)); 2415 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737 2416
1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2417void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739 2418
1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2419void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741 2420
1743 2422
1744void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2423void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1745 2424
1746int glGenTexture () 2425int glGenTexture ()
1747 CODE: 2426 CODE:
1748{ 2427 RETVAL = gen_texture ();
1749 GLuint name;
1750 glGenTextures (1, &name);
1751 RETVAL = name;
1752}
1753 OUTPUT: 2428 OUTPUT:
1754 RETVAL 2429 RETVAL
1755 2430
1756void glDeleteTexture (int name) 2431void glDeleteTexture (int name)
1757 CODE: 2432 CODE:
1758{
1759 GLuint name_ = name;
1760 glDeleteTextures (1, &name_); 2433 del_texture (name);
1761} 2434
1762
1763int glGenList () 2435int glGenList ()
1764 CODE: 2436 CODE:
1765 RETVAL = glGenLists (1); 2437 RETVAL = glGenLists (1);
1766 OUTPUT: 2438 OUTPUT:
1767 RETVAL 2439 RETVAL
1774 2446
1775void glEndList () 2447void glEndList ()
1776 2448
1777void glCallList (int list) 2449void glCallList (int list)
1778 2450
1779

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines