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.251 by root, Fri Dec 28 17:28:01 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#if 0 102/* mask out modifiers we are not interested in */
76# define PARACHUTE SDL_INIT_NOPARACHUTE 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77#else 104
78# define PARACHUTE 0 105#define KMOD_LRAM 0x10000 // our extension
79#endif 106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
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}
80 128
81static AV *texture_av; 129static AV *texture_av;
82 130
83static struct 131static struct
84{ 132{
141{ 189{
142 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
143 191
144 while (attrs) 192 while (attrs)
145 { 193 {
146 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
147 195
148 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
149 return 1; 197 return 1;
150 198
151 attrs = attrs->next; 199 attrs = attrs->next;
152 } 200 }
153 201
154 return 0; 202 return 0;
155} 203}
156 204
157typedef struct cf_layout { 205struct cf_layout {
158 PangoLayout *pl; 206 PangoLayout *pl;
159 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
160 int base_height; 208 int base_height;
161 DC__Font font; 209 DC__Font font;
162 rc_t *rc; 210 rc_t rc;
163} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
164 214
165static DC__Font default_font; 215static DC__Font default_font;
166static PangoContext *opengl_context; 216static PangoContext *opengl_context;
167static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
168 218
169static void 219static void
170substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
171{ 221{
172 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
173#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
174 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
175#endif 225#endif
176 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
177} 227}
178 228
179static void 229static void
180layout_update_font (DC__Layout self) 230layout_update_font (DC__Layout self)
181{ 231{
182 /* 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
183 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
184 */ 234 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
186 236
187 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
209} 259}
210 260
211typedef uint16_t tileid; 261typedef uint16_t tileid;
212typedef uint16_t faceid; 262typedef uint16_t faceid;
213 263
214typedef struct { 264struct maptex
265{
215 GLuint name; 266 GLuint name;
216 int w, h; 267 int w, h;
217 float s, t; 268 float s, t;
218 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
219 tileid smoothtile; 270 tileid smoothtile;
220 uint8_t smoothlevel; 271 uint8_t smoothlevel;
221} maptex; 272 uint8_t unused; /* set to zero on use */
273};
222 274
223typedef struct { 275struct mapcell
276{
224 uint32_t player; 277 uint32_t player;
225 tileid tile[3]; 278 tileid tile[3];
226 uint16_t darkness; 279 uint16_t darkness;
227 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
228} mapcell; 281};
229 282
230typedef struct { 283struct maprow
284{
231 int32_t c0, c1; 285 int32_t c0, c1;
232 mapcell *col; 286 mapcell *col;
233} maprow; 287};
234 288
235typedef struct map { 289struct mapgrid {
236 int x, y, w, h; 290 int x, y, w, h;
237 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
238 int faces; tileid *face2tile; // [faceid] 292 std::vector<tileid> tile;
239 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
240 294
241 int32_t rows; 295 int32_t rows;
242 maprow *row; 296 maprow *row;
243} *DC__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
244 307
245static char * 308static char *
246prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
247{ 310{
248 char *p; 311 char *p;
265} 328}
266 329
267#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))
268#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))
269 332
270static void
271need_facenum (struct map *self, faceid face)
272{
273 while (self->faces <= face)
274 {
275 Append (tileid, self->face2tile, self->faces, self->faces);
276 self->faces *= 2;
277 }
278}
279
280static void
281need_texid (struct map *self, int texid)
282{
283 while (self->texs <= texid)
284 {
285 Append (maptex, self->tex, self->texs, self->texs);
286 self->texs *= 2;
287 }
288}
289
290static maprow * 333static maprow *
291map_get_row (DC__Map self, int y) 334map_get_row (mapgrid *self, int y)
292{ 335{
293 if (0 > y) 336 if (0 > y)
294 { 337 {
295 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
296 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
334 377
335 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
336} 379}
337 380
338static mapcell * 381static mapcell *
339map_get_cell (DC__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
340{ 383{
341 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
342} 385}
343 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
344static void 414static void
345map_clear (DC__Map self)
346{
347 int r;
348
349 for (r = 0; r < self->rows; r++)
350 Safefree (self->row[r].col);
351
352 Safefree (self->row);
353
354 self->x = 0;
355 self->y = 0;
356 self->ox = 0;
357 self->oy = 0;
358 self->row = 0;
359 self->rows = 0;
360}
361
362static void
363map_blank (DC__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
364{ 416{
365 int x, y; 417 int x, y;
366 maprow *row; 418 maprow *row;
367 mapcell *cell; 419 mapcell *cell;
368 420
380 if (x >= row->c1) 432 if (x >= row->c1)
381 break; 433 break;
382 434
383 cell = row->col + x - row->c0; 435 cell = row->col + x - row->c0;
384 436
385 cell->darkness = 0; 437 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 438 }
390 } 439 }
391} 440}
392 441
393typedef struct { 442struct smooth_key
443{
394 tileid tile; 444 tileid tile;
395 uint8_t x, y, level; 445 uint8_t x, y, level;
396} 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}
397 465
398static void 466static void
399smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
400{ 468{
401 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
402 470
403 if (SvIOK (*sv)) 471 if (it == h.end ())
404 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
405 else 473 else
406 sv_setiv (*sv, bits); 474 it->second |= bits;
407} 475}
408 476
409static void 477static void
410music_finished (void) 478music_finished (void)
411{ 479{
428 ev.code = 1; 496 ev.code = 1;
429 ev.data1 = (void *)(long)channel; 497 ev.data1 = (void *)(long)channel;
430 ev.data2 = 0; 498 ev.data2 = 0;
431 499
432 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;
433} 508}
434 509
435static unsigned int 510static unsigned int
436minpot (unsigned int n) 511minpot (unsigned int n)
437{ 512{
504 if (!svp || !SvTRUE (*svp)) 579 if (!svp || !SvTRUE (*svp))
505 return 0; 580 return 0;
506 581
507 return 1; 582 return 1;
508} 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
509 642
510MODULE = Deliantra::Client PACKAGE = DC 643MODULE = Deliantra::Client PACKAGE = DC
511 644
512PROTOTYPES: ENABLE 645PROTOTYPES: ENABLE
513 646
542 const_iv (SDL_USEREVENT), 675 const_iv (SDL_USEREVENT),
543 676
544 const_iv (SDL_APPINPUTFOCUS), 677 const_iv (SDL_APPINPUTFOCUS),
545 const_iv (SDL_APPMOUSEFOCUS), 678 const_iv (SDL_APPMOUSEFOCUS),
546 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),
547 730
548 const_iv (SDLK_FIRST), 731 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST), 732 const_iv (SDLK_LAST),
550 const_iv (SDLK_KP0), 733 const_iv (SDLK_KP0),
551 const_iv (SDLK_KP1), 734 const_iv (SDLK_KP1),
627 const_iv (KMOD_RMETA), 810 const_iv (KMOD_RMETA),
628 const_iv (KMOD_NUM), 811 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 812 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 813 const_iv (KMOD_MODE),
631 814
815 const_iv (KMOD_LRAM),
816
632 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)
633# undef const_iv 847# undef const_iv
634 }; 848 };
635 849
636 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--)
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
638 852
639 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
640 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
641} 855}
642 856
658NV ceil (NV x) 872NV ceil (NV x)
659 873
660IV minpot (UV n) 874IV minpot (UV n)
661 875
662IV 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
663 883
664void 884void
665pango_init () 885pango_init ()
666 CODE: 886 CODE:
667{ 887{
668 opengl_fontmap = pango_opengl_font_map_new (); 888 opengl_fontmap = pango_opengl_font_map_new ();
669 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);
670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 890 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#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)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 893 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 894 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 895#endif
675} 896}
676 897
677char *
678SDL_GetError () 898char *SDL_GetError ()
679 899
680int 900void SDL_main_hack (SV *real_main)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 901 PROTOTYPE: &
682 902
683void 903int SDL_Init (U32 flags)
904
905int SDL_InitSubSystem (U32 flags)
906
907void SDL_QuitSubSystem (U32 flags)
908
684SDL_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
685 920
686void 921void
687SDL_ListModes (int rgb, int alpha) 922SDL_ListModes (int rgb, int alpha)
688 PPCODE: 923 PPCODE:
689{ 924{
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 938 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 939
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 940 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
706#if SDL_VERSION_ATLEAST(1,2,10)
707 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
708 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 941 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 942
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 943 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 944
713 if (m && m != (SDL_Rect **)-1) 945 if (m && m != (SDL_Rect **)-1)
714 while (*m) 946 while (*m)
715 { 947 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 948 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 949 {
718 AV *av = newAV (); 950 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 951 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 952 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 953 av_push (av, newSViv (rgb));
744 ); 976 );
745 977
746 if (RETVAL) 978 if (RETVAL)
747 { 979 {
748 av_clear (texture_av); 980 av_clear (texture_av);
749
750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
751#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 981#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
752#include "glfunc.h" 982#include "glfunc.h"
753#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
754 } 986 }
755} 987}
756 OUTPUT: 988 OUTPUT:
757 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
758 993
759void 994void
760SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
761 996
762char * 997char *
763SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
764 1000
765int 1001int
766SDL_GetAppState () 1002SDL_GetAppState ()
767 1003
1004int
1005SDL_GetModState ()
1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
768void 1011void
1012SDL_PumpEvents ()
1013
1014void
769poll_events () 1015peep_events ()
770 PPCODE: 1016 PPCODE:
771{ 1017{
772 SDL_Event ev; 1018 SDL_Event ev;
773 1019
774 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
781 { 1027 {
782 case SDL_KEYDOWN: 1028 case SDL_KEYDOWN:
783 case SDL_KEYUP: 1029 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1030 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1031 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1032 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
787 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1033 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
788 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1034 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 1035 break;
790 1036
791 case SDL_ACTIVEEVENT: 1037 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1038 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
810 x = ev.motion.x; 1056 x = ev.motion.x;
811 y = ev.motion.y; 1057 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1058 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 1059 }
814 1060
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1061 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 1062 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 1063 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 1064 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1065 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1066 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 1067 }
822 break; 1068 break;
823 1069
824 case SDL_MOUSEBUTTONDOWN: 1070 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 1071 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1072 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 1073
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1074 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1075 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1076 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1077 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
840 1086
841 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))));
842 } 1088 }
843} 1089}
844 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
845int 1104int
846Mix_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)
847 POSTCALL: 1106 POSTCALL:
848 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
849 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
850 1109
851void 1110void
852Mix_QuerySpec () 1111Mix_QuerySpec ()
905 } 1164 }
906 } 1165 }
907#endif 1166#endif
908} 1167}
909 1168
910void 1169int
911add_font (char *file) 1170add_font (char *file)
912 CODE: 1171 CODE:
913 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)
914 1182
915void 1183void
916load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
917 ALIAS: 1185 ALIAS:
918 load_image_file = 1 1186 load_image_file = 1
964 1232
965 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
966 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
967 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
968 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
969 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
970 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1238 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
971 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
972 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
973 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
974 1242
1034#if DEBUG 1302#if DEBUG
1035 VALGRIND_DO_LEAK_CHECK; 1303 VALGRIND_DO_LEAK_CHECK;
1036#endif 1304#endif
1037} 1305}
1038 1306
1307int
1308SvREFCNT (SV *sv)
1309 CODE:
1310 RETVAL = SvREFCNT (sv);
1311 OUTPUT:
1312 RETVAL
1313
1039MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1040 1315
1041PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1042 1317
1043DC::Font 1318DC::Font
1044new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1045 CODE: 1320 CODE:
1046{ 1321{
1047 int count; 1322 int count;
1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1049 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1078 PROTOTYPE: 1353 PROTOTYPE:
1079 CODE: 1354 CODE:
1080 tc_restore (); 1355 tc_restore ();
1081 1356
1082DC::Layout 1357DC::Layout
1083new (SV *class) 1358new (SV *klass)
1084 CODE: 1359 CODE:
1085 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1086 1361
1087 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1088 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1089 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1090 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1091 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1092 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1093 RETVAL->font = 0; 1368 RETVAL->font = 0;
1094 RETVAL->rc = rc_alloc ();
1095 1369
1096 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1097 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1098 OUTPUT: 1372 OUTPUT:
1099 RETVAL 1373 RETVAL
1100 1374
1101void 1375void
1102DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1103 CODE: 1377 CODE:
1104 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1105 rc_free (self->rc);
1106 Safefree (self); 1379 delete self;
1107 1380
1108void 1381void
1109set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1110 CODE: 1383 CODE:
1111{ 1384{
1237 1510
1238void 1511void
1239set_height (DC::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1240 CODE: 1513 CODE:
1241 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1242 { 1515 {
1243 self->base_height = base_height; 1516 self->base_height = base_height;
1244 layout_update_font (self); 1517 layout_update_font (self);
1245 } 1518 }
1246 1519
1247void 1520void
1313void 1586void
1314cursor_pos (DC::Layout self, int index) 1587cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1588 PPCODE:
1316{ 1589{
1317 PangoRectangle pos; 1590 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, 0, &pos); 1591 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1592
1320 EXTEND (SP, 3); 1593 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE))); 1595 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE))); 1596 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1328 PPCODE: 1601 PPCODE:
1329{ 1602{
1330 int line, x; 1603 int line, x;
1331 1604
1332 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);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1606#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1607 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1608 --line;
1336#endif 1609#endif
1337 EXTEND (SP, 2); 1610 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1611 PUSHs (sv_2mortal (newSViv (line)));
1365} 1638}
1366 1639
1367void 1640void
1368render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1369 CODE: 1642 CODE:
1370 rc_clear (self->rc); 1643 self->rc.clear ();
1371 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1372 self->pl, 1645 self->pl,
1373 self->rc, 1646 &self->rc,
1374 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1375 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1376 flags 1649 flags
1377 ); 1650 );
1378 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1389 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1390 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1391 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1392 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1393 1666
1394 rc_draw (self->rc); 1667 self->rc.draw ();
1395 1668
1396 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1397 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1398 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1399} 1672}
1474 glDisable (GL_ALPHA_TEST); 1747 glDisable (GL_ALPHA_TEST);
1475 glDisable (GL_BLEND); 1748 glDisable (GL_BLEND);
1476 } 1749 }
1477} 1750}
1478 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
1479IV 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)
1480 CODE: 1874 CODE:
1481{ 1875{
1482 GLint width; 1876 GLint width;
1483 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);
1490MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1491 1885
1492PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1493 1887
1494DC::Map 1888DC::Map
1495new (SV *class) 1889new (SV *klass)
1496 CODE: 1890 CODE:
1497 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1498 RETVAL->x = 0; 1892 RETVAL->x = 0;
1499 RETVAL->y = 0; 1893 RETVAL->y = 0;
1500 RETVAL->w = 0; 1894 RETVAL->w = 0;
1501 RETVAL->h = 0; 1895 RETVAL->h = 0;
1502 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1503 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1504 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1505 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1506 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1507 RETVAL->row = 0; 1899 RETVAL->row = 0;
1508 OUTPUT: 1900 OUTPUT:
1509 RETVAL 1901 RETVAL
1510 1902
1511void 1903void
1512DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1513 CODE: 1905 CODE:
1514{ 1906{
1515 map_clear (self);
1516 Safefree (self->face2tile);
1517 Safefree (self->tex);
1518 Safefree (self); 1907 delete self;
1519} 1908}
1520 1909
1521void 1910void
1522resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1523 CODE: 1912 CODE:
1525 self->h = map_height; 1914 self->h = map_height;
1526 1915
1527void 1916void
1528clear (DC::Map self) 1917clear (DC::Map self)
1529 CODE: 1918 CODE:
1530 map_clear (self); 1919 self->clear_cells ();
1531 1920
1532void 1921void
1533set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1534 CODE: 1923 CODE:
1535{ 1924{
1536 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1537 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1538} 1928}
1539 1929
1540void 1930void
1541set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1542 CODE: 1932 CODE:
1543{ 1933{
1544 tileid texid;
1545 maptex *tex;
1546
1547 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1548 return; 1935 return;
1549 1936
1550 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1551 return; 1938 return;
1552 1939
1553 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1554 1941
1555 if (!texid) 1942 if (!texid)
1556 return; 1943 return;
1557 1944
1558 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1559 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1560 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1561} 1948}
1562 1949
1563void 1950void
1564set_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)
1565 CODE: 1952 CODE:
1566{ 1953{
1567 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1568 1955
1569 { 1956 {
1570 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1571 1958
1572 tex->name = name; 1959 tex.name = name;
1573 tex->w = w; 1960 tex.w = w;
1574 tex->h = h; 1961 tex.h = h;
1575 tex->s = s; 1962 tex.s = s;
1576 tex->t = t; 1963 tex.t = t;
1577 tex->r = r; 1964 tex.r = r;
1578 tex->g = g; 1965 tex.g = g;
1579 tex->b = b; 1966 tex.b = b;
1580 tex->a = a; 1967 tex.a = a;
1581 } 1968 }
1582 1969
1583 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1584 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1585 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1587 //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);
1588 // use uglier nearest interpolation because linear suffers 1975 // use uglier nearest interpolation because linear suffers
1589 // from transparent color bleeding and ugly wrapping effects. 1976 // from transparent color bleeding and ugly wrapping effects.
1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1977 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1591} 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 }
1592 1999
1593int 2000int
1594ox (DC::Map self) 2001ox (DC::Map self)
1595 ALIAS: 2002 ALIAS:
1596 oy = 1 2003 oy = 1
1636 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1637 } 2044 }
1638} 2045}
1639 2046
1640SV * 2047SV *
1641map1a_update (DC::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1642 CODE: 2049 CODE:
1643{ 2050{
1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1645 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1646 mapcell *cell; 2053 mapcell *cell;
1667 2074
1668 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
1669 2076
1670 if (flags & 8) 2077 if (flags & 8)
1671 { 2078 {
2079 uint8_t ext, cmd;
2080
1672 if (extmap) 2081 do
1673 { 2082 {
1674 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
1675 2085
1676 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
1677 { 2089 {
1678 ext = *data++;
1679 cmd = ext & 0x3f;
1680
1681 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health
1684 {
1685 cell->stat_width = 1; 2090 cell->stat_width = 1;
1686 cell->stat_hp = *data++; 2091 cell->stat_hp = *data++;
1687 }
1688 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47)
1691 {
1692 if (*data == 4)
1693 ; // decode player count
1694
1695 data += *data + 1;
1696 }
1697 else if (cmd == 8) // cell flags
1698 cell->flags = *data++;
1699 else if (ext & 0x40) // unknown, multibyte => skip
1700 data += *data + 1;
1701 else
1702 data++;
1703 } 2092 }
1704 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++;
1705 } 2110 }
1706 else 2111 while (ext & 0x80);
1707 cell->darkness = *data++ + 1;
1708 } 2112 }
1709 2113
1710 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
1711 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
1712 { 2116 {
1713 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
1714 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
1715 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
1716 2120
1717 if (cell->tile [z]) 2121 if (cell->tile[z])
1718 { 2122 {
1719 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2124 tex.unused = 0;
1720 if (!tex->name) 2125 if (!tex.name)
1721 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
1722 2127
1723 if (tex->smoothtile) 2128 if (tex.smoothtile)
1724 { 2129 {
1725 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2131 smooth.unused = 0;
1726 if (!smooth->name) 2132 if (!smooth.name)
1727 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
1728 } 2134 }
1729 } 2135 }
1730 } 2136 }
1731 } 2137 }
1732 else 2138 else
1733 cell->darkness = 0; 2139 CELL_CLEAR (cell);
1734 } 2140 }
1735} 2141}
1736 OUTPUT: 2142 OUTPUT:
1737 RETVAL 2143 RETVAL
1738 2144
1758 ? self->row + y 2164 ? self->row + y
1759 : 0; 2165 : 0;
1760 2166
1761 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
1762 { 2168 {
1763 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
1764 2170
1765 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
1766 { 2172 {
1767 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
1768 2174
1770 { 2176 {
1771 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
1772 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
1773 int a1 = tex.a; 2179 int a1 = tex.a;
1774 2180
1775 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
1776 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
1777 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
1778 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
1779 } 2185 }
1780 } 2186 }
1781 2187
1782 *map++ = (r ) 2188 *map++ = (r )
1783 | (g << 8) 2189 | (g << 8)
1784 | (b << 16) 2190 | (b << 16)
1785 | (a << 24); 2191 | (a << 24);
1786 } 2192 }
1787 } 2193 }
1788 2194
1789 RETVAL = map_sv; 2195 RETVAL = map_sv;
1790} 2196}
1791 OUTPUT: 2197 OUTPUT:
1792 RETVAL 2198 RETVAL
1793 2199
1794void 2200void
1795draw (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)
1796 CODE: 2202 CODE:
1797{ 2203{
1798 int x, y, z; 2204 int x, y, z;
1799 2205
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1802 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2206 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1803 smooth_key skey; 2207 int pl_x, pl_y;
1804 2208 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2210 rc_t rc_ov;
1806 rc_key_t key; 2211 rc_key_t key;
1807 rc_array_t *arr; 2212 rc_t::array_t *arr;
1808 2213
2214 pl_tex.name = 0;
2215
1809 // thats current max. sorry. 2216 // that's current max. sorry.
1810 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
1812
1813 // clear key, in case of extra padding
1814 memset (&skey, 0, sizeof (skey));
1815 2219
1816 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
1817 key.r = 255; 2221 key.r = 255;
1818 key.g = 255; 2222 key.g = 255;
1819 key.b = 255; 2223 key.b = 255;
1820 key.a = 255; 2224 key.a = 255;
1821 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1822 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1823 key.texname = -1;
1824 2227
1825 mx += self->x; 2228 mx += self->x;
1826 my += self->y; 2229 my += self->y;
1827 2230
1828 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1829 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
1830 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
1831 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1832 2235
1833 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
1834 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
1835 { 2238 {
1836 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
1851 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1852 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1853 2256
1854 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1855 { 2258 {
1856 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;
1857 2263
1858 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
1860 { 2266 {
1861 maprow *row = self->row + (y + my); 2267 maprow *row = self->row + (y + my);
1871 maptex tex = self->tex [tile]; 2277 maptex tex = self->tex [tile];
1872 int px, py; 2278 int px, py;
1873 2279
1874 if (key.texname != tex.name) 2280 if (key.texname != tex.name)
1875 { 2281 {
2282 self->tex [tile].unused = 0;
2283
1876 if (!tex.name) 2284 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1878 2286
1879 key.texname = tex.name; 2287 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
1881 } 2289 }
1882 2290
1883 px = (x + 1) * T - tex.w; 2291 px = (x + 1) * Th - tex.w;
1884 py = (y + 1) * T - tex.h; 2292 py = (y + 1) * Tw - tex.h;
1885 2293
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1888 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1889 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890
1891 if (cell->flags && z == 2)
1892 { 2295 {
1893 // overlays such as the speech bubble, probably more to come 2296 pl_x = px;
1894 if (cell->flags & 1) 2297 pl_y = py;
2298 pl_tex = tex;
1895 { 2299 continue;
1896 maptex tex = self->tex [1];
1897 int px = x * T + T * 2 / 32;
1898 int py = y * T - T * 6 / 32;
1899
1900 if (tex.name)
1901 {
1902 if (key.texname != tex.name)
1903 {
1904 key.texname = tex.name;
1905 arr = rc_array (rc, &key);
1906 }
1907
1908 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1909 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1910 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1911 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1912 }
1913 }
1914 } 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);
1915 2306
1916 // update smooth hash 2307 // update smooth hash
1917 if (tex.smoothtile) 2308 if (tex.smoothtile)
1918 { 2309 {
1919 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
1920 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
1921 2312
1922 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
1923 2314
1924 // 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
1925 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
1926 2317
1927 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
1935 2326
1936 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1937 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
1938 2329
1939 // full tile 2330 // full tile
1940 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);
1941 2332
1942 // borders 2333 // borders
1943 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);
1944 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);
1945 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);
1946 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);
1947 2338
1948 // corners 2339 // corners
1949 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);
1950 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);
1951 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);
1952 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);
1953 } 2364 }
1954 } 2365 }
1955 } 2366 }
1956 } 2367 }
1957 2368
1958 rc_draw (rc); 2369 rc.draw ();
1959 rc_clear (rc); 2370 rc.clear ();
1960 2371
1961 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
1962 // this is basically counting sort 2373 // this is basically counting sort
1963 { 2374 {
1964 int w, b; 2375 int w, b;
1965 2376
1966 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
1967 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
1968 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)
1969 { 2382 {
1970 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
1971 if (smask) 2384 IV bits = it->second;
1972 for (b = 0; b < 32; ++b) 2385
1973 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
1974 { 2389 {
1975 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
1976 HE *he; 2398 if (tex.name)
1977
1978 hv_iterinit (smooth);
1979 while ((he = hv_iternext (smooth)))
1980 { 2399 {
1981 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
1982 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
1983 2402 if (key.texname != tex.name)
1984 if (!(bits & 0x1000)
1985 && skey->level == level
1986 && level > smooth_max [skey->x][skey->y])
1987 { 2403 {
1988 maptex tex = self->tex [skey->tile]; 2404 self->tex [skey.tile].unused = 0;
1989 int px = (((int)skey->x) - 1) * T;
1990 int py = (((int)skey->y) - 1) * T;
1991 int border = bits & 15;
1992 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1993 float dx = tex.s * .0625f; // 16 images/row
1994 float dy = tex.t * .5f ; // 2 images/column
1995 2405
1996 if (tex.name)
1997 {
1998 // this time avoiding texture state changes
1999 // save gobs of state changes.
2000 if (key.texname != tex.name)
2001 {
2002 glEnd (); 2406 glEnd ();
2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2004 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2005 } 2409 }
2006 2410
2007 if (border) 2411 if (border)
2008 { 2412 {
2009 float ox = border * dx; 2413 float ox = border * dx;
2010 2414
2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2015 } 2419 }
2016 2420
2017 if (corner) 2421 if (corner)
2018 { 2422 {
2019 float ox = corner * dx; 2423 float ox = corner * dx;
2020 2424
2021 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2025 }
2026 }
2027 } 2429 }
2028 } 2430 }
2029 } 2431 }
2030 } 2432 }
2031 2433
2032 glEnd (); 2434 glEnd ();
2033 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1; 2436 key.texname = -1;
2035 } 2437 }
2036
2037 hv_clear (smooth);
2038 } 2438 }
2039 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
2040 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2041 rc_free (rc);
2042 2461
2043 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2044 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2046 { 2465 {
2049 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2050 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2051 { 2470 {
2052 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2053 2472
2054 int px = x * T; 2473 int px = x * Tw;
2055 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 }
2056 2481
2057 if (cell->stat_hp) 2482 if (cell->stat_hp)
2058 { 2483 {
2059 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2060 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2061 2486
2062 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2063 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2064 px + width - 1, py); 2489 px + width - 1, py);
2065 2490
2071 } 2496 }
2072 } 2497 }
2073} 2498}
2074 2499
2075void 2500void
2076draw_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)
2077 CODE: 2502 CODE:
2078{ 2503{
2079 static float color[16][3] = { 2504 static float color[16][3] = {
2080 { 0.00F, 0.00F, 0.00F }, 2505 { 0.00f, 0.00f, 0.00f },
2081 { 1.00F, 1.00F, 1.00F }, 2506 { 1.00f, 1.00f, 1.00f },
2082 { 0.00F, 0.00F, 0.55F }, 2507 { 0.00f, 0.00f, 0.55f },
2083 { 1.00F, 0.00F, 0.00F }, 2508 { 1.00f, 0.00f, 0.00f },
2084 2509
2085 { 1.00F, 0.54F, 0.00F }, 2510 { 1.00f, 0.54f, 0.00f },
2086 { 0.11F, 0.56F, 1.00F }, 2511 { 0.11f, 0.56f, 1.00f },
2087 { 0.93F, 0.46F, 0.00F }, 2512 { 0.93f, 0.46f, 0.00f },
2088 { 0.18F, 0.54F, 0.34F }, 2513 { 0.18f, 0.54f, 0.34f },
2089 2514
2090 { 0.56F, 0.73F, 0.56F }, 2515 { 0.56f, 0.73f, 0.56f },
2091 { 0.80F, 0.80F, 0.80F }, 2516 { 0.80f, 0.80f, 0.80f },
2092 { 0.55F, 0.41F, 0.13F }, 2517 { 0.55f, 0.41f, 0.13f },
2093 { 0.99F, 0.77F, 0.26F }, 2518 { 0.99f, 0.77f, 0.26f },
2094 2519
2095 { 0.74F, 0.65F, 0.41F }, 2520 { 0.74f, 0.65f, 0.41f },
2096 2521
2097 { 0.00F, 1.00F, 1.00F }, 2522 { 0.00f, 1.00f, 1.00f },
2098 { 1.00F, 0.00F, 1.00F }, 2523 { 1.00f, 0.00f, 1.00f },
2099 { 1.00F, 1.00F, 0.00F }, 2524 { 1.00f, 1.00f, 0.00f },
2100 }; 2525 };
2101 2526
2102 int x, y; 2527 int x, y;
2103 2528
2104 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 */
2105 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2536 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2106 glEnable (GL_BLEND); 2537 glEnable (GL_BLEND);
2107 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2538 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2108 glBegin (GL_QUADS); 2539 glBegin (GL_QUADS);
2109 2540
2110 for (y = 0; y < h; y++) 2541 for (y = 0; y < h; y++)
2114 2545
2115 if (m) 2546 if (m)
2116 { 2547 {
2117 float *c = color [m & 15]; 2548 float *c = color [m & 15];
2118 2549
2119 float tx1 = m & 0x40 ? 0.5 : 0.; 2550 float tx1 = m & 0x40 ? 0.5f : 0.f;
2120 float tx2 = tx1 + 0.5; 2551 float tx2 = tx1 + 0.5f;
2121 2552
2122 glColor4f (c[0], c[1], c[2], 0.75); 2553 glColor4f (c[0], c[1], c[2], 1);
2123 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2554 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2124 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2555 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2125 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2556 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2126 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2557 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2127 } 2558 }
2135void 2566void
2136fow_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)
2137 PPCODE: 2568 PPCODE:
2138{ 2569{
2139 int x, y; 2570 int x, y;
2140 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2141 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2142 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2143 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);
2144 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2145 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2578 memset (darkness1, 0, sw1*sh1);
2146 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147 2579
2148 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2149 SvCUR_set (darkness3_sv, sw34 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2150 2582
2151 mx += self->x - 1; 2583 mx += self->x - 1;
2152 my += self->y - 1; 2584 my += self->y - 1;
2153
2154 memset (darkness1, 255, sw1 * sh1);
2155 2585
2156 for (y = 0; y < sh1; y++) 2586 for (y = 0; y < sh1; y++)
2157 if (0 <= y + my && y + my < self->rows) 2587 if (0 <= y + my && y + my < self->rows)
2158 { 2588 {
2159 maprow *row = self->row + (y + my); 2589 maprow *row = self->row + (y + my);
2162 if (row->c0 <= x + mx && x + mx < row->c1) 2592 if (row->c0 <= x + mx && x + mx < row->c1)
2163 { 2593 {
2164 mapcell *cell = row->col + (x + mx - row->c0); 2594 mapcell *cell = row->col + (x + mx - row->c0);
2165 2595
2166 darkness1 [y * sw1 + x] = cell->darkness 2596 darkness1 [y * sw1 + x] = cell->darkness
2167 ? 255 - (cell->darkness - 1) 2597 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2168 : 255 - FOW_DARKNESS; 2598 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2169 } 2599 }
2170 } 2600 }
2171 2601
2172 for (y = 0; y < sh; ++y) 2602 for (y = 0; y < sh; ++y)
2173 for (x = 0; x < sw; ++x) 2603 for (x = 0; x < sw; ++x)
2192 2622
2193 uint8_t r13 = (d13 + d23 + d12) / 3; 2623 uint8_t r13 = (d13 + d23 + d12) / 3;
2194 uint8_t r23 = d23; 2624 uint8_t r23 = d23;
2195 uint8_t r33 = (d23 + d33 + d32) / 3; 2625 uint8_t r33 = (d23 + d33 + d32) / 3;
2196 2626
2197 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2198 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2199 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2629 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2200 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2201 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 */
2202 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2632 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2203 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2204 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2205 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2635 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2206 } 2636 }
2207 2637
2208 free (darkness1); 2638 free (darkness1);
2209 2639
2210 EXTEND (SP, 3); 2640 EXTEND (SP, 3);
2211 PUSHs (sv_2mortal (newSViv (sw34))); 2641 PUSHs (sv_2mortal (newSViv (sw3)));
2212 PUSHs (sv_2mortal (newSViv (sh3))); 2642 PUSHs (sv_2mortal (newSViv (sh3)));
2213 PUSHs (darkness3_sv); 2643 PUSHs (darkness3_sv);
2214} 2644}
2215 2645
2216SV * 2646SV *
2279 else 2709 else
2280 *data++ = 0; 2710 *data++ = 0;
2281 } 2711 }
2282 } 2712 }
2283 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 {
2284 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2719 }
2720
2286 RETVAL = data_sv; 2721 RETVAL = data_sv;
2287} 2722}
2288 OUTPUT: 2723 OUTPUT:
2289 RETVAL 2724 RETVAL
2290 2725
2291void 2726void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2727set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2728 PPCODE:
2294{ 2729{
2295 int x, y, z; 2730 int x, y, z;
2296 int w, h; 2731 int w, h;
2297 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;
2298 2743
2299 if (*data++ != 0) 2744 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2745 XSRETURN_EMPTY; /* version mismatch */
2301 2746
2302 w = *data++ << 8; w |= *data++; 2747 w = *data++ << 8; w |= *data++;
2317 { 2762 {
2318 maprow *row = map_get_row (self, y); 2763 maprow *row = map_get_row (self, y);
2319 2764
2320 for (x = x0; x < x1; x++) 2765 for (x = x0; x < x1; x++)
2321 { 2766 {
2767 uint8_t flags;
2768
2769 if (data + 7 >= end)
2770 XSRETURN_EMPTY;
2771
2322 uint8_t flags = *data++; 2772 flags = *data++;
2323 2773
2324 if (flags) 2774 if (flags)
2325 { 2775 {
2326 mapcell *cell = row_get_cell (row, x); 2776 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2777 tileid tile[3] = { 0, 0, 0 };
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2780 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2781 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2782
2333 if (cell->darkness == 0) 2783 if (cell->darkness == 0)
2334 { 2784 {
2335 cell->darkness = 0; 2785 /*cell->darkness = 0;*/
2786 EXTEND (SP, 3);
2336 2787
2337 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2338 { 2789 {
2339 tileid t = tile [z]; 2790 tileid t = tile [z];
2340 2791
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2342 { 2793 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2345 } 2796 }
2346 2797
2347 cell->tile [z] = t; 2798 cell->tile[z] = t;
2348 } 2799 }
2349 } 2800 }
2350 } 2801 }
2351 } 2802 }
2352 } 2803 }
2353} 2804}
2354 2805
2355MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2356 2807
2357DC::RW 2808DC::RW
2358new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2359 CODE: 2810 CODE:
2360{ 2811{
2361 STRLEN datalen; 2812 STRLEN datalen;
2362 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2363 2814
2365} 2816}
2366 OUTPUT: 2817 OUTPUT:
2367 RETVAL 2818 RETVAL
2368 2819
2369DC::RW 2820DC::RW
2370new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2371 CODE: 2822 CODE:
2372 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2373 OUTPUT: 2824 OUTPUT:
2374 RETVAL 2825 RETVAL
2375 2826
2393 if (RETVAL < 0) 2844 if (RETVAL < 0)
2394 { 2845 {
2395 RETVAL = Mix_GroupOldest (-1); 2846 RETVAL = Mix_GroupOldest (-1);
2396 2847
2397 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)
2398 XSRETURN_UNDEF; 2854 XSRETURN_UNDEF;
2399 2855 }
2856 else
2400 Mix_HaltChannel (RETVAL); 2857 Mix_HaltChannel (RETVAL);
2401 } 2858 }
2402 2859
2403 Mix_UnregisterAllEffects (RETVAL); 2860 Mix_UnregisterAllEffects (RETVAL);
2404 Mix_Volume (RETVAL, 128); 2861 Mix_Volume (RETVAL, 128);
2405} 2862}
2452void 2909void
2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2910set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2454 CODE: 2911 CODE:
2455{ 2912{
2456 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));
2457 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;
2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2915 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459} 2916}
2460 2917
2461void 2918void
2462set_reverse_stereo (DC::Channel self, int flip) 2919set_reverse_stereo (DC::Channel self, int flip)
2465 2922
2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2467 2924
2468PROTOTYPES: DISABLE 2925PROTOTYPES: DISABLE
2469 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
2470DC::MixChunk 2939DC::MixChunk
2471new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2472 CODE: 2941 CODE:
2473 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2474 OUTPUT: 2943 OUTPUT:
2475 RETVAL 2944 RETVAL
2476 2945
2506 OUTPUT: 2975 OUTPUT:
2507 RETVAL 2976 RETVAL
2508 2977
2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2978MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2510 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
2511int 2992int
2512volume (int volume = -1) 2993volume (int volume = -1)
2513 PROTOTYPE: ;$ 2994 PROTOTYPE: ;$
2514 CODE: 2995 CODE:
2515 if (items > 0) 2996 if (items > 0)
2526void 3007void
2527halt () 3008halt ()
2528 CODE: 3009 CODE:
2529 Mix_HaltMusic (); 3010 Mix_HaltMusic ();
2530 3011
3012int
3013playing ()
3014 CODE:
3015 RETVAL = Mix_PlayingMusic ();
3016 OUTPUT:
3017 RETVAL
3018
2531DC::MixMusic 3019DC::MixMusic
2532new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
2533 CODE: 3021 CODE:
2534 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2535 OUTPUT: 3023 OUTPUT:
2536 RETVAL 3024 RETVAL
2537 3025
2565 } *civ, const_iv[] = { 3053 } *civ, const_iv[] = {
2566# define const_iv(name) { # name, (IV)name } 3054# define const_iv(name) { # name, (IV)name }
2567 const_iv (GL_VENDOR), 3055 const_iv (GL_VENDOR),
2568 const_iv (GL_VERSION), 3056 const_iv (GL_VERSION),
2569 const_iv (GL_EXTENSIONS), 3057 const_iv (GL_EXTENSIONS),
3058 const_iv (GL_MAX_TEXTURE_UNITS),
2570 const_iv (GL_COLOR_MATERIAL), 3059 const_iv (GL_COLOR_MATERIAL),
2571 const_iv (GL_SMOOTH), 3060 const_iv (GL_SMOOTH),
2572 const_iv (GL_FLAT), 3061 const_iv (GL_FLAT),
2573 const_iv (GL_DITHER), 3062 const_iv (GL_DITHER),
2574 const_iv (GL_BLEND), 3063 const_iv (GL_BLEND),
2586 const_iv (GL_ZERO), 3075 const_iv (GL_ZERO),
2587 const_iv (GL_SRC_ALPHA), 3076 const_iv (GL_SRC_ALPHA),
2588 const_iv (GL_DST_ALPHA), 3077 const_iv (GL_DST_ALPHA),
2589 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3078 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2590 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),
2591 const_iv (GL_SRC_ALPHA_SATURATE), 3084 const_iv (GL_SRC_ALPHA_SATURATE),
2592 const_iv (GL_RGB), 3085 const_iv (GL_RGB),
2593 const_iv (GL_RGBA), 3086 const_iv (GL_RGBA),
2594 const_iv (GL_RGBA4), 3087 const_iv (GL_RGBA4),
2595 const_iv (GL_RGBA8), 3088 const_iv (GL_RGBA8),
2663 const_iv (GL_NICEST), 3156 const_iv (GL_NICEST),
2664 const_iv (GL_V2F), 3157 const_iv (GL_V2F),
2665 const_iv (GL_V3F), 3158 const_iv (GL_V3F),
2666 const_iv (GL_T2F_V3F), 3159 const_iv (GL_T2F_V3F),
2667 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),
2668# undef const_iv 3164# undef const_iv
2669 }; 3165 };
2670 3166
2671 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--)
2672 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2673 3169
2674 texture_av = newAV (); 3170 texture_av = newAV ();
2675 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
2676} 3172}
2677 3173
2679disable_GL_EXT_blend_func_separate () 3175disable_GL_EXT_blend_func_separate ()
2680 CODE: 3176 CODE:
2681 gl.BlendFuncSeparate = 0; 3177 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
2683 3179
2684char * 3180void
3181apple_nvidia_bug (int enable)
3182
3183const char *
2685gl_vendor () 3184gl_vendor ()
2686 CODE: 3185 CODE:
2687 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
2688 OUTPUT: 3187 OUTPUT:
2689 RETVAL 3188 RETVAL
2690 3189
2691char * 3190const char *
2692gl_version () 3191gl_version ()
2693 CODE: 3192 CODE:
2694 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
2695 OUTPUT: 3194 OUTPUT:
2696 RETVAL 3195 RETVAL
2697 3196
2698char * 3197const char *
2699gl_extensions () 3198gl_extensions ()
2700 CODE: 3199 CODE:
2701 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2702 OUTPUT: 3201 OUTPUT:
2703 RETVAL 3202 RETVAL
2704 3203
2705const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
2706 3209
2707GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
2708 CODE: 3211 CODE:
2709 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
2710 OUTPUT: 3213 OUTPUT:
2718 3221
2719int glGetError () 3222int glGetError ()
2720 3223
2721void glFinish () 3224void glFinish ()
2722 3225
3226void glFlush ()
3227
2723void glClear (int mask) 3228void glClear (int mask)
2724 3229
2725void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
2726 PROTOTYPE: @ 3231 PROTOTYPE: @
2727 3232
2736void glBlendFunc (int sfactor, int dfactor) 3241void glBlendFunc (int sfactor, int dfactor)
2737 3242
2738void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3243void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2739 CODE: 3244 CODE:
2740 gl_BlendFuncSeparate (sa, da, saa, daa); 3245 gl_BlendFuncSeparate (sa, da, saa, daa);
3246
3247# void glBlendEquation (int se)
2741 3248
2742void glDepthMask (int flag) 3249void glDepthMask (int flag)
2743 3250
2744void glLogicOp (int opcode) 3251void glLogicOp (int opcode)
2745 3252
2780void glRotate (float angle, float x, float y, float z) 3287void glRotate (float angle, float x, float y, float z)
2781 CODE: 3288 CODE:
2782 glRotatef (angle, x, y, z); 3289 glRotatef (angle, x, y, z);
2783 3290
2784void 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: @
2785 ALIAS: 3293 ALIAS:
2786 glColor_premultiply = 1 3294 glColor_premultiply = 1
2787 CODE: 3295 CODE:
2788 if (ix) 3296 if (ix)
2789 { 3297 {
2895 3403
2896void glEndList () 3404void glEndList ()
2897 3405
2898void glCallList (int list) 3406void glCallList (int list)
2899 3407
3408void c_init ()
3409 CODE:
3410 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3411 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3412
2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3413MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2901 3414
2902PROTOTYPES: DISABLE 3415PROTOTYPES: DISABLE
2903 3416
2904void 3417void
2905find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
2906 PPCODE: 3419 PPCODE:
2907{ 3420{
2908 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
2909 XPUSHs (self); 3422 XPUSHs (self);
2910} 3423}
2911 3424
2912BOOT: 3425BOOT:
2913{ 3426{
2921 3434
2922void 3435void
2923draw (SV *self) 3436draw (SV *self)
2924 CODE: 3437 CODE:
2925{ 3438{
2926 HV *hv; 3439 HV *hv;
2927 SV **svp; 3440 SV **svp;
2928 NV x, y, w, h; 3441 NV x, y, w, h;
2929 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
2930 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
2931 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
2932 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