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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.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/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77 104
78#if 0 105#define KMOD_LRAM 0x10000 // our extension
79# define PARACHUTE SDL_INIT_NOPARACHUTE 106
80#else 107#define TEXID_SPEECH 1
81# define PARACHUTE 0 108#define TEXID_NOFACE 2
82#endif 109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
83 128
84static AV *texture_av; 129static AV *texture_av;
85 130
86static struct 131static struct
87{ 132{
144{ 189{
145 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
146 191
147 while (attrs) 192 while (attrs)
148 { 193 {
149 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
150 195
151 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
152 return 1; 197 return 1;
153 198
154 attrs = attrs->next; 199 attrs = attrs->next;
155 } 200 }
156 201
157 return 0; 202 return 0;
158} 203}
159 204
160typedef struct cf_layout { 205struct cf_layout {
161 PangoLayout *pl; 206 PangoLayout *pl;
162 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
163 int base_height; 208 int base_height;
164 DC__Font font; 209 DC__Font font;
165 rc_t *rc; 210 rc_t rc;
166} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
167 214
168static DC__Font default_font; 215static DC__Font default_font;
169static PangoContext *opengl_context; 216static PangoContext *opengl_context;
170static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
171 218
172static void 219static void
173substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
174{ 221{
175 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
176#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
177 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
178#endif 225#endif
179 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
180} 227}
181 228
182static void 229static void
183layout_update_font (DC__Layout self) 230layout_update_font (DC__Layout self)
184{ 231{
185 /* use a random scale factor to account for unknown descenders, 0.8 works 232 /* use a random scale factor to account for unknown descenders, 0.8 works
186 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
187 */ 234 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
189 236
190 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
212} 259}
213 260
214typedef uint16_t tileid; 261typedef uint16_t tileid;
215typedef uint16_t faceid; 262typedef uint16_t faceid;
216 263
217typedef struct { 264struct maptex
265{
218 GLuint name; 266 GLuint name;
219 int w, h; 267 int w, h;
220 float s, t; 268 float s, t;
221 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
222 tileid smoothtile; 270 tileid smoothtile;
223 uint8_t smoothlevel; 271 uint8_t smoothlevel;
224} maptex; 272 uint8_t unused; /* set to zero on use */
273};
225 274
226typedef struct { 275struct mapcell
276{
227 uint32_t player; 277 uint32_t player;
228 tileid tile[3]; 278 tileid tile[3];
229 uint16_t darkness; 279 uint16_t darkness;
230 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
231} mapcell; 281};
232 282
233typedef struct { 283struct maprow
284{
234 int32_t c0, c1; 285 int32_t c0, c1;
235 mapcell *col; 286 mapcell *col;
236} maprow; 287};
237 288
238typedef struct map { 289struct mapgrid {
239 int x, y, w, h; 290 int x, y, w, h;
240 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
241 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
242 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
243 294
244 int32_t rows; 295 int32_t rows;
245 maprow *row; 296 maprow *row;
246} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
247 300
248static char * 301static char *
249prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
250{ 303{
251 char *p; 304 char *p;
269 322
270#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))
271#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))
272 325
273static void 326static void
274need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
275{ 328{
276 while (self->faces <= face) 329 while (self->faces <= face)
277 { 330 {
278 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
279 self->faces *= 2; 332 self->faces *= 2;
280 } 333 }
281} 334}
282 335
283static void 336static void
284need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
285{ 338{
286 while (self->texs <= texid) 339 while (self->texs <= texid)
287 { 340 {
288 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
289 self->texs *= 2; 342 self->texs *= 2;
290 } 343 }
291} 344}
292 345
293static maprow * 346static maprow *
294map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
295{ 348{
296 if (0 > y) 349 if (0 > y)
297 { 350 {
298 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
299 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
337 390
338 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
339} 392}
340 393
341static mapcell * 394static mapcell *
342map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
343{ 396{
344 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
345} 398}
346 399
347static void 400static void
348map_clear (DC__Map self) 401map_clear (mapgrid *self)
349{ 402{
350 int r; 403 int r;
351 404
352 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
353 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
360 self->oy = 0; 413 self->oy = 0;
361 self->row = 0; 414 self->row = 0;
362 self->rows = 0; 415 self->rows = 0;
363} 416}
364 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
365static void 428static void
366map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
367{ 430{
368 int x, y; 431 int x, y;
369 maprow *row; 432 maprow *row;
370 mapcell *cell; 433 mapcell *cell;
371 434
383 if (x >= row->c1) 446 if (x >= row->c1)
384 break; 447 break;
385 448
386 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
387 450
388 cell->darkness = 0; 451 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 452 }
393 } 453 }
394} 454}
395 455
396typedef struct { 456struct smooth_key
457{
397 tileid tile; 458 tileid tile;
398 uint8_t x, y, level; 459 uint8_t x, y, level;
399} 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}
400 479
401static void 480static void
402smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
403{ 482{
404 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
405 484
406 if (SvIOK (*sv)) 485 if (it == h.end ())
407 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
408 else 487 else
409 sv_setiv (*sv, bits); 488 it->second |= bits;
410} 489}
411 490
412static void 491static void
413music_finished (void) 492music_finished (void)
414{ 493{
431 ev.code = 1; 510 ev.code = 1;
432 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
433 ev.data2 = 0; 512 ev.data2 = 0;
434 513
435 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;
436} 522}
437 523
438static unsigned int 524static unsigned int
439minpot (unsigned int n) 525minpot (unsigned int n)
440{ 526{
507 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
508 return 0; 594 return 0;
509 595
510 return 1; 596 return 1;
511} 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
512 656
513MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
514 658
515PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
516 660
545 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
546 690
547 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
548 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
549 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),
550 744
551 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
553 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
554 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
630 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
631 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
634 828
829 const_iv (KMOD_LRAM),
830
635 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)
636# undef const_iv 861# undef const_iv
637 }; 862 };
638 863
639 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--)
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
641 866
642 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
643 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
644} 869}
645 870
661NV ceil (NV x) 886NV ceil (NV x)
662 887
663IV minpot (UV n) 888IV minpot (UV n)
664 889
665IV 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
666 897
667void 898void
668pango_init () 899pango_init ()
669 CODE: 900 CODE:
670{ 901{
671 opengl_fontmap = pango_opengl_font_map_new (); 902 opengl_fontmap = pango_opengl_font_map_new ();
672 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);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 904 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#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)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 909#endif
678} 910}
679 911
680char *
681SDL_GetError () 912char *SDL_GetError ()
682 913
683int 914void SDL_main_hack (SV *real_main)
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
685 916
686void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
687SDL_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
688 934
689void 935void
690SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
691 PPCODE: 937 PPCODE:
692{ 938{
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 953
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 956
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 958
716 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
717 while (*m) 960 while (*m)
718 { 961 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 963 {
721 AV *av = newAV (); 964 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
747 ); 990 );
748 991
749 if (RETVAL) 992 if (RETVAL)
750 { 993 {
751 av_clear (texture_av); 994 av_clear (texture_av);
752
753 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
754#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
755#include "glfunc.h" 996#include "glfunc.h"
756#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
757 } 1000 }
758} 1001}
759 OUTPUT: 1002 OUTPUT:
760 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
761 1007
762void 1008void
763SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
764 1010
765char * 1011char *
766SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
767 1014
768int 1015int
769SDL_GetAppState () 1016SDL_GetAppState ()
770 1017
1018int
1019SDL_GetModState ()
1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
771void 1025void
1026SDL_PumpEvents ()
1027
1028void
772poll_events () 1029peep_events ()
773 PPCODE: 1030 PPCODE:
774{ 1031{
775 SDL_Event ev; 1032 SDL_Event ev;
776 1033
777 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
784 { 1041 {
785 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
786 case SDL_KEYUP: 1043 case SDL_KEYUP:
787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
790 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792 break; 1049 break;
793 1050
794 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
813 x = ev.motion.x; 1070 x = ev.motion.x;
814 y = ev.motion.y; 1071 y = ev.motion.y;
815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816 } 1073 }
817 1074
818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
820 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
821 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
822 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
843 1100
844 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))));
845 } 1102 }
846} 1103}
847 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
848int 1118int
849Mix_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)
850 POSTCALL: 1120 POSTCALL:
851 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
852 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
853 1123
854void 1124void
855Mix_QuerySpec () 1125Mix_QuerySpec ()
908 } 1178 }
909 } 1179 }
910#endif 1180#endif
911} 1181}
912 1182
913void 1183int
914add_font (char *file) 1184add_font (char *file)
915 CODE: 1185 CODE:
916 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)
917 1196
918void 1197void
919load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
920 ALIAS: 1199 ALIAS:
921 load_image_file = 1 1200 load_image_file = 1
967 1246
968 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
969 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
970 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
971 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
972 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
973 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
974 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
975 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
976 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
977 1256
1037#if DEBUG 1316#if DEBUG
1038 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1039#endif 1318#endif
1040} 1319}
1041 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1042MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1043 1329
1044PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1045 1331
1046DC::Font 1332DC::Font
1047new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1048 CODE: 1334 CODE:
1049{ 1335{
1050 int count; 1336 int count;
1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1052 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1081 PROTOTYPE: 1367 PROTOTYPE:
1082 CODE: 1368 CODE:
1083 tc_restore (); 1369 tc_restore ();
1084 1370
1085DC::Layout 1371DC::Layout
1086new (SV *class) 1372new (SV *klass)
1087 CODE: 1373 CODE:
1088 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1089 1375
1090 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1091 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1092 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1093 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1094 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1095 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1096 RETVAL->font = 0; 1382 RETVAL->font = 0;
1097 RETVAL->rc = rc_alloc ();
1098 1383
1099 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1100 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1101 OUTPUT: 1386 OUTPUT:
1102 RETVAL 1387 RETVAL
1103 1388
1104void 1389void
1105DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1106 CODE: 1391 CODE:
1107 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1108 rc_free (self->rc);
1109 Safefree (self); 1393 delete self;
1110 1394
1111void 1395void
1112set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1113 CODE: 1397 CODE:
1114{ 1398{
1240 1524
1241void 1525void
1242set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1243 CODE: 1527 CODE:
1244 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1245 { 1529 {
1246 self->base_height = base_height; 1530 self->base_height = base_height;
1247 layout_update_font (self); 1531 layout_update_font (self);
1248 } 1532 }
1249 1533
1250void 1534void
1331 PPCODE: 1615 PPCODE:
1332{ 1616{
1333 int line, x; 1617 int line, x;
1334 1618
1335 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);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1620#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1621 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1622 --line;
1339#endif 1623#endif
1340 EXTEND (SP, 2); 1624 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1625 PUSHs (sv_2mortal (newSViv (line)));
1368} 1652}
1369 1653
1370void 1654void
1371render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1372 CODE: 1656 CODE:
1373 rc_clear (self->rc); 1657 self->rc.clear ();
1374 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1375 self->pl, 1659 self->pl,
1376 self->rc, 1660 &self->rc,
1377 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1378 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1379 flags 1663 flags
1380 ); 1664 );
1381 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1392 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1393 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1394 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1395 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1396 1680
1397 rc_draw (self->rc); 1681 self->rc.draw ();
1398 1682
1399 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1400 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1401 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1402} 1686}
1477 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1478 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1479 } 1763 }
1480} 1764}
1481 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
1482IV 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)
1483 CODE: 1888 CODE:
1484{ 1889{
1485 GLint width; 1890 GLint width;
1486 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);
1493MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1494 1899
1495PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1496 1901
1497DC::Map 1902DC::Map
1498new (SV *class) 1903new (SV *klass)
1499 CODE: 1904 CODE:
1500 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1501 RETVAL->x = 0; 1906 RETVAL->x = 0;
1502 RETVAL->y = 0; 1907 RETVAL->y = 0;
1503 RETVAL->w = 0; 1908 RETVAL->w = 0;
1504 RETVAL->h = 0; 1909 RETVAL->h = 0;
1505 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1542 1947
1543void 1948void
1544set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1545 CODE: 1950 CODE:
1546{ 1951{
1547 tileid texid; 1952 tileid texid;
1548 maptex *tex; 1953 maptex *tex;
1549 1954
1550 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1551 return; 1956 return;
1552 1957
1553 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1554 return; 1959 return;
1555 1960
1556 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1557 1962
1558 if (!texid) 1963 if (!texid)
1559 return; 1964 return;
1560 1965
1561 tex = self->tex + texid; 1966 tex = self->tex + texid;
1590 //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);
1591 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1592 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594} 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 }
1595 2020
1596int 2021int
1597ox (DC::Map self) 2022ox (DC::Map self)
1598 ALIAS: 2023 ALIAS:
1599 oy = 1 2024 oy = 1
1639 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1640 } 2065 }
1641} 2066}
1642 2067
1643SV * 2068SV *
1644map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1645 CODE: 2070 CODE:
1646{ 2071{
1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1648 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1649 mapcell *cell; 2074 mapcell *cell;
1670 2095
1671 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1672 2097
1673 if (flags & 8) 2098 if (flags & 8)
1674 { 2099 {
2100 uint8_t ext, cmd;
2101
1675 if (extmap) 2102 do
1676 { 2103 {
1677 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1678 2106
1679 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
1680 { 2110 {
1681 ext = *data++;
1682 cmd = ext & 0x3f;
1683
1684 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health
1687 {
1688 cell->stat_width = 1; 2111 cell->stat_width = 1;
1689 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1690 }
1691 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47)
1694 {
1695 if (*data == 4)
1696 ; // decode player count
1697
1698 data += *data + 1;
1699 }
1700 else if (cmd == 8) // cell flags
1701 cell->flags = *data++;
1702 else if (ext & 0x40) // unknown, multibyte => skip
1703 data += *data + 1;
1704 else
1705 data++;
1706 } 2113 }
1707 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++;
1708 } 2131 }
1709 else 2132 while (ext & 0x80);
1710 cell->darkness = *data++ + 1;
1711 } 2133 }
1712 2134
1713 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1714 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1715 { 2137 {
1718 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1719 2141
1720 if (cell->tile [z]) 2142 if (cell->tile [z])
1721 { 2143 {
1722 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1723 if (!tex->name) 2146 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1725 2148
1726 if (tex->smoothtile) 2149 if (tex->smoothtile)
1727 { 2150 {
1728 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1729 if (!smooth->name) 2153 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1731 } 2155 }
1732 } 2156 }
1733 } 2157 }
1734 } 2158 }
1735 else 2159 else
1736 cell->darkness = 0; 2160 CELL_CLEAR (cell);
1737 } 2161 }
1738} 2162}
1739 OUTPUT: 2163 OUTPUT:
1740 RETVAL 2164 RETVAL
1741 2165
1761 ? self->row + y 2185 ? self->row + y
1762 : 0; 2186 : 0;
1763 2187
1764 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1765 { 2189 {
1766 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1767 2191
1768 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1769 { 2193 {
1770 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1771 2195
1773 { 2197 {
1774 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1775 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1776 int a1 = tex.a; 2200 int a1 = tex.a;
1777 2201
1778 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1779 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1780 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1781 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1782 } 2206 }
1783 } 2207 }
1784 2208
1785 *map++ = (r ) 2209 *map++ = (r )
1786 | (g << 8) 2210 | (g << 8)
1787 | (b << 16) 2211 | (b << 16)
1788 | (a << 24); 2212 | (a << 24);
1789 } 2213 }
1790 } 2214 }
1791 2215
1792 RETVAL = map_sv; 2216 RETVAL = map_sv;
1793} 2217}
1794 OUTPUT: 2218 OUTPUT:
1795 RETVAL 2219 RETVAL
1796 2220
1797void 2221void
1798draw (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)
1799 CODE: 2223 CODE:
1800{ 2224{
1801 int x, y, z; 2225 int x, y, z;
1802 2226
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1806 smooth_key skey; 2228 int pl_x, pl_y;
1807 2229 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1809 rc_key_t key; 2232 rc_key_t key;
1810 rc_array_t *arr; 2233 rc_t::array_t *arr;
1811 2234
2235 pl_tex.name = 0;
2236
1812 // thats current max. sorry. 2237 // that's current max. sorry.
1813 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1815
1816 // clear key, in case of extra padding
1817 memset (&skey, 0, sizeof (skey));
1818 2240
1819 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1820 key.r = 255; 2242 key.r = 255;
1821 key.g = 255; 2243 key.g = 255;
1822 key.b = 255; 2244 key.b = 255;
1823 key.a = 255; 2245 key.a = 255;
1824 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1825 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1826 key.texname = -1;
1827 2248
1828 mx += self->x; 2249 mx += self->x;
1829 my += self->y; 2250 my += self->y;
1830 2251
1831 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1832 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1833 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1834 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1835 2256
1836 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1837 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1838 { 2259 {
1839 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1854 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 2277
1857 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1858 { 2279 {
1859 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;
1860 2284
1861 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1863 { 2287 {
1864 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
1874 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1875 int px, py; 2299 int px, py;
1876 2300
1877 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
1878 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1879 if (!tex.name) 2305 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1881 2307
1882 key.texname = tex.name; 2308 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
1884 } 2310 }
1885 2311
1886 px = (x + 1) * T - tex.w; 2312 px = (x + 1) * Th - tex.w;
1887 py = (y + 1) * T - tex.h; 2313 py = (y + 1) * Tw - tex.h;
1888 2314
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893
1894 if (cell->flags && z == 2)
1895 { 2316 {
1896 // overlays such as the speech bubble, probably more to come 2317 pl_x = px;
1897 if (cell->flags & 1) 2318 pl_y = py;
2319 pl_tex = tex;
1898 { 2320 continue;
1899 maptex tex = self->tex [1];
1900 int px = x * T + T * 2 / 32;
1901 int py = y * T - T * 6 / 32;
1902
1903 if (tex.name)
1904 {
1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1915 }
1916 }
1917 } 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);
1918 2327
1919 // update smooth hash 2328 // update smooth hash
1920 if (tex.smoothtile) 2329 if (tex.smoothtile)
1921 { 2330 {
1922 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
1923 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
1924 2333
1925 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
1926 2335
1927 // 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
1928 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
1929 2338
1930 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
1938 2347
1939 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1940 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
1941 2350
1942 // full tile 2351 // full tile
1943 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);
1944 2353
1945 // borders 2354 // borders
1946 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);
1947 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);
1948 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);
1949 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);
1950 2359
1951 // corners 2360 // corners
1952 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);
1953 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);
1954 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);
1955 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);
1956 } 2385 }
1957 } 2386 }
1958 } 2387 }
1959 } 2388 }
1960 2389
1961 rc_draw (rc); 2390 rc.draw ();
1962 rc_clear (rc); 2391 rc.clear ();
1963 2392
1964 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
1965 // this is basically counting sort 2394 // this is basically counting sort
1966 { 2395 {
1967 int w, b; 2396 int w, b;
1968 2397
1969 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
1970 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
1971 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)
1972 { 2403 {
1973 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
1974 if (smask) 2405 IV bits = it->second;
1975 for (b = 0; b < 32; ++b) 2406
1976 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
1977 { 2410 {
1978 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
1979 HE *he; 2419 if (tex.name)
1980
1981 hv_iterinit (smooth);
1982 while ((he = hv_iternext (smooth)))
1983 { 2420 {
1984 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
1985 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
1986 2423 if (key.texname != tex.name)
1987 if (!(bits & 0x1000)
1988 && skey->level == level
1989 && level > smooth_max [skey->x][skey->y])
1990 { 2424 {
1991 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
1992 int px = (((int)skey->x) - 1) * T;
1993 int py = (((int)skey->y) - 1) * T;
1994 int border = bits & 15;
1995 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1996 float dx = tex.s * .0625f; // 16 images/row
1997 float dy = tex.t * .5f ; // 2 images/column
1998 2426
1999 if (tex.name)
2000 {
2001 // this time avoiding texture state changes
2002 // save gobs of state changes.
2003 if (key.texname != tex.name)
2004 {
2005 glEnd (); 2427 glEnd ();
2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2008 } 2430 }
2009 2431
2010 if (border) 2432 if (border)
2011 { 2433 {
2012 float ox = border * dx; 2434 float ox = border * dx;
2013 2435
2014 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2015 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2016 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2017 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2018 } 2440 }
2019 2441
2020 if (corner) 2442 if (corner)
2021 { 2443 {
2022 float ox = corner * dx; 2444 float ox = corner * dx;
2023 2445
2024 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2028 }
2029 }
2030 } 2450 }
2031 } 2451 }
2032 } 2452 }
2033 } 2453 }
2034 2454
2035 glEnd (); 2455 glEnd ();
2036 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1; 2457 key.texname = -1;
2038 } 2458 }
2039
2040 hv_clear (smooth);
2041 } 2459 }
2042 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
2043 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2044 rc_free (rc);
2045 2482
2046 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2048 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2049 { 2486 {
2052 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2053 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2054 { 2491 {
2055 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2056 2493
2057 int px = x * T; 2494 int px = x * Tw;
2058 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 }
2059 2502
2060 if (cell->stat_hp) 2503 if (cell->stat_hp)
2061 { 2504 {
2062 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2063 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2064 2507
2065 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2066 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2067 px + width - 1, py); 2510 px + width - 1, py);
2068 2511
2074 } 2517 }
2075 } 2518 }
2076} 2519}
2077 2520
2078void 2521void
2079draw_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)
2080 CODE: 2523 CODE:
2081{ 2524{
2082 static float color[16][3] = { 2525 static float color[16][3] = {
2083 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2084 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2085 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2086 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2087 2530
2088 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2089 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2090 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2091 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2092 2535
2093 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2094 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2095 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2096 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2097 2540
2098 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2099 2542
2100 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2101 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2102 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2103 }; 2546 };
2104 2547
2105 int x, y; 2548 int x, y;
2106 2549
2107 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 */
2108 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2109 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2110 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2111 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2112 2561
2113 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2117 2566
2118 if (m) 2567 if (m)
2119 { 2568 {
2120 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2121 2570
2122 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2123 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2124 2573
2125 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2126 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2127 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2128 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2129 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2130 } 2579 }
2138void 2587void
2139fow_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)
2140 PPCODE: 2589 PPCODE:
2141{ 2590{
2142 int x, y; 2591 int x, y;
2143 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2144 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2145 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2146 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);
2147 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2148 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2149 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2150 2600
2151 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2153 2603
2154 mx += self->x - 1; 2604 mx += self->x - 1;
2155 my += self->y - 1; 2605 my += self->y - 1;
2156
2157 memset (darkness1, 255, sw1 * sh1);
2158 2606
2159 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2161 { 2609 {
2162 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2165 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2166 { 2614 {
2167 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2168 2616
2169 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2170 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2171 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2172 } 2620 }
2173 } 2621 }
2174 2622
2175 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2176 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2195 2643
2196 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2197 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2198 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2199 2647
2200 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2201 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2202 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2203 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2204 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 */
2205 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2206 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2207 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2208 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2209 } 2657 }
2210 2658
2211 free (darkness1); 2659 free (darkness1);
2212 2660
2213 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2214 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2215 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2216 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2217} 2665}
2218 2666
2219SV * 2667SV *
2282 else 2730 else
2283 *data++ = 0; 2731 *data++ = 0;
2284 } 2732 }
2285 } 2733 }
2286 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 {
2287 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2740 }
2741
2289 RETVAL = data_sv; 2742 RETVAL = data_sv;
2290} 2743}
2291 OUTPUT: 2744 OUTPUT:
2292 RETVAL 2745 RETVAL
2293 2746
2294void 2747void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2748set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2749 PPCODE:
2297{ 2750{
2298 int x, y, z; 2751 int x, y, z;
2299 int w, h; 2752 int w, h;
2300 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;
2301 2764
2302 if (*data++ != 0) 2765 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2766 XSRETURN_EMPTY; /* version mismatch */
2304 2767
2305 w = *data++ << 8; w |= *data++; 2768 w = *data++ << 8; w |= *data++;
2320 { 2783 {
2321 maprow *row = map_get_row (self, y); 2784 maprow *row = map_get_row (self, y);
2322 2785
2323 for (x = x0; x < x1; x++) 2786 for (x = x0; x < x1; x++)
2324 { 2787 {
2788 uint8_t flags;
2789
2790 if (data + 7 >= end)
2791 XSRETURN_EMPTY;
2792
2325 uint8_t flags = *data++; 2793 flags = *data++;
2326 2794
2327 if (flags) 2795 if (flags)
2328 { 2796 {
2329 mapcell *cell = row_get_cell (row, x); 2797 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2798 tileid tile[3] = { 0, 0, 0 };
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2801 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2802 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2803
2336 if (cell->darkness == 0) 2804 if (cell->darkness == 0)
2337 { 2805 {
2338 cell->darkness = 0; 2806 /*cell->darkness = 0;*/
2807 EXTEND (SP, 3);
2339 2808
2340 for (z = 0; z <= 2; z++) 2809 for (z = 0; z <= 2; z++)
2341 { 2810 {
2342 tileid t = tile [z]; 2811 tileid t = tile [z];
2343 2812
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2813 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2814 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2815 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2816 need_texid (self, t);
2348 } 2817 }
2349 2818
2350 cell->tile [z] = t; 2819 cell->tile [z] = t;
2351 } 2820 }
2356} 2825}
2357 2826
2358MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2359 2828
2360DC::RW 2829DC::RW
2361new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2362 CODE: 2831 CODE:
2363{ 2832{
2364 STRLEN datalen; 2833 STRLEN datalen;
2365 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2366 2835
2368} 2837}
2369 OUTPUT: 2838 OUTPUT:
2370 RETVAL 2839 RETVAL
2371 2840
2372DC::RW 2841DC::RW
2373new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2374 CODE: 2843 CODE:
2375 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2376 OUTPUT: 2845 OUTPUT:
2377 RETVAL 2846 RETVAL
2378 2847
2396 if (RETVAL < 0) 2865 if (RETVAL < 0)
2397 { 2866 {
2398 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2399 2868
2400 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)
2401 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2402 2876 }
2877 else
2403 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2404 } 2879 }
2405 2880
2406 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2407 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2408} 2883}
2455void 2930void
2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457 CODE: 2932 CODE:
2458{ 2933{
2459 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));
2460 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;
2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462} 2937}
2463 2938
2464void 2939void
2465set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2468 2943
2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2470 2945
2471PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2472 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
2473DC::MixChunk 2960DC::MixChunk
2474new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2475 CODE: 2962 CODE:
2476 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2477 OUTPUT: 2964 OUTPUT:
2478 RETVAL 2965 RETVAL
2479 2966
2509 OUTPUT: 2996 OUTPUT:
2510 RETVAL 2997 RETVAL
2511 2998
2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2513 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
2514int 3013int
2515volume (int volume = -1) 3014volume (int volume = -1)
2516 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2517 CODE: 3016 CODE:
2518 if (items > 0) 3017 if (items > 0)
2529void 3028void
2530halt () 3029halt ()
2531 CODE: 3030 CODE:
2532 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2533 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2534DC::MixMusic 3040DC::MixMusic
2535new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2536 CODE: 3042 CODE:
2537 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2538 OUTPUT: 3044 OUTPUT:
2539 RETVAL 3045 RETVAL
2540 3046
2568 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2569# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2570 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2571 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2572 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2573 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2574 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2575 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2576 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2577 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2589 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2590 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2591 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2592 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2593 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),
2594 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2595 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2596 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2597 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2598 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2666 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2667 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2668 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2669 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2670 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),
2671# undef const_iv 3185# undef const_iv
2672 }; 3186 };
2673 3187
2674 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--)
2675 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2676 3190
2677 texture_av = newAV (); 3191 texture_av = newAV ();
2678 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2679} 3193}
2680 3194
2682disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2683 CODE: 3197 CODE:
2684 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2686 3200
2687char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2688gl_vendor () 3205gl_vendor ()
2689 CODE: 3206 CODE:
2690 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2691 OUTPUT: 3208 OUTPUT:
2692 RETVAL 3209 RETVAL
2693 3210
2694char * 3211const char *
2695gl_version () 3212gl_version ()
2696 CODE: 3213 CODE:
2697 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2698 OUTPUT: 3215 OUTPUT:
2699 RETVAL 3216 RETVAL
2700 3217
2701char * 3218const char *
2702gl_extensions () 3219gl_extensions ()
2703 CODE: 3220 CODE:
2704 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2705 OUTPUT: 3222 OUTPUT:
2706 RETVAL 3223 RETVAL
2707 3224
2708const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2709 3230
2710GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2711 CODE: 3232 CODE:
2712 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2713 OUTPUT: 3234 OUTPUT:
2721 3242
2722int glGetError () 3243int glGetError ()
2723 3244
2724void glFinish () 3245void glFinish ()
2725 3246
3247void glFlush ()
3248
2726void glClear (int mask) 3249void glClear (int mask)
2727 3250
2728void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2729 PROTOTYPE: @ 3252 PROTOTYPE: @
2730 3253
2739void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2740 3263
2741void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2742 CODE: 3265 CODE:
2743 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2744 3269
2745void glDepthMask (int flag) 3270void glDepthMask (int flag)
2746 3271
2747void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2748 3273
2783void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2784 CODE: 3309 CODE:
2785 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2786 3311
2787void 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: @
2788 ALIAS: 3314 ALIAS:
2789 glColor_premultiply = 1 3315 glColor_premultiply = 1
2790 CODE: 3316 CODE:
2791 if (ix) 3317 if (ix)
2792 { 3318 {
2898 3424
2899void glEndList () 3425void glEndList ()
2900 3426
2901void glCallList (int list) 3427void glCallList (int list)
2902 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2904 3435
2905PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
2906 3437
2907void 3438void
2908find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
2909 PPCODE: 3440 PPCODE:
2910{ 3441{
2911 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
2912 XPUSHs (self); 3443 XPUSHs (self);
2913} 3444}
2914 3445
2915BOOT: 3446BOOT:
2916{ 3447{
2924 3455
2925void 3456void
2926draw (SV *self) 3457draw (SV *self)
2927 CODE: 3458 CODE:
2928{ 3459{
2929 HV *hv; 3460 HV *hv;
2930 SV **svp; 3461 SV **svp;
2931 NV x, y, w, h; 3462 NV x, y, w, h;
2932 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
2933 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
2934 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
2935 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