ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.249 by root, Fri Dec 28 15:40:07 2007 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 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 int faces; tileid *face2tile; // [faceid]
239 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
240 294
241 int32_t rows; 295 int32_t rows;
242 maprow *row; 296 maprow *row;
243} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
244 300
245static char * 301static char *
246prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
247{ 303{
248 char *p; 304 char *p;
… …
266 322
267#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#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)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
269 325
270static void 326static void
271need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
272{ 328{
273 while (self->faces <= face) 329 while (self->faces <= face)
274 { 330 {
275 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
276 self->faces *= 2; 332 self->faces *= 2;
277 } 333 }
278} 334}
279 335
280static void 336static void
281need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
282{ 338{
283 while (self->texs <= texid) 339 while (self->texs <= texid)
284 { 340 {
285 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
286 self->texs *= 2; 342 self->texs *= 2;
287 } 343 }
288} 344}
289 345
290static maprow * 346static maprow *
291map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
292{ 348{
293 if (0 > y) 349 if (0 > y)
294 { 350 {
295 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
296 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
… …
334 390
335 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
336} 392}
337 393
338static mapcell * 394static mapcell *
339map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
340{ 396{
341 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
342} 398}
343 399
344static void 400static void
345map_clear (DC__Map self) 401map_clear (mapgrid *self)
346{ 402{
347 int r; 403 int r;
348 404
349 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
350 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
… …
357 self->oy = 0; 413 self->oy = 0;
358 self->row = 0; 414 self->row = 0;
359 self->rows = 0; 415 self->rows = 0;
360} 416}
361 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
362static void 428static void
363map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
364{ 430{
365 int x, y; 431 int x, y;
366 maprow *row; 432 maprow *row;
367 mapcell *cell; 433 mapcell *cell;
368 434
… …
380 if (x >= row->c1) 446 if (x >= row->c1)
381 break; 447 break;
382 448
383 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
384 450
385 cell->darkness = 0; 451 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 452 }
390 } 453 }
391} 454}
392 455
393typedef struct { 456struct smooth_key
457{
394 tileid tile; 458 tileid tile;
395 uint8_t x, y, level; 459 uint8_t x, y, level;
396} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
397 479
398static void 480static void
399smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
400{ 482{
401 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
402 484
403 if (SvIOK (*sv)) 485 if (it == h.end ())
404 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
405 else 487 else
406 sv_setiv (*sv, bits); 488 it->second |= bits;
407} 489}
408 490
409static void 491static void
410music_finished (void) 492music_finished (void)
411{ 493{
… …
428 ev.code = 1; 510 ev.code = 1;
429 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
430 ev.data2 = 0; 512 ev.data2 = 0;
431 513
432 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
433} 522}
434 523
435static unsigned int 524static unsigned int
436minpot (unsigned int n) 525minpot (unsigned int n)
437{ 526{
… …
504 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
505 return 0; 594 return 0;
506 595
507 return 1; 596 return 1;
508} 597}
598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
509 656
510MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
511 658
512PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
513 660
… …
542 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
543 690
544 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
545 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
546 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
547 744
548 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
550 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
551 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
… …
627 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
628 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
631 828
829 const_iv (KMOD_LRAM),
830
632 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
832
833 const_iv (SDL_INIT_TIMER),
834 const_iv (SDL_INIT_AUDIO),
835 const_iv (SDL_INIT_VIDEO),
836 const_iv (SDL_INIT_CDROM),
837 const_iv (SDL_INIT_JOYSTICK),
838 const_iv (SDL_INIT_EVERYTHING),
839 const_iv (SDL_INIT_NOPARACHUTE),
840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
633# undef const_iv 861# undef const_iv
634 }; 862 };
635 863
636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
638 866
639 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
640 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
641} 869}
642 870
… …
658NV ceil (NV x) 886NV ceil (NV x)
659 887
660IV minpot (UV n) 888IV minpot (UV n)
661 889
662IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
663 897
664void 898void
665pango_init () 899pango_init ()
666 CODE: 900 CODE:
667{ 901{
668 opengl_fontmap = pango_opengl_font_map_new (); 902 opengl_fontmap = pango_opengl_font_map_new ();
669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 903 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); 904 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 905 /*pango_context_set_font_description (opengl_context, default_font);*/
906#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR); 908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 909#endif
675} 910}
676 911
677char *
678SDL_GetError () 912char *SDL_GetError ()
679 913
680int 914void SDL_main_hack (SV *real_main)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
682 916
683void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
684SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
685 934
686void 935void
687SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
688 PPCODE: 937 PPCODE:
689{ 938{
… …
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 953
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 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); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 956
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 958
713 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
714 while (*m) 960 while (*m)
715 { 961 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 963 {
718 AV *av = newAV (); 964 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
… …
744 ); 990 );
745 991
746 if (RETVAL) 992 if (RETVAL)
747 { 993 {
748 av_clear (texture_av); 994 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); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
752#include "glfunc.h" 996#include "glfunc.h"
753#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
754 } 1000 }
755} 1001}
756 OUTPUT: 1002 OUTPUT:
757 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
758 1007
759void 1008void
760SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
761 1010
762char * 1011char *
763SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
764 1014
765int 1015int
766SDL_GetAppState () 1016SDL_GetAppState ()
767 1017
1018int
1019SDL_GetModState ()
1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
768void 1025void
1026SDL_PumpEvents ()
1027
1028void
769poll_events () 1029peep_events ()
770 PPCODE: 1030 PPCODE:
771{ 1031{
772 SDL_Event ev; 1032 SDL_Event ev;
773 1033
774 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
… …
781 { 1041 {
782 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
783 case SDL_KEYUP: 1043 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1046 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 */ 1047 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); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 1049 break;
790 1050
791 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
810 x = ev.motion.x; 1070 x = ev.motion.x;
811 y = ev.motion.y; 1071 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 1073 }
814 1074
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 1081 }
822 break; 1082 break;
823 1083
824 case SDL_MOUSEBUTTONDOWN: 1084 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 1085 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1086 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 1087
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1088 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1089 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1090 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1091 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
840 1100
841 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
842 } 1102 }
843} 1103}
844 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
845int 1118int
846Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
847 POSTCALL: 1120 POSTCALL:
848 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
849 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
850 1123
851void 1124void
852Mix_QuerySpec () 1125Mix_QuerySpec ()
… …
905 } 1178 }
906 } 1179 }
907#endif 1180#endif
908} 1181}
909 1182
910void 1183int
911add_font (char *file) 1184add_font (char *file)
912 CODE: 1185 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1187 OUTPUT:
1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
914 1196
915void 1197void
916load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
917 ALIAS: 1199 ALIAS:
918 load_image_file = 1 1200 load_image_file = 1
… …
964 1246
965 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
966 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
967 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
968 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
969 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 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))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
971 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
972 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
973 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
974 1256
… …
1034#if DEBUG 1316#if DEBUG
1035 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1036#endif 1318#endif
1037} 1319}
1038 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1039MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1040 1329
1041PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1042 1331
1043DC::Font 1332DC::Font
1044new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1045 CODE: 1334 CODE:
1046{ 1335{
1047 int count; 1336 int count;
1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1049 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1078 PROTOTYPE: 1367 PROTOTYPE:
1079 CODE: 1368 CODE:
1080 tc_restore (); 1369 tc_restore ();
1081 1370
1082DC::Layout 1371DC::Layout
1083new (SV *class) 1372new (SV *klass)
1084 CODE: 1373 CODE:
1085 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1086 1375
1087 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1088 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1089 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1090 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1091 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1092 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1093 RETVAL->font = 0; 1382 RETVAL->font = 0;
1094 RETVAL->rc = rc_alloc ();
1095 1383
1096 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1097 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1098 OUTPUT: 1386 OUTPUT:
1099 RETVAL 1387 RETVAL
1100 1388
1101void 1389void
1102DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1103 CODE: 1391 CODE:
1104 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1105 rc_free (self->rc);
1106 Safefree (self); 1393 delete self;
1107 1394
1108void 1395void
1109set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1110 CODE: 1397 CODE:
1111{ 1398{
… …
1237 1524
1238void 1525void
1239set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1240 CODE: 1527 CODE:
1241 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1242 { 1529 {
1243 self->base_height = base_height; 1530 self->base_height = base_height;
1244 layout_update_font (self); 1531 layout_update_font (self);
1245 } 1532 }
1246 1533
1247void 1534void
… …
1312 1599
1313void 1600void
1314cursor_pos (DC::Layout self, int index) 1601cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1602 PPCODE:
1316{ 1603{
1317 PangoRectangle strong_pos; 1604 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1605 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1606
1320 EXTEND (SP, 3); 1607 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1608 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1609 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1324} 1611}
1325 1612
1326void 1613void
1327index_to_line_x (DC::Layout self, int index, int trailing = 0) 1614index_to_line_x (DC::Layout self, int index, int trailing = 0)
1328 PPCODE: 1615 PPCODE:
1329{ 1616{
1330 int line, x; 1617 int line, x;
1331 1618
1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1619 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1620#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1621 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1622 --line;
1336#endif 1623#endif
1337 EXTEND (SP, 2); 1624 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1625 PUSHs (sv_2mortal (newSViv (line)));
… …
1365} 1652}
1366 1653
1367void 1654void
1368render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1369 CODE: 1656 CODE:
1370 rc_clear (self->rc); 1657 self->rc.clear ();
1371 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1372 self->pl, 1659 self->pl,
1373 self->rc, 1660 &self->rc,
1374 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1375 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1376 flags 1663 flags
1377 ); 1664 );
1378 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
… …
1389 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1390 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1391 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1392 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1393 1680
1394 rc_draw (self->rc); 1681 self->rc.draw ();
1395 1682
1396 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1397 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1398 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1399} 1686}
… …
1474 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1475 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1476 } 1763 }
1477} 1764}
1478 1765
1766void
1767draw_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)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1479IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1480 CODE: 1888 CODE:
1481{ 1889{
1482 GLint width; 1890 GLint width;
1483 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1490MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1491 1899
1492PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1493 1901
1494DC::Map 1902DC::Map
1495new (SV *class) 1903new (SV *klass)
1496 CODE: 1904 CODE:
1497 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1498 RETVAL->x = 0; 1906 RETVAL->x = 0;
1499 RETVAL->y = 0; 1907 RETVAL->y = 0;
1500 RETVAL->w = 0; 1908 RETVAL->w = 0;
1501 RETVAL->h = 0; 1909 RETVAL->h = 0;
1502 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
… …
1539 1947
1540void 1948void
1541set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1542 CODE: 1950 CODE:
1543{ 1951{
1544 tileid texid; 1952 tileid texid;
1545 maptex *tex; 1953 maptex *tex;
1546 1954
1547 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1548 return; 1956 return;
1549 1957
1550 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1551 return; 1959 return;
1552 1960
1553 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1554 1962
1555 if (!texid) 1963 if (!texid)
1556 return; 1964 return;
1557 1965
1558 tex = self->tex + texid; 1966 tex = self->tex + texid;
… …
1587 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1995 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1588 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1589 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1591} 1999}
2000
2001void
2002expire_textures (DC::Map self, int texid, int count)
2003 PPCODE:
2004 for (; texid < self->texs && count; ++texid, --count)
2005 {
2006 maptex *tex = self->tex + texid;
2007
2008 if (tex->name)
2009 {
2010 if (tex->unused)
2011 {
2012 tex->name = 0;
2013 tex->unused = 0;
2014 XPUSHs (sv_2mortal (newSViv (texid)));
2015 }
2016 else
2017 tex->unused = 1;
2018 }
2019 }
1592 2020
1593int 2021int
1594ox (DC::Map self) 2022ox (DC::Map self)
1595 ALIAS: 2023 ALIAS:
1596 oy = 1 2024 oy = 1
… …
1636 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1637 } 2065 }
1638} 2066}
1639 2067
1640SV * 2068SV *
1641map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1642 CODE: 2070 CODE:
1643{ 2071{
1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1645 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1646 mapcell *cell; 2074 mapcell *cell;
… …
1667 2095
1668 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1669 2097
1670 if (flags & 8) 2098 if (flags & 8)
1671 { 2099 {
2100 uint8_t ext, cmd;
2101
1672 if (extmap) 2102 do
1673 { 2103 {
1674 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1675 2106
1676 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1677 { 2110 {
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; 2111 cell->stat_width = 1;
1686 cell->stat_hp = *data++; 2112 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 } 2113 }
1704 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1705 } 2131 }
1706 else 2132 while (ext & 0x80);
1707 cell->darkness = *data++ + 1;
1708 } 2133 }
1709 2134
1710 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1711 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1712 { 2137 {
… …
1715 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1716 2141
1717 if (cell->tile [z]) 2142 if (cell->tile [z])
1718 { 2143 {
1719 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1720 if (!tex->name) 2146 if (!tex->name)
1721 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1722 2148
1723 if (tex->smoothtile) 2149 if (tex->smoothtile)
1724 { 2150 {
1725 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1726 if (!smooth->name) 2153 if (!smooth->name)
1727 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1728 } 2155 }
1729 } 2156 }
1730 } 2157 }
1731 } 2158 }
1732 else 2159 else
1733 cell->darkness = 0; 2160 CELL_CLEAR (cell);
1734 } 2161 }
1735} 2162}
1736 OUTPUT: 2163 OUTPUT:
1737 RETVAL 2164 RETVAL
1738 2165
… …
1758 ? self->row + y 2185 ? self->row + y
1759 : 0; 2186 : 0;
1760 2187
1761 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1762 { 2189 {
1763 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1764 2191
1765 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1766 { 2193 {
1767 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1768 2195
… …
1770 { 2197 {
1771 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1772 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1773 int a1 = tex.a; 2200 int a1 = tex.a;
1774 2201
1775 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1776 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1777 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1778 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1779 } 2206 }
1780 } 2207 }
1781 2208
1782 *map++ = (r ) 2209 *map++ = (r )
1783 | (g << 8) 2210 | (g << 8)
1784 | (b << 16) 2211 | (b << 16)
1785 | (a << 24); 2212 | (a << 24);
1786 } 2213 }
1787 } 2214 }
1788 2215
1789 RETVAL = map_sv; 2216 RETVAL = map_sv;
1790} 2217}
1791 OUTPUT: 2218 OUTPUT:
1792 RETVAL 2219 RETVAL
1793 2220
1794void 2221void
1795draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2222draw (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: 2223 CODE:
1797{ 2224{
1798 int x, y, z; 2225 int x, y, z;
1799 2226
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) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1803 smooth_key skey; 2228 int pl_x, pl_y;
1804 2229 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1806 rc_key_t key; 2232 rc_key_t key;
1807 rc_array_t *arr; 2233 rc_t::array_t *arr;
1808 2234
2235 pl_tex.name = 0;
2236
1809 // thats current max. sorry. 2237 // that's current max. sorry.
1810 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1812
1813 // clear key, in case of extra padding
1814 memset (&skey, 0, sizeof (skey));
1815 2240
1816 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1817 key.r = 255; 2242 key.r = 255;
1818 key.g = 255; 2243 key.g = 255;
1819 key.b = 255; 2244 key.b = 255;
1820 key.a = 255; 2245 key.a = 255;
1821 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1822 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1823 key.texname = -1;
1824 2248
1825 mx += self->x; 2249 mx += self->x;
1826 my += self->y; 2250 my += self->y;
1827 2251
1828 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1829 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1830 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1831 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1832 2256
1833 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1834 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1835 { 2259 {
1836 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
… …
1851 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1852 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1853 2277
1854 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1855 { 2279 {
1856 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2283 key.texname = -1;
1857 2284
1858 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1860 { 2287 {
1861 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
… …
1871 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1872 int px, py; 2299 int px, py;
1873 2300
1874 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
1875 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1876 if (!tex.name) 2305 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1878 2307
1879 key.texname = tex.name; 2308 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
1881 } 2310 }
1882 2311
1883 px = (x + 1) * T - tex.w; 2312 px = (x + 1) * Th - tex.w;
1884 py = (y + 1) * T - tex.h; 2313 py = (y + 1) * Tw - tex.h;
1885 2314
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2315 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 { 2316 {
1893 // overlays such as the speech bubble, probably more to come 2317 pl_x = px;
1894 if (cell->flags & 1) 2318 pl_y = py;
2319 pl_tex = tex;
1895 { 2320 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 } 2321 }
2322
2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1915 2327
1916 // update smooth hash 2328 // update smooth hash
1917 if (tex.smoothtile) 2329 if (tex.smoothtile)
1918 { 2330 {
1919 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
1920 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
1921 2333
1922 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
1923 2335
1924 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
1925 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
1926 2338
1927 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
… …
1935 2347
1936 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1937 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
1938 2350
1939 // full tile 2351 // full tile
1940 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1941 2353
1942 // borders 2354 // borders
1943 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 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); 2356 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); 2357 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); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1947 2359
1948 // corners 2360 // corners
1949 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 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); 2362 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); 2363 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); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1953 } 2385 }
1954 } 2386 }
1955 } 2387 }
1956 } 2388 }
1957 2389
1958 rc_draw (rc); 2390 rc.draw ();
1959 rc_clear (rc); 2391 rc.clear ();
1960 2392
1961 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
1962 // this is basically counting sort 2394 // this is basically counting sort
1963 { 2395 {
1964 int w, b; 2396 int w, b;
1965 2397
1966 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
1967 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
1968 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1969 { 2403 {
1970 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
1971 if (smask) 2405 IV bits = it->second;
1972 for (b = 0; b < 32; ++b) 2406
1973 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
1974 { 2410 {
1975 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
1976 HE *he; 2419 if (tex.name)
1977
1978 hv_iterinit (smooth);
1979 while ((he = hv_iternext (smooth)))
1980 { 2420 {
1981 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
1982 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
1983 2423 if (key.texname != tex.name)
1984 if (!(bits & 0x1000)
1985 && skey->level == level
1986 && level > smooth_max [skey->x][skey->y])
1987 { 2424 {
1988 maptex tex = self->tex [skey->tile]; 2425 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 2426
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 (); 2427 glEnd ();
2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2004 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2005 } 2430 }
2006 2431
2007 if (border) 2432 if (border)
2008 { 2433 {
2009 float ox = border * dx; 2434 float ox = border * dx;
2010 2435
2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2015 } 2440 }
2016 2441
2017 if (corner) 2442 if (corner)
2018 { 2443 {
2019 float ox = corner * dx; 2444 float ox = corner * dx;
2020 2445
2021 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2025 }
2026 }
2027 } 2450 }
2028 } 2451 }
2029 } 2452 }
2030 } 2453 }
2031 2454
2032 glEnd (); 2455 glEnd ();
2033 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1; 2457 key.texname = -1;
2035 } 2458 }
2036
2037 hv_clear (smooth);
2038 } 2459 }
2039 2460
2461 if (pl_tex.name)
2462 {
2463 maptex tex = pl_tex;
2464 int px = pl_x + sdx;
2465 int py = pl_y + sdy;
2466
2467 key.texname = tex.name;
2468 rc_t::array_t &arr = rc.array (key);
2469
2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2474
2475 rc.draw ();
2476 }
2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2040 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2041 rc_free (rc);
2042 2482
2043 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2044 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2046 { 2486 {
… …
2049 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2050 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2051 { 2491 {
2052 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2053 2493
2054 int px = x * T; 2494 int px = x * Tw;
2055 int py = y * T; 2495 int py = y * Th;
2496
2497 if (expect_false (cell->player == player))
2498 {
2499 px += sdx;
2500 py += sdy;
2501 }
2056 2502
2057 if (cell->stat_hp) 2503 if (cell->stat_hp)
2058 { 2504 {
2059 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2060 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2061 2507
2062 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2063 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2064 px + width - 1, py); 2510 px + width - 1, py);
2065 2511
… …
2071 } 2517 }
2072 } 2518 }
2073} 2519}
2074 2520
2075void 2521void
2076draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2077 CODE: 2523 CODE:
2078{ 2524{
2079 static float color[16][3] = { 2525 static float color[16][3] = {
2080 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2081 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2082 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2083 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2084 2530
2085 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2086 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2087 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2088 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2089 2535
2090 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2091 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2092 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2093 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2094 2540
2095 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2096 2542
2097 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2098 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2099 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2100 }; 2546 };
2101 2547
2102 int x, y; 2548 int x, y;
2103 2549
2104 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
2105 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2106 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2107 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2108 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2109 2561
2110 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
… …
2114 2566
2115 if (m) 2567 if (m)
2116 { 2568 {
2117 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2118 2570
2119 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2120 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2121 2573
2122 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2123 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2124 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2125 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2126 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2127 } 2579 }
… …
2135void 2587void
2136fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2137 PPCODE: 2589 PPCODE:
2138{ 2590{
2139 int x, y; 2591 int x, y;
2140 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2141 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2142 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2143 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2144 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2145 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2146 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147 2600
2148 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2149 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2150 2603
2151 mx += self->x - 1; 2604 mx += self->x - 1;
2152 my += self->y - 1; 2605 my += self->y - 1;
2153
2154 memset (darkness1, 255, sw1 * sh1);
2155 2606
2156 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2157 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2158 { 2609 {
2159 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
… …
2162 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2163 { 2614 {
2164 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2165 2616
2166 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2167 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2168 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2169 } 2620 }
2170 } 2621 }
2171 2622
2172 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2173 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
… …
2192 2643
2193 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2194 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2195 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2196 2647
2197 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2198 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2199 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2200 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2201 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 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); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2203 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2204 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2205 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2206 } 2657 }
2207 2658
2208 free (darkness1); 2659 free (darkness1);
2209 2660
2210 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2211 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2212 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2213 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2214} 2665}
2215 2666
2216SV * 2667SV *
… …
2279 else 2730 else
2280 *data++ = 0; 2731 *data++ = 0;
2281 } 2732 }
2282 } 2733 }
2283 2734
2735 /* if size is w*h + 5 then no data has been found */
2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2737 {
2284 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2740 }
2741
2286 RETVAL = data_sv; 2742 RETVAL = data_sv;
2287} 2743}
2288 OUTPUT: 2744 OUTPUT:
2289 RETVAL 2745 RETVAL
2290 2746
2291void 2747void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2748set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2749 PPCODE:
2294{ 2750{
2295 int x, y, z; 2751 int x, y, z;
2296 int w, h; 2752 int w, h;
2297 int x1, y1; 2753 int x1, y1;
2754 STRLEN len;
2755 uint8_t *data, *end;
2756
2757 len = SvLEN (data_sv);
2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2760 end = data + len + 8;
2761
2762 if (len < 5)
2763 XSRETURN_EMPTY;
2298 2764
2299 if (*data++ != 0) 2765 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2766 XSRETURN_EMPTY; /* version mismatch */
2301 2767
2302 w = *data++ << 8; w |= *data++; 2768 w = *data++ << 8; w |= *data++;
… …
2317 { 2783 {
2318 maprow *row = map_get_row (self, y); 2784 maprow *row = map_get_row (self, y);
2319 2785
2320 for (x = x0; x < x1; x++) 2786 for (x = x0; x < x1; x++)
2321 { 2787 {
2788 uint8_t flags;
2789
2790 if (data + 7 >= end)
2791 XSRETURN_EMPTY;
2792
2322 uint8_t flags = *data++; 2793 flags = *data++;
2323 2794
2324 if (flags) 2795 if (flags)
2325 { 2796 {
2326 mapcell *cell = row_get_cell (row, x); 2797 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2798 tileid tile[3] = { 0, 0, 0 };
… …
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2801 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2802 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2803
2333 if (cell->darkness == 0) 2804 if (cell->darkness == 0)
2334 { 2805 {
2335 cell->darkness = 0; 2806 /*cell->darkness = 0;*/
2807 EXTEND (SP, 3);
2336 2808
2337 for (z = 0; z <= 2; z++) 2809 for (z = 0; z <= 2; z++)
2338 { 2810 {
2339 tileid t = tile [z]; 2811 tileid t = tile [z];
2340 2812
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2813 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2814 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2815 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2816 need_texid (self, t);
2345 } 2817 }
2346 2818
2347 cell->tile [z] = t; 2819 cell->tile [z] = t;
2348 } 2820 }
… …
2353} 2825}
2354 2826
2355MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2356 2828
2357DC::RW 2829DC::RW
2358new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2359 CODE: 2831 CODE:
2360{ 2832{
2361 STRLEN datalen; 2833 STRLEN datalen;
2362 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2363 2835
… …
2365} 2837}
2366 OUTPUT: 2838 OUTPUT:
2367 RETVAL 2839 RETVAL
2368 2840
2369DC::RW 2841DC::RW
2370new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2371 CODE: 2843 CODE:
2372 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2373 OUTPUT: 2845 OUTPUT:
2374 RETVAL 2846 RETVAL
2375 2847
… …
2393 if (RETVAL < 0) 2865 if (RETVAL < 0)
2394 { 2866 {
2395 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2396 2868
2397 if (RETVAL < 0) 2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2398 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2399 2876 }
2877 else
2400 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2401 } 2879 }
2402 2880
2403 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2404 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2405} 2883}
… …
2452void 2930void
2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2454 CODE: 2932 CODE:
2455{ 2933{
2456 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 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); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459} 2937}
2460 2938
2461void 2939void
2462set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
… …
2465 2943
2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2467 2945
2468PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2469 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2470DC::MixChunk 2960DC::MixChunk
2471new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2472 CODE: 2962 CODE:
2473 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2474 OUTPUT: 2964 OUTPUT:
2475 RETVAL 2965 RETVAL
2476 2966
… …
2506 OUTPUT: 2996 OUTPUT:
2507 RETVAL 2997 RETVAL
2508 2998
2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2510 3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
3012
2511int 3013int
2512volume (int volume = -1) 3014volume (int volume = -1)
2513 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2514 CODE: 3016 CODE:
2515 if (items > 0) 3017 if (items > 0)
… …
2526void 3028void
2527halt () 3029halt ()
2528 CODE: 3030 CODE:
2529 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2530 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2531DC::MixMusic 3040DC::MixMusic
2532new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2533 CODE: 3042 CODE:
2534 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2535 OUTPUT: 3044 OUTPUT:
2536 RETVAL 3045 RETVAL
2537 3046
… …
2565 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2566# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2567 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2568 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2569 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2570 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2571 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2572 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2573 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2574 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
… …
2586 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2587 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2588 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2589 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2590 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2591 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2592 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2593 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2594 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2595 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
… …
2663 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2664 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2665 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2666 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2667 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2668# undef const_iv 3185# undef const_iv
2669 }; 3186 };
2670 3187
2671 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2672 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2673 3190
2674 texture_av = newAV (); 3191 texture_av = newAV ();
2675 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2676} 3193}
2677 3194
… …
2679disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2680 CODE: 3197 CODE:
2681 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2683 3200
2684char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2685gl_vendor () 3205gl_vendor ()
2686 CODE: 3206 CODE:
2687 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2688 OUTPUT: 3208 OUTPUT:
2689 RETVAL 3209 RETVAL
2690 3210
2691char * 3211const char *
2692gl_version () 3212gl_version ()
2693 CODE: 3213 CODE:
2694 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2695 OUTPUT: 3215 OUTPUT:
2696 RETVAL 3216 RETVAL
2697 3217
2698char * 3218const char *
2699gl_extensions () 3219gl_extensions ()
2700 CODE: 3220 CODE:
2701 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2702 OUTPUT: 3222 OUTPUT:
2703 RETVAL 3223 RETVAL
2704 3224
2705const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2706 3230
2707GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2708 CODE: 3232 CODE:
2709 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2710 OUTPUT: 3234 OUTPUT:
… …
2718 3242
2719int glGetError () 3243int glGetError ()
2720 3244
2721void glFinish () 3245void glFinish ()
2722 3246
3247void glFlush ()
3248
2723void glClear (int mask) 3249void glClear (int mask)
2724 3250
2725void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2726 PROTOTYPE: @ 3252 PROTOTYPE: @
2727 3253
… …
2736void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2737 3263
2738void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2739 CODE: 3265 CODE:
2740 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2741 3269
2742void glDepthMask (int flag) 3270void glDepthMask (int flag)
2743 3271
2744void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2745 3273
… …
2780void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2781 CODE: 3309 CODE:
2782 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2783 3311
2784void glColor (float r, float g, float b, float a = 1.0) 3312void glColor (float r, float g, float b, float a = 1.0)
3313 PROTOTYPE: @
2785 ALIAS: 3314 ALIAS:
2786 glColor_premultiply = 1 3315 glColor_premultiply = 1
2787 CODE: 3316 CODE:
2788 if (ix) 3317 if (ix)
2789 { 3318 {
… …
2895 3424
2896void glEndList () 3425void glEndList ()
2897 3426
2898void glCallList (int list) 3427void glCallList (int list)
2899 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2901 3435
2902PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
2903 3437
2904void 3438void
2905find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
2906 PPCODE: 3440 PPCODE:
2907{ 3441{
2908 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
2909 XPUSHs (self); 3443 XPUSHs (self);
2910} 3444}
2911 3445
2912BOOT: 3446BOOT:
2913{ 3447{
… …
2921 3455
2922void 3456void
2923draw (SV *self) 3457draw (SV *self)
2924 CODE: 3458 CODE:
2925{ 3459{
2926 HV *hv; 3460 HV *hv;
2927 SV **svp; 3461 SV **svp;
2928 NV x, y, w, h; 3462 NV x, y, w, h;
2929 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
2930 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
2931 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
2932 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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