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.125 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 2008 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// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
27#endif
28
29#include <assert.h>
12#include <math.h> 30#include <math.h>
13#include <string.h> 31#include <string.h>
14#include <stdio.h> 32#include <stdio.h>
15#include <stdlib.h> 33#include <stdlib.h>
16 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
17#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
18#include <SDL_endian.h> 39#include <SDL_endian.h>
19#include <SDL_image.h> 40#include <SDL_image.h>
20#include <SDL_mixer.h> 41#include <SDL_mixer.h>
21#include <SDL_opengl.h> 42#include <SDL_opengl.h>
22 43
… …
24#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
25 46
26#include <glib/gmacros.h> 47#include <glib/gmacros.h>
27 48
28#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
29 61
30#ifndef _WIN32 62#ifndef _WIN32
31# include <sys/types.h> 63# include <sys/types.h>
32# include <sys/socket.h> 64# include <sys/socket.h>
33# include <netinet/in.h> 65# include <netinet/in.h>
34# include <netinet/tcp.h> 66# include <netinet/tcp.h>
35# include <inttypes.h> 67# include <inttypes.h>
68#endif
69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
36#else 72#else
37 typedef unsigned char uint8_t; 73# define expect(expr,value) (expr)
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 74#endif
44 75
45#include "glext.h" 76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
46 78
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 80
49#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
50 82
51#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
53 85
54#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
55 87
56#if 1 88/* mask out modifiers we are not interested in */
57# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
58#else 90
59# define PARACHUTE 0 91static AV *texture_av;
60#endif
61 92
62static struct 93static struct
63{ 94{
64#define GL_FUNC(ptr,name) ptr name; 95#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 96#include "glfunc.h"
66#undef GL_FUNC 97#undef GL_FUNC
67} gl; 98} gl;
68 99
100static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 101gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 102{
71 if (gl.BlendFuncSeparate) 103 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 104 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 105 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 106 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 107 else
76 glBlendFunc (sa, da); 108 glBlendFunc (sa, da);
77} 109}
78 110
111static GLuint
112gen_texture ()
113{
114 GLuint name;
115
116 if (AvFILL (texture_av) >= 0)
117 name = (GLuint)(size_t)av_pop (texture_av);
118 else
119 glGenTextures (1, &name);
120
121 return name;
122}
123
124static void
125del_texture (GLuint name)
126{
127 /* make a half-assed attempt at returning the memory used by the texture */
128 /* textures are frequently being reused by cfplus anyway */
129 /*glBindTexture (GL_TEXTURE_2D, name);*/
130 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
131 av_push (texture_av, (SV *)(size_t)name);
132 glDeleteTextures (1, &name);
133}
134
79#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
80 137
81#include "pango-font.c" 138#include "pango-font.c"
82#include "pango-fontmap.c" 139#include "pango-fontmap.c"
83#include "pango-render.c" 140#include "pango-render.c"
84 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
85typedef Mix_Chunk *CFClient__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 145typedef Mix_Music *DC__MixMusic;
87 146
88typedef PangoFontDescription *CFClient__Font; 147typedef PangoFontDescription *DC__Font;
89 148
90static int 149static int
91shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
92{ 151{
93 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 166
108typedef struct cf_layout { 167typedef struct cf_layout {
109 PangoLayout *pl; 168 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
111 int base_height; 170 int base_height;
112 CFClient__Font font; 171 DC__Font font;
172 rc_t *rc;
113} *CFClient__Layout; 173} *DC__Layout;
114 174
115static CFClient__Font default_font; 175static DC__Font default_font;
116static PangoContext *opengl_context; 176static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
118 178
119static void 179static void
120substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
… …
125#endif 185#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 187}
128 188
129static void 189static void
130layout_update_font (CFClient__Layout self) 190layout_update_font (DC__Layout self)
131{ 191{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
134 */ 194 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
136 196
137 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
138 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
139 199
140 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
141} 201}
142 202
143static void 203static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
145{ 205{
206 PangoRectangle rect;
207
208 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 209 pango_layout_get_extents (self->pl, 0, &rect);
147 210
148 if (!*w) *w = 1; 211 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 212 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 213
151 *w = (*w + 3) & ~3; 214 if (!rect.width) rect.width = 1;
152} 215 if (!rect.height) rect.height = 1;
153 216
217 *w = rect.width;
218 *h = rect.height;
219}
220
221typedef uint16_t tileid;
154typedef uint16_t mapface; 222typedef uint16_t faceid;
155 223
156typedef struct { 224typedef struct {
157 GLint name; 225 GLuint name;
158 int w, h; 226 int w, h;
159 float s, t; 227 float s, t;
160 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
229 tileid smoothtile;
230 uint8_t smoothlevel;
161} maptex; 231} maptex;
162 232
163typedef struct { 233typedef struct {
234 uint32_t player;
235 tileid tile[3];
164 int16_t darkness; 236 uint16_t darkness;
165 mapface face[3]; 237 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 238} mapcell;
167 239
168typedef struct { 240typedef struct {
169 int32_t c0, c1; 241 int32_t c0, c1;
170 mapcell *col; 242 mapcell *col;
171} maprow; 243} maprow;
172 244
173typedef struct map { 245typedef struct map {
174 int x, y, w, h; 246 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 247 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 248 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 249 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 250
182 int32_t rows; 251 int32_t rows;
183 maprow *row; 252 maprow *row;
184} *CFClient__Map; 253} *DC__Map;
185 254
186static char * 255static char *
187prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
188{ 257{
189 char *p; 258 char *p;
… …
206} 275}
207 276
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
209#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 278#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 279
280static void
281need_facenum (struct map *self, faceid face)
282{
283 while (self->faces <= face)
284 {
285 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2;
287 }
288}
289
290static void
291need_texid (struct map *self, int texid)
292{
293 while (self->texs <= texid)
294 {
295 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2;
297 }
298}
299
211static maprow * 300static maprow *
212map_get_row (CFClient__Map self, int y) 301map_get_row (DC__Map self, int y)
213{ 302{
214 if (0 > y) 303 if (0 > y)
215 { 304 {
216 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
… …
255 344
256 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
257} 346}
258 347
259static mapcell * 348static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
261{ 350{
262 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
263} 352}
264 353
265static void 354static void
266map_clear (CFClient__Map self) 355map_clear (DC__Map self)
267{ 356{
268 int r; 357 int r;
269 358
270 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
… …
278 self->oy = 0; 367 self->oy = 0;
279 self->row = 0; 368 self->row = 0;
280 self->rows = 0; 369 self->rows = 0;
281} 370}
282 371
372#define CELL_CLEAR(cell) \
373 do { \
374 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \
377 (cell)->player = 0; \
378 } while (0)
379
283static void 380static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 381map_blank (DC__Map self, int x0, int y0, int w, int h)
285{ 382{
286 int x, y; 383 int x, y;
287 maprow *row; 384 maprow *row;
385 mapcell *cell;
288 386
289 for (y = y0; y < y0 + h; y++) 387 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 388 if (y >= 0)
291 { 389 {
292 if (y >= self->rows) 390 if (y >= self->rows)
… …
298 if (x >= row->c0) 396 if (x >= row->c0)
299 { 397 {
300 if (x >= row->c1) 398 if (x >= row->c1)
301 break; 399 break;
302 400
303 row->col[x - row->c0].darkness = -1; 401 cell = row->col + x - row->c0;
402
403 CELL_CLEAR (cell);
304 } 404 }
305 } 405 }
406}
407
408typedef struct {
409 tileid tile;
410 uint8_t x, y, level;
411} smooth_key;
412
413static void
414smooth_or_bits (HV *hv, smooth_key *key, IV bits)
415{
416 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
417
418 if (SvIOK (*sv))
419 SvIV_set (*sv, SvIVX (*sv) | bits);
420 else
421 sv_setiv (*sv, bits);
306} 422}
307 423
308static void 424static void
309music_finished (void) 425music_finished (void)
310{ 426{
… …
346 n |= n >> 16; 462 n |= n >> 16;
347 463
348 return n + 1; 464 return n + 1;
349} 465}
350 466
351MODULE = CFClient PACKAGE = CFClient 467static unsigned int
468popcount (unsigned int n)
469{
470 n -= (n >> 1) & 0x55555555U;
471 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
472 n = ((n >> 4) + n) & 0x0f0f0f0fU;
473 n *= 0x01010101U;
474
475 return n >> 24;
476}
477
478/* SDL should provide this, really. */
479#define SDLK_MODIFIER_MIN 300
480#define SDLK_MODIFIER_MAX 314
481
482/******************************************************************************/
483
484static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
485static GV *hover_gv;
486
487static int
488within_widget (SV *widget, NV x, NV y)
489{
490 HV *self;
491 SV **svp;
492 NV wx, ww, wy, wh;
493
494 if (!SvROK (widget))
495 return 0;
496
497 self = (HV *)SvRV (widget);
498
499 if (SvTYPE (self) != SVt_PVHV)
500 return 0;
501
502 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
503 if (y < wy)
504 return 0;
505
506 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
507 if (y >= wy + wh)
508 return 0;
509
510 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
511 if (x < wx)
512 return 0;
513
514 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
515 if (x >= wx + ww)
516 return 0;
517
518 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
519 if (!svp || !SvTRUE (*svp))
520 return 0;
521
522 return 1;
523}
524
525MODULE = Deliantra::Client PACKAGE = DC
352 526
353PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
354 528
355BOOT: 529BOOT:
356{ 530{
357 HV *stash = gv_stashpv ("CFClient", 1); 531 HV *stash = gv_stashpv ("DC", 1);
358 static const struct { 532 static const struct {
359 const char *name; 533 const char *name;
360 IV iv; 534 IV iv;
361 } *civ, const_iv[] = { 535 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 536# define const_iv(name) { # name, (IV)name }
537 const_iv (SDLK_MODIFIER_MIN),
538 const_iv (SDLK_MODIFIER_MAX),
539
363 const_iv (SDL_ACTIVEEVENT), 540 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 541 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 542 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 543 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 544 const_iv (SDL_MOUSEBUTTONDOWN),
… …
376 const_iv (SDL_EVENT_RESERVEDA), 553 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 554 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 555 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 556 const_iv (SDL_VIDEOEXPOSE),
380 const_iv (SDL_USEREVENT), 557 const_iv (SDL_USEREVENT),
558
559 const_iv (SDL_APPINPUTFOCUS),
560 const_iv (SDL_APPMOUSEFOCUS),
561 const_iv (SDL_APPACTIVE),
562
563 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST),
381 const_iv (SDLK_KP0), 565 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 566 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 567 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 568 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 569 const_iv (SDLK_KP4),
… …
440 const_iv (SDLK_BREAK), 624 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 625 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 626 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 627 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 628 const_iv (SDLK_UNDO),
629
445 const_iv (KMOD_NONE), 630 const_iv (KMOD_NONE),
631 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 632 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 633 const_iv (KMOD_RSHIFT),
634 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 635 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 636 const_iv (KMOD_RCTRL),
637 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 638 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 639 const_iv (KMOD_RALT),
640 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 641 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 642 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 643 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 644 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 645 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL), 646
458 const_iv (KMOD_SHIFT), 647 const_iv (MIX_DEFAULT_FORMAT),
459 const_iv (KMOD_ALT), 648
460 const_iv (KMOD_META) 649 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO),
652 const_iv (SDL_INIT_CDROM),
653 const_iv (SDL_INIT_JOYSTICK),
654 const_iv (SDL_INIT_EVERYTHING),
655 const_iv (SDL_INIT_NOPARACHUTE),
656 const_iv (SDL_INIT_EVENTTHREAD),
657
658 const_iv (SDL_GL_RED_SIZE),
659 const_iv (SDL_GL_GREEN_SIZE),
660 const_iv (SDL_GL_BLUE_SIZE),
661 const_iv (SDL_GL_ALPHA_SIZE),
662 const_iv (SDL_GL_DOUBLEBUFFER),
663 const_iv (SDL_GL_BUFFER_SIZE),
664 const_iv (SDL_GL_DEPTH_SIZE),
665 const_iv (SDL_GL_STENCIL_SIZE),
666 const_iv (SDL_GL_ACCUM_RED_SIZE),
667 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
668 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL)
461# undef const_iv 675# undef const_iv
462 }; 676 };
463 677
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
680
681 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
682 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466} 683}
684
685void
686weaken (SV *rv)
687 PROTOTYPE: $
688 CODE:
689 sv_rvweaken (rv);
690
691int
692in_destruct ()
693 CODE:
694 RETVAL = PL_main_cv == Nullcv;
695 OUTPUT:
696 RETVAL
467 697
468NV floor (NV x) 698NV floor (NV x)
469 699
470NV ceil (NV x) 700NV ceil (NV x)
701
702IV minpot (UV n)
703
704IV popcount (UV n)
471 705
472void 706void
473pango_init () 707pango_init ()
474 CODE: 708 CODE:
475{ 709{
476 opengl_fontmap = pango_opengl_font_map_new (); 710 opengl_fontmap = pango_opengl_font_map_new ();
477 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 711 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
478 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 712 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
713 /*pango_context_set_font_description (opengl_context, default_font);*/
714#if PANGO_VERSION_CHECK (1, 15, 2)
715 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
717#endif
479} 718}
480 719
481int 720char *SDL_GetError ()
482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
483 721
484void 722int SDL_Init (U32 flags)
723
724int SDL_InitSubSystem (U32 flags)
725
726void SDL_QuitSubSystem (U32 flags)
727
485SDL_Quit () 728void SDL_Quit ()
486 729
730int SDL_GL_SetAttribute (int attr, int value)
731
732int SDL_GL_GetAttribute (int attr)
733 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL))
735 XSRETURN_UNDEF;
736 OUTPUT:
737 RETVAL
738
487void 739void
488SDL_ListModes () 740SDL_ListModes (int rgb, int alpha)
489 PPCODE: 741 PPCODE:
490{ 742{
491 SDL_Rect **m; 743 SDL_Rect **m;
492 744
493 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 745 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 746 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 747 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 748 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
497 749
498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 750 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
500 752
501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 753 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 754 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 755 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 757
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 758 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
507 759 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
508 SDL_EnableUNICODE (1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
510 760
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 761 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
512 762
513 if (m && m != (SDL_Rect **)-1) 763 if (m && m != (SDL_Rect **)-1)
514 while (*m) 764 while (*m)
515 { 765 {
766 if ((*m)->w >= 400 && (*m)->h >= 300)
767 {
516 AV *av = newAV (); 768 AV *av = newAV ();
517 av_push (av, newSViv ((*m)->w)); 769 av_push (av, newSViv ((*m)->w));
518 av_push (av, newSViv ((*m)->h)); 770 av_push (av, newSViv ((*m)->h));
771 av_push (av, newSViv (rgb));
772 av_push (av, newSViv (alpha));
519 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 773 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
774 }
520 775
521 ++m; 776 ++m;
522 } 777 }
523} 778}
524 779
525char *
526SDL_GetError ()
527
528int 780int
529SDL_SetVideoMode (int w, int h, int fullscreen) 781SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
530 CODE: 782 CODE:
783{
784 SDL_EnableUNICODE (1);
785 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
786
787 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
788 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
789 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
790 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
791
531 RETVAL = !!SDL_SetVideoMode ( 792 RETVAL = !!SDL_SetVideoMode (
532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 793 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
533 ); 794 );
795
534 if (RETVAL) 796 if (RETVAL)
535 { 797 {
536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 798 av_clear (texture_av);
799
800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h" 802#include "glfunc.h"
539# undef GL_FUNC 803#undef GL_FUNC
540 } 804 }
805}
541 OUTPUT: 806 OUTPUT:
542 RETVAL 807 RETVAL
543 808
544void 809void
545SDL_GL_SwapBuffers () 810SDL_GL_SwapBuffers ()
546 811
547char * 812char *
548SDL_GetKeyName (int sym) 813SDL_GetKeyName (int sym)
549 814
815int
816SDL_GetAppState ()
817
818int
819SDL_GetModState ()
820
550void 821void
551SDL_PollEvent () 822poll_events ()
552 PPCODE: 823 PPCODE:
553{ 824{
554 SDL_Event ev; 825 SDL_Event ev;
555 826
556 while (SDL_PollEvent (&ev)) 827 SDL_PumpEvents ();
828 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
557 { 829 {
558 HV *hv = newHV (); 830 HV *hv = newHV ();
559 hv_store (hv, "type", 4, newSViv (ev.type), 0); 831 hv_store (hv, "type", 4, newSViv (ev.type), 0);
560 832
561 switch (ev.type) 833 switch (ev.type)
562 { 834 {
563 case SDL_KEYDOWN: 835 case SDL_KEYDOWN:
564 case SDL_KEYUP: 836 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 839 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
840 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 842 break;
570 843
571 case SDL_ACTIVEEVENT: 844 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 846 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
574 break; 847 break;
575 848
576 case SDL_MOUSEMOTION: 849 case SDL_MOUSEMOTION:
850 {
851 int state = ev.motion.state;
852 int x = ev.motion.x;
853 int y = ev.motion.y;
854 int xrel = ev.motion.xrel;
855 int yrel = ev.motion.yrel;
856
857 /* do simplistic event compression */
858 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
859 && state == ev.motion.state)
860 {
861 xrel += ev.motion.xrel;
862 yrel += ev.motion.yrel;
863 x = ev.motion.x;
864 y = ev.motion.y;
865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
866 }
867
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
578
579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 869 hv_store (hv, "state", 5, newSViv (state), 0);
580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 870 hv_store (hv, "x", 1, newSViv (x), 0);
581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 871 hv_store (hv, "y", 1, newSViv (y), 0);
582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 872 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 873 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
874 }
584 break; 875 break;
585 876
586 case SDL_MOUSEBUTTONDOWN: 877 case SDL_MOUSEBUTTONDOWN:
587 case SDL_MOUSEBUTTONUP: 878 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 879 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
589 880
590 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 881 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
591 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 882 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
592 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 883 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
593 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 884 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 889 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 890 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 891 break;
601 } 892 }
602 893
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 894 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
604 } 895 }
605} 896}
606 897
607int 898int
608Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 899Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
609 POSTCALL: 900 POSTCALL:
610 Mix_HookMusicFinished (music_finished); 901 Mix_HookMusicFinished (music_finished);
611 Mix_ChannelFinished (channel_finished); 902 Mix_ChannelFinished (channel_finished);
612 903
613void 904void
905Mix_QuerySpec ()
906 PPCODE:
907{
908 int freq, channels;
909 Uint16 format;
910
911 if (Mix_QuerySpec (&freq, &format, &channels))
912 {
913 EXTEND (SP, 3);
914 PUSHs (sv_2mortal (newSViv (freq)));
915 PUSHs (sv_2mortal (newSViv (format)));
916 PUSHs (sv_2mortal (newSViv (channels)));
917 }
918}
919
920void
614Mix_CloseAudio () 921Mix_CloseAudio ()
615 922
616int 923int
617Mix_AllocateChannels (int numchans = -1) 924Mix_AllocateChannels (int numchans = -1)
618 925
926const char *
927Mix_GetError ()
928
619void 929void
620lowdelay (int fd, int val = 1) 930lowdelay (int fd, int val = 1)
621 CODE: 931 CODE:
932 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
933
934void
935win32_proxy_info ()
936 PPCODE:
937{
622#ifndef _WIN32 938#ifdef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 939 char buffer[2048];
940 DWORD buflen;
941
942 EXTEND (SP, 3);
943
944 buflen = sizeof (buffer);
945 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
946 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
947 {
948 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
949
950 buflen = sizeof (buffer);
951 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
952 {
953 PUSHs (newSVpv (buffer, 0));
954
955 buflen = sizeof (buffer);
956 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
957 PUSHs (newSVpv (buffer, 0));
958 }
959 }
624#endif 960#endif
961}
625 962
626void 963int
627add_font (char *file) 964add_font (char *file)
628 CODE: 965 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT:
968 RETVAL
630 969
631void 970void
632load_image_inline (SV *image_) 971load_image_inline (SV *image_)
633 ALIAS: 972 ALIAS:
634 load_image_file = 1 973 load_image_file = 1
… …
637 STRLEN image_len; 976 STRLEN image_len;
638 char *image = (char *)SvPVbyte (image_, image_len); 977 char *image = (char *)SvPVbyte (image_, image_len);
639 SDL_Surface *surface, *surface2; 978 SDL_Surface *surface, *surface2;
640 SDL_PixelFormat fmt; 979 SDL_PixelFormat fmt;
641 SDL_RWops *rw = ix 980 SDL_RWops *rw = ix
642 ? SDL_RWFromFile (image, "r") 981 ? SDL_RWFromFile (image, "rb")
643 : SDL_RWFromConstMem (image, image_len); 982 : SDL_RWFromConstMem (image, image_len);
644 983
645 if (!rw) 984 if (!rw)
646 croak ("load_image: %s", SDL_GetError ()); 985 croak ("load_image: %s", SDL_GetError ());
647 986
… …
676 1015
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 1016 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 1017
679 assert (surface2->pitch == surface2->w * 4); 1018 assert (surface2->pitch == surface2->w * 4);
680 1019
1020 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 1021 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 1022 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 1023 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1024 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1025 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1026 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1027 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1028 SDL_UnlockSurface (surface2);
690 1029
691 SDL_FreeSurface (surface); 1030 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 1031 SDL_FreeSurface (surface2);
693} 1032}
694 1033
… …
720void 1059void
721error (char *message) 1060error (char *message)
722 CODE: 1061 CODE:
723 fprintf (stderr, "ERROR: %s\n", message); 1062 fprintf (stderr, "ERROR: %s\n", message);
724#ifdef _WIN32 1063#ifdef _WIN32
725 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
726#endif 1065#endif
727 1066
728void 1067void
729fatal (char *message) 1068fatal (char *message)
730 CODE: 1069 CODE:
731 fprintf (stderr, "FATAL: %s\n", message); 1070 fprintf (stderr, "FATAL: %s\n", message);
732#ifdef _WIN32 1071#ifdef _WIN32
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1072 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
734#endif 1073#endif
735 _exit (1); 1074 _exit (1);
736 1075
737void 1076void
738_exit (int retval) 1077_exit (int retval = 0)
739 CODE: 1078 CODE:
1079#ifdef WIN32
1080 ExitThread (retval); // unclean, please beam me up
1081#else
740 _exit (retval); 1082 _exit (retval);
1083#endif
741 1084
1085void
1086debug ()
1087 CODE:
1088{
1089#if DEBUG
1090 VALGRIND_DO_LEAK_CHECK;
1091#endif
1092}
1093
742MODULE = CFClient PACKAGE = CFClient::Font 1094MODULE = Deliantra::Client PACKAGE = DC::Font
743 1095
744CFClient::Font 1096PROTOTYPES: DISABLE
1097
1098DC::Font
745new_from_file (SV *class, char *path, int id = 0) 1099new_from_file (SV *class, char *path, int id = 0)
746 CODE: 1100 CODE:
747{ 1101{
748 int count; 1102 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1103 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
752} 1106}
753 OUTPUT: 1107 OUTPUT:
754 RETVAL 1108 RETVAL
755 1109
756void 1110void
757DESTROY (CFClient::Font self) 1111DESTROY (DC::Font self)
758 CODE: 1112 CODE:
759 pango_font_description_free (self); 1113 pango_font_description_free (self);
760 1114
761void 1115void
762make_default (CFClient::Font self) 1116make_default (DC::Font self)
1117 PROTOTYPE: $
763 CODE: 1118 CODE:
764 default_font = self; 1119 default_font = self;
765 1120
766MODULE = CFClient PACKAGE = CFClient::Layout 1121MODULE = Deliantra::Client PACKAGE = DC::Layout
767 1122
1123PROTOTYPES: DISABLE
1124
768void 1125void
769clear_font_cache () 1126glyph_cache_backup ()
1127 PROTOTYPE:
770 CODE: 1128 CODE:
771 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap); 1129 tc_backup ();
1130
1131void
1132glyph_cache_restore ()
1133 PROTOTYPE:
1134 CODE:
772 tc_clear (); 1135 tc_restore ();
773 1136
774CFClient::Layout 1137DC::Layout
775new (SV *class, int type = 0) 1138new (SV *class)
776 CODE: 1139 CODE:
777 New (0, RETVAL, 1, struct cf_layout); 1140 New (0, RETVAL, 1, struct cf_layout);
778 1141
779 RETVAL->pl = pango_layout_new (opengl_context); 1142 RETVAL->pl = pango_layout_new (opengl_context);
780 RETVAL->r = 1.; 1143 RETVAL->r = 1.;
781 RETVAL->g = 1.; 1144 RETVAL->g = 1.;
782 RETVAL->b = 1.; 1145 RETVAL->b = 1.;
783 RETVAL->a = 1.; 1146 RETVAL->a = 1.;
784 RETVAL->base_height = MIN_FONT_HEIGHT; 1147 RETVAL->base_height = MIN_FONT_HEIGHT;
785 RETVAL->font = 0; 1148 RETVAL->font = 0;
1149 RETVAL->rc = rc_alloc ();
786 1150
787 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1151 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
788 layout_update_font (RETVAL); 1152 layout_update_font (RETVAL);
789 OUTPUT: 1153 OUTPUT:
790 RETVAL 1154 RETVAL
791 1155
792void 1156void
793DESTROY (CFClient::Layout self) 1157DESTROY (DC::Layout self)
794 CODE: 1158 CODE:
795 g_object_unref (self->pl); 1159 g_object_unref (self->pl);
1160 rc_free (self->rc);
796 Safefree (self); 1161 Safefree (self);
797 1162
798void 1163void
799set_text (CFClient::Layout self, SV *text_) 1164set_text (DC::Layout self, SV *text_)
800 CODE: 1165 CODE:
801{ 1166{
802 STRLEN textlen; 1167 STRLEN textlen;
803 char *text = SvPVutf8 (text_, textlen); 1168 char *text = SvPVutf8 (text_, textlen);
804 1169
805 pango_layout_set_text (self->pl, text, textlen); 1170 pango_layout_set_text (self->pl, text, textlen);
806} 1171}
807 1172
808void 1173void
809set_markup (CFClient::Layout self, SV *text_) 1174set_markup (DC::Layout self, SV *text_)
810 CODE: 1175 CODE:
811{ 1176{
812 STRLEN textlen; 1177 STRLEN textlen;
813 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
814 1179
815 pango_layout_set_markup (self->pl, text, textlen); 1180 pango_layout_set_markup (self->pl, text, textlen);
816} 1181}
817 1182
818void 1183void
819set_shapes (CFClient::Layout self, ...) 1184set_shapes (DC::Layout self, ...)
820 CODE: 1185 CODE:
821{ 1186{
822 PangoAttrList *attrs = 0; 1187 PangoAttrList *attrs = 0;
823 const char *text = pango_layout_get_text (self->pl); 1188 const char *text = pango_layout_get_text (self->pl);
824 const char *pos = text; 1189 const char *pos = text;
… …
859 if (attrs) 1224 if (attrs)
860 pango_layout_set_attributes (self->pl, attrs); 1225 pango_layout_set_attributes (self->pl, attrs);
861} 1226}
862 1227
863void 1228void
864get_shapes (CFClient::Layout self) 1229get_shapes (DC::Layout self)
865 PPCODE: 1230 PPCODE:
866{ 1231{
867 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1232 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
868 1233
869 do 1234 do
870 { 1235 {
871 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1236 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
872 1237
873 if (run && shape_attr_p (run)) 1238 if (run && shape_attr_p (run))
874 { 1239 {
875 PangoRectangle extents; 1240 PangoRectangle extents;
876 pango_layout_iter_get_run_extents (iter, 0, &extents); 1241 pango_layout_iter_get_run_extents (iter, 0, &extents);
877 1242
1243 EXTEND (SP, 2);
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1244 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
879 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1245 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
880 } 1246 }
881 } 1247 }
882 while (pango_layout_iter_next_run (iter)); 1248 while (pango_layout_iter_next_run (iter));
883 1249
884 pango_layout_iter_free (iter); 1250 pango_layout_iter_free (iter);
885} 1251}
886 1252
887int 1253int
888has_wrapped (CFClient::Layout self) 1254has_wrapped (DC::Layout self)
889 CODE: 1255 CODE:
890{ 1256{
891 int lines = 1; 1257 int lines = 1;
892 const char *text = pango_layout_get_text (self->pl); 1258 const char *text = pango_layout_get_text (self->pl);
893 1259
… …
898} 1264}
899 OUTPUT: 1265 OUTPUT:
900 RETVAL 1266 RETVAL
901 1267
902SV * 1268SV *
903get_text (CFClient::Layout self) 1269get_text (DC::Layout self)
904 CODE: 1270 CODE:
905 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1271 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
906 sv_utf8_decode (RETVAL); 1272 sv_utf8_decode (RETVAL);
907 OUTPUT: 1273 OUTPUT:
908 RETVAL 1274 RETVAL
909 1275
910void 1276void
911set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1277set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
912 CODE: 1278 CODE:
913 self->r = r; 1279 self->r = r;
914 self->g = g; 1280 self->g = g;
915 self->b = b; 1281 self->b = b;
916 self->a = a; 1282 self->a = a;
917 1283
918void 1284void
919set_font (CFClient::Layout self, CFClient::Font font = 0) 1285set_font (DC::Layout self, DC::Font font = 0)
920 CODE: 1286 CODE:
921 if (self->font != font) 1287 if (self->font != font)
922 { 1288 {
923 self->font = font; 1289 self->font = font;
924 layout_update_font (self); 1290 layout_update_font (self);
925 } 1291 }
926 1292
927void 1293void
928set_height (CFClient::Layout self, int base_height) 1294set_height (DC::Layout self, int base_height)
929 CODE: 1295 CODE:
930 if (self->base_height != base_height) 1296 if (self->base_height != base_height)
931 { 1297 {
932 self->base_height = base_height; 1298 self->base_height = base_height;
933 layout_update_font (self); 1299 layout_update_font (self);
934 } 1300 }
935 1301
936void 1302void
937set_width (CFClient::Layout self, int max_width = -1) 1303set_width (DC::Layout self, int max_width = -1)
938 CODE: 1304 CODE:
939 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1305 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
940 1306
941void 1307void
942set_indent (CFClient::Layout self, int indent) 1308set_indent (DC::Layout self, int indent)
943 CODE: 1309 CODE:
944 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1310 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
945 1311
946void 1312void
947set_spacing (CFClient::Layout self, int spacing) 1313set_spacing (DC::Layout self, int spacing)
948 CODE: 1314 CODE:
949 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1315 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
950 1316
951void 1317void
952set_ellipsise (CFClient::Layout self, int ellipsise) 1318set_ellipsise (DC::Layout self, int ellipsise)
953 CODE: 1319 CODE:
954 pango_layout_set_ellipsize (self->pl, 1320 pango_layout_set_ellipsize (self->pl,
955 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1321 ellipsise == 1 ? PANGO_ELLIPSIZE_START
956 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1322 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
957 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1323 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
958 : PANGO_ELLIPSIZE_NONE 1324 : PANGO_ELLIPSIZE_NONE
959 ); 1325 );
960 1326
961void 1327void
962set_single_paragraph_mode (CFClient::Layout self, int spm) 1328set_single_paragraph_mode (DC::Layout self, int spm)
963 CODE: 1329 CODE:
964 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1330 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
965 1331
966void 1332void
967size (CFClient::Layout self) 1333size (DC::Layout self)
968 PPCODE: 1334 PPCODE:
969{ 1335{
970 int w, h; 1336 int w, h;
971 1337
972 layout_get_pixel_size (self, &w, &h); 1338 layout_get_pixel_size (self, &w, &h);
… …
975 PUSHs (sv_2mortal (newSViv (w))); 1341 PUSHs (sv_2mortal (newSViv (w)));
976 PUSHs (sv_2mortal (newSViv (h))); 1342 PUSHs (sv_2mortal (newSViv (h)));
977} 1343}
978 1344
979int 1345int
980descent (CFClient::Layout self) 1346descent (DC::Layout self)
981 CODE: 1347 CODE:
982{ 1348{
983 PangoRectangle rect; 1349 PangoRectangle rect;
984 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1350 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
985 pango_layout_line_get_pixel_extents (line, 0, &rect); 1351 pango_layout_line_get_pixel_extents (line, 0, &rect);
986 RETVAL = PANGO_DESCENT (rect); 1352 RETVAL = PANGO_DESCENT (rect);
987} 1353}
988 OUTPUT: 1354 OUTPUT:
989 RETVAL 1355 RETVAL
990 1356
991int 1357int
992xy_to_index (CFClient::Layout self, int x, int y) 1358xy_to_index (DC::Layout self, int x, int y)
993 CODE: 1359 CODE:
994{ 1360{
995 int index, trailing; 1361 int index, trailing;
996 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1362 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
997 RETVAL = index; 1363 RETVAL = index + trailing;
998} 1364}
999 OUTPUT: 1365 OUTPUT:
1000 RETVAL 1366 RETVAL
1001 1367
1002void 1368void
1003cursor_pos (CFClient::Layout self, int index) 1369cursor_pos (DC::Layout self, int index)
1004 PPCODE: 1370 PPCODE:
1005{ 1371{
1006 PangoRectangle strong_pos; 1372 PangoRectangle pos;
1007 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1373 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1008 1374
1009 EXTEND (SP, 3); 1375 EXTEND (SP, 3);
1010 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1376 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1377 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1012 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1013} 1379}
1014 1380
1015void 1381void
1016render (CFClient::Layout self, float x, float y) 1382index_to_line_x (DC::Layout self, int index, int trailing = 0)
1017 PPCODE: 1383 PPCODE:
1384{
1385 int line, x;
1386
1387 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1388#if !PANGO_VERSION_CHECK (1, 17, 3)
1389 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1390 --line;
1391#endif
1392 EXTEND (SP, 2);
1393 PUSHs (sv_2mortal (newSViv (line)));
1394 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1395}
1396
1397void
1398line_x_to_index (DC::Layout self, int line, int x)
1399 PPCODE:
1400{
1401 PangoLayoutLine *lp;
1402 int index, trailing;
1403
1404 if (line < 0)
1405 XSRETURN_EMPTY;
1406
1407 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1408 XSRETURN_EMPTY; /* do better */
1409
1410 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1411
1412 EXTEND (SP, 2);
1413 if (GIMME_V == G_SCALAR)
1414 PUSHs (sv_2mortal (newSViv (index + trailing)));
1415 else
1416 {
1417 PUSHs (sv_2mortal (newSViv (index)));
1418 PUSHs (sv_2mortal (newSViv (trailing)));
1419 }
1420}
1421
1422void
1423render (DC::Layout self, float x, float y, int flags = 0)
1424 CODE:
1425 rc_clear (self->rc);
1018 pango_opengl_render_layout_subpixel ( 1426 pango_opengl_render_layout_subpixel (
1019 self->pl, 1427 self->pl,
1428 self->rc,
1020 x * PANGO_SCALE, y * PANGO_SCALE, 1429 x * PANGO_SCALE, y * PANGO_SCALE,
1021 self->r, self->g, self->b, self->a 1430 self->r, self->g, self->b, self->a,
1431 flags
1022 ); 1432 );
1433 // we assume that context_change actually clears/frees stuff
1434 // and does not do any recomputation...
1435 pango_layout_context_changed (self->pl);
1023 1436
1437void
1438draw (DC::Layout self)
1439 CODE:
1440{
1441 glEnable (GL_TEXTURE_2D);
1442 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1443 glEnable (GL_BLEND);
1444 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1445 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1446 glEnable (GL_ALPHA_TEST);
1447 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1448
1449 rc_draw (self->rc);
1450
1451 glDisable (GL_ALPHA_TEST);
1452 glDisable (GL_BLEND);
1453 glDisable (GL_TEXTURE_2D);
1454}
1455
1024MODULE = CFClient PACKAGE = CFClient::Texture 1456MODULE = Deliantra::Client PACKAGE = DC::Texture
1025 1457
1026void 1458PROTOTYPES: ENABLE
1027pad2pot (SV *data_, SV *w_, SV *h_)
1028 CODE:
1029{
1030 int ow = SvIV (w_);
1031 int oh = SvIV (h_);
1032 1459
1033 if (ow && oh) 1460void
1461pad (SV *data_, int ow, int oh, int nw, int nh)
1462 CODE:
1463{
1464 if ((nw != ow || nh != oh) && SvOK (data_))
1034 { 1465 {
1035 int nw = minpot (ow);
1036 int nh = minpot (oh);
1037
1038 if (nw != ow || nh != oh)
1039 {
1040 if (SvOK (data_))
1041 {
1042 STRLEN datalen; 1466 STRLEN datalen;
1043 char *data = SvPVbyte (data_, datalen); 1467 char *data = SvPVbyte (data_, datalen);
1044 int bpp = datalen / (ow * oh); 1468 int bpp = datalen / (ow * oh);
1045 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1469 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1046 1470
1047 SvPOK_only (result_); 1471 SvPOK_only (result_);
1048 SvCUR_set (result_, nw * nh * bpp); 1472 SvCUR_set (result_, nw * nh * bpp);
1049 1473
1050 memset (SvPVX (result_), 0, nw * nh * bpp); 1474 memset (SvPVX (result_), 0, nw * nh * bpp);
1051 while (oh--) 1475 while (oh--)
1052 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1476 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1053 1477
1054 sv_setsv (data_, result_); 1478 sv_setsv (data_, result_);
1055 }
1056
1057 sv_setiv (w_, nw);
1058 sv_setiv (h_, nh);
1059 }
1060 } 1479 }
1061} 1480}
1062 1481
1063void 1482void
1064draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1483draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1070{ 1489{
1071 HV *hv = (HV *)SvRV (self); 1490 HV *hv = (HV *)SvRV (self);
1072 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1491 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1073 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1492 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1074 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1493 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1494
1495 if (name <= 0)
1496 XSRETURN_EMPTY;
1075 1497
1076 if (items < 5) 1498 if (items < 5)
1077 { 1499 {
1078 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1500 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1079 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1501 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1107 glDisable (GL_ALPHA_TEST); 1529 glDisable (GL_ALPHA_TEST);
1108 glDisable (GL_BLEND); 1530 glDisable (GL_BLEND);
1109 } 1531 }
1110} 1532}
1111 1533
1534IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1535 CODE:
1536{
1537 GLint width;
1538 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1539 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1540 RETVAL = width > 0;
1541}
1542 OUTPUT:
1543 RETVAL
1544
1112MODULE = CFClient PACKAGE = CFClient::Map 1545MODULE = Deliantra::Client PACKAGE = DC::Map
1113 1546
1114CFClient::Map 1547PROTOTYPES: DISABLE
1115new (SV *class, int map_width, int map_height) 1548
1549DC::Map
1550new (SV *class)
1116 CODE: 1551 CODE:
1117 New (0, RETVAL, 1, struct map); 1552 New (0, RETVAL, 1, struct map);
1118 RETVAL->x = 0; 1553 RETVAL->x = 0;
1119 RETVAL->y = 0; 1554 RETVAL->y = 0;
1120 RETVAL->w = map_width; 1555 RETVAL->w = 0;
1121 RETVAL->h = map_height; 1556 RETVAL->h = 0;
1122 RETVAL->ox = 0; 1557 RETVAL->ox = 0;
1123 RETVAL->oy = 0; 1558 RETVAL->oy = 0;
1124 RETVAL->faces = 8192; 1559 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1125 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1560 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1126 RETVAL->texs = 8192;
1127 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1128 RETVAL->rows = 0; 1561 RETVAL->rows = 0;
1129 RETVAL->row = 0; 1562 RETVAL->row = 0;
1130 OUTPUT: 1563 OUTPUT:
1131 RETVAL 1564 RETVAL
1132 1565
1133void 1566void
1134DESTROY (CFClient::Map self) 1567DESTROY (DC::Map self)
1135 CODE: 1568 CODE:
1136{ 1569{
1137 map_clear (self); 1570 map_clear (self);
1138 Safefree (self->face); 1571 Safefree (self->face2tile);
1139 Safefree (self->tex); 1572 Safefree (self->tex);
1140 Safefree (self); 1573 Safefree (self);
1141} 1574}
1142 1575
1143void 1576void
1577resize (DC::Map self, int map_width, int map_height)
1578 CODE:
1579 self->w = map_width;
1580 self->h = map_height;
1581
1582void
1144clear (CFClient::Map self) 1583clear (DC::Map self)
1145 CODE: 1584 CODE:
1146 map_clear (self); 1585 map_clear (self);
1147 1586
1148void 1587void
1149set_face (CFClient::Map self, int face, int texid) 1588set_tileid (DC::Map self, int face, int tile)
1150 CODE: 1589 CODE:
1151{ 1590{
1152 while (self->faces <= face) 1591 need_facenum (self, face); self->face2tile [face] = tile;
1153 { 1592 need_texid (self, tile);
1154 Append (mapface, self->face, self->faces, self->faces);
1155 self->faces *= 2;
1156 }
1157
1158 self->face [face] = texid;
1159} 1593}
1160 1594
1161void 1595void
1596set_smooth (DC::Map self, int face, int smooth, int level)
1597 CODE:
1598{
1599 tileid texid;
1600 maptex *tex;
1601
1602 if (face < 0 || face >= self->faces)
1603 return;
1604
1605 if (smooth < 0 || smooth >= self->faces)
1606 return;
1607
1608 texid = self->face2tile [face];
1609
1610 if (!texid)
1611 return;
1612
1613 tex = self->tex + texid;
1614 tex->smoothtile = self->face2tile [smooth];
1615 tex->smoothlevel = level;
1616}
1617
1618void
1162set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1619set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1163 CODE: 1620 CODE:
1164{ 1621{
1165 while (self->texs <= texid) 1622 need_texid (self, texid);
1166 {
1167 Append (maptex, self->tex, self->texs, self->texs);
1168 self->texs *= 2;
1169 }
1170 1623
1171 { 1624 {
1172 maptex *tex = self->tex + texid; 1625 maptex *tex = self->tex + texid;
1173 1626
1174 tex->name = name; 1627 tex->name = name;
… …
1191 // from transparent color bleeding and ugly wrapping effects. 1644 // from transparent color bleeding and ugly wrapping effects.
1192 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1193} 1646}
1194 1647
1195int 1648int
1196ox (CFClient::Map self) 1649ox (DC::Map self)
1197 ALIAS: 1650 ALIAS:
1198 oy = 1 1651 oy = 1
1199 x = 2 1652 x = 2
1200 y = 3 1653 y = 3
1201 w = 4 1654 w = 4
… …
1212 } 1665 }
1213 OUTPUT: 1666 OUTPUT:
1214 RETVAL 1667 RETVAL
1215 1668
1216void 1669void
1217scroll (CFClient::Map self, int dx, int dy) 1670scroll (DC::Map self, int dx, int dy)
1218 CODE: 1671 CODE:
1219{ 1672{
1220 if (dx > 0) 1673 if (dx > 0)
1221 map_blank (self, self->x, self->y, dx - 1, self->h); 1674 map_blank (self, self->x, self->y, dx, self->h);
1222 else if (dx < 0) 1675 else if (dx < 0)
1223 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1676 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1224 1677
1225 if (dy > 0) 1678 if (dy > 0)
1226 map_blank (self, self->x, self->y, self->w, dy - 1); 1679 map_blank (self, self->x, self->y, self->w, dy);
1227 else if (dy < 0) 1680 else if (dy < 0)
1228 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1681 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1229 1682
1230 self->ox += dx; self->x += dx; 1683 self->ox += dx; self->x += dx;
1231 self->oy += dy; self->y += dy; 1684 self->oy += dy; self->y += dy;
1232 1685
1233 while (self->y < 0) 1686 while (self->y < 0)
… …
1237 self->rows += MAP_EXTEND_Y; 1690 self->rows += MAP_EXTEND_Y;
1238 self->y += MAP_EXTEND_Y; 1691 self->y += MAP_EXTEND_Y;
1239 } 1692 }
1240} 1693}
1241 1694
1242void 1695SV *
1243map1a_update (CFClient::Map self, SV *data_) 1696map1a_update (DC::Map self, SV *data_, int extmap)
1244 CODE: 1697 CODE:
1245{ 1698{
1246 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1699 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1247 uint8_t *data_end = (uint8_t *)SvEND (data_); 1700 uint8_t *data_end = (uint8_t *)SvEND (data_);
1248 mapcell *cell; 1701 mapcell *cell;
1249 int x, y, flags; 1702 int x, y, z, flags;
1703 AV *missing = newAV ();
1704 RETVAL = newRV_noinc ((SV *)missing);
1250 1705
1251 while (data < data_end) 1706 while (data < data_end - 1)
1252 { 1707 {
1253 flags = (data [0] << 8) + data [1]; data += 2; 1708 flags = (data [0] << 8) + data [1]; data += 2;
1254 1709
1255 x = self->x + ((flags >> 10) & 63); 1710 x = self->x + ((flags >> 10) & 63);
1256 y = self->y + ((flags >> 4) & 63); 1711 y = self->y + ((flags >> 4) & 63);
1257 1712
1258 cell = map_get_cell (self, x, y); 1713 cell = map_get_cell (self, x, y);
1259 1714
1260 if (flags & 15) 1715 if (flags & 15)
1261 { 1716 {
1262 if (cell->darkness < 0) 1717 if (!cell->darkness)
1263 { 1718 {
1719 memset (cell, 0, sizeof (*cell));
1264 cell->darkness = 0; 1720 cell->darkness = 256;
1265 cell->face [0] = 0;
1266 cell->face [1] = 0;
1267 cell->face [2] = 0;
1268 } 1721 }
1269 1722
1270 cell->darkness = flags & 8 ? *data++ : 255;
1271
1272 //TODO: don't trust server data to be in-range(!) 1723 //TODO: don't trust server data to be in-range(!)
1273 1724
1274 if (flags & 4) 1725 if (flags & 8)
1275 { 1726 {
1276 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1727 if (extmap)
1728 {
1729 uint8_t ext, cmd;
1730
1731 do
1732 {
1733 ext = *data++;
1734 cmd = ext & 0x7f;
1735
1736 if (cmd < 4)
1737 cell->darkness = 255 - ext * 64 + 1;
1738 else if (cmd == 5) // health
1739 {
1740 cell->stat_width = 1;
1741 cell->stat_hp = *data++;
1742 }
1743 else if (cmd == 6) // monster width
1744 cell->stat_width = *data++ + 1;
1745 else if (cmd == 0x47)
1746 {
1747 if (*data == 1) cell->player = data [1];
1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1751
1752 data += *data + 1;
1753 }
1754 else if (cmd == 8) // cell flags
1755 cell->flags = *data++;
1756 else if (ext & 0x40) // unknown, multibyte => skip
1757 data += *data + 1;
1758 else
1759 data++;
1760 }
1761 while (ext & 0x80);
1762 }
1763 else
1764 cell->darkness = *data++ + 1;
1277 } 1765 }
1278 1766
1767 for (z = 0; z <= 2; ++z)
1279 if (flags & 2) 1768 if (flags & (4 >> z))
1280 { 1769 {
1281 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1770 faceid face = (data [0] << 8) + data [1]; data += 2;
1771 need_facenum (self, face);
1772 cell->tile [z] = self->face2tile [face];
1773
1774 if (cell->tile [z])
1775 {
1776 maptex *tex = self->tex + cell->tile [z];
1777 if (!tex->name)
1778 av_push (missing, newSViv (cell->tile [z]));
1779
1780 if (tex->smoothtile)
1781 {
1782 maptex *smooth = self->tex + tex->smoothtile;
1783 if (!smooth->name)
1784 av_push (missing, newSViv (tex->smoothtile));
1785 }
1786 }
1282 } 1787 }
1283
1284 if (flags & 1)
1285 {
1286 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1287 }
1288 } 1788 }
1289 else 1789 else
1290 cell->darkness = -1; 1790 CELL_CLEAR (cell);
1291 } 1791 }
1292} 1792}
1793 OUTPUT:
1794 RETVAL
1293 1795
1294SV * 1796SV *
1295mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1797mapmap (DC::Map self, int x0, int y0, int w, int h)
1296 CODE: 1798 CODE:
1297{ 1799{
1298 int x1, x; 1800 int x1, x;
1299 int y1, y; 1801 int y1, y;
1300 int z; 1802 int z;
… …
1321 { 1823 {
1322 mapcell *cell = row->col + (x - row->c0); 1824 mapcell *cell = row->col + (x - row->c0);
1323 1825
1324 for (z = 0; z <= 0; z++) 1826 for (z = 0; z <= 0; z++)
1325 { 1827 {
1326 mapface face = cell->face [z];
1327
1328 if (face)
1329 {
1330 maptex tex = self->tex [face]; 1828 maptex tex = self->tex [cell->tile [z]];
1331 int a0 = 255 - tex.a; 1829 int a0 = 255 - tex.a;
1332 int a1 = tex.a; 1830 int a1 = tex.a;
1333 1831
1334 r = (r * a0 + tex.r * a1) / 255; 1832 r = (r * a0 + tex.r * a1) / 255;
1335 g = (g * a0 + tex.g * a1) / 255; 1833 g = (g * a0 + tex.g * a1) / 255;
1336 b = (b * a0 + tex.b * a1) / 255; 1834 b = (b * a0 + tex.b * a1) / 255;
1337 a = (a * a0 + tex.a * a1) / 255; 1835 a = (a * a0 + tex.a * a1) / 255;
1338 }
1339 } 1836 }
1340 } 1837 }
1341 1838
1342 *map++ = (r ) 1839 *map++ = (r )
1343 | (g << 8) 1840 | (g << 8)
… …
1350} 1847}
1351 OUTPUT: 1848 OUTPUT:
1352 RETVAL 1849 RETVAL
1353 1850
1354void 1851void
1355draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1356 CODE: 1853 CODE:
1357{ 1854{
1358 int vx, vy;
1359 int x, y, z; 1855 int x, y, z;
1360 int last_name;
1361 mapface face;
1362 1856
1363 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1364 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1860 smooth_key skey;
1861 int pl_x, pl_y;
1862 maptex pl_tex;
1863 rc_t *rc = rc_alloc ();
1864 rc_key_t key;
1865 rc_array_t *arr;
1365 1866
1366 /* 1867 pl_tex.name = 0;
1367 int vx = self->vx = self->w >= sw
1368 ? self->x + (self->w - sw) / 2
1369 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1370 1868
1371 int vy = self->vy = self->h >= sh 1869 // thats current max. sorry.
1372 ? self->y + (self->h - sh) / 2 1870 if (sw > 255) sw = 255;
1373 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1871 if (sh > 255) sh = 255;
1374 */
1375 1872
1376 glColor4ub (255, 255, 255, 255); 1873 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey));
1875
1876 memset (&key, 0, sizeof (key));
1877 key.r = 255;
1878 key.g = 255;
1879 key.b = 255;
1880 key.a = 255;
1881 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884
1885 mx += self->x;
1886 my += self->y;
1887
1888 // first pass: determine smooth_max
1889 // rather ugly, if you ask me
1890 // could also be stored inside mapcell and updated on change
1891 memset (smooth_max, 0, sizeof (smooth_max));
1892
1893 for (y = 0; y < sh; y++)
1894 if (0 <= y + my && y + my < self->rows)
1895 {
1896 maprow *row = self->row + (y + my);
1897
1898 for (x = 0; x < sw; x++)
1899 if (row->c0 <= x + mx && x + mx < row->c1)
1900 {
1901 mapcell *cell = row->col + (x + mx - row->c0);
1902
1903 smooth_max[x + 1][y + 1] =
1904 MAX (self->tex [cell->tile [0]].smoothlevel,
1905 MAX (self->tex [cell->tile [1]].smoothlevel,
1906 self->tex [cell->tile [2]].smoothlevel));
1907 }
1908 }
1377 1909
1378 glEnable (GL_BLEND); 1910 glEnable (GL_BLEND);
1379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1380 glEnable (GL_TEXTURE_2D);
1381 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1382 1913
1383 glBegin (GL_QUADS);
1384
1385 last_name = 0;
1386
1387 for (z = 0; z < 3; z++) 1914 for (z = 0; z <= 2; z++)
1915 {
1916 memset (smooth_level, 0, sizeof (smooth_level));
1917
1388 for (y = 0; y < sh; y++) 1918 for (y = 0; y < sh; y++)
1389 if (0 <= y + vy && y + vy < self->rows) 1919 if (0 <= y + my && y + my < self->rows)
1390 { 1920 {
1391 maprow *row = self->row + (y + vy); 1921 maprow *row = self->row + (y + my);
1392 1922
1393 for (x = 0; x < sw; x++) 1923 for (x = 0; x < sw; x++)
1394 if (row->c0 <= x + vx && x + vx < row->c1) 1924 if (row->c0 <= x + mx && x + mx < row->c1)
1395 { 1925 {
1396 mapcell *cell = row->col + (x + vx - row->c0); 1926 mapcell *cell = row->col + (x + mx - row->c0);
1397
1398 face = cell->face [z]; 1927 tileid tile = cell->tile [z];
1399 1928
1400 if (face) 1929 if (tile)
1930 {
1931 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w;
1933 int py = (y + 1) * T - tex.h;
1934
1935 if (key.texname != tex.name)
1936 {
1937 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */
1939
1940 key.texname = tex.name;
1941 arr = rc_array (rc, &key);
1942 }
1943
1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1951
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1956
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981
1982 // update smooth hash
1983 if (tex.smoothtile)
1984 {
1985 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel;
1987
1988 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1989
1990 // add bits to current tile and all neighbours. skey.x|y is
1991 // shifted +1|+1 so we always stay positive.
1992
1993 // bits is ___n cccc CCCC bbbb
1994 // n do not draw borders&corners
1995 // c draw these corners, but...
1996 // C ... not these
1997 // b draw these borders
1998
1999 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
2000 // ┃· ·· ·┃ ━━
2001
2002 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2003 // ·· ·· ·┏ ┓·
2004
2005 // full tile
2006 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
2007
2008 // borders
2009 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
2010 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
2011 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
2012 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
2013
2014 // corners
2015 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2016 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2017 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2018 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2019 }
2020 }
2021 }
2022 }
2023
2024 rc_draw (rc);
2025 rc_clear (rc);
2026
2027 // go through all smoothlevels, lowest to highest, then draw.
2028 // this is basically counting sort
2029 {
2030 int w, b;
2031
2032 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS);
2034 for (w = 0; w < 256 / 32; ++w)
2035 {
2036 uint32_t smask = smooth_level [w];
2037 if (smask)
2038 for (b = 0; b < 32; ++b)
2039 if (smask & (((uint32_t)1) << b))
1401 { 2040 {
1402 maptex tex = self->tex [face]; 2041 int level = (w << 5) | b;
2042 HE *he;
1403 2043
1404 int px = (x + 1) * 32 - tex.w; 2044 hv_iterinit (smooth);
1405 int py = (y + 1) * 32 - tex.h; 2045 while ((he = hv_iternext (smooth)))
1406
1407 if (last_name != tex.name)
1408 { 2046 {
2047 smooth_key *skey = (smooth_key *)HeKEY (he);
2048 IV bits = SvIVX (HeVAL (he));
2049
2050 if (!(bits & 0x1000)
2051 && skey->level == level
2052 && level > smooth_max [skey->x][skey->y])
2053 {
2054 maptex tex = self->tex [skey->tile];
2055 int px = (((int)skey->x) - 1) * T;
2056 int py = (((int)skey->y) - 1) * T;
2057 int border = bits & 15;
2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059 float dx = tex.s * .0625f; // 16 images/row
2060 float dy = tex.t * .5f ; // 2 images/column
2061
2062 if (tex.name)
2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
2066 if (key.texname != tex.name)
2067 {
1409 glEnd (); 2068 glEnd ();
1410 last_name = tex.name;
1411 glBindTexture (GL_TEXTURE_2D, last_name); 2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1412 glBegin (GL_QUADS); 2070 glBegin (GL_QUADS);
2071 }
2072
2073 if (border)
2074 {
2075 float ox = border * dx;
2076
2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2081 }
2082
2083 if (corner)
2084 {
2085 float ox = corner * dx;
2086
2087 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2091 }
2092 }
2093 }
1413 } 2094 }
1414
1415 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1416 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1417 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1418 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1419 } 2095 }
1420 }
1421 } 2096 }
1422 2097
1423 glEnd (); 2098 glEnd ();
1424
1425 glDisable (GL_TEXTURE_2D); 2099 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1;
2101 }
2102
2103 hv_clear (smooth);
2104 }
2105
2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
2111
2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2121 }
2122
1426 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
1427} 2124 rc_free (rc);
1428 2125
2126 // top layer: overlays such as the health bar
2127 for (y = 0; y < sh; y++)
2128 if (0 <= y + my && y + my < self->rows)
2129 {
2130 maprow *row = self->row + (y + my);
2131
2132 for (x = 0; x < sw; x++)
2133 if (row->c0 <= x + mx && x + mx < row->c1)
2134 {
2135 mapcell *cell = row->col + (x + mx - row->c0);
2136
2137 int px = x * T;
2138 int py = y * T;
2139
2140 if (cell->stat_hp)
2141 {
2142 int width = cell->stat_width * T;
2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2144
2145 glColor3ub (0, 0, 0);
2146 glRectf (px + 1, py - thick - 2,
2147 px + width - 1, py);
2148
2149 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
2150 glRectf (px + 2,
2151 py - thick - 1,
2152 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
2153 }
2154 }
2155 }
2156}
2157
1429void 2158void
1430draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1431 CODE: 2160 CODE:
1432{ 2161{
1433 static float color[16][3] = { 2162 static float color[16][3] = {
1434 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
1435 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
… …
1485 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
1486 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
1487} 2216}
1488 2217
1489void 2218void
1490fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2219fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1491 PPCODE: 2220 PPCODE:
1492{ 2221{
1493 int vx, vy;
1494 int x, y; 2222 int x, y;
2223 int sw1 = sw + 2;
2224 int sh1 = sh + 2;
2225 int sh3 = sh * 3;
1495 int sw4 = (sw + 3) & ~3; 2226 int sw34 = (sw * 3 + 3) & ~3;
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1496 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1497 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1498 2230
1499 memset (darkness, 255, sw4 * sh);
1500 SvPOK_only (darkness_sv); 2231 SvPOK_only (darkness3_sv);
1501 SvCUR_set (darkness_sv, sw4 * sh); 2232 SvCUR_set (darkness3_sv, sw34 * sh3);
1502 2233
1503 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2234 mx += self->x - 1;
1504 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2235 my += self->y - 1;
1505 2236
2237 memset (darkness1, 255, sw1 * sh1);
2238
1506 for (y = 0; y < sh; y++) 2239 for (y = 0; y < sh1; y++)
1507 if (0 <= y + vy && y + vy < self->rows) 2240 if (0 <= y + my && y + my < self->rows)
1508 { 2241 {
1509 maprow *row = self->row + (y + vy); 2242 maprow *row = self->row + (y + my);
1510 2243
1511 for (x = 0; x < sw; x++) 2244 for (x = 0; x < sw1; x++)
1512 if (row->c0 <= x + vx && x + vx < row->c1) 2245 if (row->c0 <= x + mx && x + mx < row->c1)
1513 { 2246 {
1514 mapcell *cell = row->col + (x + vx - row->c0); 2247 mapcell *cell = row->col + (x + mx - row->c0);
1515 2248
1516 darkness[y * sw4 + x] = cell->darkness < 0 2249 darkness1 [y * sw1 + x] = cell->darkness
2250 ? 255 - (cell->darkness - 1)
1517 ? 255 - FOW_DARKNESS 2251 : 255 - FOW_DARKNESS;
1518 : 255 - cell->darkness;
1519 } 2252 }
1520 } 2253 }
1521 2254
2255 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x)
2257 {
2258 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2259 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2260 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2261 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2262 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2263 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2264 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2265 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2266 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2267
2268 uint8_t r11 = (d11 + d21 + d12) / 3;
2269 uint8_t r21 = d21;
2270 uint8_t r31 = (d21 + d31 + d32) / 3;
2271
2272 uint8_t r12 = d12;
2273 uint8_t r22 = d22;
2274 uint8_t r32 = d32;
2275
2276 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3;
2279
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2284 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2289 }
2290
2291 free (darkness1);
2292
1522 EXTEND (SP, 3); 2293 EXTEND (SP, 3);
1523 PUSHs (sv_2mortal (newSViv (sw4))); 2294 PUSHs (sv_2mortal (newSViv (sw34)));
1524 PUSHs (sv_2mortal (newSViv (sh))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
1525 PUSHs (darkness_sv); 2296 PUSHs (darkness3_sv);
1526} 2297}
1527 2298
1528SV * 2299SV *
1529get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2300get_rect (DC::Map self, int x0, int y0, int w, int h)
1530 CODE: 2301 CODE:
1531{ 2302{
1532 int x, y, x1, y1; 2303 int x, y, x1, y1;
1533 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
1534 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1559 if (row && row->c0 <= x && x < row->c1) 2330 if (row && row->c0 <= x && x < row->c1)
1560 { 2331 {
1561 mapcell *cell = row->col + (x - row->c0); 2332 mapcell *cell = row->col + (x - row->c0);
1562 uint8_t flags = 0; 2333 uint8_t flags = 0;
1563 2334
1564 if (cell->face [0]) flags |= 1; 2335 if (cell->tile [0]) flags |= 1;
1565 if (cell->face [1]) flags |= 2; 2336 if (cell->tile [1]) flags |= 2;
1566 if (cell->face [2]) flags |= 4; 2337 if (cell->tile [2]) flags |= 4;
1567 2338
1568 *data++ = flags; 2339 *data++ = flags;
1569 2340
1570 if (flags & 1) 2341 if (flags & 1)
1571 { 2342 {
2343 tileid tile = cell->tile [0];
1572 *data++ = cell->face [0] >> 8; 2344 *data++ = tile >> 8;
1573 *data++ = cell->face [0]; 2345 *data++ = tile;
1574 } 2346 }
1575 2347
1576 if (flags & 2) 2348 if (flags & 2)
1577 { 2349 {
2350 tileid tile = cell->tile [1];
1578 *data++ = cell->face [1] >> 8; 2351 *data++ = tile >> 8;
1579 *data++ = cell->face [1]; 2352 *data++ = tile;
1580 } 2353 }
1581 2354
1582 if (flags & 4) 2355 if (flags & 4)
1583 { 2356 {
2357 tileid tile = cell->tile [2];
1584 *data++ = cell->face [2] >> 8; 2358 *data++ = tile >> 8;
1585 *data++ = cell->face [2]; 2359 *data++ = tile;
1586 } 2360 }
1587 } 2361 }
1588 else 2362 else
1589 *data++ = 0; 2363 *data++ = 0;
1590 } 2364 }
1591 } 2365 }
1592 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
1593 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
1594 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
1595 RETVAL = data_sv; 2374 RETVAL = data_sv;
1596} 2375}
1597 OUTPUT: 2376 OUTPUT:
1598 RETVAL 2377 RETVAL
1599 2378
1600void 2379void
1601set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1602 PPCODE: 2381 PPCODE:
1603{ 2382{
1604 int x, y, z; 2383 int x, y, z;
1605 int w, h; 2384 int w, h;
1606 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
1607 2396
1608 if (*data++ != 0) 2397 if (*data++ != 0)
1609 return; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
1610 2399
1611 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
1612 h = *data++ << 8; h |= *data++; 2401 h = *data++ << 8; h |= *data++;
1613 2402
1614 // we need to do this 'cause we don't keep an absolute coord system for rows 2403 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
1626 { 2415 {
1627 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
1628 2417
1629 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
1630 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
1631 uint8_t flags = *data++; 2425 flags = *data++;
1632 2426
1633 if (flags) 2427 if (flags)
1634 { 2428 {
1635 mapface face[3] = { 0, 0, 0 };
1636
1637 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2430 tileid tile[3] = { 0, 0, 0 };
1638 2431
1639 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2432 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1640 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1641 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1642 2435
1643 if (cell->darkness <= 0) 2436 if (cell->darkness == 0)
1644 { 2437 {
1645 cell->darkness = -1; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
1646 2440
1647 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
1648 { 2442 {
1649 cell->face[z] = face[z]; 2443 tileid t = tile [z];
1650 2444
1651 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2446 {
1652 XPUSHs (sv_2mortal (newSViv (face[z]))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2448 need_texid (self, t);
2449 }
2450
2451 cell->tile [z] = t;
1653 } 2452 }
1654 } 2453 }
1655 } 2454 }
1656 } 2455 }
1657 } 2456 }
1658} 2457}
1659 2458
1660MODULE = CFClient PACKAGE = CFClient::MixChunk 2459MODULE = Deliantra::Client PACKAGE = DC::RW
1661 2460
1662CFClient::MixChunk 2461DC::RW
1663new_from_file (SV *class, char *path) 2462new (SV *class, SV *data_sv)
1664 CODE: 2463 CODE:
1665 RETVAL = Mix_LoadWAV (path); 2464{
2465 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen);
2467
2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2469}
1666 OUTPUT: 2470 OUTPUT:
1667 RETVAL 2471 RETVAL
1668 2472
2473DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2475 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT:
2478 RETVAL
2479
2480# fails on win32:
2481# dc.xs(2268) : error C2059: syntax error : '('
1669void 2482#void
2483#close (DC::RW self)
2484# CODE:
2485# (self->(close)) (self);
2486
2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2488
2489PROTOTYPES: DISABLE
2490
2491DC::Channel
2492find ()
2493 CODE:
2494{
2495 RETVAL = Mix_GroupAvailable (-1);
2496
2497 if (RETVAL < 0)
2498 {
2499 RETVAL = Mix_GroupOldest (-1);
2500
2501 if (RETVAL < 0)
2502 XSRETURN_UNDEF;
2503
2504 Mix_HaltChannel (RETVAL);
2505 }
2506
2507 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128);
2509}
2510 OUTPUT:
2511 RETVAL
2512
2513void
2514halt (DC::Channel self)
2515 CODE:
2516 Mix_HaltChannel (self);
2517
2518void
2519expire (DC::Channel self, int ticks = -1)
2520 CODE:
2521 Mix_ExpireChannel (self, ticks);
2522
2523void
2524fade_out (DC::Channel self, int ticks = -1)
2525 CODE:
2526 Mix_FadeOutChannel (self, ticks);
2527
2528int
2529volume (DC::Channel self, int volume)
2530 CODE:
2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2532 OUTPUT:
2533 RETVAL
2534
2535void
2536unregister_all_effects (DC::Channel self)
2537 CODE:
2538 Mix_UnregisterAllEffects (self);
2539
2540void
2541set_panning (DC::Channel self, int left, int right)
2542 CODE:
2543 left = CLAMP (left , 0, 255);
2544 right = CLAMP (right, 0, 255);
2545 Mix_SetPanning (self, left, right);
2546
2547void
2548set_distance (DC::Channel self, int distance)
2549 CODE:
2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2551
2552void
2553set_position (DC::Channel self, int angle, int distance)
2554 CODE:
2555
2556void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE:
2559{
2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563}
2564
2565void
2566set_reverse_stereo (DC::Channel self, int flip)
2567 CODE:
2568 Mix_SetReverseStereo (self, flip);
2569
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571
2572PROTOTYPES: DISABLE
2573
2574DC::MixChunk
2575new (SV *class, DC::RW rwops)
2576 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT:
2579 RETVAL
2580
2581void
1670DESTROY (CFClient::MixChunk self) 2582DESTROY (DC::MixChunk self)
1671 CODE: 2583 CODE:
1672 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
1673 2585
1674int 2586int
1675volume (CFClient::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
1676 CODE: 2588 CODE:
2589 if (items > 1)
2590 volume = CLAMP (volume, 0, 128);
1677 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
1678 OUTPUT: 2592 OUTPUT:
1679 RETVAL 2593 RETVAL
1680 2594
1681int 2595DC::Channel
1682play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2596play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1683 CODE: 2597 CODE:
2598{
1684 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2600
2601 if (RETVAL < 0)
2602 XSRETURN_UNDEF;
2603
2604 if (channel < 0)
2605 {
2606 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128);
2608 }
2609}
1685 OUTPUT: 2610 OUTPUT:
1686 RETVAL 2611 RETVAL
1687 2612
1688MODULE = CFClient PACKAGE = CFClient::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1689 2614
1690int 2615int
1691volume (int volume = -1) 2616volume (int volume = -1)
2617 PROTOTYPE: ;$
1692 CODE: 2618 CODE:
2619 if (items > 0)
2620 volume = CLAMP (volume, 0, 128);
1693 RETVAL = Mix_VolumeMusic (volume); 2621 RETVAL = Mix_VolumeMusic (volume);
1694 OUTPUT: 2622 OUTPUT:
1695 RETVAL 2623 RETVAL
1696 2624
1697CFClient::MixMusic 2625void
1698new_from_file (SV *class, char *path) 2626fade_out (int ms)
1699 CODE: 2627 CODE:
2628 Mix_FadeOutMusic (ms);
2629
2630void
2631halt ()
2632 CODE:
2633 Mix_HaltMusic ();
2634
2635DC::MixMusic
2636new (SV *class, DC::RW rwops)
2637 CODE:
1700 RETVAL = Mix_LoadMUS (path); 2638 RETVAL = Mix_LoadMUS_RW (rwops);
1701 OUTPUT: 2639 OUTPUT:
1702 RETVAL 2640 RETVAL
1703 2641
1704void 2642void
1705DESTROY (CFClient::MixMusic self) 2643DESTROY (DC::MixMusic self)
1706 CODE: 2644 CODE:
1707 Mix_FreeMusic (self); 2645 Mix_FreeMusic (self);
1708 2646
1709int 2647int
1710play (CFClient::MixMusic self, int loops = -1) 2648play (DC::MixMusic self, int loops = -1)
1711 CODE: 2649 CODE:
1712 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
1713 OUTPUT: 2651 OUTPUT:
1714 RETVAL 2652 RETVAL
1715 2653
2654void
2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2656 CODE:
2657 Mix_FadeInMusicPos (self, loops, ms, position);
2658
1716MODULE = CFClient PACKAGE = CFClient::OpenGL 2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2660
2661PROTOTYPES: ENABLE
1717 2662
1718BOOT: 2663BOOT:
1719{ 2664{
1720 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1721 static const struct { 2666 static const struct {
1722 const char *name; 2667 const char *name;
1723 IV iv; 2668 IV iv;
1724 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
1725# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS),
1726 const_iv (GL_COLOR_MATERIAL), 2674 const_iv (GL_COLOR_MATERIAL),
1727 const_iv (GL_SMOOTH), 2675 const_iv (GL_SMOOTH),
1728 const_iv (GL_FLAT), 2676 const_iv (GL_FLAT),
1729 const_iv (GL_DITHER), 2677 const_iv (GL_DITHER),
1730 const_iv (GL_BLEND), 2678 const_iv (GL_BLEND),
… …
1734 const_iv (GL_ALPHA_TEST), 2682 const_iv (GL_ALPHA_TEST),
1735 const_iv (GL_NORMALIZE), 2683 const_iv (GL_NORMALIZE),
1736 const_iv (GL_RESCALE_NORMAL), 2684 const_iv (GL_RESCALE_NORMAL),
1737 const_iv (GL_FRONT), 2685 const_iv (GL_FRONT),
1738 const_iv (GL_BACK), 2686 const_iv (GL_BACK),
2687 const_iv (GL_AUX0),
1739 const_iv (GL_AND), 2688 const_iv (GL_AND),
1740 const_iv (GL_ONE), 2689 const_iv (GL_ONE),
1741 const_iv (GL_ZERO), 2690 const_iv (GL_ZERO),
1742 const_iv (GL_SRC_ALPHA), 2691 const_iv (GL_SRC_ALPHA),
1743 const_iv (GL_DST_ALPHA), 2692 const_iv (GL_DST_ALPHA),
… …
1756 const_iv (GL_INTENSITY), 2705 const_iv (GL_INTENSITY),
1757 const_iv (GL_LUMINANCE), 2706 const_iv (GL_LUMINANCE),
1758 const_iv (GL_LUMINANCE_ALPHA), 2707 const_iv (GL_LUMINANCE_ALPHA),
1759 const_iv (GL_FLOAT), 2708 const_iv (GL_FLOAT),
1760 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2709 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2710 const_iv (GL_COMPRESSED_ALPHA_ARB),
2711 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2712 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2714 const_iv (GL_COMPRESSED_RGB_ARB),
2715 const_iv (GL_COMPRESSED_RGBA_ARB),
1761 const_iv (GL_COMPILE), 2716 const_iv (GL_COMPILE),
2717 const_iv (GL_PROXY_TEXTURE_1D),
2718 const_iv (GL_PROXY_TEXTURE_2D),
1762 const_iv (GL_TEXTURE_1D), 2719 const_iv (GL_TEXTURE_1D),
1763 const_iv (GL_TEXTURE_2D), 2720 const_iv (GL_TEXTURE_2D),
1764 const_iv (GL_TEXTURE_ENV), 2721 const_iv (GL_TEXTURE_ENV),
1765 const_iv (GL_TEXTURE_MAG_FILTER), 2722 const_iv (GL_TEXTURE_MAG_FILTER),
1766 const_iv (GL_TEXTURE_MIN_FILTER), 2723 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1787 const_iv (GL_COLOR_LOGIC_OP), 2744 const_iv (GL_COLOR_LOGIC_OP),
1788 const_iv (GL_SEPARABLE_2D), 2745 const_iv (GL_SEPARABLE_2D),
1789 const_iv (GL_CONVOLUTION_2D), 2746 const_iv (GL_CONVOLUTION_2D),
1790 const_iv (GL_CONVOLUTION_BORDER_MODE), 2747 const_iv (GL_CONVOLUTION_BORDER_MODE),
1791 const_iv (GL_CONSTANT_BORDER), 2748 const_iv (GL_CONSTANT_BORDER),
2749 const_iv (GL_POINTS),
1792 const_iv (GL_LINES), 2750 const_iv (GL_LINES),
2751 const_iv (GL_LINE_STRIP),
1793 const_iv (GL_LINE_LOOP), 2752 const_iv (GL_LINE_LOOP),
1794 const_iv (GL_QUADS), 2753 const_iv (GL_QUADS),
1795 const_iv (GL_QUAD_STRIP), 2754 const_iv (GL_QUAD_STRIP),
1796 const_iv (GL_TRIANGLES), 2755 const_iv (GL_TRIANGLES),
1797 const_iv (GL_TRIANGLE_STRIP), 2756 const_iv (GL_TRIANGLE_STRIP),
1798 const_iv (GL_TRIANGLE_FAN), 2757 const_iv (GL_TRIANGLE_FAN),
2758 const_iv (GL_POLYGON),
1799 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2760 const_iv (GL_POINT_SMOOTH_HINT),
2761 const_iv (GL_LINE_SMOOTH_HINT),
2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1800 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2766 const_iv (GL_DONT_CARE),
2767 const_iv (GL_NICEST),
1801 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
1802 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
1803 const_iv (GL_T2F_V3F), 2770 const_iv (GL_T2F_V3F),
1804 const_iv (GL_T2F_N3F_V3F), 2771 const_iv (GL_T2F_N3F_V3F),
1805# undef const_iv 2772# undef const_iv
1806 }; 2773 };
1807 2774
1808 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1809 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2777
2778 texture_av = newAV ();
2779 AvREAL_off (texture_av);
1810} 2780}
2781
2782void
2783disable_GL_EXT_blend_func_separate ()
2784 CODE:
2785 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0;
1811 2787
1812char * 2788char *
1813gl_vendor () 2789gl_vendor ()
1814 CODE: 2790 CODE:
1815 RETVAL = (char *)glGetString (GL_VENDOR); 2791 RETVAL = (char *)glGetString (GL_VENDOR);
… …
1828 CODE: 2804 CODE:
1829 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2805 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1830 OUTPUT: 2806 OUTPUT:
1831 RETVAL 2807 RETVAL
1832 2808
2809const char *glGetString (GLenum pname)
2810
2811GLint glGetInteger (GLenum pname)
2812 CODE:
2813 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT:
2815 RETVAL
2816
2817GLdouble glGetDouble (GLenum pname)
2818 CODE:
2819 glGetDoublev (pname, &RETVAL);
2820 OUTPUT:
2821 RETVAL
2822
1833int glGetError () 2823int glGetError ()
1834 2824
1835void glFinish () 2825void glFinish ()
1836 2826
1837void glClear (int mask) 2827void glClear (int mask)
… …
1874# near_ and far_ are due to microsofts buggy "c" compiler 2864# near_ and far_ are due to microsofts buggy "c" compiler
1875void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2865void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1876 2866
1877# near_ and far_ are due to microsofts buggy "c" compiler 2867# near_ and far_ are due to microsofts buggy "c" compiler
1878void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2868void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2869
2870PROTOTYPES: DISABLE
1879 2871
1880void glViewport (int x, int y, int width, int height) 2872void glViewport (int x, int y, int width, int height)
1881 2873
1882void glScissor (int x, int y, int width, int height) 2874void glScissor (int x, int y, int width, int height)
1883 2875
… …
1891 2883
1892void glRotate (float angle, float x, float y, float z) 2884void glRotate (float angle, float x, float y, float z)
1893 CODE: 2885 CODE:
1894 glRotatef (angle, x, y, z); 2886 glRotatef (angle, x, y, z);
1895 2887
1896void glBegin (int mode)
1897
1898void glEnd ()
1899
1900void glColor (float r, float g, float b, float a = 1.0) 2888void glColor (float r, float g, float b, float a = 1.0)
1901 PROTOTYPE: @
1902 ALIAS: 2889 ALIAS:
1903 glColor_premultiply = 1 2890 glColor_premultiply = 1
1904 CODE: 2891 CODE:
1905 if (ix) 2892 if (ix)
1906 { 2893 {
1907 r *= a; 2894 r *= a;
1908 g *= a; 2895 g *= a;
1909 b *= a; 2896 b *= a;
1910 } 2897 }
1911 // microsoft visual "c" rounds instead of truncating... 2898 // microsoft visual "c" rounds instead of truncating...
1912 glColor4ub (MIN ((int)(r * 256.f), 255), 2899 glColor4f (r, g, b, a);
1913 MIN ((int)(g * 256.f), 255),
1914 MIN ((int)(b * 256.f), 255),
1915 MIN ((int)(a * 256.f), 255));
1916
1917void glInterleavedArrays (int format, int stride, char *data)
1918
1919void glDrawElements (int mode, int count, int type, char *indices)
1920
1921# 1.2 void glDrawRangeElements (int mode, int start, int end
1922 2900
1923void glRasterPos (float x, float y, float z = 0.) 2901void glRasterPos (float x, float y, float z = 0.)
1924 CODE: 2902 CODE:
1925 glRasterPos3f (0, 0, z); 2903 glRasterPos3f (0, 0, z);
1926 glBitmap (0, 0, 0, 0, x, y, 0); 2904 glBitmap (0, 0, 0, 0, x, y, 0);
… …
1931 2909
1932void glTexCoord (float s, float t) 2910void glTexCoord (float s, float t)
1933 CODE: 2911 CODE:
1934 glTexCoord2f (s, t); 2912 glTexCoord2f (s, t);
1935 2913
2914void glRect (float x1, float y1, float x2, float y2)
2915 CODE:
2916 glRectf (x1, y1, x2, y2);
2917
2918void glRect_lineloop (float x1, float y1, float x2, float y2)
2919 CODE:
2920 glBegin (GL_LINE_LOOP);
2921 glVertex2f (x1, y1);
2922 glVertex2f (x2, y1);
2923 glVertex2f (x2, y2);
2924 glVertex2f (x1, y2);
2925 glEnd ();
2926
2927PROTOTYPES: ENABLE
2928
2929void glBegin (int mode)
2930
2931void glEnd ()
2932
2933void glPointSize (GLfloat size)
2934
2935void glLineWidth (GLfloat width)
2936
2937void glInterleavedArrays (int format, int stride, char *data)
2938
2939void glDrawElements (int mode, int count, int type, char *indices)
2940
2941# 1.2 void glDrawRangeElements (int mode, int start, int end
2942
1936void glTexEnv (int target, int pname, float param) 2943void glTexEnv (int target, int pname, float param)
1937 CODE: 2944 CODE:
1938 glTexEnvf (target, pname, param); 2945 glTexEnvf (target, pname, param);
1939 2946
1940void glTexParameter (int target, int pname, float param) 2947void glTexParameter (int target, int pname, float param)
… …
1956void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1957 CODE: 2964 CODE:
1958 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
1959 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1960 2967
1961void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
1962 2969
1963void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1964 2971
1965void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2973
2974void glPixelZoom (float x, float y)
1966 2975
1967void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2976void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1968 2977
1969int glGenTexture () 2978int glGenTexture ()
1970 CODE: 2979 CODE:
1971{ 2980 RETVAL = gen_texture ();
1972 GLuint name;
1973 glGenTextures (1, &name);
1974 RETVAL = name;
1975}
1976 OUTPUT: 2981 OUTPUT:
1977 RETVAL 2982 RETVAL
1978 2983
1979void glDeleteTexture (int name) 2984void glDeleteTexture (int name)
1980 CODE: 2985 CODE:
1981{
1982 GLuint name_ = name;
1983 glDeleteTextures (1, &name_); 2986 del_texture (name);
1984} 2987
1985
1986int glGenList () 2988int glGenList ()
1987 CODE: 2989 CODE:
1988 RETVAL = glGenLists (1); 2990 RETVAL = glGenLists (1);
1989 OUTPUT: 2991 OUTPUT:
1990 RETVAL 2992 RETVAL
… …
1997 2999
1998void glEndList () 3000void glEndList ()
1999 3001
2000void glCallList (int list) 3002void glCallList (int list)
2001 3003
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2002 3005
3006PROTOTYPES: DISABLE
3007
3008void
3009find_widget (SV *self, NV x, NV y)
3010 PPCODE:
3011{
3012 if (within_widget (self, x, y))
3013 XPUSHs (self);
3014}
3015
3016BOOT:
3017{
3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3019
3020 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3021 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3022 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3023 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3024}
3025
3026void
3027draw (SV *self)
3028 CODE:
3029{
3030 HV *hv;
3031 SV **svp;
3032 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv);
3036 SV *draw_h_sv = GvSV (draw_h_gv);
3037 double draw_x, draw_y;
3038
3039 if (!SvROK (self))
3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3041
3042 hv = (HV *)SvRV (self);
3043
3044 if (SvTYPE (hv) != SVt_PVHV)
3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3046
3047 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3048 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3049
3050 if (!h || !w)
3051 XSRETURN_EMPTY;
3052
3053 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3054 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3055
3056 draw_x = SvNV (draw_x_sv) + x;
3057 draw_y = SvNV (draw_y_sv) + y;
3058
3059 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3060 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3061 XSRETURN_EMPTY;
3062
3063 sv_setnv (draw_x_sv, draw_x);
3064 sv_setnv (draw_y_sv, draw_y);
3065
3066 glPushMatrix ();
3067 glTranslated (x, y, 0);
3068
3069 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3070 {
3071 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3072
3073 if (svp && SvTRUE (*svp))
3074 {
3075 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3076 glEnable (GL_BLEND);
3077 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3078 glBegin (GL_QUADS);
3079 glVertex2f (0, 0);
3080 glVertex2f (w, 0);
3081 glVertex2f (w, h);
3082 glVertex2f (0, h);
3083 glEnd ();
3084 glDisable (GL_BLEND);
3085 }
3086 }
3087#if 0
3088 // draw borders, for debugging
3089 glPushMatrix ();
3090 glColor4f (1., 1., 0., 1.);
3091 glTranslatef (.5, .5, 0.);
3092 glBegin (GL_LINE_LOOP);
3093 glVertex2f (0 , 0);
3094 glVertex2f (w - 1, 0);
3095 glVertex2f (w - 1, h - 1);
3096 glVertex2f (0 , h - 1);
3097 glEnd ();
3098 glPopMatrix ();
3099#endif
3100 PUSHMARK (SP);
3101 XPUSHs (self);
3102 PUTBACK;
3103 call_method ("_draw", G_VOID | G_DISCARD);
3104 SPAGAIN;
3105
3106 glPopMatrix ();
3107
3108 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3109 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3110}
3111

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines