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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines