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.254 by root, Sun Jan 6 18:12:20 2008 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 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#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif 64#endif
54 65
55#if !PANGO_VERSION_CHECK (1, 15, 2) 66#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line_readonly 67# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 68# define pango_layout_get_lines_readonly pango_layout_get_lines
58# 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
59# 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
60#endif 71#endif
61 72
62#ifndef _WIN32 73#ifndef _WIN32
63# include <sys/types.h> 74# include <sys/types.h>
64# include <sys/socket.h> 75# include <sys/socket.h>
65# include <netinet/in.h> 76# include <netinet/in.h>
66# include <netinet/tcp.h> 77# include <netinet/tcp.h>
67# include <inttypes.h> 78# include <inttypes.h>
68#endif 79#endif
69 80
81#include "ecb.h"
82
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 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 */
72#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
73 89
74#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
76 92
77#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
78 94
79/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 97
82#if 0 98#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 99
84#else 100#define TEXID_SPEECH 1
85# define PARACHUTE 0 101#define TEXID_NOFACE 2
86#endif 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}
87 121
88static AV *texture_av; 122static AV *texture_av;
89 123
90static struct 124static struct
91{ 125{
… …
148{ 182{
149 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
150 184
151 while (attrs) 185 while (attrs)
152 { 186 {
153 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 188
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 190 return 1;
157 191
158 attrs = attrs->next; 192 attrs = attrs->next;
159 } 193 }
160 194
161 return 0; 195 return 0;
162} 196}
163 197
164typedef struct cf_layout { 198struct cf_layout {
165 PangoLayout *pl; 199 PangoLayout *pl;
166 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
167 int base_height; 201 int base_height;
168 DC__Font font; 202 DC__Font font;
169 rc_t *rc; 203 rc_t rc;
170} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
171 207
172static DC__Font default_font; 208static DC__Font default_font;
173static PangoContext *opengl_context; 209static PangoContext *opengl_context;
174static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
175 211
176static void 212static void
177substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
178{ 214{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 218#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 220}
185 221
186static void 222static void
187layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
188{ 224{
189 /* 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
190 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
191 */ 227 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
193 229
194 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
213 249
214 *w = rect.width; 250 *w = rect.width;
215 *h = rect.height; 251 *h = rect.height;
216} 252}
217 253
254/////////////////////////////////////////////////////////////////////////////
255
218typedef uint16_t tileid; 256typedef uint16_t tileid;
219typedef uint16_t faceid; 257typedef uint16_t faceid;
220 258
221typedef struct { 259struct maptex
260{
222 GLuint name; 261 GLuint name;
223 int w, h; 262 int w, h;
224 float s, t; 263 float s, t;
225 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
226 tileid smoothtile; 265 tileid smoothtile;
227 uint8_t smoothlevel; 266 uint8_t smoothlevel;
228} maptex; 267 uint8_t unused; /* set to zero on use */
268};
229 269
230typedef struct { 270struct mapcell
271{
231 uint32_t player; 272 uint32_t player;
232 tileid tile[3]; 273 tileid tile[3];
233 uint16_t darkness; 274 uint16_t darkness;
234 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
235} mapcell; 276};
236 277
237typedef struct { 278struct maprow
279{
238 int32_t c0, c1; 280 int32_t c0, c1;
239 mapcell *col; 281 mapcell *col;
240} maprow; 282};
241 283
242typedef struct map { 284struct mapgrid {
243 int x, y, w, h; 285 int x, y, w, h;
244 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
245 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
246 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
247 289
248 int32_t rows; 290 int32_t rows;
249 maprow *row; 291 maprow *row;
250} *DC__Map; 292};
251 293
252static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
253prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
254{ 299{
255 char *p; 300 T *p;
256 301
257 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
258 Zero (p, inc, char); 303 Zero (p, inc, T);
259 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
260 Safefree (ptr); 305 Safefree (ptr);
261 306
262 return p; 307 ptr = p;
263} 308}
264 309
265static char * 310template<typename T>
266append (char *ptr, int sze, int inc)
267{
268 Renew (ptr, sze + inc, char);
269 Zero (ptr + sze, inc, char);
270
271 return ptr;
272}
273
274#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
275#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
276
277static 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
278need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
279{ 320{
280 while (self->faces <= face) 321 while (self->faces <= face)
281 { 322 {
282 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
283 self->faces *= 2; 324 self->faces *= 2;
284 } 325 }
285} 326}
286 327
287static void 328static void
288need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
289{ 330{
290 while (self->texs <= texid) 331 while (self->texs <= texid)
291 { 332 {
292 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
293 self->texs *= 2; 334 self->texs *= 2;
294 } 335 }
295} 336}
296 337
297static maprow * 338static maprow *
298map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
299{ 340{
300 if (0 > y) 341 if (0 > y)
301 { 342 {
302 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
303 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
304 345
305 self->rows += extend; 346 self->rows += extend;
306 self->y += extend; 347 self->y += extend;
307 y += extend; 348 y += extend;
308 } 349 }
309 else if (y >= self->rows) 350 else if (y >= self->rows)
310 { 351 {
311 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
312 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
313 self->rows += extend; 354 self->rows += extend;
314 } 355 }
315 356
316 return self->row + y; 357 return self->row + y;
317} 358}
… …
327 } 368 }
328 369
329 if (row->c0 > x) 370 if (row->c0 > x)
330 { 371 {
331 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
332 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
333 row->c0 -= extend; 374 row->c0 -= extend;
334 } 375 }
335 else if (x >= row->c1) 376 else if (x >= row->c1)
336 { 377 {
337 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
338 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
339 row->c1 += extend; 380 row->c1 += extend;
340 } 381 }
341 382
342 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
343} 384}
344 385
345static mapcell * 386static mapcell *
346map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
347{ 388{
348 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
349} 390}
350 391
351static void 392static void
352map_clear (DC__Map self) 393map_clear (mapgrid *self)
353{ 394{
354 int r; 395 int r;
355 396
356 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
357 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
… …
364 self->oy = 0; 405 self->oy = 0;
365 self->row = 0; 406 self->row = 0;
366 self->rows = 0; 407 self->rows = 0;
367} 408}
368 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
369static void 420static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
371{ 422{
372 int x, y; 423 int x, y;
373 maprow *row; 424 maprow *row;
374 mapcell *cell; 425 mapcell *cell;
375 426
… …
387 if (x >= row->c1) 438 if (x >= row->c1)
388 break; 439 break;
389 440
390 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
391 442
392 cell->darkness = 0; 443 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 444 }
397 } 445 }
398} 446}
399 447
400typedef struct { 448struct smooth_key
449{
401 tileid tile; 450 tileid tile;
402 uint8_t x, y, level; 451 uint8_t x, y, level;
403} 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}
404 471
405static void 472static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 474{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
409 476
410 if (SvIOK (*sv)) 477 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
412 else 479 else
413 sv_setiv (*sv, bits); 480 it->second |= bits;
414} 481}
415 482
416static void 483static void
417music_finished (void) 484music_finished (void)
418{ 485{
… …
435 ev.code = 1; 502 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 504 ev.data2 = 0;
438 505
439 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;
440} 514}
441 515
442static unsigned int 516static unsigned int
443minpot (unsigned int n) 517minpot (unsigned int n)
444{ 518{
… …
454 n |= n >> 16; 528 n |= n >> 16;
455 529
456 return n + 1; 530 return n + 1;
457} 531}
458 532
459static unsigned int
460popcount (unsigned int n)
461{
462 n -= (n >> 1) & 0x55555555U;
463 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
464 n = ((n >> 4) + n) & 0x0f0f0f0fU;
465 n *= 0x01010101U;
466
467 return n >> 24;
468}
469
470/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
471#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
472#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
473 536
474/******************************************************************************/ 537/******************************************************************************/
… …
511 if (!svp || !SvTRUE (*svp)) 574 if (!svp || !SvTRUE (*svp))
512 return 0; 575 return 0;
513 576
514 return 1; 577 return 1;
515} 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
516 637
517MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
518 639
519PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
520 641
… …
549 const_iv (SDL_USEREVENT), 670 const_iv (SDL_USEREVENT),
550 671
551 const_iv (SDL_APPINPUTFOCUS), 672 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 673 const_iv (SDL_APPMOUSEFOCUS),
553 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),
554 725
555 const_iv (SDLK_FIRST), 726 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 727 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 728 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 729 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 808 const_iv (KMOD_MODE),
638 809
810 const_iv (KMOD_LRAM),
811
639 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)
640# undef const_iv 842# undef const_iv
641 }; 843 };
642 844
643 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--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 847
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 850}
649 851
… …
664 866
665NV ceil (NV x) 867NV ceil (NV x)
666 868
667IV minpot (UV n) 869IV minpot (UV n)
668 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
669IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
670 888
671void 889void
672pango_init () 890pango_init ()
673 CODE: 891 CODE:
674{ 892{
675 opengl_fontmap = pango_opengl_font_map_new (); 893 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 894 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 895 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
896 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 897#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 898 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 899 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 900#endif
682} 901}
683 902
684char *
685SDL_GetError () 903char *SDL_GetError ()
686 904
687int 905void SDL_main_hack (SV *real_main)
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 906 PROTOTYPE: &
689 907
690void 908int SDL_Init (U32 flags)
909
910int SDL_InitSubSystem (U32 flags)
911
912void SDL_QuitSubSystem (U32 flags)
913
691SDL_Quit () 914void SDL_Quit ()
915
916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
918
919int SDL_GL_GetAttribute (int attr)
920 CODE:
921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
922 XSRETURN_UNDEF;
923 OUTPUT:
924 RETVAL
692 925
693void 926void
694SDL_ListModes (int rgb, int alpha) 927SDL_ListModes (int rgb, int alpha)
695 PPCODE: 928 PPCODE:
696{ 929{
… …
708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 941 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711 944
712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 945 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713#if SDL_VERSION_ATLEAST(1,2,10)
714 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 946 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
717 947
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 948 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 949
720 if (m && m != (SDL_Rect **)-1) 950 if (m && m != (SDL_Rect **)-1)
721 while (*m) 951 while (*m)
722 { 952 {
723 if ((*m)->w >= 800 && (*m)->h >= 480) 953 if ((*m)->w >= 400 && (*m)->h >= 300)
724 { 954 {
725 AV *av = newAV (); 955 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 956 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 957 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 958 av_push (av, newSViv (rgb));
… …
751 ); 981 );
752 982
753 if (RETVAL) 983 if (RETVAL)
754 { 984 {
755 av_clear (texture_av); 985 av_clear (texture_av);
756
757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
758#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
759#include "glfunc.h" 987#include "glfunc.h"
760#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
761 } 991 }
762} 992}
763 OUTPUT: 993 OUTPUT:
764 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
765 998
766void 999void
767SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
768 1001
769char * 1002char *
770SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
771 1005
772int 1006int
773SDL_GetAppState () 1007SDL_GetAppState ()
774 1008
1009int
1010SDL_GetModState ()
1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
775void 1016void
1017SDL_PumpEvents ()
1018
1019void
776poll_events () 1020peep_events ()
777 PPCODE: 1021 PPCODE:
778{ 1022{
779 SDL_Event ev; 1023 SDL_Event ev;
780 1024
781 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
… …
788 { 1032 {
789 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
790 case SDL_KEYUP: 1034 case SDL_KEYUP:
791 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
792 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
793 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1037 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
794 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1038 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
795 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
796 break; 1040 break;
797 1041
798 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
799 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
817 x = ev.motion.x; 1061 x = ev.motion.x;
818 y = ev.motion.y; 1062 y = ev.motion.y;
819 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
820 } 1064 }
821 1065
822 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
823 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
824 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
825 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
826 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
827 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
847 1091
848 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
849 } 1093 }
850} 1094}
851 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
852int 1109int
853Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
854 POSTCALL: 1111 POSTCALL:
855 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
856 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
857 1114
858void 1115void
859Mix_QuerySpec () 1116Mix_QuerySpec ()
… …
912 } 1169 }
913 } 1170 }
914#endif 1171#endif
915} 1172}
916 1173
917void 1174int
918add_font (char *file) 1175add_font (char *file)
919 CODE: 1176 CODE:
920 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1178 OUTPUT:
1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
921 1187
922void 1188void
923load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
924 ALIAS: 1190 ALIAS:
925 load_image_file = 1 1191 load_image_file = 1
… …
971 1237
972 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
973 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
974 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
975 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
976 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
977 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
978 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
979 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
980 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
981 1247
… …
1041#if DEBUG 1307#if DEBUG
1042 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
1043#endif 1309#endif
1044} 1310}
1045 1311
1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1046MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1047 1320
1048PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1049 1322
1050DC::Font 1323DC::Font
1051new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1052 CODE: 1325 CODE:
1053{ 1326{
1054 int count; 1327 int count;
1055 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1056 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1085 PROTOTYPE: 1358 PROTOTYPE:
1086 CODE: 1359 CODE:
1087 tc_restore (); 1360 tc_restore ();
1088 1361
1089DC::Layout 1362DC::Layout
1090new (SV *class) 1363new (SV *klass)
1091 CODE: 1364 CODE:
1092 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1093 1366
1094 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1095 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1096 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1097 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1098 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1099 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1100 RETVAL->font = 0; 1373 RETVAL->font = 0;
1101 RETVAL->rc = rc_alloc ();
1102 1374
1103 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1104 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1105 OUTPUT: 1377 OUTPUT:
1106 RETVAL 1378 RETVAL
1107 1379
1108void 1380void
1109DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1110 CODE: 1382 CODE:
1111 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1112 rc_free (self->rc);
1113 Safefree (self); 1384 delete self;
1114 1385
1115void 1386void
1116set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1117 CODE: 1388 CODE:
1118{ 1389{
… …
1244 1515
1245void 1516void
1246set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1247 CODE: 1518 CODE:
1248 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1249 { 1520 {
1250 self->base_height = base_height; 1521 self->base_height = base_height;
1251 layout_update_font (self); 1522 layout_update_font (self);
1252 } 1523 }
1253 1524
1254void 1525void
… …
1372} 1643}
1373 1644
1374void 1645void
1375render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1376 CODE: 1647 CODE:
1377 rc_clear (self->rc); 1648 self->rc.clear ();
1378 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1379 self->pl, 1650 self->pl,
1380 self->rc, 1651 &self->rc,
1381 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1382 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1383 flags 1654 flags
1384 ); 1655 );
1385 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
… …
1396 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1397 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1398 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1399 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1400 1671
1401 rc_draw (self->rc); 1672 self->rc.draw ();
1402 1673
1403 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1404 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1405 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1406} 1677}
… …
1481 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1482 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1483 } 1754 }
1484} 1755}
1485 1756
1757void
1758draw_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)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1486IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1487 CODE: 1879 CODE:
1488{ 1880{
1489 GLint width; 1881 GLint width;
1490 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1497MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1498 1890
1499PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1500 1892
1501DC::Map 1893DC::Map
1502new (SV *class) 1894new (SV *klass)
1503 CODE: 1895 CODE:
1504 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1505 RETVAL->x = 0; 1897 RETVAL->x = 0;
1506 RETVAL->y = 0; 1898 RETVAL->y = 0;
1507 RETVAL->w = 0; 1899 RETVAL->w = 0;
1508 RETVAL->h = 0; 1900 RETVAL->h = 0;
1509 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
… …
1546 1938
1547void 1939void
1548set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1549 CODE: 1941 CODE:
1550{ 1942{
1551 tileid texid; 1943 tileid texid;
1552 maptex *tex; 1944 maptex *tex;
1553 1945
1554 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1555 return; 1947 return;
1556 1948
1557 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1558 return; 1950 return;
1559 1951
1560 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1561 1953
1562 if (!texid) 1954 if (!texid)
1563 return; 1955 return;
1564 1956
1565 tex = self->tex + texid; 1957 tex = self->tex + texid;
… …
1594 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1986 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1595 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1596 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1597 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1598} 1990}
1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
1599 2011
1600int 2012int
1601ox (DC::Map self) 2013ox (DC::Map self)
1602 ALIAS: 2014 ALIAS:
1603 oy = 1 2015 oy = 1
… …
1635 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1636 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1637 2049
1638 while (self->y < 0) 2050 while (self->y < 0)
1639 { 2051 {
1640 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1641 2053
1642 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1643 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1644 } 2056 }
1645} 2057}
1646 2058
1647SV * 2059SV *
1648map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1649 CODE: 2061 CODE:
1650{ 2062{
1651 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1652 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1653 mapcell *cell; 2065 mapcell *cell;
… …
1674 2086
1675 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1676 2088
1677 if (flags & 8) 2089 if (flags & 8)
1678 { 2090 {
2091 uint8_t ext, cmd;
2092
1679 if (extmap) 2093 do
1680 { 2094 {
1681 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1682 2097
1683 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1684 { 2101 {
1685 ext = *data++;
1686 cmd = ext & 0x3f;
1687
1688 if (cmd < 4)
1689 cell->darkness = 255 - ext * 64 + 1;
1690 else if (cmd == 5) // health
1691 {
1692 cell->stat_width = 1; 2102 cell->stat_width = 1;
1693 cell->stat_hp = *data++; 2103 cell->stat_hp = *data++;
1694 }
1695 else if (cmd == 6) // monster width
1696 cell->stat_width = *data++ + 1;
1697 else if (cmd == 0x47)
1698 {
1699 if (*data == 4)
1700 ; // decode player count
1701
1702 data += *data + 1;
1703 }
1704 else if (cmd == 8) // cell flags
1705 cell->flags = *data++;
1706 else if (ext & 0x40) // unknown, multibyte => skip
1707 data += *data + 1;
1708 else
1709 data++;
1710 } 2104 }
1711 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1712 } 2122 }
1713 else 2123 while (ext & 0x80);
1714 cell->darkness = *data++ + 1;
1715 } 2124 }
1716 2125
1717 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1718 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1719 { 2128 {
… …
1722 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1723 2132
1724 if (cell->tile [z]) 2133 if (cell->tile [z])
1725 { 2134 {
1726 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1727 if (!tex->name) 2137 if (!tex->name)
1728 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1729 2139
1730 if (tex->smoothtile) 2140 if (tex->smoothtile)
1731 { 2141 {
1732 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1733 if (!smooth->name) 2144 if (!smooth->name)
1734 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1735 } 2146 }
1736 } 2147 }
1737 } 2148 }
1738 } 2149 }
1739 else 2150 else
1740 cell->darkness = 0; 2151 CELL_CLEAR (cell);
1741 } 2152 }
1742} 2153}
1743 OUTPUT: 2154 OUTPUT:
1744 RETVAL 2155 RETVAL
1745 2156
… …
1765 ? self->row + y 2176 ? self->row + y
1766 : 0; 2177 : 0;
1767 2178
1768 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1769 { 2180 {
1770 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1771 2182
1772 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1773 { 2184 {
1774 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1775 2186
… …
1777 { 2188 {
1778 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1779 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1780 int a1 = tex.a; 2191 int a1 = tex.a;
1781 2192
1782 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1783 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1784 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1785 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1786 } 2197 }
1787 } 2198 }
1788 2199
1789 *map++ = (r ) 2200 *map++ = (r )
1790 | (g << 8) 2201 | (g << 8)
1791 | (b << 16) 2202 | (b << 16)
1792 | (a << 24); 2203 | (a << 24);
1793 } 2204 }
1794 } 2205 }
1795 2206
1796 RETVAL = map_sv; 2207 RETVAL = map_sv;
1797} 2208}
1798 OUTPUT: 2209 OUTPUT:
1799 RETVAL 2210 RETVAL
1800 2211
1801void 2212void
1802draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2213draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1803 CODE: 2214 CODE:
1804{ 2215{
1805 int x, y, z; 2216 int x, y, z;
1806 2217
1807 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1808 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1809 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1810 smooth_key skey; 2219 int pl_x, pl_y;
1811 2220 maptex pl_tex;
1812 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1813 rc_key_t key; 2223 rc_key_t key;
1814 rc_array_t *arr; 2224 rc_t::array_t *arr;
1815 2225
2226 pl_tex.name = 0;
2227
1816 // thats current max. sorry. 2228 // that's current max. sorry.
1817 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1818 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1819
1820 // clear key, in case of extra padding
1821 memset (&skey, 0, sizeof (skey));
1822 2231
1823 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1824 key.r = 255; 2233 key.r = 255;
1825 key.g = 255; 2234 key.g = 255;
1826 key.b = 255; 2235 key.b = 255;
1827 key.a = 255; 2236 key.a = 255;
1828 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1829 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
1830 key.texname = -1;
1831 2239
1832 mx += self->x; 2240 mx += self->x;
1833 my += self->y; 2241 my += self->y;
1834 2242
1835 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1836 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1837 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1838 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1839 2247
1840 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1841 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1842 { 2250 {
1843 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
… …
1858 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1859 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1860 2268
1861 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1862 { 2270 {
1863 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
1864 2275
1865 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1866 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1867 { 2278 {
1868 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
… …
1878 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1879 int px, py; 2290 int px, py;
1880 2291
1881 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
1882 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1883 if (!tex.name) 2296 if (!tex.name)
1884 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1885 2298
1886 key.texname = tex.name; 2299 key.texname = tex.name;
1887 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
1888 } 2301 }
1889 2302
1890 px = (x + 1) * T - tex.w; 2303 px = (x + 1) * Th - tex.w;
1891 py = (y + 1) * T - tex.h; 2304 py = (y + 1) * Tw - tex.h;
1892 2305
1893 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1894 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1895 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1896 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1897
1898 if (cell->flags && z == 2)
1899 { 2307 {
1900 // overlays such as the speech bubble, probably more to come 2308 pl_x = px;
1901 if (cell->flags & 1) 2309 pl_y = py;
2310 pl_tex = tex;
1902 { 2311 continue;
1903 maptex tex = self->tex [1];
1904 int px = x * T + T * 2 / 32;
1905 int py = y * T - T * 6 / 32;
1906
1907 if (tex.name)
1908 {
1909 if (key.texname != tex.name)
1910 {
1911 key.texname = tex.name;
1912 arr = rc_array (rc, &key);
1913 }
1914
1915 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1916 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1917 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1918 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1919 }
1920 }
1921 } 2312 }
2313
2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1922 2318
1923 // update smooth hash 2319 // update smooth hash
1924 if (tex.smoothtile) 2320 if (tex.smoothtile)
1925 { 2321 {
1926 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
1927 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
1928 2324
1929 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
1930 2326
1931 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
1932 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
1933 2329
1934 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
… …
1942 2338
1943 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1944 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
1945 2341
1946 // full tile 2342 // full tile
1947 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1948 2344
1949 // borders 2345 // borders
1950 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1951 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1952 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1953 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1954 2350
1955 // corners 2351 // corners
1956 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1957 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1958 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1959 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1960 } 2376 }
1961 } 2377 }
1962 } 2378 }
1963 } 2379 }
1964 2380
1965 rc_draw (rc); 2381 rc.draw ();
1966 rc_clear (rc); 2382 rc.clear ();
1967 2383
1968 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
1969 // this is basically counting sort 2385 // this is basically counting sort
1970 { 2386 {
1971 int w, b; 2387 int w, b;
1972 2388
1973 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
1974 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
1975 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1976 { 2394 {
1977 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
1978 if (smask) 2396 IV bits = it->second;
1979 for (b = 0; b < 32; ++b) 2397
1980 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
1981 { 2401 {
1982 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
1983 HE *he; 2410 if (tex.name)
1984
1985 hv_iterinit (smooth);
1986 while ((he = hv_iternext (smooth)))
1987 { 2411 {
1988 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
1989 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
1990 2414 if (key.texname != tex.name)
1991 if (!(bits & 0x1000)
1992 && skey->level == level
1993 && level > smooth_max [skey->x][skey->y])
1994 { 2415 {
1995 maptex tex = self->tex [skey->tile]; 2416 self->tex [skey.tile].unused = 0;
1996 int px = (((int)skey->x) - 1) * T;
1997 int py = (((int)skey->y) - 1) * T;
1998 int border = bits & 15;
1999 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2000 float dx = tex.s * .0625f; // 16 images/row
2001 float dy = tex.t * .5f ; // 2 images/column
2002 2417
2003 if (tex.name)
2004 {
2005 // this time avoiding texture state changes
2006 // save gobs of state changes.
2007 if (key.texname != tex.name)
2008 {
2009 glEnd (); 2418 glEnd ();
2010 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2011 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2012 } 2421 }
2013 2422
2014 if (border) 2423 if (border)
2015 { 2424 {
2016 float ox = border * dx; 2425 float ox = border * dx;
2017 2426
2018 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2019 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2020 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2021 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2022 } 2431 }
2023 2432
2024 if (corner) 2433 if (corner)
2025 { 2434 {
2026 float ox = corner * dx; 2435 float ox = corner * dx;
2027 2436
2028 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2029 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2030 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2031 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2032 }
2033 }
2034 } 2441 }
2035 } 2442 }
2036 } 2443 }
2037 } 2444 }
2038 2445
2039 glEnd (); 2446 glEnd ();
2040 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2041 key.texname = -1; 2448 key.texname = -1;
2042 } 2449 }
2043
2044 hv_clear (smooth);
2045 } 2450 }
2046 2451
2452 if (pl_tex.name)
2453 {
2454 maptex tex = pl_tex;
2455 int px = pl_x + sdx;
2456 int py = pl_y + sdy;
2457
2458 key.texname = tex.name;
2459 rc_t::array_t &arr = rc.array (key);
2460
2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2465
2466 rc.draw ();
2467 }
2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
2047 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2048 rc_free (rc);
2049 2473
2050 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2051 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2052 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2053 { 2477 {
… …
2056 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2057 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2058 { 2482 {
2059 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2060 2484
2061 int px = x * T; 2485 int px = x * Tw;
2062 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2063 2493
2064 if (cell->stat_hp) 2494 if (cell->stat_hp)
2065 { 2495 {
2066 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2067 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2068 2498
2069 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2070 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2071 px + width - 1, py); 2501 px + width - 1, py);
2072 2502
… …
2078 } 2508 }
2079 } 2509 }
2080} 2510}
2081 2511
2082void 2512void
2083draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2084 CODE: 2514 CODE:
2085{ 2515{
2086 static float color[16][3] = { 2516 static float color[16][3] = {
2087 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2088 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2089 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2090 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2091 2521
2092 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2093 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2094 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2095 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2096 2526
2097 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2098 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2099 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2100 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2101 2531
2102 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2103 2533
2104 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2105 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2106 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2107 }; 2537 };
2108 2538
2109 int x, y; 2539 int x, y;
2110 2540
2111 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2112 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2113 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2114 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2115 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2116 2552
2117 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
… …
2121 2557
2122 if (m) 2558 if (m)
2123 { 2559 {
2124 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2125 2561
2126 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2127 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2128 2564
2129 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2130 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2131 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2132 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2133 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2134 } 2570 }
… …
2142void 2578void
2143fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2144 PPCODE: 2580 PPCODE:
2145{ 2581{
2146 int x, y; 2582 int x, y;
2147 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2148 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2149 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2150 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2151 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2152 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2153 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2154 2591
2155 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2156 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2157 2594
2158 mx += self->x - 1; 2595 mx += self->x - 1;
2159 my += self->y - 1; 2596 my += self->y - 1;
2160
2161 memset (darkness1, 255, sw1 * sh1);
2162 2597
2163 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2164 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2165 { 2600 {
2166 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
… …
2169 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2170 { 2605 {
2171 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2172 2607
2173 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2174 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2175 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2176 } 2611 }
2177 } 2612 }
2178 2613
2179 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2180 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
… …
2199 2634
2200 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2201 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2202 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2203 2638
2204 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2205 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2206 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2207 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2208 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2209 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2210 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2211 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2212 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2213 } 2648 }
2214 2649
2215 free (darkness1); 2650 free (darkness1);
2216 2651
2217 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2218 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2219 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2220 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2221} 2656}
2222 2657
2223SV * 2658SV *
… …
2286 else 2721 else
2287 *data++ = 0; 2722 *data++ = 0;
2288 } 2723 }
2289 } 2724 }
2290 2725
2726 /* if size is w*h + 5 then no data has been found */
2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2728 {
2291 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2292 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2731 }
2732
2293 RETVAL = data_sv; 2733 RETVAL = data_sv;
2294} 2734}
2295 OUTPUT: 2735 OUTPUT:
2296 RETVAL 2736 RETVAL
2297 2737
2298void 2738void
2299set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2739set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2300 PPCODE: 2740 PPCODE:
2301{ 2741{
2302 int x, y, z; 2742 int x, y, z;
2303 int w, h; 2743 int w, h;
2304 int x1, y1; 2744 int x1, y1;
2745 STRLEN len;
2746 uint8_t *data, *end;
2747
2748 len = SvLEN (data_sv);
2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2751 end = data + len + 8;
2752
2753 if (len < 5)
2754 XSRETURN_EMPTY;
2305 2755
2306 if (*data++ != 0) 2756 if (*data++ != 0)
2307 XSRETURN_EMPTY; /* version mismatch */ 2757 XSRETURN_EMPTY; /* version mismatch */
2308 2758
2309 w = *data++ << 8; w |= *data++; 2759 w = *data++ << 8; w |= *data++;
… …
2324 { 2774 {
2325 maprow *row = map_get_row (self, y); 2775 maprow *row = map_get_row (self, y);
2326 2776
2327 for (x = x0; x < x1; x++) 2777 for (x = x0; x < x1; x++)
2328 { 2778 {
2779 uint8_t flags;
2780
2781 if (data + 7 >= end)
2782 XSRETURN_EMPTY;
2783
2329 uint8_t flags = *data++; 2784 flags = *data++;
2330 2785
2331 if (flags) 2786 if (flags)
2332 { 2787 {
2333 mapcell *cell = row_get_cell (row, x); 2788 mapcell *cell = row_get_cell (row, x);
2334 tileid tile[3] = { 0, 0, 0 }; 2789 tileid tile[3] = { 0, 0, 0 };
… …
2337 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2792 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2338 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2793 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2339 2794
2340 if (cell->darkness == 0) 2795 if (cell->darkness == 0)
2341 { 2796 {
2342 cell->darkness = 0; 2797 /*cell->darkness = 0;*/
2798 EXTEND (SP, 3);
2343 2799
2344 for (z = 0; z <= 2; z++) 2800 for (z = 0; z <= 2; z++)
2345 { 2801 {
2346 tileid t = tile [z]; 2802 tileid t = tile [z];
2347 2803
2348 if (t >= self->texs || (t && !self->tex [t].name)) 2804 if (t >= self->texs || (t && !self->tex [t].name))
2349 { 2805 {
2350 XPUSHs (sv_2mortal (newSViv (t))); 2806 PUSHs (sv_2mortal (newSViv (t)));
2351 need_texid (self, t); 2807 need_texid (self, t);
2352 } 2808 }
2353 2809
2354 cell->tile [z] = t; 2810 cell->tile [z] = t;
2355 } 2811 }
… …
2360} 2816}
2361 2817
2362MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2363 2819
2364DC::RW 2820DC::RW
2365new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2366 CODE: 2822 CODE:
2367{ 2823{
2368 STRLEN datalen; 2824 STRLEN datalen;
2369 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2370 2826
… …
2372} 2828}
2373 OUTPUT: 2829 OUTPUT:
2374 RETVAL 2830 RETVAL
2375 2831
2376DC::RW 2832DC::RW
2377new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2378 CODE: 2834 CODE:
2379 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2380 OUTPUT: 2836 OUTPUT:
2381 RETVAL 2837 RETVAL
2382 2838
… …
2400 if (RETVAL < 0) 2856 if (RETVAL < 0)
2401 { 2857 {
2402 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2403 2859
2404 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2405 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2406 2867 }
2868 else
2407 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2408 } 2870 }
2409 2871
2410 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2411 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2412} 2874}
… …
2459void 2921void
2460set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2461 CODE: 2923 CODE:
2462{ 2924{
2463 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2464 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2465 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2466} 2928}
2467 2929
2468void 2930void
2469set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
… …
2472 2934
2473MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2474 2936
2475PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2476 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2477DC::MixChunk 2951DC::MixChunk
2478new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2479 CODE: 2953 CODE:
2480 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2481 OUTPUT: 2955 OUTPUT:
2482 RETVAL 2956 RETVAL
2483 2957
… …
2513 OUTPUT: 2987 OUTPUT:
2514 RETVAL 2988 RETVAL
2515 2989
2516MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2517 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2518int 3004int
2519volume (int volume = -1) 3005volume (int volume = -1)
2520 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2521 CODE: 3007 CODE:
2522 if (items > 0) 3008 if (items > 0)
… …
2533void 3019void
2534halt () 3020halt ()
2535 CODE: 3021 CODE:
2536 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2537 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2538DC::MixMusic 3031DC::MixMusic
2539new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2540 CODE: 3033 CODE:
2541 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2542 OUTPUT: 3035 OUTPUT:
2543 RETVAL 3036 RETVAL
2544 3037
… …
2572 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2573# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2574 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2575 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2576 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2577 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2578 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2579 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2580 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2581 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
… …
2593 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2594 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2595 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2596 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2597 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2598 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2599 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2600 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2601 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2602 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
… …
2670 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2671 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2672 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2673 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2674 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2675# undef const_iv 3176# undef const_iv
2676 }; 3177 };
2677 3178
2678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2680 3181
2681 texture_av = newAV (); 3182 texture_av = newAV ();
2682 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2683} 3184}
2684 3185
… …
2686disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2687 CODE: 3188 CODE:
2688 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2689 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2690 3191
2691char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2692gl_vendor () 3196gl_vendor ()
2693 CODE: 3197 CODE:
2694 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2695 OUTPUT: 3199 OUTPUT:
2696 RETVAL 3200 RETVAL
2697 3201
2698char * 3202const char *
2699gl_version () 3203gl_version ()
2700 CODE: 3204 CODE:
2701 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2702 OUTPUT: 3206 OUTPUT:
2703 RETVAL 3207 RETVAL
2704 3208
2705char * 3209const char *
2706gl_extensions () 3210gl_extensions ()
2707 CODE: 3211 CODE:
2708 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2709 OUTPUT: 3213 OUTPUT:
2710 RETVAL 3214 RETVAL
2711 3215
2712const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2713 3221
2714GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2715 CODE: 3223 CODE:
2716 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2717 OUTPUT: 3225 OUTPUT:
… …
2725 3233
2726int glGetError () 3234int glGetError ()
2727 3235
2728void glFinish () 3236void glFinish ()
2729 3237
3238void glFlush ()
3239
2730void glClear (int mask) 3240void glClear (int mask)
2731 3241
2732void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2733 PROTOTYPE: @ 3243 PROTOTYPE: @
2734 3244
… …
2743void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2744 3254
2745void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2746 CODE: 3256 CODE:
2747 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2748 3260
2749void glDepthMask (int flag) 3261void glDepthMask (int flag)
2750 3262
2751void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2752 3264
… …
2787void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2788 CODE: 3300 CODE:
2789 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2790 3302
2791void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2792 ALIAS: 3305 ALIAS:
2793 glColor_premultiply = 1 3306 glColor_premultiply = 1
2794 CODE: 3307 CODE:
2795 if (ix) 3308 if (ix)
2796 { 3309 {
… …
2902 3415
2903void glEndList () 3416void glEndList ()
2904 3417
2905void glCallList (int list) 3418void glCallList (int list)
2906 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
2907MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2908 3426
2909PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
2910 3428
2911void 3429void
2912find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
2913 PPCODE: 3431 PPCODE:
2914{ 3432{
2915 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
2916 XPUSHs (self); 3434 XPUSHs (self);
2917} 3435}
2918 3436
2919BOOT: 3437BOOT:
2920{ 3438{
… …
2928 3446
2929void 3447void
2930draw (SV *self) 3448draw (SV *self)
2931 CODE: 3449 CODE:
2932{ 3450{
2933 HV *hv; 3451 HV *hv;
2934 SV **svp; 3452 SV **svp;
2935 NV x, y, w, h; 3453 NV x, y, w, h;
2936 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
2937 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
2938 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
2939 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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