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.249 by root, Fri Dec 28 15:40:07 2007 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 62#ifndef PANGO_VERSION_CHECK
63# define PANGO_VERSION_CHECK(a,b,c) 0
64#endif
65
66#if !PANGO_VERSION_CHECK (1, 15, 2)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 67# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 68# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 69# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 70# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 71#endif
57 72
58#ifndef _WIN32 73#ifndef _WIN32
59# include <sys/types.h> 74# include <sys/types.h>
60# include <sys/socket.h> 75# include <sys/socket.h>
61# include <netinet/in.h> 76# include <netinet/in.h>
62# include <netinet/tcp.h> 77# include <netinet/tcp.h>
63# include <inttypes.h> 78# include <inttypes.h>
64#endif 79#endif
65 80
81#include "ecb.h"
82
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
68#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
69 89
70#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
72 92
73#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
74 94
75#if 0 95/* mask out modifiers we are not interested in */
76# define PARACHUTE SDL_INIT_NOPARACHUTE 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77#else 97
78# define PARACHUTE 0 98#define KMOD_LRAM 0x10000 // our extension
79#endif 99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
102
103static char *
104fast_sv_grow (SV *sv, STRLEN need)
105{
106 STRLEN len = SvLEN (sv);
107 STRLEN want = SvCUR (sv) + need;
108
109 if (ecb_expect_false (len < want))
110 {
111 do
112 len *= 2;
113 while (len < want);
114
115 sv_grow (sv, len);
116 }
117
118 SvCUR_set (sv, want);
119 return SvEND (sv) - need;
120}
80 121
81static AV *texture_av; 122static AV *texture_av;
82 123
83static struct 124static struct
84{ 125{
141{ 182{
142 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
143 184
144 while (attrs) 185 while (attrs)
145 { 186 {
146 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
147 188
148 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
149 return 1; 190 return 1;
150 191
151 attrs = attrs->next; 192 attrs = attrs->next;
152 } 193 }
153 194
154 return 0; 195 return 0;
155} 196}
156 197
157typedef struct cf_layout { 198struct cf_layout {
158 PangoLayout *pl; 199 PangoLayout *pl;
159 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
160 int base_height; 201 int base_height;
161 DC__Font font; 202 DC__Font font;
162 rc_t *rc; 203 rc_t rc;
163} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
164 207
165static DC__Font default_font; 208static DC__Font default_font;
166static PangoContext *opengl_context; 209static PangoContext *opengl_context;
167static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
168 211
169static void 212static void
170substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
171{ 214{
172 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
173#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
174 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
175#endif 218#endif
176 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
177} 220}
178 221
179static void 222static void
180layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
181{ 224{
182 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
183 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
184 */ 227 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
186 229
187 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
206 249
207 *w = rect.width; 250 *w = rect.width;
208 *h = rect.height; 251 *h = rect.height;
209} 252}
210 253
254/////////////////////////////////////////////////////////////////////////////
255
211typedef uint16_t tileid; 256typedef uint16_t tileid;
212typedef uint16_t faceid; 257typedef uint16_t faceid;
213 258
214typedef struct { 259struct maptex
260{
215 GLuint name; 261 GLuint name;
216 int w, h; 262 int w, h;
217 float s, t; 263 float s, t;
218 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
219 tileid smoothtile; 265 tileid smoothtile;
220 uint8_t smoothlevel; 266 uint8_t smoothlevel;
221} maptex; 267 uint8_t unused; /* set to zero on use */
268};
222 269
223typedef struct { 270struct mapcell
271{
224 uint32_t player; 272 uint32_t player;
225 tileid tile[3]; 273 tileid tile[3];
226 uint16_t darkness; 274 uint16_t darkness;
227 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
228} mapcell; 276};
229 277
230typedef struct { 278struct maprow
279{
231 int32_t c0, c1; 280 int32_t c0, c1;
232 mapcell *col; 281 mapcell *col;
233} maprow; 282};
234 283
235typedef struct map { 284struct mapgrid {
236 int x, y, w, h; 285 int x, y, w, h;
237 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
238 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
239 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
240 289
241 int32_t rows; 290 int32_t rows;
242 maprow *row; 291 maprow *row;
243} *DC__Map; 292};
244 293
245static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
246prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
247{ 299{
248 char *p; 300 T *p;
249 301
250 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
251 Zero (p, inc, char); 303 Zero (p, inc, T);
252 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
253 Safefree (ptr); 305 Safefree (ptr);
254 306
255 return p; 307 ptr = p;
256} 308}
257 309
258static char * 310template<typename T>
259append (char *ptr, int sze, int inc)
260{
261 Renew (ptr, sze + inc, char);
262 Zero (ptr + sze, inc, char);
263
264 return ptr;
265}
266
267#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
268#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
269
270static void 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
271need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
272{ 320{
273 while (self->faces <= face) 321 while (self->faces <= face)
274 { 322 {
275 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
276 self->faces *= 2; 324 self->faces *= 2;
277 } 325 }
278} 326}
279 327
280static void 328static void
281need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
282{ 330{
283 while (self->texs <= texid) 331 while (self->texs <= texid)
284 { 332 {
285 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
286 self->texs *= 2; 334 self->texs *= 2;
287 } 335 }
288} 336}
289 337
290static maprow * 338static maprow *
291map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
292{ 340{
293 if (0 > y) 341 if (0 > y)
294 { 342 {
295 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
296 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
297 345
298 self->rows += extend; 346 self->rows += extend;
299 self->y += extend; 347 self->y += extend;
300 y += extend; 348 y += extend;
301 } 349 }
302 else if (y >= self->rows) 350 else if (y >= self->rows)
303 { 351 {
304 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
305 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
306 self->rows += extend; 354 self->rows += extend;
307 } 355 }
308 356
309 return self->row + y; 357 return self->row + y;
310} 358}
320 } 368 }
321 369
322 if (row->c0 > x) 370 if (row->c0 > x)
323 { 371 {
324 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
325 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
326 row->c0 -= extend; 374 row->c0 -= extend;
327 } 375 }
328 else if (x >= row->c1) 376 else if (x >= row->c1)
329 { 377 {
330 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
331 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
332 row->c1 += extend; 380 row->c1 += extend;
333 } 381 }
334 382
335 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
336} 384}
337 385
338static mapcell * 386static mapcell *
339map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
340{ 388{
341 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
342} 390}
343 391
344static void 392static void
345map_clear (DC__Map self) 393map_clear (mapgrid *self)
346{ 394{
347 int r; 395 int r;
348 396
349 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
350 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
357 self->oy = 0; 405 self->oy = 0;
358 self->row = 0; 406 self->row = 0;
359 self->rows = 0; 407 self->rows = 0;
360} 408}
361 409
410#define CELL_CLEAR(cell) \
411 do { \
412 if ((cell)->player) \
413 (cell)->tile [2] = 0; \
414 (cell)->darkness = 0; \
415 (cell)->stat_hp = 0; \
416 (cell)->flags = 0; \
417 (cell)->player = 0; \
418 } while (0)
419
362static void 420static void
363map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
364{ 422{
365 int x, y; 423 int x, y;
366 maprow *row; 424 maprow *row;
367 mapcell *cell; 425 mapcell *cell;
368 426
380 if (x >= row->c1) 438 if (x >= row->c1)
381 break; 439 break;
382 440
383 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
384 442
385 cell->darkness = 0; 443 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 444 }
390 } 445 }
391} 446}
392 447
393typedef struct { 448struct smooth_key
449{
394 tileid tile; 450 tileid tile;
395 uint8_t x, y, level; 451 uint8_t x, y, level;
396} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
397 471
398static void 472static void
399smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
400{ 474{
401 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
402 476
403 if (SvIOK (*sv)) 477 if (it == h.end ())
404 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
405 else 479 else
406 sv_setiv (*sv, bits); 480 it->second |= bits;
407} 481}
408 482
409static void 483static void
410music_finished (void) 484music_finished (void)
411{ 485{
428 ev.code = 1; 502 ev.code = 1;
429 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
430 ev.data2 = 0; 504 ev.data2 = 0;
431 505
432 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
433} 514}
434 515
435static unsigned int 516static unsigned int
436minpot (unsigned int n) 517minpot (unsigned int n)
437{ 518{
447 n |= n >> 16; 528 n |= n >> 16;
448 529
449 return n + 1; 530 return n + 1;
450} 531}
451 532
452static unsigned int
453popcount (unsigned int n)
454{
455 n -= (n >> 1) & 0x55555555U;
456 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
457 n = ((n >> 4) + n) & 0x0f0f0f0fU;
458 n *= 0x01010101U;
459
460 return n >> 24;
461}
462
463/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
464#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
465#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
466 536
467/******************************************************************************/ 537/******************************************************************************/
504 if (!svp || !SvTRUE (*svp)) 574 if (!svp || !SvTRUE (*svp))
505 return 0; 575 return 0;
506 576
507 return 1; 577 return 1;
508} 578}
579
580/******************************************************************************/
581
582/* process keyboard modifiers */
583static int
584mod_munge (int mod)
585{
586 mod &= MOD_MASK;
587
588 if (mod & (KMOD_META | KMOD_ALT))
589 mod |= KMOD_LRAM;
590
591 return mod;
592}
593
594static void
595deliantra_main (SV *real_main)
596{
597 dSP;
598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
601}
602
603#ifdef __MACOSX__
604 static SV *real_main;
605
606 /* to due surprising braindamage on the side of SDL design, we
607 * do some mind-boggling hack here: SDL requires a custom main()
608 * on OS X, so... we provide one and call the original main(), which,
609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
610 * and which calls our main (== SDL_main) back.
611 */
612 extern C_LINKAGE int
613 main (int argc, char *argv[])
614 {
615 deliantra_main (real_main);
616 }
617
618 #undef main
619
620 extern C_LINKAGE int main (int argc, char *argv[]);
621
622 static void
623 SDL_main_hack (SV *real_main_)
624 {
625 real_main = real_main_;
626
627 char *argv[] = { "deliantra client", 0 };
628 (main) (1, argv);
629 }
630#else
631 static void
632 SDL_main_hack (SV *real_main)
633 {
634 deliantra_main (real_main);
635 }
636#endif
509 637
510MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
511 639
512PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
513 641
542 const_iv (SDL_USEREVENT), 670 const_iv (SDL_USEREVENT),
543 671
544 const_iv (SDL_APPINPUTFOCUS), 672 const_iv (SDL_APPINPUTFOCUS),
545 const_iv (SDL_APPMOUSEFOCUS), 673 const_iv (SDL_APPMOUSEFOCUS),
546 const_iv (SDL_APPACTIVE), 674 const_iv (SDL_APPACTIVE),
675
676
677 const_iv (SDLK_UNKNOWN),
678 const_iv (SDLK_FIRST),
679 const_iv (SDLK_BACKSPACE),
680 const_iv (SDLK_TAB),
681 const_iv (SDLK_CLEAR),
682 const_iv (SDLK_RETURN),
683 const_iv (SDLK_PAUSE),
684 const_iv (SDLK_ESCAPE),
685 const_iv (SDLK_SPACE),
686 const_iv (SDLK_EXCLAIM),
687 const_iv (SDLK_QUOTEDBL),
688 const_iv (SDLK_HASH),
689 const_iv (SDLK_DOLLAR),
690 const_iv (SDLK_AMPERSAND),
691 const_iv (SDLK_QUOTE),
692 const_iv (SDLK_LEFTPAREN),
693 const_iv (SDLK_RIGHTPAREN),
694 const_iv (SDLK_ASTERISK),
695 const_iv (SDLK_PLUS),
696 const_iv (SDLK_COMMA),
697 const_iv (SDLK_MINUS),
698 const_iv (SDLK_PERIOD),
699 const_iv (SDLK_SLASH),
700 const_iv (SDLK_0),
701 const_iv (SDLK_1),
702 const_iv (SDLK_2),
703 const_iv (SDLK_3),
704 const_iv (SDLK_4),
705 const_iv (SDLK_5),
706 const_iv (SDLK_6),
707 const_iv (SDLK_7),
708 const_iv (SDLK_8),
709 const_iv (SDLK_9),
710 const_iv (SDLK_COLON),
711 const_iv (SDLK_SEMICOLON),
712 const_iv (SDLK_LESS),
713 const_iv (SDLK_EQUALS),
714 const_iv (SDLK_GREATER),
715 const_iv (SDLK_QUESTION),
716 const_iv (SDLK_AT),
717
718 const_iv (SDLK_LEFTBRACKET),
719 const_iv (SDLK_BACKSLASH),
720 const_iv (SDLK_RIGHTBRACKET),
721 const_iv (SDLK_CARET),
722 const_iv (SDLK_UNDERSCORE),
723 const_iv (SDLK_BACKQUOTE),
724 const_iv (SDLK_DELETE),
547 725
548 const_iv (SDLK_FIRST), 726 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST), 727 const_iv (SDLK_LAST),
550 const_iv (SDLK_KP0), 728 const_iv (SDLK_KP0),
551 const_iv (SDLK_KP1), 729 const_iv (SDLK_KP1),
627 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
628 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 808 const_iv (KMOD_MODE),
631 809
810 const_iv (KMOD_LRAM),
811
632 const_iv (MIX_DEFAULT_FORMAT), 812 const_iv (MIX_DEFAULT_FORMAT),
813
814 const_iv (SDL_INIT_TIMER),
815 const_iv (SDL_INIT_AUDIO),
816 const_iv (SDL_INIT_VIDEO),
817 const_iv (SDL_INIT_CDROM),
818 const_iv (SDL_INIT_JOYSTICK),
819 const_iv (SDL_INIT_EVERYTHING),
820 const_iv (SDL_INIT_NOPARACHUTE),
821 const_iv (SDL_INIT_EVENTTHREAD),
822
823 const_iv (SDL_GL_RED_SIZE),
824 const_iv (SDL_GL_GREEN_SIZE),
825 const_iv (SDL_GL_BLUE_SIZE),
826 const_iv (SDL_GL_ALPHA_SIZE),
827 const_iv (SDL_GL_DOUBLEBUFFER),
828 const_iv (SDL_GL_BUFFER_SIZE),
829 const_iv (SDL_GL_DEPTH_SIZE),
830 const_iv (SDL_GL_STENCIL_SIZE),
831 const_iv (SDL_GL_ACCUM_RED_SIZE),
832 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
833 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
834 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
835 const_iv (SDL_GL_STEREO),
836 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
837 const_iv (SDL_GL_MULTISAMPLESAMPLES),
838 const_iv (SDL_GL_ACCELERATED_VISUAL),
839 const_iv (SDL_GL_SWAP_CONTROL),
840
841 const_iv (FOW_DARKNESS)
633# undef const_iv 842# undef const_iv
634 }; 843 };
635 844
636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 845 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
638 847
639 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
640 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
641} 850}
642 851
658NV ceil (NV x) 867NV ceil (NV x)
659 868
660IV minpot (UV n) 869IV minpot (UV n)
661 870
662IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
876
877NV distance (NV dx, NV dy)
878 CODE:
879 RETVAL = pow (dx * dx + dy * dy, 0.5);
880 OUTPUT:
881 RETVAL
663 882
664void 883void
665pango_init () 884pango_init ()
666 CODE: 885 CODE:
667{ 886{
668 opengl_fontmap = pango_opengl_font_map_new (); 887 opengl_fontmap = pango_opengl_font_map_new ();
669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 888 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 889 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 890 /*pango_context_set_font_description (opengl_context, default_font);*/
891#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 892 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR); 893 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 894#endif
675} 895}
676 896
677char *
678SDL_GetError () 897char *SDL_GetError ()
679 898
680int 899void SDL_main_hack (SV *real_main)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 900 PROTOTYPE: &
682 901
683void 902int SDL_Init (U32 flags)
903
904int SDL_InitSubSystem (U32 flags)
905
906void SDL_QuitSubSystem (U32 flags)
907
684SDL_Quit () 908void SDL_Quit ()
909
910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
912
913int SDL_GL_GetAttribute (int attr)
914 CODE:
915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
916 XSRETURN_UNDEF;
917 OUTPUT:
918 RETVAL
685 919
686void 920void
687SDL_ListModes (int rgb, int alpha) 921SDL_ListModes (int rgb, int alpha)
688 PPCODE: 922 PPCODE:
689{ 923{
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 935 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 938
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 939 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
706#if SDL_VERSION_ATLEAST(1,2,10)
707 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
708 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 940 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 941
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 942 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 943
713 if (m && m != (SDL_Rect **)-1) 944 if (m && m != (SDL_Rect **)-1)
714 while (*m) 945 while (*m)
715 { 946 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 947 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 948 {
718 AV *av = newAV (); 949 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 950 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 951 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 952 av_push (av, newSViv (rgb));
744 ); 975 );
745 976
746 if (RETVAL) 977 if (RETVAL)
747 { 978 {
748 av_clear (texture_av); 979 av_clear (texture_av);
749
750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
751#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
752#include "glfunc.h" 981#include "glfunc.h"
753#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
754 } 985 }
755} 986}
756 OUTPUT: 987 OUTPUT:
757 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
758 992
759void 993void
760SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
761 995
762char * 996char *
763SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
764 999
765int 1000int
766SDL_GetAppState () 1001SDL_GetAppState ()
767 1002
1003int
1004SDL_GetModState ()
1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
768void 1010void
1011SDL_PumpEvents ()
1012
1013void
769poll_events () 1014peep_events ()
770 PPCODE: 1015 PPCODE:
771{ 1016{
772 SDL_Event ev; 1017 SDL_Event ev;
773 1018
774 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
781 { 1026 {
782 case SDL_KEYDOWN: 1027 case SDL_KEYDOWN:
783 case SDL_KEYUP: 1028 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1029 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1030 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1031 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
787 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1032 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
788 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1033 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 1034 break;
790 1035
791 case SDL_ACTIVEEVENT: 1036 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1037 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
810 x = ev.motion.x; 1055 x = ev.motion.x;
811 y = ev.motion.y; 1056 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1057 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 1058 }
814 1059
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1060 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 1061 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 1062 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 1063 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1064 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1065 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 1066 }
822 break; 1067 break;
823 1068
824 case SDL_MOUSEBUTTONDOWN: 1069 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 1070 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1071 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 1072
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1073 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1074 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1075 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1076 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
840 1085
841 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1086 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
842 } 1087 }
843} 1088}
844 1089
1090char *
1091SDL_AudioDriverName ()
1092 CODE:
1093{
1094 char buf [256];
1095 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1096 XSRETURN_UNDEF;
1097
1098 RETVAL = buf;
1099}
1100 OUTPUT:
1101 RETVAL
1102
845int 1103int
846Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
847 POSTCALL: 1105 POSTCALL:
848 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
849 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
850 1108
851void 1109void
852Mix_QuerySpec () 1110Mix_QuerySpec ()
905 } 1163 }
906 } 1164 }
907#endif 1165#endif
908} 1166}
909 1167
910void 1168int
911add_font (char *file) 1169add_font (char *file)
912 CODE: 1170 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1172 OUTPUT:
1173 RETVAL
1174
1175void
1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
914 1181
915void 1182void
916load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
917 ALIAS: 1184 ALIAS:
918 load_image_file = 1 1185 load_image_file = 1
964 1231
965 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
966 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
967 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
968 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
969 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
970 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
971 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
972 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
973 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
974 1241
1034#if DEBUG 1301#if DEBUG
1035 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
1036#endif 1303#endif
1037} 1304}
1038 1305
1306int
1307SvREFCNT (SV *sv)
1308 CODE:
1309 RETVAL = SvREFCNT (sv);
1310 OUTPUT:
1311 RETVAL
1312
1039MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1040 1314
1041PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1042 1316
1043DC::Font 1317DC::Font
1044new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1045 CODE: 1319 CODE:
1046{ 1320{
1047 int count; 1321 int count;
1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1049 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1078 PROTOTYPE: 1352 PROTOTYPE:
1079 CODE: 1353 CODE:
1080 tc_restore (); 1354 tc_restore ();
1081 1355
1082DC::Layout 1356DC::Layout
1083new (SV *class) 1357new (SV *klass)
1084 CODE: 1358 CODE:
1085 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1086 1360
1087 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1088 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1089 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1090 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1091 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1092 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1093 RETVAL->font = 0; 1367 RETVAL->font = 0;
1094 RETVAL->rc = rc_alloc ();
1095 1368
1096 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1097 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1098 OUTPUT: 1371 OUTPUT:
1099 RETVAL 1372 RETVAL
1100 1373
1101void 1374void
1102DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1103 CODE: 1376 CODE:
1104 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1105 rc_free (self->rc);
1106 Safefree (self); 1378 delete self;
1107 1379
1108void 1380void
1109set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1110 CODE: 1382 CODE:
1111{ 1383{
1237 1509
1238void 1510void
1239set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1240 CODE: 1512 CODE:
1241 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1242 { 1514 {
1243 self->base_height = base_height; 1515 self->base_height = base_height;
1244 layout_update_font (self); 1516 layout_update_font (self);
1245 } 1517 }
1246 1518
1247void 1519void
1312 1584
1313void 1585void
1314cursor_pos (DC::Layout self, int index) 1586cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1587 PPCODE:
1316{ 1588{
1317 PangoRectangle strong_pos; 1589 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1590 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1591
1320 EXTEND (SP, 3); 1592 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1593 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1595 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1324} 1596}
1325 1597
1326void 1598void
1327index_to_line_x (DC::Layout self, int index, int trailing = 0) 1599index_to_line_x (DC::Layout self, int index, int trailing = 0)
1328 PPCODE: 1600 PPCODE:
1329{ 1601{
1330 int line, x; 1602 int line, x;
1331 1603
1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1604 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1605#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1606 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1607 --line;
1336#endif 1608#endif
1337 EXTEND (SP, 2); 1609 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1610 PUSHs (sv_2mortal (newSViv (line)));
1365} 1637}
1366 1638
1367void 1639void
1368render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1369 CODE: 1641 CODE:
1370 rc_clear (self->rc); 1642 self->rc.clear ();
1371 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1372 self->pl, 1644 self->pl,
1373 self->rc, 1645 &self->rc,
1374 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1375 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1376 flags 1648 flags
1377 ); 1649 );
1378 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1389 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1390 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1391 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1392 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1393 1665
1394 rc_draw (self->rc); 1666 self->rc.draw ();
1395 1667
1396 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1397 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1398 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1399} 1671}
1474 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1475 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1476 } 1748 }
1477} 1749}
1478 1750
1751void
1752draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1753 PROTOTYPE: @
1754 CODE:
1755{
1756 glEnable (GL_BLEND);
1757 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1758 glEnable (GL_TEXTURE_2D);
1759 glBindTexture (GL_TEXTURE_2D, name1);
1760
1761 glColor3f (intensity, intensity, intensity);
1762 glPushMatrix ();
1763 glScalef (1./3, 1./3, 1.);
1764
1765 if (blend > 0.f)
1766 {
1767 float dx3 = dx * -3.f / w;
1768 float dy3 = dy * -3.f / h;
1769 GLfloat env_color[4] = { 0., 0., 0., blend };
1770
1771 /* interpolate the two shadow textures */
1772 /* stage 0 == rgb(glcolor) + alpha(t0) */
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774
1775 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1776 gl.ActiveTexture (GL_TEXTURE1);
1777 glEnable (GL_TEXTURE_2D);
1778 glBindTexture (GL_TEXTURE_2D, name2);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1780
1781 /* rgb == rgb(glcolor) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1785
1786 /* alpha = interpolate t0, t1 by env_alpha */
1787 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1788
1789 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1798
1799 glBegin (GL_QUADS);
1800 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1804 glEnd ();
1805
1806 glDisable (GL_TEXTURE_2D);
1807 gl.ActiveTexture (GL_TEXTURE0);
1808 }
1809 else
1810 {
1811 /* simple blending of one texture, also opengl <1.3 path */
1812 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1813
1814 glBegin (GL_QUADS);
1815 glTexCoord2f (0, 0); glVertex2f (0, 0);
1816 glTexCoord2f (0, t); glVertex2f (0, h);
1817 glTexCoord2f (s, t); glVertex2f (w, h);
1818 glTexCoord2f (s, 0); glVertex2f (w, 0);
1819 glEnd ();
1820 }
1821
1822 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1823 {
1824 int x, y;
1825 int dx3 = dx * 3;
1826 int dy3 = dy * 3;
1827
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1829 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1830 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1831 glTranslatef (-1., -1., 0);
1832 glBegin (GL_QUADS);
1833
1834 for (y = 1; y < h; y += 3)
1835 {
1836 int y1 = y - dy3;
1837 int y1valid = y1 >= 0 && y1 < h;
1838
1839 for (x = 1; x < w; x += 3)
1840 {
1841 int x1 = x - dx3;
1842 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1843 uint8_t h2;
1844
1845 if (y1valid && x1 >= 0 && x1 < w)
1846 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1847 else
1848 h2 = 1; /* out of range == invisible */
1849
1850 if (h1 || h2)
1851 {
1852 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1853 glColor4f (1., 1., 1., alpha);
1854
1855 glTexCoord2f (0, 0.); glVertex2i (x , y );
1856 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1857 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1858 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1859 }
1860 }
1861 }
1862 }
1863
1864 glEnd ();
1865
1866 glPopMatrix ();
1867
1868 glDisable (GL_TEXTURE_2D);
1869 glDisable (GL_BLEND);
1870}
1871
1479IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1872IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1480 CODE: 1873 CODE:
1481{ 1874{
1482 GLint width; 1875 GLint width;
1483 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1876 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1490MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1491 1884
1492PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1493 1886
1494DC::Map 1887DC::Map
1495new (SV *class) 1888new (SV *klass)
1496 CODE: 1889 CODE:
1497 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1498 RETVAL->x = 0; 1891 RETVAL->x = 0;
1499 RETVAL->y = 0; 1892 RETVAL->y = 0;
1500 RETVAL->w = 0; 1893 RETVAL->w = 0;
1501 RETVAL->h = 0; 1894 RETVAL->h = 0;
1502 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1539 1932
1540void 1933void
1541set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1542 CODE: 1935 CODE:
1543{ 1936{
1544 tileid texid; 1937 tileid texid;
1545 maptex *tex; 1938 maptex *tex;
1546 1939
1547 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1548 return; 1941 return;
1549 1942
1550 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1551 return; 1944 return;
1552 1945
1553 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1554 1947
1555 if (!texid) 1948 if (!texid)
1556 return; 1949 return;
1557 1950
1558 tex = self->tex + texid; 1951 tex = self->tex + texid;
1587 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1980 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1588 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1589 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1591} 1984}
1985
1986void
1987expire_textures (DC::Map self, int texid, int count)
1988 PPCODE:
1989 for (; texid < self->texs && count; ++texid, --count)
1990 {
1991 maptex *tex = self->tex + texid;
1992
1993 if (tex->name)
1994 {
1995 if (tex->unused)
1996 {
1997 tex->name = 0;
1998 tex->unused = 0;
1999 XPUSHs (sv_2mortal (newSViv (texid)));
2000 }
2001 else
2002 tex->unused = 1;
2003 }
2004 }
1592 2005
1593int 2006int
1594ox (DC::Map self) 2007ox (DC::Map self)
1595 ALIAS: 2008 ALIAS:
1596 oy = 1 2009 oy = 1
1628 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1629 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1630 2043
1631 while (self->y < 0) 2044 while (self->y < 0)
1632 { 2045 {
1633 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1634 2047
1635 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1636 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1637 } 2050 }
1638} 2051}
1639 2052
1640SV * 2053SV *
1641map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1642 CODE: 2055 CODE:
1643{ 2056{
1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1645 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1646 mapcell *cell; 2059 mapcell *cell;
1667 2080
1668 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1669 2082
1670 if (flags & 8) 2083 if (flags & 8)
1671 { 2084 {
2085 uint8_t ext, cmd;
2086
1672 if (extmap) 2087 do
1673 { 2088 {
1674 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1675 2091
1676 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
1677 { 2095 {
1678 ext = *data++;
1679 cmd = ext & 0x3f;
1680
1681 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health
1684 {
1685 cell->stat_width = 1; 2096 cell->stat_width = 1;
1686 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1687 }
1688 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47)
1691 {
1692 if (*data == 4)
1693 ; // decode player count
1694
1695 data += *data + 1;
1696 }
1697 else if (cmd == 8) // cell flags
1698 cell->flags = *data++;
1699 else if (ext & 0x40) // unknown, multibyte => skip
1700 data += *data + 1;
1701 else
1702 data++;
1703 } 2098 }
1704 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
1705 } 2116 }
1706 else 2117 while (ext & 0x80);
1707 cell->darkness = *data++ + 1;
1708 } 2118 }
1709 2119
1710 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1711 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1712 { 2122 {
1715 cell->tile [z] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
1716 2126
1717 if (cell->tile [z]) 2127 if (cell->tile [z])
1718 { 2128 {
1719 maptex *tex = self->tex + cell->tile [z]; 2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
1720 if (!tex->name) 2131 if (!tex->name)
1721 av_push (missing, newSViv (cell->tile [z])); 2132 av_push (missing, newSViv (cell->tile [z]));
1722 2133
1723 if (tex->smoothtile) 2134 if (tex->smoothtile)
1724 { 2135 {
1725 maptex *smooth = self->tex + tex->smoothtile; 2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
1726 if (!smooth->name) 2138 if (!smooth->name)
1727 av_push (missing, newSViv (tex->smoothtile)); 2139 av_push (missing, newSViv (tex->smoothtile));
1728 } 2140 }
1729 } 2141 }
1730 } 2142 }
1731 } 2143 }
1732 else 2144 else
1733 cell->darkness = 0; 2145 CELL_CLEAR (cell);
1734 } 2146 }
1735} 2147}
1736 OUTPUT: 2148 OUTPUT:
1737 RETVAL 2149 RETVAL
1738 2150
1758 ? self->row + y 2170 ? self->row + y
1759 : 0; 2171 : 0;
1760 2172
1761 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1762 { 2174 {
1763 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1764 2176
1765 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1766 { 2178 {
1767 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1768 2180
1770 { 2182 {
1771 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1772 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1773 int a1 = tex.a; 2185 int a1 = tex.a;
1774 2186
1775 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1776 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1777 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1778 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1779 } 2191 }
1780 } 2192 }
1781 2193
1782 *map++ = (r ) 2194 *map++ = (r )
1783 | (g << 8) 2195 | (g << 8)
1784 | (b << 16) 2196 | (b << 16)
1785 | (a << 24); 2197 | (a << 24);
1786 } 2198 }
1787 } 2199 }
1788 2200
1789 RETVAL = map_sv; 2201 RETVAL = map_sv;
1790} 2202}
1791 OUTPUT: 2203 OUTPUT:
1792 RETVAL 2204 RETVAL
1793 2205
1794void 2206void
1795draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2207draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1796 CODE: 2208 CODE:
1797{ 2209{
1798 int x, y, z; 2210 int x, y, z;
1799 2211
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1802 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1803 smooth_key skey; 2213 int pl_x, pl_y;
1804 2214 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
1806 rc_key_t key; 2217 rc_key_t key;
1807 rc_array_t *arr; 2218 rc_t::array_t *arr;
1808 2219
2220 pl_tex.name = 0;
2221
1809 // thats current max. sorry. 2222 // that's current max. sorry.
1810 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1812
1813 // clear key, in case of extra padding
1814 memset (&skey, 0, sizeof (skey));
1815 2225
1816 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
1817 key.r = 255; 2227 key.r = 255;
1818 key.g = 255; 2228 key.g = 255;
1819 key.b = 255; 2229 key.b = 255;
1820 key.a = 255; 2230 key.a = 255;
1821 key.mode = GL_QUADS; 2231 key.mode = GL_QUADS;
1822 key.format = GL_T2F_V3F; 2232 key.format = GL_T2F_V3F;
1823 key.texname = -1;
1824 2233
1825 mx += self->x; 2234 mx += self->x;
1826 my += self->y; 2235 my += self->y;
1827 2236
1828 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
1829 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
1830 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
1831 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1832 2241
1833 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1834 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1835 { 2244 {
1836 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
1851 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1852 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1853 2262
1854 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
1855 { 2264 {
1856 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2268 key.texname = -1;
1857 2269
1858 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
1860 { 2272 {
1861 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
1871 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
1872 int px, py; 2284 int px, py;
1873 2285
1874 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
1875 { 2287 {
2288 self->tex [tile].unused = 0;
2289
1876 if (!tex.name) 2290 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1878 2292
1879 key.texname = tex.name; 2293 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
1881 } 2295 }
1882 2296
1883 px = (x + 1) * T - tex.w; 2297 px = (x + 1) * Th - tex.w;
1884 py = (y + 1) * T - tex.h; 2298 py = (y + 1) * Tw - tex.h;
1885 2299
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1888 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1889 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890
1891 if (cell->flags && z == 2)
1892 { 2301 {
1893 // overlays such as the speech bubble, probably more to come 2302 pl_x = px;
1894 if (cell->flags & 1) 2303 pl_y = py;
2304 pl_tex = tex;
1895 { 2305 continue;
1896 maptex tex = self->tex [1];
1897 int px = x * T + T * 2 / 32;
1898 int py = y * T - T * 6 / 32;
1899
1900 if (tex.name)
1901 {
1902 if (key.texname != tex.name)
1903 {
1904 key.texname = tex.name;
1905 arr = rc_array (rc, &key);
1906 }
1907
1908 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1909 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1910 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1911 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1912 }
1913 }
1914 } 2306 }
2307
2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1915 2312
1916 // update smooth hash 2313 // update smooth hash
1917 if (tex.smoothtile) 2314 if (tex.smoothtile)
1918 { 2315 {
1919 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
1920 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
1921 2318
1922 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
1923 2320
1924 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
1925 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
1926 2323
1927 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
1935 2332
1936 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1937 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
1938 2335
1939 // full tile 2336 // full tile
1940 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1941 2338
1942 // borders 2339 // borders
1943 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1944 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2341 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1945 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2342 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1946 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1947 2344
1948 // corners 2345 // corners
1949 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1950 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2347 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1951 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2348 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1952 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2350 }
2351 }
2352
2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2354 {
2355 // overlays such as the speech bubble, probably more to come
2356 if (cell->flags & 1)
2357 {
2358 rc_key_t key_ov = key;
2359 maptex tex = self->tex[TEXID_SPEECH];
2360 int px = x * Tw + Tw * 2 / 32;
2361 int py = y * Th - Th * 6 / 32;
2362
2363 key_ov.texname = tex.name;
2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2365
2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1953 } 2370 }
1954 } 2371 }
1955 } 2372 }
1956 } 2373 }
1957 2374
1958 rc_draw (rc); 2375 rc.draw ();
1959 rc_clear (rc); 2376 rc.clear ();
1960 2377
1961 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
1962 // this is basically counting sort 2379 // this is basically counting sort
1963 { 2380 {
1964 int w, b; 2381 int w, b;
1965 2382
1966 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
1967 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
1968 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1969 { 2388 {
1970 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
1971 if (smask) 2390 IV bits = it->second;
1972 for (b = 0; b < 32; ++b) 2391
1973 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
1974 { 2395 {
1975 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
1976 HE *he; 2404 if (tex.name)
1977
1978 hv_iterinit (smooth);
1979 while ((he = hv_iternext (smooth)))
1980 { 2405 {
1981 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
1982 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
1983 2408 if (key.texname != tex.name)
1984 if (!(bits & 0x1000)
1985 && skey->level == level
1986 && level > smooth_max [skey->x][skey->y])
1987 { 2409 {
1988 maptex tex = self->tex [skey->tile]; 2410 self->tex [skey.tile].unused = 0;
1989 int px = (((int)skey->x) - 1) * T;
1990 int py = (((int)skey->y) - 1) * T;
1991 int border = bits & 15;
1992 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1993 float dx = tex.s * .0625f; // 16 images/row
1994 float dy = tex.t * .5f ; // 2 images/column
1995 2411
1996 if (tex.name)
1997 {
1998 // this time avoiding texture state changes
1999 // save gobs of state changes.
2000 if (key.texname != tex.name)
2001 {
2002 glEnd (); 2412 glEnd ();
2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2004 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2005 } 2415 }
2006 2416
2007 if (border) 2417 if (border)
2008 { 2418 {
2009 float ox = border * dx; 2419 float ox = border * dx;
2010 2420
2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2015 } 2425 }
2016 2426
2017 if (corner) 2427 if (corner)
2018 { 2428 {
2019 float ox = corner * dx; 2429 float ox = corner * dx;
2020 2430
2021 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2025 }
2026 }
2027 } 2435 }
2028 } 2436 }
2029 } 2437 }
2030 } 2438 }
2031 2439
2032 glEnd (); 2440 glEnd ();
2033 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1; 2442 key.texname = -1;
2035 } 2443 }
2036
2037 hv_clear (smooth);
2038 } 2444 }
2039 2445
2446 if (pl_tex.name)
2447 {
2448 maptex tex = pl_tex;
2449 int px = pl_x + sdx;
2450 int py = pl_y + sdy;
2451
2452 key.texname = tex.name;
2453 rc_t::array_t &arr = rc.array (key);
2454
2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2459
2460 rc.draw ();
2461 }
2462
2463 rc_ov.draw ();
2464 rc_ov.clear ();
2465
2040 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2041 rc_free (rc);
2042 2467
2043 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2044 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2046 { 2471 {
2049 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2050 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2051 { 2476 {
2052 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2053 2478
2054 int px = x * T; 2479 int px = x * Tw;
2055 int py = y * T; 2480 int py = y * Th;
2481
2482 if (ecb_expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
2056 2487
2057 if (cell->stat_hp) 2488 if (cell->stat_hp)
2058 { 2489 {
2059 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2060 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2061 2492
2062 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2063 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2064 px + width - 1, py); 2495 px + width - 1, py);
2065 2496
2071 } 2502 }
2072 } 2503 }
2073} 2504}
2074 2505
2075void 2506void
2076draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2077 CODE: 2508 CODE:
2078{ 2509{
2079 static float color[16][3] = { 2510 static float color[16][3] = {
2080 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2081 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2082 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2083 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2084 2515
2085 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2086 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2087 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2088 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2089 2520
2090 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2091 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2092 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2093 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2094 2525
2095 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2096 2527
2097 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2098 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2099 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2100 }; 2531 };
2101 2532
2102 int x, y; 2533 int x, y;
2103 2534
2104 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2105 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2106 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2107 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2108 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2109 2546
2110 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2114 2551
2115 if (m) 2552 if (m)
2116 { 2553 {
2117 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2118 2555
2119 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2120 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2121 2558
2122 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2123 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2124 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2125 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2126 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2127 } 2564 }
2135void 2572void
2136fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2137 PPCODE: 2574 PPCODE:
2138{ 2575{
2139 int x, y; 2576 int x, y;
2140 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2141 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2142 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2143 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2144 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2145 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2146 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147 2585
2148 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2149 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2150 2588
2151 mx += self->x - 1; 2589 mx += self->x - 1;
2152 my += self->y - 1; 2590 my += self->y - 1;
2153
2154 memset (darkness1, 255, sw1 * sh1);
2155 2591
2156 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2157 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2158 { 2594 {
2159 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2162 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2163 { 2599 {
2164 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2165 2601
2166 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2167 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2168 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2169 } 2605 }
2170 } 2606 }
2171 2607
2172 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2173 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2192 2628
2193 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2194 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2195 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2196 2632
2197 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2198 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2199 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2200 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2201 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2202 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2203 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2204 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2205 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2206 } 2642 }
2207 2643
2208 free (darkness1); 2644 free (darkness1);
2209 2645
2210 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2211 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2212 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2213 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2214} 2650}
2215 2651
2216SV * 2652SV *
2279 else 2715 else
2280 *data++ = 0; 2716 *data++ = 0;
2281 } 2717 }
2282 } 2718 }
2283 2719
2720 /* if size is w*h + 5 then no data has been found */
2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2722 {
2284 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 }
2726
2286 RETVAL = data_sv; 2727 RETVAL = data_sv;
2287} 2728}
2288 OUTPUT: 2729 OUTPUT:
2289 RETVAL 2730 RETVAL
2290 2731
2291void 2732void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2733set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2734 PPCODE:
2294{ 2735{
2295 int x, y, z; 2736 int x, y, z;
2296 int w, h; 2737 int w, h;
2297 int x1, y1; 2738 int x1, y1;
2739 STRLEN len;
2740 uint8_t *data, *end;
2741
2742 len = SvLEN (data_sv);
2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2745 end = data + len + 8;
2746
2747 if (len < 5)
2748 XSRETURN_EMPTY;
2298 2749
2299 if (*data++ != 0) 2750 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2751 XSRETURN_EMPTY; /* version mismatch */
2301 2752
2302 w = *data++ << 8; w |= *data++; 2753 w = *data++ << 8; w |= *data++;
2317 { 2768 {
2318 maprow *row = map_get_row (self, y); 2769 maprow *row = map_get_row (self, y);
2319 2770
2320 for (x = x0; x < x1; x++) 2771 for (x = x0; x < x1; x++)
2321 { 2772 {
2773 uint8_t flags;
2774
2775 if (data + 7 >= end)
2776 XSRETURN_EMPTY;
2777
2322 uint8_t flags = *data++; 2778 flags = *data++;
2323 2779
2324 if (flags) 2780 if (flags)
2325 { 2781 {
2326 mapcell *cell = row_get_cell (row, x); 2782 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2783 tileid tile[3] = { 0, 0, 0 };
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2786 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2787 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2788
2333 if (cell->darkness == 0) 2789 if (cell->darkness == 0)
2334 { 2790 {
2335 cell->darkness = 0; 2791 /*cell->darkness = 0;*/
2792 EXTEND (SP, 3);
2336 2793
2337 for (z = 0; z <= 2; z++) 2794 for (z = 0; z <= 2; z++)
2338 { 2795 {
2339 tileid t = tile [z]; 2796 tileid t = tile [z];
2340 2797
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2798 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2799 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2800 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2801 need_texid (self, t);
2345 } 2802 }
2346 2803
2347 cell->tile [z] = t; 2804 cell->tile [z] = t;
2348 } 2805 }
2353} 2810}
2354 2811
2355MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2356 2813
2357DC::RW 2814DC::RW
2358new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2359 CODE: 2816 CODE:
2360{ 2817{
2361 STRLEN datalen; 2818 STRLEN datalen;
2362 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2363 2820
2365} 2822}
2366 OUTPUT: 2823 OUTPUT:
2367 RETVAL 2824 RETVAL
2368 2825
2369DC::RW 2826DC::RW
2370new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2371 CODE: 2828 CODE:
2372 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2373 OUTPUT: 2830 OUTPUT:
2374 RETVAL 2831 RETVAL
2375 2832
2393 if (RETVAL < 0) 2850 if (RETVAL < 0)
2394 { 2851 {
2395 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2396 2853
2397 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2398 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2399 2861 }
2862 else
2400 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2401 } 2864 }
2402 2865
2403 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2404 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2405} 2868}
2452void 2915void
2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2454 CODE: 2917 CODE:
2455{ 2918{
2456 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2457 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459} 2922}
2460 2923
2461void 2924void
2462set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2465 2928
2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2467 2930
2468PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2469 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2470DC::MixChunk 2945DC::MixChunk
2471new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2472 CODE: 2947 CODE:
2473 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2474 OUTPUT: 2949 OUTPUT:
2475 RETVAL 2950 RETVAL
2476 2951
2506 OUTPUT: 2981 OUTPUT:
2507 RETVAL 2982 RETVAL
2508 2983
2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2510 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2511int 2998int
2512volume (int volume = -1) 2999volume (int volume = -1)
2513 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2514 CODE: 3001 CODE:
2515 if (items > 0) 3002 if (items > 0)
2526void 3013void
2527halt () 3014halt ()
2528 CODE: 3015 CODE:
2529 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2530 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2531DC::MixMusic 3025DC::MixMusic
2532new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2533 CODE: 3027 CODE:
2534 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2535 OUTPUT: 3029 OUTPUT:
2536 RETVAL 3030 RETVAL
2537 3031
2565 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2566# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2567 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2568 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2569 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2570 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2571 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2572 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2573 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2574 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2586 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2587 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2588 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2589 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2590 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2591 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2592 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2593 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2594 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2595 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2663 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2664 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2665 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2666 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2667 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2668# undef const_iv 3170# undef const_iv
2669 }; 3171 };
2670 3172
2671 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2672 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2673 3175
2674 texture_av = newAV (); 3176 texture_av = newAV ();
2675 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2676} 3178}
2677 3179
2679disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2680 CODE: 3182 CODE:
2681 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2683 3185
2684char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2685gl_vendor () 3190gl_vendor ()
2686 CODE: 3191 CODE:
2687 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2688 OUTPUT: 3193 OUTPUT:
2689 RETVAL 3194 RETVAL
2690 3195
2691char * 3196const char *
2692gl_version () 3197gl_version ()
2693 CODE: 3198 CODE:
2694 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2695 OUTPUT: 3200 OUTPUT:
2696 RETVAL 3201 RETVAL
2697 3202
2698char * 3203const char *
2699gl_extensions () 3204gl_extensions ()
2700 CODE: 3205 CODE:
2701 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2702 OUTPUT: 3207 OUTPUT:
2703 RETVAL 3208 RETVAL
2704 3209
2705const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2706 3215
2707GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2708 CODE: 3217 CODE:
2709 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2710 OUTPUT: 3219 OUTPUT:
2718 3227
2719int glGetError () 3228int glGetError ()
2720 3229
2721void glFinish () 3230void glFinish ()
2722 3231
3232void glFlush ()
3233
2723void glClear (int mask) 3234void glClear (int mask)
2724 3235
2725void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2726 PROTOTYPE: @ 3237 PROTOTYPE: @
2727 3238
2736void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2737 3248
2738void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2739 CODE: 3250 CODE:
2740 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2741 3254
2742void glDepthMask (int flag) 3255void glDepthMask (int flag)
2743 3256
2744void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2745 3258
2780void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
2781 CODE: 3294 CODE:
2782 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
2783 3296
2784void glColor (float r, float g, float b, float a = 1.0) 3297void glColor (float r, float g, float b, float a = 1.0)
3298 PROTOTYPE: @
2785 ALIAS: 3299 ALIAS:
2786 glColor_premultiply = 1 3300 glColor_premultiply = 1
2787 CODE: 3301 CODE:
2788 if (ix) 3302 if (ix)
2789 { 3303 {
2895 3409
2896void glEndList () 3410void glEndList ()
2897 3411
2898void glCallList (int list) 3412void glCallList (int list)
2899 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2901 3420
2902PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
2903 3422
2904void 3423void
2905find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
2906 PPCODE: 3425 PPCODE:
2907{ 3426{
2908 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
2909 XPUSHs (self); 3428 XPUSHs (self);
2910} 3429}
2911 3430
2912BOOT: 3431BOOT:
2913{ 3432{
2921 3440
2922void 3441void
2923draw (SV *self) 3442draw (SV *self)
2924 CODE: 3443 CODE:
2925{ 3444{
2926 HV *hv; 3445 HV *hv;
2927 SV **svp; 3446 SV **svp;
2928 NV x, y, w, h; 3447 NV x, y, w, h;
2929 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
2930 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
2931 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
2932 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines