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.253 by root, Fri Dec 28 20:59:14 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/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77 97
78#if 0 98#define KMOD_LRAM 0x10000 // our extension
79# define PARACHUTE SDL_INIT_NOPARACHUTE 99
80#else 100#define TEXID_SPEECH 1
81# define PARACHUTE 0 101#define TEXID_NOFACE 2
82#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}
83 121
84static AV *texture_av; 122static AV *texture_av;
85 123
86static struct 124static struct
87{ 125{
… …
144{ 182{
145 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
146 184
147 while (attrs) 185 while (attrs)
148 { 186 {
149 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
150 188
151 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
152 return 1; 190 return 1;
153 191
154 attrs = attrs->next; 192 attrs = attrs->next;
155 } 193 }
156 194
157 return 0; 195 return 0;
158} 196}
159 197
160typedef struct cf_layout { 198struct cf_layout {
161 PangoLayout *pl; 199 PangoLayout *pl;
162 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
163 int base_height; 201 int base_height;
164 DC__Font font; 202 DC__Font font;
165 rc_t *rc; 203 rc_t rc;
166} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
167 207
168static DC__Font default_font; 208static DC__Font default_font;
169static PangoContext *opengl_context; 209static PangoContext *opengl_context;
170static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
171 211
172static void 212static void
173substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
174{ 214{
175 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
176#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
177 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
178#endif 218#endif
179 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
180} 220}
181 221
182static void 222static void
183layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
184{ 224{
185 /* 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
186 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
187 */ 227 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
189 229
190 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
209 249
210 *w = rect.width; 250 *w = rect.width;
211 *h = rect.height; 251 *h = rect.height;
212} 252}
213 253
254/////////////////////////////////////////////////////////////////////////////
255
214typedef uint16_t tileid; 256typedef uint16_t tileid;
215typedef uint16_t faceid; 257typedef uint16_t faceid;
216 258
217typedef struct { 259struct maptex
260{
218 GLuint name; 261 GLuint name;
219 int w, h; 262 int w, h;
220 float s, t; 263 float s, t;
221 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
222 tileid smoothtile; 265 tileid smoothtile;
223 uint8_t smoothlevel; 266 uint8_t smoothlevel;
224} maptex; 267 uint8_t unused; /* set to zero on use */
268};
225 269
226typedef struct { 270struct mapcell
271{
227 uint32_t player; 272 uint32_t player;
228 tileid tile[3]; 273 tileid tile[3];
229 uint16_t darkness; 274 uint16_t darkness;
230 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
231} mapcell; 276};
232 277
233typedef struct { 278struct maprow
279{
234 int32_t c0, c1; 280 int32_t c0, c1;
235 mapcell *col; 281 mapcell *col;
236} maprow; 282};
237 283
238typedef struct map { 284struct mapgrid {
239 int x, y, w, h; 285 int x, y, w, h;
240 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
241 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
242 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
243 289
244 int32_t rows; 290 int32_t rows;
245 maprow *row; 291 maprow *row;
246} *DC__Map; 292};
247 293
248static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
249prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
250{ 299{
251 char *p; 300 T *p;
252 301
253 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
254 Zero (p, inc, char); 303 Zero (p, inc, T);
255 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
256 Safefree (ptr); 305 Safefree (ptr);
257 306
258 return p; 307 ptr = p;
259} 308}
260 309
261static char * 310template<typename T>
262append (char *ptr, int sze, int inc)
263{
264 Renew (ptr, sze + inc, char);
265 Zero (ptr + sze, inc, char);
266
267 return ptr;
268}
269
270#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
271#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
272
273static 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
274need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
275{ 320{
276 while (self->faces <= face) 321 while (self->faces <= face)
277 { 322 {
278 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
279 self->faces *= 2; 324 self->faces *= 2;
280 } 325 }
281} 326}
282 327
283static void 328static void
284need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
285{ 330{
286 while (self->texs <= texid) 331 while (self->texs <= texid)
287 { 332 {
288 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
289 self->texs *= 2; 334 self->texs *= 2;
290 } 335 }
291} 336}
292 337
293static maprow * 338static maprow *
294map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
295{ 340{
296 if (0 > y) 341 if (0 > y)
297 { 342 {
298 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
299 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
300 345
301 self->rows += extend; 346 self->rows += extend;
302 self->y += extend; 347 self->y += extend;
303 y += extend; 348 y += extend;
304 } 349 }
305 else if (y >= self->rows) 350 else if (y >= self->rows)
306 { 351 {
307 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
308 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
309 self->rows += extend; 354 self->rows += extend;
310 } 355 }
311 356
312 return self->row + y; 357 return self->row + y;
313} 358}
… …
323 } 368 }
324 369
325 if (row->c0 > x) 370 if (row->c0 > x)
326 { 371 {
327 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
328 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
329 row->c0 -= extend; 374 row->c0 -= extend;
330 } 375 }
331 else if (x >= row->c1) 376 else if (x >= row->c1)
332 { 377 {
333 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
334 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
335 row->c1 += extend; 380 row->c1 += extend;
336 } 381 }
337 382
338 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
339} 384}
340 385
341static mapcell * 386static mapcell *
342map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
343{ 388{
344 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
345} 390}
346 391
347static void 392static void
348map_clear (DC__Map self) 393map_clear (mapgrid *self)
349{ 394{
350 int r; 395 int r;
351 396
352 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
353 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
… …
360 self->oy = 0; 405 self->oy = 0;
361 self->row = 0; 406 self->row = 0;
362 self->rows = 0; 407 self->rows = 0;
363} 408}
364 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
365static void 420static void
366map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
367{ 422{
368 int x, y; 423 int x, y;
369 maprow *row; 424 maprow *row;
370 mapcell *cell; 425 mapcell *cell;
371 426
… …
383 if (x >= row->c1) 438 if (x >= row->c1)
384 break; 439 break;
385 440
386 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
387 442
388 cell->darkness = 0; 443 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 444 }
393 } 445 }
394} 446}
395 447
396typedef struct { 448struct smooth_key
449{
397 tileid tile; 450 tileid tile;
398 uint8_t x, y, level; 451 uint8_t x, y, level;
399} 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}
400 471
401static void 472static void
402smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
403{ 474{
404 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
405 476
406 if (SvIOK (*sv)) 477 if (it == h.end ())
407 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
408 else 479 else
409 sv_setiv (*sv, bits); 480 it->second |= bits;
410} 481}
411 482
412static void 483static void
413music_finished (void) 484music_finished (void)
414{ 485{
… …
431 ev.code = 1; 502 ev.code = 1;
432 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
433 ev.data2 = 0; 504 ev.data2 = 0;
434 505
435 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;
436} 514}
437 515
438static unsigned int 516static unsigned int
439minpot (unsigned int n) 517minpot (unsigned int n)
440{ 518{
… …
450 n |= n >> 16; 528 n |= n >> 16;
451 529
452 return n + 1; 530 return n + 1;
453} 531}
454 532
455static unsigned int
456popcount (unsigned int n)
457{
458 n -= (n >> 1) & 0x55555555U;
459 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
460 n = ((n >> 4) + n) & 0x0f0f0f0fU;
461 n *= 0x01010101U;
462
463 return n >> 24;
464}
465
466/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
467#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
468#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
469 536
470/******************************************************************************/ 537/******************************************************************************/
… …
507 if (!svp || !SvTRUE (*svp)) 574 if (!svp || !SvTRUE (*svp))
508 return 0; 575 return 0;
509 576
510 return 1; 577 return 1;
511} 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
512 637
513MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
514 639
515PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
516 641
… …
545 const_iv (SDL_USEREVENT), 670 const_iv (SDL_USEREVENT),
546 671
547 const_iv (SDL_APPINPUTFOCUS), 672 const_iv (SDL_APPINPUTFOCUS),
548 const_iv (SDL_APPMOUSEFOCUS), 673 const_iv (SDL_APPMOUSEFOCUS),
549 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),
550 725
551 const_iv (SDLK_FIRST), 726 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST), 727 const_iv (SDLK_LAST),
553 const_iv (SDLK_KP0), 728 const_iv (SDLK_KP0),
554 const_iv (SDLK_KP1), 729 const_iv (SDLK_KP1),
… …
630 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
631 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 808 const_iv (KMOD_MODE),
634 809
810 const_iv (KMOD_LRAM),
811
635 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)
636# undef const_iv 842# undef const_iv
637 }; 843 };
638 844
639 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--)
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
641 847
642 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
643 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
644} 850}
645 851
… …
661NV ceil (NV x) 867NV ceil (NV x)
662 868
663IV minpot (UV n) 869IV minpot (UV n)
664 870
665IV 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
666 882
667void 883void
668pango_init () 884pango_init ()
669 CODE: 885 CODE:
670{ 886{
671 opengl_fontmap = pango_opengl_font_map_new (); 887 opengl_fontmap = pango_opengl_font_map_new ();
672 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);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 889 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#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)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 892 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 893 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 894#endif
678} 895}
679 896
680char *
681SDL_GetError () 897char *SDL_GetError ()
682 898
683int 899void SDL_main_hack (SV *real_main)
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 900 PROTOTYPE: &
685 901
686void 902int SDL_Init (U32 flags)
903
904int SDL_InitSubSystem (U32 flags)
905
906void SDL_QuitSubSystem (U32 flags)
907
687SDL_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
688 919
689void 920void
690SDL_ListModes (int rgb, int alpha) 921SDL_ListModes (int rgb, int alpha)
691 PPCODE: 922 PPCODE:
692{ 923{
… …
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 935 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 938
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 939 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 940 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 941
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 942 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 943
716 if (m && m != (SDL_Rect **)-1) 944 if (m && m != (SDL_Rect **)-1)
717 while (*m) 945 while (*m)
718 { 946 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 947 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 948 {
721 AV *av = newAV (); 949 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 950 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 951 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 952 av_push (av, newSViv (rgb));
… …
747 ); 975 );
748 976
749 if (RETVAL) 977 if (RETVAL)
750 { 978 {
751 av_clear (texture_av); 979 av_clear (texture_av);
752
753 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
754#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);
755#include "glfunc.h" 981#include "glfunc.h"
756#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
757 } 985 }
758} 986}
759 OUTPUT: 987 OUTPUT:
760 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
761 992
762void 993void
763SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
764 995
765char * 996char *
766SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
767 999
768int 1000int
769SDL_GetAppState () 1001SDL_GetAppState ()
770 1002
1003int
1004SDL_GetModState ()
1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
771void 1010void
1011SDL_PumpEvents ()
1012
1013void
772poll_events () 1014peep_events ()
773 PPCODE: 1015 PPCODE:
774{ 1016{
775 SDL_Event ev; 1017 SDL_Event ev;
776 1018
777 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
… …
784 { 1026 {
785 case SDL_KEYDOWN: 1027 case SDL_KEYDOWN:
786 case SDL_KEYUP: 1028 case SDL_KEYUP:
787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1029 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1030 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1031 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
790 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1032 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1033 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792 break; 1034 break;
793 1035
794 case SDL_ACTIVEEVENT: 1036 case SDL_ACTIVEEVENT:
795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1037 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
813 x = ev.motion.x; 1055 x = ev.motion.x;
814 y = ev.motion.y; 1056 y = ev.motion.y;
815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1057 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816 } 1058 }
817 1059
818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1060 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819 hv_store (hv, "state", 5, newSViv (state), 0); 1061 hv_store (hv, "state", 5, newSViv (state), 0);
820 hv_store (hv, "x", 1, newSViv (x), 0); 1062 hv_store (hv, "x", 1, newSViv (x), 0);
821 hv_store (hv, "y", 1, newSViv (y), 0); 1063 hv_store (hv, "y", 1, newSViv (y), 0);
822 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1064 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1065 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
843 1085
844 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))));
845 } 1087 }
846} 1088}
847 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
848int 1103int
849Mix_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)
850 POSTCALL: 1105 POSTCALL:
851 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
852 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
853 1108
854void 1109void
855Mix_QuerySpec () 1110Mix_QuerySpec ()
… …
908 } 1163 }
909 } 1164 }
910#endif 1165#endif
911} 1166}
912 1167
913void 1168int
914add_font (char *file) 1169add_font (char *file)
915 CODE: 1170 CODE:
916 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)
917 1181
918void 1182void
919load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
920 ALIAS: 1184 ALIAS:
921 load_image_file = 1 1185 load_image_file = 1
… …
967 1231
968 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
969 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
970 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
971 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
972 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
973 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)));
974 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
975 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
976 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
977 1241
… …
1037#if DEBUG 1301#if DEBUG
1038 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
1039#endif 1303#endif
1040} 1304}
1041 1305
1306int
1307SvREFCNT (SV *sv)
1308 CODE:
1309 RETVAL = SvREFCNT (sv);
1310 OUTPUT:
1311 RETVAL
1312
1042MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1043 1314
1044PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1045 1316
1046DC::Font 1317DC::Font
1047new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1048 CODE: 1319 CODE:
1049{ 1320{
1050 int count; 1321 int count;
1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1052 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1081 PROTOTYPE: 1352 PROTOTYPE:
1082 CODE: 1353 CODE:
1083 tc_restore (); 1354 tc_restore ();
1084 1355
1085DC::Layout 1356DC::Layout
1086new (SV *class) 1357new (SV *klass)
1087 CODE: 1358 CODE:
1088 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1089 1360
1090 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1091 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1092 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1093 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1094 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1095 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1096 RETVAL->font = 0; 1367 RETVAL->font = 0;
1097 RETVAL->rc = rc_alloc ();
1098 1368
1099 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1100 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1101 OUTPUT: 1371 OUTPUT:
1102 RETVAL 1372 RETVAL
1103 1373
1104void 1374void
1105DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1106 CODE: 1376 CODE:
1107 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1108 rc_free (self->rc);
1109 Safefree (self); 1378 delete self;
1110 1379
1111void 1380void
1112set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1113 CODE: 1382 CODE:
1114{ 1383{
… …
1240 1509
1241void 1510void
1242set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1243 CODE: 1512 CODE:
1244 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1245 { 1514 {
1246 self->base_height = base_height; 1515 self->base_height = base_height;
1247 layout_update_font (self); 1516 layout_update_font (self);
1248 } 1517 }
1249 1518
1250void 1519void
… …
1331 PPCODE: 1600 PPCODE:
1332{ 1601{
1333 int line, x; 1602 int line, x;
1334 1603
1335 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);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1605#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1606 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1607 --line;
1339#endif 1608#endif
1340 EXTEND (SP, 2); 1609 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1610 PUSHs (sv_2mortal (newSViv (line)));
… …
1368} 1637}
1369 1638
1370void 1639void
1371render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1372 CODE: 1641 CODE:
1373 rc_clear (self->rc); 1642 self->rc.clear ();
1374 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1375 self->pl, 1644 self->pl,
1376 self->rc, 1645 &self->rc,
1377 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1378 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1379 flags 1648 flags
1380 ); 1649 );
1381 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
… …
1392 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1393 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1394 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1395 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1396 1665
1397 rc_draw (self->rc); 1666 self->rc.draw ();
1398 1667
1399 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1400 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1401 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1402} 1671}
… …
1477 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1478 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1479 } 1748 }
1480} 1749}
1481 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
1482IV 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)
1483 CODE: 1873 CODE:
1484{ 1874{
1485 GLint width; 1875 GLint width;
1486 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);
… …
1493MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1494 1884
1495PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1496 1886
1497DC::Map 1887DC::Map
1498new (SV *class) 1888new (SV *klass)
1499 CODE: 1889 CODE:
1500 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1501 RETVAL->x = 0; 1891 RETVAL->x = 0;
1502 RETVAL->y = 0; 1892 RETVAL->y = 0;
1503 RETVAL->w = 0; 1893 RETVAL->w = 0;
1504 RETVAL->h = 0; 1894 RETVAL->h = 0;
1505 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
… …
1542 1932
1543void 1933void
1544set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1545 CODE: 1935 CODE:
1546{ 1936{
1547 tileid texid; 1937 tileid texid;
1548 maptex *tex; 1938 maptex *tex;
1549 1939
1550 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1551 return; 1941 return;
1552 1942
1553 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1554 return; 1944 return;
1555 1945
1556 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1557 1947
1558 if (!texid) 1948 if (!texid)
1559 return; 1949 return;
1560 1950
1561 tex = self->tex + texid; 1951 tex = self->tex + texid;
… …
1590 //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);
1591 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1592 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594} 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 }
1595 2005
1596int 2006int
1597ox (DC::Map self) 2007ox (DC::Map self)
1598 ALIAS: 2008 ALIAS:
1599 oy = 1 2009 oy = 1
… …
1631 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1632 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1633 2043
1634 while (self->y < 0) 2044 while (self->y < 0)
1635 { 2045 {
1636 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1637 2047
1638 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1639 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1640 } 2050 }
1641} 2051}
1642 2052
1643SV * 2053SV *
1644map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1645 CODE: 2055 CODE:
1646{ 2056{
1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1648 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1649 mapcell *cell; 2059 mapcell *cell;
… …
1670 2080
1671 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1672 2082
1673 if (flags & 8) 2083 if (flags & 8)
1674 { 2084 {
2085 uint8_t ext, cmd;
2086
1675 if (extmap) 2087 do
1676 { 2088 {
1677 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1678 2091
1679 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
1680 { 2095 {
1681 ext = *data++;
1682 cmd = ext & 0x3f;
1683
1684 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health
1687 {
1688 cell->stat_width = 1; 2096 cell->stat_width = 1;
1689 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1690 }
1691 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47)
1694 {
1695 if (*data == 4)
1696 ; // decode player count
1697
1698 data += *data + 1;
1699 }
1700 else if (cmd == 8) // cell flags
1701 cell->flags = *data++;
1702 else if (ext & 0x40) // unknown, multibyte => skip
1703 data += *data + 1;
1704 else
1705 data++;
1706 } 2098 }
1707 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++;
1708 } 2116 }
1709 else 2117 while (ext & 0x80);
1710 cell->darkness = *data++ + 1;
1711 } 2118 }
1712 2119
1713 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1714 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1715 { 2122 {
… …
1718 cell->tile [z] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
1719 2126
1720 if (cell->tile [z]) 2127 if (cell->tile [z])
1721 { 2128 {
1722 maptex *tex = self->tex + cell->tile [z]; 2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
1723 if (!tex->name) 2131 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z])); 2132 av_push (missing, newSViv (cell->tile [z]));
1725 2133
1726 if (tex->smoothtile) 2134 if (tex->smoothtile)
1727 { 2135 {
1728 maptex *smooth = self->tex + tex->smoothtile; 2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
1729 if (!smooth->name) 2138 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile)); 2139 av_push (missing, newSViv (tex->smoothtile));
1731 } 2140 }
1732 } 2141 }
1733 } 2142 }
1734 } 2143 }
1735 else 2144 else
1736 cell->darkness = 0; 2145 CELL_CLEAR (cell);
1737 } 2146 }
1738} 2147}
1739 OUTPUT: 2148 OUTPUT:
1740 RETVAL 2149 RETVAL
1741 2150
… …
1761 ? self->row + y 2170 ? self->row + y
1762 : 0; 2171 : 0;
1763 2172
1764 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1765 { 2174 {
1766 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1767 2176
1768 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1769 { 2178 {
1770 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1771 2180
… …
1773 { 2182 {
1774 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1775 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1776 int a1 = tex.a; 2185 int a1 = tex.a;
1777 2186
1778 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1779 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1780 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1781 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1782 } 2191 }
1783 } 2192 }
1784 2193
1785 *map++ = (r ) 2194 *map++ = (r )
1786 | (g << 8) 2195 | (g << 8)
1787 | (b << 16) 2196 | (b << 16)
1788 | (a << 24); 2197 | (a << 24);
1789 } 2198 }
1790 } 2199 }
1791 2200
1792 RETVAL = map_sv; 2201 RETVAL = map_sv;
1793} 2202}
1794 OUTPUT: 2203 OUTPUT:
1795 RETVAL 2204 RETVAL
1796 2205
1797void 2206void
1798draw (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)
1799 CODE: 2208 CODE:
1800{ 2209{
1801 int x, y, z; 2210 int x, y, z;
1802 2211
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805 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!
1806 smooth_key skey; 2213 int pl_x, pl_y;
1807 2214 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
1809 rc_key_t key; 2217 rc_key_t key;
1810 rc_array_t *arr; 2218 rc_t::array_t *arr;
1811 2219
2220 pl_tex.name = 0;
2221
1812 // thats current max. sorry. 2222 // that's current max. sorry.
1813 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1815
1816 // clear key, in case of extra padding
1817 memset (&skey, 0, sizeof (skey));
1818 2225
1819 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
1820 key.r = 255; 2227 key.r = 255;
1821 key.g = 255; 2228 key.g = 255;
1822 key.b = 255; 2229 key.b = 255;
1823 key.a = 255; 2230 key.a = 255;
1824 key.mode = GL_QUADS; 2231 key.mode = GL_QUADS;
1825 key.format = GL_T2F_V3F; 2232 key.format = GL_T2F_V3F;
1826 key.texname = -1;
1827 2233
1828 mx += self->x; 2234 mx += self->x;
1829 my += self->y; 2235 my += self->y;
1830 2236
1831 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
1832 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
1833 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
1834 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1835 2241
1836 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1837 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1838 { 2244 {
1839 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
… …
1854 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 2262
1857 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
1858 { 2264 {
1859 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;
1860 2269
1861 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
1863 { 2272 {
1864 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
… …
1874 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
1875 int px, py; 2284 int px, py;
1876 2285
1877 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
1878 { 2287 {
2288 self->tex [tile].unused = 0;
2289
1879 if (!tex.name) 2290 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1881 2292
1882 key.texname = tex.name; 2293 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
1884 } 2295 }
1885 2296
1886 px = (x + 1) * T - tex.w; 2297 px = (x + 1) * Th - tex.w;
1887 py = (y + 1) * T - tex.h; 2298 py = (y + 1) * Tw - tex.h;
1888 2299
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893
1894 if (cell->flags && z == 2)
1895 { 2301 {
1896 // overlays such as the speech bubble, probably more to come 2302 pl_x = px;
1897 if (cell->flags & 1) 2303 pl_y = py;
2304 pl_tex = tex;
1898 { 2305 continue;
1899 maptex tex = self->tex [1];
1900 int px = x * T + T * 2 / 32;
1901 int py = y * T - T * 6 / 32;
1902
1903 if (tex.name)
1904 {
1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1915 }
1916 }
1917 } 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);
1918 2312
1919 // update smooth hash 2313 // update smooth hash
1920 if (tex.smoothtile) 2314 if (tex.smoothtile)
1921 { 2315 {
1922 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
1923 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
1924 2318
1925 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
1926 2320
1927 // 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
1928 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
1929 2323
1930 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
… …
1938 2332
1939 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1940 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
1941 2335
1942 // full tile 2336 // full tile
1943 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);
1944 2338
1945 // borders 2339 // borders
1946 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);
1947 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);
1948 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);
1949 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);
1950 2344
1951 // corners 2345 // corners
1952 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);
1953 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);
1954 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);
1955 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);
1956 } 2370 }
1957 } 2371 }
1958 } 2372 }
1959 } 2373 }
1960 2374
1961 rc_draw (rc); 2375 rc.draw ();
1962 rc_clear (rc); 2376 rc.clear ();
1963 2377
1964 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
1965 // this is basically counting sort 2379 // this is basically counting sort
1966 { 2380 {
1967 int w, b; 2381 int w, b;
1968 2382
1969 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
1970 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
1971 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)
1972 { 2388 {
1973 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
1974 if (smask) 2390 IV bits = it->second;
1975 for (b = 0; b < 32; ++b) 2391
1976 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
1977 { 2395 {
1978 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
1979 HE *he; 2404 if (tex.name)
1980
1981 hv_iterinit (smooth);
1982 while ((he = hv_iternext (smooth)))
1983 { 2405 {
1984 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
1985 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
1986 2408 if (key.texname != tex.name)
1987 if (!(bits & 0x1000)
1988 && skey->level == level
1989 && level > smooth_max [skey->x][skey->y])
1990 { 2409 {
1991 maptex tex = self->tex [skey->tile]; 2410 self->tex [skey.tile].unused = 0;
1992 int px = (((int)skey->x) - 1) * T;
1993 int py = (((int)skey->y) - 1) * T;
1994 int border = bits & 15;
1995 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1996 float dx = tex.s * .0625f; // 16 images/row
1997 float dy = tex.t * .5f ; // 2 images/column
1998 2411
1999 if (tex.name)
2000 {
2001 // this time avoiding texture state changes
2002 // save gobs of state changes.
2003 if (key.texname != tex.name)
2004 {
2005 glEnd (); 2412 glEnd ();
2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2008 } 2415 }
2009 2416
2010 if (border) 2417 if (border)
2011 { 2418 {
2012 float ox = border * dx; 2419 float ox = border * dx;
2013 2420
2014 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2015 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2016 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2017 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2018 } 2425 }
2019 2426
2020 if (corner) 2427 if (corner)
2021 { 2428 {
2022 float ox = corner * dx; 2429 float ox = corner * dx;
2023 2430
2024 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2028 }
2029 }
2030 } 2435 }
2031 } 2436 }
2032 } 2437 }
2033 } 2438 }
2034 2439
2035 glEnd (); 2440 glEnd ();
2036 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1; 2442 key.texname = -1;
2038 } 2443 }
2039
2040 hv_clear (smooth);
2041 } 2444 }
2042 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
2043 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2044 rc_free (rc);
2045 2467
2046 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2048 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2049 { 2471 {
… …
2052 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2053 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2054 { 2476 {
2055 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2056 2478
2057 int px = x * T; 2479 int px = x * Tw;
2058 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 }
2059 2487
2060 if (cell->stat_hp) 2488 if (cell->stat_hp)
2061 { 2489 {
2062 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2063 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2064 2492
2065 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2066 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2067 px + width - 1, py); 2495 px + width - 1, py);
2068 2496
… …
2074 } 2502 }
2075 } 2503 }
2076} 2504}
2077 2505
2078void 2506void
2079draw_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)
2080 CODE: 2508 CODE:
2081{ 2509{
2082 static float color[16][3] = { 2510 static float color[16][3] = {
2083 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2084 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2085 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2086 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2087 2515
2088 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2089 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2090 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2091 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2092 2520
2093 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2094 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2095 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2096 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2097 2525
2098 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2099 2527
2100 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2101 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2102 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2103 }; 2531 };
2104 2532
2105 int x, y; 2533 int x, y;
2106 2534
2107 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 */
2108 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2109 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2110 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2111 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2112 2546
2113 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
… …
2117 2551
2118 if (m) 2552 if (m)
2119 { 2553 {
2120 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2121 2555
2122 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2123 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2124 2558
2125 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2126 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2127 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2128 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2129 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2130 } 2564 }
… …
2138void 2572void
2139fow_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)
2140 PPCODE: 2574 PPCODE:
2141{ 2575{
2142 int x, y; 2576 int x, y;
2143 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2144 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2145 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2146 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);
2147 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2148 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2149 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2150 2585
2151 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2153 2588
2154 mx += self->x - 1; 2589 mx += self->x - 1;
2155 my += self->y - 1; 2590 my += self->y - 1;
2156
2157 memset (darkness1, 255, sw1 * sh1);
2158 2591
2159 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2161 { 2594 {
2162 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
… …
2165 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2166 { 2599 {
2167 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2168 2601
2169 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2170 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2171 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2172 } 2605 }
2173 } 2606 }
2174 2607
2175 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2176 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
… …
2195 2628
2196 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2197 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2198 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2199 2632
2200 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2201 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2202 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2203 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2204 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 */
2205 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2206 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2207 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2208 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2209 } 2642 }
2210 2643
2211 free (darkness1); 2644 free (darkness1);
2212 2645
2213 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2214 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2215 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2216 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2217} 2650}
2218 2651
2219SV * 2652SV *
… …
2282 else 2715 else
2283 *data++ = 0; 2716 *data++ = 0;
2284 } 2717 }
2285 } 2718 }
2286 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 {
2287 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 }
2726
2289 RETVAL = data_sv; 2727 RETVAL = data_sv;
2290} 2728}
2291 OUTPUT: 2729 OUTPUT:
2292 RETVAL 2730 RETVAL
2293 2731
2294void 2732void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2733set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2734 PPCODE:
2297{ 2735{
2298 int x, y, z; 2736 int x, y, z;
2299 int w, h; 2737 int w, h;
2300 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;
2301 2749
2302 if (*data++ != 0) 2750 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2751 XSRETURN_EMPTY; /* version mismatch */
2304 2752
2305 w = *data++ << 8; w |= *data++; 2753 w = *data++ << 8; w |= *data++;
… …
2320 { 2768 {
2321 maprow *row = map_get_row (self, y); 2769 maprow *row = map_get_row (self, y);
2322 2770
2323 for (x = x0; x < x1; x++) 2771 for (x = x0; x < x1; x++)
2324 { 2772 {
2773 uint8_t flags;
2774
2775 if (data + 7 >= end)
2776 XSRETURN_EMPTY;
2777
2325 uint8_t flags = *data++; 2778 flags = *data++;
2326 2779
2327 if (flags) 2780 if (flags)
2328 { 2781 {
2329 mapcell *cell = row_get_cell (row, x); 2782 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2783 tileid tile[3] = { 0, 0, 0 };
… …
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2786 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2787 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2788
2336 if (cell->darkness == 0) 2789 if (cell->darkness == 0)
2337 { 2790 {
2338 cell->darkness = 0; 2791 /*cell->darkness = 0;*/
2792 EXTEND (SP, 3);
2339 2793
2340 for (z = 0; z <= 2; z++) 2794 for (z = 0; z <= 2; z++)
2341 { 2795 {
2342 tileid t = tile [z]; 2796 tileid t = tile [z];
2343 2797
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2798 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2799 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2800 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2801 need_texid (self, t);
2348 } 2802 }
2349 2803
2350 cell->tile [z] = t; 2804 cell->tile [z] = t;
2351 } 2805 }
… …
2356} 2810}
2357 2811
2358MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2359 2813
2360DC::RW 2814DC::RW
2361new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2362 CODE: 2816 CODE:
2363{ 2817{
2364 STRLEN datalen; 2818 STRLEN datalen;
2365 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2366 2820
… …
2368} 2822}
2369 OUTPUT: 2823 OUTPUT:
2370 RETVAL 2824 RETVAL
2371 2825
2372DC::RW 2826DC::RW
2373new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2374 CODE: 2828 CODE:
2375 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2376 OUTPUT: 2830 OUTPUT:
2377 RETVAL 2831 RETVAL
2378 2832
… …
2396 if (RETVAL < 0) 2850 if (RETVAL < 0)
2397 { 2851 {
2398 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2399 2853
2400 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)
2401 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2402 2861 }
2862 else
2403 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2404 } 2864 }
2405 2865
2406 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2407 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2408} 2868}
… …
2455void 2915void
2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457 CODE: 2917 CODE:
2458{ 2918{
2459 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));
2460 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;
2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462} 2922}
2463 2923
2464void 2924void
2465set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
… …
2468 2928
2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2470 2930
2471PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2472 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
2473DC::MixChunk 2945DC::MixChunk
2474new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2475 CODE: 2947 CODE:
2476 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2477 OUTPUT: 2949 OUTPUT:
2478 RETVAL 2950 RETVAL
2479 2951
… …
2509 OUTPUT: 2981 OUTPUT:
2510 RETVAL 2982 RETVAL
2511 2983
2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2513 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
2514int 2998int
2515volume (int volume = -1) 2999volume (int volume = -1)
2516 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2517 CODE: 3001 CODE:
2518 if (items > 0) 3002 if (items > 0)
… …
2529void 3013void
2530halt () 3014halt ()
2531 CODE: 3015 CODE:
2532 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2533 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2534DC::MixMusic 3025DC::MixMusic
2535new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2536 CODE: 3027 CODE:
2537 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2538 OUTPUT: 3029 OUTPUT:
2539 RETVAL 3030 RETVAL
2540 3031
… …
2568 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2569# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2570 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2571 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2572 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2573 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2574 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2575 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2576 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2577 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
… …
2589 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2590 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2591 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2592 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2593 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),
2594 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2595 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2596 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2597 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2598 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
… …
2666 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2667 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2668 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2669 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2670 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),
2671# undef const_iv 3170# undef const_iv
2672 }; 3171 };
2673 3172
2674 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--)
2675 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2676 3175
2677 texture_av = newAV (); 3176 texture_av = newAV ();
2678 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2679} 3178}
2680 3179
… …
2682disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2683 CODE: 3182 CODE:
2684 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2686 3185
2687char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2688gl_vendor () 3190gl_vendor ()
2689 CODE: 3191 CODE:
2690 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2691 OUTPUT: 3193 OUTPUT:
2692 RETVAL 3194 RETVAL
2693 3195
2694char * 3196const char *
2695gl_version () 3197gl_version ()
2696 CODE: 3198 CODE:
2697 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2698 OUTPUT: 3200 OUTPUT:
2699 RETVAL 3201 RETVAL
2700 3202
2701char * 3203const char *
2702gl_extensions () 3204gl_extensions ()
2703 CODE: 3205 CODE:
2704 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2705 OUTPUT: 3207 OUTPUT:
2706 RETVAL 3208 RETVAL
2707 3209
2708const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2709 3215
2710GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2711 CODE: 3217 CODE:
2712 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2713 OUTPUT: 3219 OUTPUT:
… …
2721 3227
2722int glGetError () 3228int glGetError ()
2723 3229
2724void glFinish () 3230void glFinish ()
2725 3231
3232void glFlush ()
3233
2726void glClear (int mask) 3234void glClear (int mask)
2727 3235
2728void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2729 PROTOTYPE: @ 3237 PROTOTYPE: @
2730 3238
… …
2739void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2740 3248
2741void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2742 CODE: 3250 CODE:
2743 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2744 3254
2745void glDepthMask (int flag) 3255void glDepthMask (int flag)
2746 3256
2747void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2748 3258
… …
2783void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
2784 CODE: 3294 CODE:
2785 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
2786 3296
2787void 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: @
2788 ALIAS: 3299 ALIAS:
2789 glColor_premultiply = 1 3300 glColor_premultiply = 1
2790 CODE: 3301 CODE:
2791 if (ix) 3302 if (ix)
2792 { 3303 {
… …
2898 3409
2899void glEndList () 3410void glEndList ()
2900 3411
2901void glCallList (int list) 3412void glCallList (int list)
2902 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2904 3420
2905PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
2906 3422
2907void 3423void
2908find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
2909 PPCODE: 3425 PPCODE:
2910{ 3426{
2911 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
2912 XPUSHs (self); 3428 XPUSHs (self);
2913} 3429}
2914 3430
2915BOOT: 3431BOOT:
2916{ 3432{
… …
2924 3440
2925void 3441void
2926draw (SV *self) 3442draw (SV *self)
2927 CODE: 3443 CODE:
2928{ 3444{
2929 HV *hv; 3445 HV *hv;
2930 SV **svp; 3446 SV **svp;
2931 NV x, y, w, h; 3447 NV x, y, w, h;
2932 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
2933 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
2934 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
2935 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