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.255 by root, Sun Jan 6 18:25:59 2008 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 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#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
65# include <netinet/in.h> 76# include <netinet/in.h>
66# include <netinet/tcp.h> 77# include <netinet/tcp.h>
67# include <inttypes.h> 78# include <inttypes.h>
68#endif 79#endif
69 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
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 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 */
72#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
73 96
74#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
76 99
77#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
78 101
79/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 104
82#if 0 105#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 106
84#else 107#define TEXID_SPEECH 1
85# define PARACHUTE 0 108#define TEXID_NOFACE 2
86#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}
87 128
88static AV *texture_av; 129static AV *texture_av;
89 130
90static struct 131static struct
91{ 132{
148{ 189{
149 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
150 191
151 while (attrs) 192 while (attrs)
152 { 193 {
153 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 195
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 197 return 1;
157 198
158 attrs = attrs->next; 199 attrs = attrs->next;
159 } 200 }
160 201
161 return 0; 202 return 0;
162} 203}
163 204
164typedef struct cf_layout { 205struct cf_layout {
165 PangoLayout *pl; 206 PangoLayout *pl;
166 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
167 int base_height; 208 int base_height;
168 DC__Font font; 209 DC__Font font;
169 rc_t *rc; 210 rc_t rc;
170} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
171 214
172static DC__Font default_font; 215static DC__Font default_font;
173static PangoContext *opengl_context; 216static PangoContext *opengl_context;
174static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
175 218
176static void 219static void
177substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
178{ 221{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 225#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 227}
185 228
186static void 229static void
187layout_update_font (DC__Layout self) 230layout_update_font (DC__Layout self)
188{ 231{
189 /* 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
190 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
191 */ 234 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
193 236
194 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
216} 259}
217 260
218typedef uint16_t tileid; 261typedef uint16_t tileid;
219typedef uint16_t faceid; 262typedef uint16_t faceid;
220 263
221typedef struct { 264struct maptex
265{
222 GLuint name; 266 GLuint name;
223 int w, h; 267 int w, h;
224 float s, t; 268 float s, t;
225 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
226 tileid smoothtile; 270 tileid smoothtile;
227 uint8_t smoothlevel; 271 uint8_t smoothlevel;
228} maptex; 272 uint8_t unused; /* set to zero on use */
273};
229 274
230typedef struct { 275struct mapcell
276{
231 uint32_t player; 277 uint32_t player;
232 tileid tile[3]; 278 tileid tile[3];
233 uint16_t darkness; 279 uint16_t darkness;
234 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
235} mapcell; 281};
236 282
237typedef struct { 283struct maprow
284{
238 int32_t c0, c1; 285 int32_t c0, c1;
239 mapcell *col; 286 mapcell *col;
240} maprow; 287};
241 288
242typedef struct map { 289struct mapgrid {
243 int x, y, w, h; 290 int x, y, w, h;
244 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
245 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
246 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
247 294
248 int32_t rows; 295 int32_t rows;
249 maprow *row; 296 maprow *row;
250} *DC__Map; 297};
251 298
252static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
253prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
254{ 304{
255 char *p; 305 T *p;
256 306
257 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
258 Zero (p, inc, char);
259 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
260 Safefree (ptr); 309 Safefree (ptr);
261 310
262 return p; 311 ptr = p;
263} 312}
264 313
265static char * 314template<typename T>
266append (char *ptr, int sze, int inc)
267{
268 Renew (ptr, sze + inc, char);
269 Zero (ptr + sze, inc, char);
270
271 return ptr;
272}
273
274#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
275#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
276
277static void 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
278need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
279{ 324{
280 while (self->faces <= face) 325 while (self->faces <= face)
281 { 326 {
282 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
283 self->faces *= 2; 328 self->faces *= 2;
284 } 329 }
285} 330}
286 331
287static void 332static void
288need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
289{ 334{
290 while (self->texs <= texid) 335 while (self->texs <= texid)
291 { 336 {
292 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
293 self->texs *= 2; 338 self->texs *= 2;
294 } 339 }
295} 340}
296 341
297static maprow * 342static maprow *
298map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
299{ 344{
300 if (0 > y) 345 if (0 > y)
301 { 346 {
302 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
303 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
304 349
305 self->rows += extend; 350 self->rows += extend;
306 self->y += extend; 351 self->y += extend;
307 y += extend; 352 y += extend;
308 } 353 }
309 else if (y >= self->rows) 354 else if (y >= self->rows)
310 { 355 {
311 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
312 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
313 self->rows += extend; 358 self->rows += extend;
314 } 359 }
315 360
316 return self->row + y; 361 return self->row + y;
317} 362}
327 } 372 }
328 373
329 if (row->c0 > x) 374 if (row->c0 > x)
330 { 375 {
331 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
332 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
333 row->c0 -= extend; 378 row->c0 -= extend;
334 } 379 }
335 else if (x >= row->c1) 380 else if (x >= row->c1)
336 { 381 {
337 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
338 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
339 row->c1 += extend; 384 row->c1 += extend;
340 } 385 }
341 386
342 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
343} 388}
344 389
345static mapcell * 390static mapcell *
346map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
347{ 392{
348 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
349} 394}
350 395
351static void 396static void
352map_clear (DC__Map self) 397map_clear (mapgrid *self)
353{ 398{
354 int r; 399 int r;
355 400
356 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
357 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
364 self->oy = 0; 409 self->oy = 0;
365 self->row = 0; 410 self->row = 0;
366 self->rows = 0; 411 self->rows = 0;
367} 412}
368 413
414#define CELL_CLEAR(cell) \
415 do { \
416 if ((cell)->player) \
417 (cell)->tile [2] = 0; \
418 (cell)->darkness = 0; \
419 (cell)->stat_hp = 0; \
420 (cell)->flags = 0; \
421 (cell)->player = 0; \
422 } while (0)
423
369static void 424static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
371{ 426{
372 int x, y; 427 int x, y;
373 maprow *row; 428 maprow *row;
374 mapcell *cell; 429 mapcell *cell;
375 430
387 if (x >= row->c1) 442 if (x >= row->c1)
388 break; 443 break;
389 444
390 cell = row->col + x - row->c0; 445 cell = row->col + x - row->c0;
391 446
392 cell->darkness = 0; 447 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 448 }
397 } 449 }
398} 450}
399 451
400typedef struct { 452struct smooth_key
453{
401 tileid tile; 454 tileid tile;
402 uint8_t x, y, level; 455 uint8_t x, y, level;
403} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
404 475
405static void 476static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 478{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
409 480
410 if (SvIOK (*sv)) 481 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
412 else 483 else
413 sv_setiv (*sv, bits); 484 it->second |= bits;
414} 485}
415 486
416static void 487static void
417music_finished (void) 488music_finished (void)
418{ 489{
435 ev.code = 1; 506 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 508 ev.data2 = 0;
438 509
439 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
440} 518}
441 519
442static unsigned int 520static unsigned int
443minpot (unsigned int n) 521minpot (unsigned int n)
444{ 522{
511 if (!svp || !SvTRUE (*svp)) 589 if (!svp || !SvTRUE (*svp))
512 return 0; 590 return 0;
513 591
514 return 1; 592 return 1;
515} 593}
594
595/******************************************************************************/
596
597/* process keyboard modifiers */
598static int
599mod_munge (int mod)
600{
601 mod &= MOD_MASK;
602
603 if (mod & (KMOD_META | KMOD_ALT))
604 mod |= KMOD_LRAM;
605
606 return mod;
607}
608
609static void
610deliantra_main (SV *real_main)
611{
612 dSP;
613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
616}
617
618#ifdef __MACOSX__
619 static SV *real_main;
620
621 /* to due surprising braindamage on the side of SDL design, we
622 * do some mind-boggling hack here: SDL requires a custom main()
623 * on OS X, so... we provide one and call the original main(), which,
624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
625 * and which calls our main (== SDL_main) back.
626 */
627 extern C_LINKAGE int
628 main (int argc, char *argv[])
629 {
630 deliantra_main (real_main);
631 }
632
633 #undef main
634
635 extern C_LINKAGE int main (int argc, char *argv[]);
636
637 static void
638 SDL_main_hack (SV *real_main_)
639 {
640 real_main = real_main_;
641
642 char *argv[] = { "deliantra client", 0 };
643 (main) (1, argv);
644 }
645#else
646 static void
647 SDL_main_hack (SV *real_main)
648 {
649 deliantra_main (real_main);
650 }
651#endif
516 652
517MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
518 654
519PROTOTYPES: ENABLE 655PROTOTYPES: ENABLE
520 656
549 const_iv (SDL_USEREVENT), 685 const_iv (SDL_USEREVENT),
550 686
551 const_iv (SDL_APPINPUTFOCUS), 687 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 688 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 689 const_iv (SDL_APPACTIVE),
690
691
692 const_iv (SDLK_UNKNOWN),
693 const_iv (SDLK_FIRST),
694 const_iv (SDLK_BACKSPACE),
695 const_iv (SDLK_TAB),
696 const_iv (SDLK_CLEAR),
697 const_iv (SDLK_RETURN),
698 const_iv (SDLK_PAUSE),
699 const_iv (SDLK_ESCAPE),
700 const_iv (SDLK_SPACE),
701 const_iv (SDLK_EXCLAIM),
702 const_iv (SDLK_QUOTEDBL),
703 const_iv (SDLK_HASH),
704 const_iv (SDLK_DOLLAR),
705 const_iv (SDLK_AMPERSAND),
706 const_iv (SDLK_QUOTE),
707 const_iv (SDLK_LEFTPAREN),
708 const_iv (SDLK_RIGHTPAREN),
709 const_iv (SDLK_ASTERISK),
710 const_iv (SDLK_PLUS),
711 const_iv (SDLK_COMMA),
712 const_iv (SDLK_MINUS),
713 const_iv (SDLK_PERIOD),
714 const_iv (SDLK_SLASH),
715 const_iv (SDLK_0),
716 const_iv (SDLK_1),
717 const_iv (SDLK_2),
718 const_iv (SDLK_3),
719 const_iv (SDLK_4),
720 const_iv (SDLK_5),
721 const_iv (SDLK_6),
722 const_iv (SDLK_7),
723 const_iv (SDLK_8),
724 const_iv (SDLK_9),
725 const_iv (SDLK_COLON),
726 const_iv (SDLK_SEMICOLON),
727 const_iv (SDLK_LESS),
728 const_iv (SDLK_EQUALS),
729 const_iv (SDLK_GREATER),
730 const_iv (SDLK_QUESTION),
731 const_iv (SDLK_AT),
732
733 const_iv (SDLK_LEFTBRACKET),
734 const_iv (SDLK_BACKSLASH),
735 const_iv (SDLK_RIGHTBRACKET),
736 const_iv (SDLK_CARET),
737 const_iv (SDLK_UNDERSCORE),
738 const_iv (SDLK_BACKQUOTE),
739 const_iv (SDLK_DELETE),
554 740
555 const_iv (SDLK_FIRST), 741 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 742 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 743 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 744 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 820 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 821 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 822 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 823 const_iv (KMOD_MODE),
638 824
825 const_iv (KMOD_LRAM),
826
639 const_iv (MIX_DEFAULT_FORMAT), 827 const_iv (MIX_DEFAULT_FORMAT),
828
829 const_iv (SDL_INIT_TIMER),
830 const_iv (SDL_INIT_AUDIO),
831 const_iv (SDL_INIT_VIDEO),
832 const_iv (SDL_INIT_CDROM),
833 const_iv (SDL_INIT_JOYSTICK),
834 const_iv (SDL_INIT_EVERYTHING),
835 const_iv (SDL_INIT_NOPARACHUTE),
836 const_iv (SDL_INIT_EVENTTHREAD),
837
838 const_iv (SDL_GL_RED_SIZE),
839 const_iv (SDL_GL_GREEN_SIZE),
840 const_iv (SDL_GL_BLUE_SIZE),
841 const_iv (SDL_GL_ALPHA_SIZE),
842 const_iv (SDL_GL_DOUBLEBUFFER),
843 const_iv (SDL_GL_BUFFER_SIZE),
844 const_iv (SDL_GL_DEPTH_SIZE),
845 const_iv (SDL_GL_STENCIL_SIZE),
846 const_iv (SDL_GL_ACCUM_RED_SIZE),
847 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
848 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
849 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
850 const_iv (SDL_GL_STEREO),
851 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
852 const_iv (SDL_GL_MULTISAMPLESAMPLES),
853 const_iv (SDL_GL_ACCELERATED_VISUAL),
854 const_iv (SDL_GL_SWAP_CONTROL),
855
856 const_iv (FOW_DARKNESS)
640# undef const_iv 857# undef const_iv
641 }; 858 };
642 859
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 862
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 865}
649 866
665NV ceil (NV x) 882NV ceil (NV x)
666 883
667IV minpot (UV n) 884IV minpot (UV n)
668 885
669IV popcount (UV n) 886IV popcount (UV n)
887
888NV distance (NV dx, NV dy)
889 CODE:
890 RETVAL = pow (dx * dx + dy * dy, 0.5);
891 OUTPUT:
892 RETVAL
670 893
671void 894void
672pango_init () 895pango_init ()
673 CODE: 896 CODE:
674{ 897{
675 opengl_fontmap = pango_opengl_font_map_new (); 898 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 899 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 900 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
901 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 902#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 903 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 904 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 905#endif
682} 906}
683 907
684char *
685SDL_GetError () 908char *SDL_GetError ()
686 909
687int 910void SDL_main_hack (SV *real_main)
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 911 PROTOTYPE: &
689 912
690void 913int SDL_Init (U32 flags)
914
915int SDL_InitSubSystem (U32 flags)
916
917void SDL_QuitSubSystem (U32 flags)
918
691SDL_Quit () 919void SDL_Quit ()
920
921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
923
924int SDL_GL_GetAttribute (int attr)
925 CODE:
926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
927 XSRETURN_UNDEF;
928 OUTPUT:
929 RETVAL
692 930
693void 931void
694SDL_ListModes (int rgb, int alpha) 932SDL_ListModes (int rgb, int alpha)
695 PPCODE: 933 PPCODE:
696{ 934{
708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 946 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 947 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 948 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711 949
712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 950 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713#if SDL_VERSION_ATLEAST(1,2,10)
714 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 951 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
717 952
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 953 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 954
720 if (m && m != (SDL_Rect **)-1) 955 if (m && m != (SDL_Rect **)-1)
721 while (*m) 956 while (*m)
722 { 957 {
723 if ((*m)->w >= 800 && (*m)->h >= 480) 958 if ((*m)->w >= 400 && (*m)->h >= 300)
724 { 959 {
725 AV *av = newAV (); 960 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 961 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 962 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 963 av_push (av, newSViv (rgb));
751 ); 986 );
752 987
753 if (RETVAL) 988 if (RETVAL)
754 { 989 {
755 av_clear (texture_av); 990 av_clear (texture_av);
756
757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
758#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
759#include "glfunc.h" 992#include "glfunc.h"
760#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
761 } 996 }
762} 997}
763 OUTPUT: 998 OUTPUT:
764 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
765 1003
766void 1004void
767SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
768 1006
769char * 1007char *
770SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
771 1010
772int 1011int
773SDL_GetAppState () 1012SDL_GetAppState ()
774 1013
1014int
1015SDL_GetModState ()
1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
775void 1021void
1022SDL_PumpEvents ()
1023
1024void
776poll_events () 1025peep_events ()
777 PPCODE: 1026 PPCODE:
778{ 1027{
779 SDL_Event ev; 1028 SDL_Event ev;
780 1029
781 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
788 { 1037 {
789 case SDL_KEYDOWN: 1038 case SDL_KEYDOWN:
790 case SDL_KEYUP: 1039 case SDL_KEYUP:
791 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1040 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
792 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1041 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
793 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1042 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
794 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1043 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
795 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1044 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
796 break; 1045 break;
797 1046
798 case SDL_ACTIVEEVENT: 1047 case SDL_ACTIVEEVENT:
799 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1048 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
817 x = ev.motion.x; 1066 x = ev.motion.x;
818 y = ev.motion.y; 1067 y = ev.motion.y;
819 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1068 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
820 } 1069 }
821 1070
822 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1071 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
823 hv_store (hv, "state", 5, newSViv (state), 0); 1072 hv_store (hv, "state", 5, newSViv (state), 0);
824 hv_store (hv, "x", 1, newSViv (x), 0); 1073 hv_store (hv, "x", 1, newSViv (x), 0);
825 hv_store (hv, "y", 1, newSViv (y), 0); 1074 hv_store (hv, "y", 1, newSViv (y), 0);
826 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1075 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
827 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1076 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
847 1096
848 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
849 } 1098 }
850} 1099}
851 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
852int 1114int
853Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
854 POSTCALL: 1116 POSTCALL:
855 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
856 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
857 1119
858void 1120void
859Mix_QuerySpec () 1121Mix_QuerySpec ()
912 } 1174 }
913 } 1175 }
914#endif 1176#endif
915} 1177}
916 1178
917void 1179int
918add_font (char *file) 1180add_font (char *file)
919 CODE: 1181 CODE:
920 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1183 OUTPUT:
1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
921 1192
922void 1193void
923load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
924 ALIAS: 1195 ALIAS:
925 load_image_file = 1 1196 load_image_file = 1
971 1242
972 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
973 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
974 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
975 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
976 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
977 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
978 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
979 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
980 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
981 1252
1041#if DEBUG 1312#if DEBUG
1042 VALGRIND_DO_LEAK_CHECK; 1313 VALGRIND_DO_LEAK_CHECK;
1043#endif 1314#endif
1044} 1315}
1045 1316
1317int
1318SvREFCNT (SV *sv)
1319 CODE:
1320 RETVAL = SvREFCNT (sv);
1321 OUTPUT:
1322 RETVAL
1323
1046MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1047 1325
1048PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1049 1327
1050DC::Font 1328DC::Font
1051new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1052 CODE: 1330 CODE:
1053{ 1331{
1054 int count; 1332 int count;
1055 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1056 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1085 PROTOTYPE: 1363 PROTOTYPE:
1086 CODE: 1364 CODE:
1087 tc_restore (); 1365 tc_restore ();
1088 1366
1089DC::Layout 1367DC::Layout
1090new (SV *class) 1368new (SV *klass)
1091 CODE: 1369 CODE:
1092 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1093 1371
1094 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1095 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1096 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1097 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1098 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1099 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1100 RETVAL->font = 0; 1378 RETVAL->font = 0;
1101 RETVAL->rc = rc_alloc ();
1102 1379
1103 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1104 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1105 OUTPUT: 1382 OUTPUT:
1106 RETVAL 1383 RETVAL
1107 1384
1108void 1385void
1109DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1110 CODE: 1387 CODE:
1111 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1112 rc_free (self->rc);
1113 Safefree (self); 1389 delete self;
1114 1390
1115void 1391void
1116set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1117 CODE: 1393 CODE:
1118{ 1394{
1244 1520
1245void 1521void
1246set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1247 CODE: 1523 CODE:
1248 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1249 { 1525 {
1250 self->base_height = base_height; 1526 self->base_height = base_height;
1251 layout_update_font (self); 1527 layout_update_font (self);
1252 } 1528 }
1253 1529
1254void 1530void
1372} 1648}
1373 1649
1374void 1650void
1375render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1376 CODE: 1652 CODE:
1377 rc_clear (self->rc); 1653 self->rc.clear ();
1378 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1379 self->pl, 1655 self->pl,
1380 self->rc, 1656 &self->rc,
1381 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1382 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1383 flags 1659 flags
1384 ); 1660 );
1385 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1396 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1397 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1398 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1399 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1400 1676
1401 rc_draw (self->rc); 1677 self->rc.draw ();
1402 1678
1403 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1404 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1405 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1406} 1682}
1481 glDisable (GL_ALPHA_TEST); 1757 glDisable (GL_ALPHA_TEST);
1482 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1483 } 1759 }
1484} 1760}
1485 1761
1762void
1763draw_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)
1764 PROTOTYPE: @
1765 CODE:
1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1769 glEnable (GL_TEXTURE_2D);
1770 glBindTexture (GL_TEXTURE_2D, name1);
1771
1772 glColor3f (intensity, intensity, intensity);
1773 glPushMatrix ();
1774 glScalef (1./3, 1./3, 1.);
1775
1776 if (blend > 0.f)
1777 {
1778 float dx3 = dx * -3.f / w;
1779 float dy3 = dy * -3.f / h;
1780 GLfloat env_color[4] = { 0., 0., 0., blend };
1781
1782 /* interpolate the two shadow textures */
1783 /* stage 0 == rgb(glcolor) + alpha(t0) */
1784 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1785
1786 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1787 gl.ActiveTexture (GL_TEXTURE1);
1788 glEnable (GL_TEXTURE_2D);
1789 glBindTexture (GL_TEXTURE_2D, name2);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1791
1792 /* rgb == rgb(glcolor) */
1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1796
1797 /* alpha = interpolate t0, t1 by env_alpha */
1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1799
1800 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1806
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1809
1810 glBegin (GL_QUADS);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1815 glEnd ();
1816
1817 glDisable (GL_TEXTURE_2D);
1818 gl.ActiveTexture (GL_TEXTURE0);
1819 }
1820 else
1821 {
1822 /* simple blending of one texture, also opengl <1.3 path */
1823 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1824
1825 glBegin (GL_QUADS);
1826 glTexCoord2f (0, 0); glVertex2f (0, 0);
1827 glTexCoord2f (0, t); glVertex2f (0, h);
1828 glTexCoord2f (s, t); glVertex2f (w, h);
1829 glTexCoord2f (s, 0); glVertex2f (w, 0);
1830 glEnd ();
1831 }
1832
1833 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1834 {
1835 int x, y;
1836 int dx3 = dx * 3;
1837 int dy3 = dy * 3;
1838
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1840 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1841 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1842 glTranslatef (-1., -1., 0);
1843 glBegin (GL_QUADS);
1844
1845 for (y = 1; y < h; y += 3)
1846 {
1847 int y1 = y - dy3;
1848 int y1valid = y1 >= 0 && y1 < h;
1849
1850 for (x = 1; x < w; x += 3)
1851 {
1852 int x1 = x - dx3;
1853 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 uint8_t h2;
1855
1856 if (y1valid && x1 >= 0 && x1 < w)
1857 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 else
1859 h2 = 1; /* out of range == invisible */
1860
1861 if (h1 || h2)
1862 {
1863 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1864 glColor4f (1., 1., 1., alpha);
1865
1866 glTexCoord2f (0, 0.); glVertex2i (x , y );
1867 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1868 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1869 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1870 }
1871 }
1872 }
1873 }
1874
1875 glEnd ();
1876
1877 glPopMatrix ();
1878
1879 glDisable (GL_TEXTURE_2D);
1880 glDisable (GL_BLEND);
1881}
1882
1486IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1883IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1487 CODE: 1884 CODE:
1488{ 1885{
1489 GLint width; 1886 GLint width;
1490 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1887 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1497MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1498 1895
1499PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1500 1897
1501DC::Map 1898DC::Map
1502new (SV *class) 1899new (SV *klass)
1503 CODE: 1900 CODE:
1504 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1505 RETVAL->x = 0; 1902 RETVAL->x = 0;
1506 RETVAL->y = 0; 1903 RETVAL->y = 0;
1507 RETVAL->w = 0; 1904 RETVAL->w = 0;
1508 RETVAL->h = 0; 1905 RETVAL->h = 0;
1509 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1546 1943
1547void 1944void
1548set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1549 CODE: 1946 CODE:
1550{ 1947{
1551 tileid texid; 1948 tileid texid;
1552 maptex *tex; 1949 maptex *tex;
1553 1950
1554 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1555 return; 1952 return;
1556 1953
1557 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1558 return; 1955 return;
1559 1956
1560 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1561 1958
1562 if (!texid) 1959 if (!texid)
1563 return; 1960 return;
1564 1961
1565 tex = self->tex + texid; 1962 tex = self->tex + texid;
1594 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1991 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1595 // use uglier nearest interpolation because linear suffers 1992 // use uglier nearest interpolation because linear suffers
1596 // from transparent color bleeding and ugly wrapping effects. 1993 // from transparent color bleeding and ugly wrapping effects.
1597 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1994 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1598} 1995}
1996
1997void
1998expire_textures (DC::Map self, int texid, int count)
1999 PPCODE:
2000 for (; texid < self->texs && count; ++texid, --count)
2001 {
2002 maptex *tex = self->tex + texid;
2003
2004 if (tex->name)
2005 {
2006 if (tex->unused)
2007 {
2008 tex->name = 0;
2009 tex->unused = 0;
2010 XPUSHs (sv_2mortal (newSViv (texid)));
2011 }
2012 else
2013 tex->unused = 1;
2014 }
2015 }
1599 2016
1600int 2017int
1601ox (DC::Map self) 2018ox (DC::Map self)
1602 ALIAS: 2019 ALIAS:
1603 oy = 1 2020 oy = 1
1635 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1636 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1637 2054
1638 while (self->y < 0) 2055 while (self->y < 0)
1639 { 2056 {
1640 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1641 2058
1642 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1643 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1644 } 2061 }
1645} 2062}
1646 2063
1647SV * 2064SV *
1648map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1649 CODE: 2066 CODE:
1650{ 2067{
1651 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1652 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1653 mapcell *cell; 2070 mapcell *cell;
1674 2091
1675 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1676 2093
1677 if (flags & 8) 2094 if (flags & 8)
1678 { 2095 {
2096 uint8_t ext, cmd;
2097
1679 if (extmap) 2098 do
1680 { 2099 {
1681 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1682 2102
1683 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
1684 { 2106 {
1685 ext = *data++;
1686 cmd = ext & 0x3f;
1687
1688 if (cmd < 4)
1689 cell->darkness = 255 - ext * 64 + 1;
1690 else if (cmd == 5) // health
1691 {
1692 cell->stat_width = 1; 2107 cell->stat_width = 1;
1693 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
1694 }
1695 else if (cmd == 6) // monster width
1696 cell->stat_width = *data++ + 1;
1697 else if (cmd == 0x47)
1698 {
1699 if (*data == 4)
1700 ; // decode player count
1701
1702 data += *data + 1;
1703 }
1704 else if (cmd == 8) // cell flags
1705 cell->flags = *data++;
1706 else if (ext & 0x40) // unknown, multibyte => skip
1707 data += *data + 1;
1708 else
1709 data++;
1710 } 2109 }
1711 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
1712 } 2127 }
1713 else 2128 while (ext & 0x80);
1714 cell->darkness = *data++ + 1;
1715 } 2129 }
1716 2130
1717 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1718 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1719 { 2133 {
1722 cell->tile [z] = self->face2tile [face]; 2136 cell->tile [z] = self->face2tile [face];
1723 2137
1724 if (cell->tile [z]) 2138 if (cell->tile [z])
1725 { 2139 {
1726 maptex *tex = self->tex + cell->tile [z]; 2140 maptex *tex = self->tex + cell->tile [z];
2141 tex->unused = 0;
1727 if (!tex->name) 2142 if (!tex->name)
1728 av_push (missing, newSViv (cell->tile [z])); 2143 av_push (missing, newSViv (cell->tile [z]));
1729 2144
1730 if (tex->smoothtile) 2145 if (tex->smoothtile)
1731 { 2146 {
1732 maptex *smooth = self->tex + tex->smoothtile; 2147 maptex *smooth = self->tex + tex->smoothtile;
2148 smooth->unused = 0;
1733 if (!smooth->name) 2149 if (!smooth->name)
1734 av_push (missing, newSViv (tex->smoothtile)); 2150 av_push (missing, newSViv (tex->smoothtile));
1735 } 2151 }
1736 } 2152 }
1737 } 2153 }
1738 } 2154 }
1739 else 2155 else
1740 cell->darkness = 0; 2156 CELL_CLEAR (cell);
1741 } 2157 }
1742} 2158}
1743 OUTPUT: 2159 OUTPUT:
1744 RETVAL 2160 RETVAL
1745 2161
1765 ? self->row + y 2181 ? self->row + y
1766 : 0; 2182 : 0;
1767 2183
1768 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1769 { 2185 {
1770 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
1771 2187
1772 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
1773 { 2189 {
1774 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
1775 2191
1777 { 2193 {
1778 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
1779 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
1780 int a1 = tex.a; 2196 int a1 = tex.a;
1781 2197
1782 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
1783 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
1784 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
1785 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
1786 } 2202 }
1787 } 2203 }
1788 2204
1789 *map++ = (r ) 2205 *map++ = (r )
1790 | (g << 8) 2206 | (g << 8)
1791 | (b << 16) 2207 | (b << 16)
1792 | (a << 24); 2208 | (a << 24);
1793 } 2209 }
1794 } 2210 }
1795 2211
1796 RETVAL = map_sv; 2212 RETVAL = map_sv;
1797} 2213}
1798 OUTPUT: 2214 OUTPUT:
1799 RETVAL 2215 RETVAL
1800 2216
1801void 2217void
1802draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2218draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1803 CODE: 2219 CODE:
1804{ 2220{
1805 int x, y, z; 2221 int x, y, z;
1806 2222
1807 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1808 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1809 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2223 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1810 smooth_key skey; 2224 int pl_x, pl_y;
1811 2225 maptex pl_tex;
1812 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2227 rc_t rc_ov;
1813 rc_key_t key; 2228 rc_key_t key;
1814 rc_array_t *arr; 2229 rc_t::array_t *arr;
1815 2230
2231 pl_tex.name = 0;
2232
1816 // thats current max. sorry. 2233 // that's current max. sorry.
1817 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1818 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1819
1820 // clear key, in case of extra padding
1821 memset (&skey, 0, sizeof (skey));
1822 2236
1823 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
1824 key.r = 255; 2238 key.r = 255;
1825 key.g = 255; 2239 key.g = 255;
1826 key.b = 255; 2240 key.b = 255;
1827 key.a = 255; 2241 key.a = 255;
1828 key.mode = GL_QUADS; 2242 key.mode = GL_QUADS;
1829 key.format = GL_T2F_V3F; 2243 key.format = GL_T2F_V3F;
1830 key.texname = -1;
1831 2244
1832 mx += self->x; 2245 mx += self->x;
1833 my += self->y; 2246 my += self->y;
1834 2247
1835 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
1836 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
1837 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
1838 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1839 2252
1840 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
1841 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
1842 { 2255 {
1843 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
1858 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1859 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1860 2273
1861 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
1862 { 2275 {
1863 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2279 key.texname = -1;
1864 2280
1865 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
1866 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
1867 { 2283 {
1868 maprow *row = self->row + (y + my); 2284 maprow *row = self->row + (y + my);
1878 maptex tex = self->tex [tile]; 2294 maptex tex = self->tex [tile];
1879 int px, py; 2295 int px, py;
1880 2296
1881 if (key.texname != tex.name) 2297 if (key.texname != tex.name)
1882 { 2298 {
2299 self->tex [tile].unused = 0;
2300
1883 if (!tex.name) 2301 if (!tex.name)
1884 tex = self->tex [2]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1885 2303
1886 key.texname = tex.name; 2304 key.texname = tex.name;
1887 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
1888 } 2306 }
1889 2307
1890 px = (x + 1) * T - tex.w; 2308 px = (x + 1) * Th - tex.w;
1891 py = (y + 1) * T - tex.h; 2309 py = (y + 1) * Tw - tex.h;
1892 2310
1893 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
1894 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1895 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1896 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1897
1898 if (cell->flags && z == 2)
1899 { 2312 {
1900 // overlays such as the speech bubble, probably more to come 2313 pl_x = px;
1901 if (cell->flags & 1) 2314 pl_y = py;
2315 pl_tex = tex;
1902 { 2316 continue;
1903 maptex tex = self->tex [1];
1904 int px = x * T + T * 2 / 32;
1905 int py = y * T - T * 6 / 32;
1906
1907 if (tex.name)
1908 {
1909 if (key.texname != tex.name)
1910 {
1911 key.texname = tex.name;
1912 arr = rc_array (rc, &key);
1913 }
1914
1915 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1916 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1917 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1918 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1919 }
1920 }
1921 } 2317 }
2318
2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2321 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1922 2323
1923 // update smooth hash 2324 // update smooth hash
1924 if (tex.smoothtile) 2325 if (tex.smoothtile)
1925 { 2326 {
1926 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
1927 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
1928 2329
1929 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
1930 2331
1931 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
1932 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
1933 2334
1934 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
1942 2343
1943 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1944 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
1945 2346
1946 // full tile 2347 // full tile
1947 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1948 2349
1949 // borders 2350 // borders
1950 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1951 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2352 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1952 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2353 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1953 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1954 2355
1955 // corners 2356 // corners
1956 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1957 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2358 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1958 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2359 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1959 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2361 }
2362 }
2363
2364 if (expect_false (z == 2) && expect_false (cell->flags))
2365 {
2366 // overlays such as the speech bubble, probably more to come
2367 if (cell->flags & 1)
2368 {
2369 rc_key_t key_ov = key;
2370 maptex tex = self->tex[TEXID_SPEECH];
2371 int px = x * Tw + Tw * 2 / 32;
2372 int py = y * Th - Th * 6 / 32;
2373
2374 key_ov.texname = tex.name;
2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2376
2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1960 } 2381 }
1961 } 2382 }
1962 } 2383 }
1963 } 2384 }
1964 2385
1965 rc_draw (rc); 2386 rc.draw ();
1966 rc_clear (rc); 2387 rc.clear ();
1967 2388
1968 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
1969 // this is basically counting sort 2390 // this is basically counting sort
1970 { 2391 {
1971 int w, b; 2392 int w, b;
1972 2393
1973 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
1974 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
1975 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1976 { 2399 {
1977 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
1978 if (smask) 2401 IV bits = it->second;
1979 for (b = 0; b < 32; ++b) 2402
1980 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
1981 { 2406 {
1982 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
1983 HE *he; 2415 if (tex.name)
1984
1985 hv_iterinit (smooth);
1986 while ((he = hv_iternext (smooth)))
1987 { 2416 {
1988 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
1989 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
1990 2419 if (key.texname != tex.name)
1991 if (!(bits & 0x1000)
1992 && skey->level == level
1993 && level > smooth_max [skey->x][skey->y])
1994 { 2420 {
1995 maptex tex = self->tex [skey->tile]; 2421 self->tex [skey.tile].unused = 0;
1996 int px = (((int)skey->x) - 1) * T;
1997 int py = (((int)skey->y) - 1) * T;
1998 int border = bits & 15;
1999 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2000 float dx = tex.s * .0625f; // 16 images/row
2001 float dy = tex.t * .5f ; // 2 images/column
2002 2422
2003 if (tex.name)
2004 {
2005 // this time avoiding texture state changes
2006 // save gobs of state changes.
2007 if (key.texname != tex.name)
2008 {
2009 glEnd (); 2423 glEnd ();
2010 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2011 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2012 } 2426 }
2013 2427
2014 if (border) 2428 if (border)
2015 { 2429 {
2016 float ox = border * dx; 2430 float ox = border * dx;
2017 2431
2018 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2019 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2020 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2021 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2022 } 2436 }
2023 2437
2024 if (corner) 2438 if (corner)
2025 { 2439 {
2026 float ox = corner * dx; 2440 float ox = corner * dx;
2027 2441
2028 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2029 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2030 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2031 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2032 }
2033 }
2034 } 2446 }
2035 } 2447 }
2036 } 2448 }
2037 } 2449 }
2038 2450
2039 glEnd (); 2451 glEnd ();
2040 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2041 key.texname = -1; 2453 key.texname = -1;
2042 } 2454 }
2043
2044 hv_clear (smooth);
2045 } 2455 }
2046 2456
2457 if (pl_tex.name)
2458 {
2459 maptex tex = pl_tex;
2460 int px = pl_x + sdx;
2461 int py = pl_y + sdy;
2462
2463 key.texname = tex.name;
2464 rc_t::array_t &arr = rc.array (key);
2465
2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2468 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2470
2471 rc.draw ();
2472 }
2473
2474 rc_ov.draw ();
2475 rc_ov.clear ();
2476
2047 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2048 rc_free (rc);
2049 2478
2050 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2051 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2052 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2053 { 2482 {
2056 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2057 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2058 { 2487 {
2059 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2060 2489
2061 int px = x * T; 2490 int px = x * Tw;
2062 int py = y * T; 2491 int py = y * Th;
2492
2493 if (expect_false (cell->player == player))
2494 {
2495 px += sdx;
2496 py += sdy;
2497 }
2063 2498
2064 if (cell->stat_hp) 2499 if (cell->stat_hp)
2065 { 2500 {
2066 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2067 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2068 2503
2069 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2070 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2071 px + width - 1, py); 2506 px + width - 1, py);
2072 2507
2078 } 2513 }
2079 } 2514 }
2080} 2515}
2081 2516
2082void 2517void
2083draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2518draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2084 CODE: 2519 CODE:
2085{ 2520{
2086 static float color[16][3] = { 2521 static float color[16][3] = {
2087 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2088 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2089 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2090 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2091 2526
2092 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2093 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2094 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2095 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2096 2531
2097 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2098 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2099 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2100 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2101 2536
2102 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2103 2538
2104 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2105 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2106 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2107 }; 2542 };
2108 2543
2109 int x, y; 2544 int x, y;
2110 2545
2111 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2549 * and takes the colour from god knows where instead of using
2550 * Cp. MODULATE results in the same colour, but slightly different
2551 * alpha, but atcually gives us the correct colour with nvidia.
2552 */
2112 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2113 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2114 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2555 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2115 glBegin (GL_QUADS); 2556 glBegin (GL_QUADS);
2116 2557
2117 for (y = 0; y < h; y++) 2558 for (y = 0; y < h; y++)
2121 2562
2122 if (m) 2563 if (m)
2123 { 2564 {
2124 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2125 2566
2126 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2127 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2128 2569
2129 glColor4f (c[0], c[1], c[2], 0.75); 2570 glColor4f (c[0], c[1], c[2], 1);
2130 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2131 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2132 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2133 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2574 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2134 } 2575 }
2142void 2583void
2143fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2584fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2144 PPCODE: 2585 PPCODE:
2145{ 2586{
2146 int x, y; 2587 int x, y;
2147 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2148 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2149 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2150 int sw34 = (sw * 3 + 3) & ~3; 2591 int sw3 = sw * 3;
2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2151 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2152 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2153 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2154 2596
2155 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2156 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2157 2599
2158 mx += self->x - 1; 2600 mx += self->x - 1;
2159 my += self->y - 1; 2601 my += self->y - 1;
2160
2161 memset (darkness1, 255, sw1 * sh1);
2162 2602
2163 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2164 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2165 { 2605 {
2166 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2169 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2170 { 2610 {
2171 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2172 2612
2173 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2174 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2175 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2176 } 2616 }
2177 } 2617 }
2178 2618
2179 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2180 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2199 2639
2200 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2201 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2202 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2203 2643
2204 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2205 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2206 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2207 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2208 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2209 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2210 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2211 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2212 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2213 } 2653 }
2214 2654
2215 free (darkness1); 2655 free (darkness1);
2216 2656
2217 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2218 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2219 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2220 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2221} 2661}
2222 2662
2223SV * 2663SV *
2286 else 2726 else
2287 *data++ = 0; 2727 *data++ = 0;
2288 } 2728 }
2289 } 2729 }
2290 2730
2731 /* if size is w*h + 5 then no data has been found */
2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2733 {
2291 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2292 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2736 }
2737
2293 RETVAL = data_sv; 2738 RETVAL = data_sv;
2294} 2739}
2295 OUTPUT: 2740 OUTPUT:
2296 RETVAL 2741 RETVAL
2297 2742
2298void 2743void
2299set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2744set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2300 PPCODE: 2745 PPCODE:
2301{ 2746{
2302 int x, y, z; 2747 int x, y, z;
2303 int w, h; 2748 int w, h;
2304 int x1, y1; 2749 int x1, y1;
2750 STRLEN len;
2751 uint8_t *data, *end;
2752
2753 len = SvLEN (data_sv);
2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2756 end = data + len + 8;
2757
2758 if (len < 5)
2759 XSRETURN_EMPTY;
2305 2760
2306 if (*data++ != 0) 2761 if (*data++ != 0)
2307 XSRETURN_EMPTY; /* version mismatch */ 2762 XSRETURN_EMPTY; /* version mismatch */
2308 2763
2309 w = *data++ << 8; w |= *data++; 2764 w = *data++ << 8; w |= *data++;
2324 { 2779 {
2325 maprow *row = map_get_row (self, y); 2780 maprow *row = map_get_row (self, y);
2326 2781
2327 for (x = x0; x < x1; x++) 2782 for (x = x0; x < x1; x++)
2328 { 2783 {
2784 uint8_t flags;
2785
2786 if (data + 7 >= end)
2787 XSRETURN_EMPTY;
2788
2329 uint8_t flags = *data++; 2789 flags = *data++;
2330 2790
2331 if (flags) 2791 if (flags)
2332 { 2792 {
2333 mapcell *cell = row_get_cell (row, x); 2793 mapcell *cell = row_get_cell (row, x);
2334 tileid tile[3] = { 0, 0, 0 }; 2794 tileid tile[3] = { 0, 0, 0 };
2337 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2797 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2338 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2798 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2339 2799
2340 if (cell->darkness == 0) 2800 if (cell->darkness == 0)
2341 { 2801 {
2342 cell->darkness = 0; 2802 /*cell->darkness = 0;*/
2803 EXTEND (SP, 3);
2343 2804
2344 for (z = 0; z <= 2; z++) 2805 for (z = 0; z <= 2; z++)
2345 { 2806 {
2346 tileid t = tile [z]; 2807 tileid t = tile [z];
2347 2808
2348 if (t >= self->texs || (t && !self->tex [t].name)) 2809 if (t >= self->texs || (t && !self->tex [t].name))
2349 { 2810 {
2350 XPUSHs (sv_2mortal (newSViv (t))); 2811 PUSHs (sv_2mortal (newSViv (t)));
2351 need_texid (self, t); 2812 need_texid (self, t);
2352 } 2813 }
2353 2814
2354 cell->tile [z] = t; 2815 cell->tile [z] = t;
2355 } 2816 }
2360} 2821}
2361 2822
2362MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2363 2824
2364DC::RW 2825DC::RW
2365new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2366 CODE: 2827 CODE:
2367{ 2828{
2368 STRLEN datalen; 2829 STRLEN datalen;
2369 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2370 2831
2372} 2833}
2373 OUTPUT: 2834 OUTPUT:
2374 RETVAL 2835 RETVAL
2375 2836
2376DC::RW 2837DC::RW
2377new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2378 CODE: 2839 CODE:
2379 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2380 OUTPUT: 2841 OUTPUT:
2381 RETVAL 2842 RETVAL
2382 2843
2400 if (RETVAL < 0) 2861 if (RETVAL < 0)
2401 { 2862 {
2402 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2403 2864
2404 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2405 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2406 2872 }
2873 else
2407 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2408 } 2875 }
2409 2876
2410 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2411 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2412} 2879}
2459void 2926void
2460set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2461 CODE: 2928 CODE:
2462{ 2929{
2463 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2930 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2464 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2931 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2465 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2466} 2933}
2467 2934
2468void 2935void
2469set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2472 2939
2473MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2474 2941
2475PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2476 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2477DC::MixChunk 2956DC::MixChunk
2478new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2479 CODE: 2958 CODE:
2480 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2481 OUTPUT: 2960 OUTPUT:
2482 RETVAL 2961 RETVAL
2483 2962
2513 OUTPUT: 2992 OUTPUT:
2514 RETVAL 2993 RETVAL
2515 2994
2516MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2517 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2518int 3009int
2519volume (int volume = -1) 3010volume (int volume = -1)
2520 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2521 CODE: 3012 CODE:
2522 if (items > 0) 3013 if (items > 0)
2533void 3024void
2534halt () 3025halt ()
2535 CODE: 3026 CODE:
2536 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2537 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2538DC::MixMusic 3036DC::MixMusic
2539new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2540 CODE: 3038 CODE:
2541 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2542 OUTPUT: 3040 OUTPUT:
2543 RETVAL 3041 RETVAL
2544 3042
2572 } *civ, const_iv[] = { 3070 } *civ, const_iv[] = {
2573# define const_iv(name) { # name, (IV)name } 3071# define const_iv(name) { # name, (IV)name }
2574 const_iv (GL_VENDOR), 3072 const_iv (GL_VENDOR),
2575 const_iv (GL_VERSION), 3073 const_iv (GL_VERSION),
2576 const_iv (GL_EXTENSIONS), 3074 const_iv (GL_EXTENSIONS),
3075 const_iv (GL_MAX_TEXTURE_UNITS),
2577 const_iv (GL_COLOR_MATERIAL), 3076 const_iv (GL_COLOR_MATERIAL),
2578 const_iv (GL_SMOOTH), 3077 const_iv (GL_SMOOTH),
2579 const_iv (GL_FLAT), 3078 const_iv (GL_FLAT),
2580 const_iv (GL_DITHER), 3079 const_iv (GL_DITHER),
2581 const_iv (GL_BLEND), 3080 const_iv (GL_BLEND),
2593 const_iv (GL_ZERO), 3092 const_iv (GL_ZERO),
2594 const_iv (GL_SRC_ALPHA), 3093 const_iv (GL_SRC_ALPHA),
2595 const_iv (GL_DST_ALPHA), 3094 const_iv (GL_DST_ALPHA),
2596 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3095 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2597 const_iv (GL_ONE_MINUS_DST_ALPHA), 3096 const_iv (GL_ONE_MINUS_DST_ALPHA),
3097 const_iv (GL_SRC_COLOR),
3098 const_iv (GL_DST_COLOR),
3099 const_iv (GL_ONE_MINUS_SRC_COLOR),
3100 const_iv (GL_ONE_MINUS_DST_COLOR),
2598 const_iv (GL_SRC_ALPHA_SATURATE), 3101 const_iv (GL_SRC_ALPHA_SATURATE),
2599 const_iv (GL_RGB), 3102 const_iv (GL_RGB),
2600 const_iv (GL_RGBA), 3103 const_iv (GL_RGBA),
2601 const_iv (GL_RGBA4), 3104 const_iv (GL_RGBA4),
2602 const_iv (GL_RGBA8), 3105 const_iv (GL_RGBA8),
2670 const_iv (GL_NICEST), 3173 const_iv (GL_NICEST),
2671 const_iv (GL_V2F), 3174 const_iv (GL_V2F),
2672 const_iv (GL_V3F), 3175 const_iv (GL_V3F),
2673 const_iv (GL_T2F_V3F), 3176 const_iv (GL_T2F_V3F),
2674 const_iv (GL_T2F_N3F_V3F), 3177 const_iv (GL_T2F_N3F_V3F),
3178 const_iv (GL_FUNC_ADD),
3179 const_iv (GL_FUNC_SUBTRACT),
3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2675# undef const_iv 3181# undef const_iv
2676 }; 3182 };
2677 3183
2678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2680 3186
2681 texture_av = newAV (); 3187 texture_av = newAV ();
2682 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
2683} 3189}
2684 3190
2686disable_GL_EXT_blend_func_separate () 3192disable_GL_EXT_blend_func_separate ()
2687 CODE: 3193 CODE:
2688 gl.BlendFuncSeparate = 0; 3194 gl.BlendFuncSeparate = 0;
2689 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
2690 3196
2691char * 3197void
3198apple_nvidia_bug (int enable)
3199
3200const char *
2692gl_vendor () 3201gl_vendor ()
2693 CODE: 3202 CODE:
2694 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
2695 OUTPUT: 3204 OUTPUT:
2696 RETVAL 3205 RETVAL
2697 3206
2698char * 3207const char *
2699gl_version () 3208gl_version ()
2700 CODE: 3209 CODE:
2701 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
2702 OUTPUT: 3211 OUTPUT:
2703 RETVAL 3212 RETVAL
2704 3213
2705char * 3214const char *
2706gl_extensions () 3215gl_extensions ()
2707 CODE: 3216 CODE:
2708 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2709 OUTPUT: 3218 OUTPUT:
2710 RETVAL 3219 RETVAL
2711 3220
2712const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
2713 3226
2714GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
2715 CODE: 3228 CODE:
2716 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
2717 OUTPUT: 3230 OUTPUT:
2725 3238
2726int glGetError () 3239int glGetError ()
2727 3240
2728void glFinish () 3241void glFinish ()
2729 3242
3243void glFlush ()
3244
2730void glClear (int mask) 3245void glClear (int mask)
2731 3246
2732void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
2733 PROTOTYPE: @ 3248 PROTOTYPE: @
2734 3249
2743void glBlendFunc (int sfactor, int dfactor) 3258void glBlendFunc (int sfactor, int dfactor)
2744 3259
2745void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3260void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2746 CODE: 3261 CODE:
2747 gl_BlendFuncSeparate (sa, da, saa, daa); 3262 gl_BlendFuncSeparate (sa, da, saa, daa);
3263
3264# void glBlendEquation (int se)
2748 3265
2749void glDepthMask (int flag) 3266void glDepthMask (int flag)
2750 3267
2751void glLogicOp (int opcode) 3268void glLogicOp (int opcode)
2752 3269
2787void glRotate (float angle, float x, float y, float z) 3304void glRotate (float angle, float x, float y, float z)
2788 CODE: 3305 CODE:
2789 glRotatef (angle, x, y, z); 3306 glRotatef (angle, x, y, z);
2790 3307
2791void glColor (float r, float g, float b, float a = 1.0) 3308void glColor (float r, float g, float b, float a = 1.0)
3309 PROTOTYPE: @
2792 ALIAS: 3310 ALIAS:
2793 glColor_premultiply = 1 3311 glColor_premultiply = 1
2794 CODE: 3312 CODE:
2795 if (ix) 3313 if (ix)
2796 { 3314 {
2902 3420
2903void glEndList () 3421void glEndList ()
2904 3422
2905void glCallList (int list) 3423void glCallList (int list)
2906 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
2907MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2908 3431
2909PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
2910 3433
2911void 3434void
2912find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
2913 PPCODE: 3436 PPCODE:
2914{ 3437{
2915 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
2916 XPUSHs (self); 3439 XPUSHs (self);
2917} 3440}
2918 3441
2919BOOT: 3442BOOT:
2920{ 3443{
2928 3451
2929void 3452void
2930draw (SV *self) 3453draw (SV *self)
2931 CODE: 3454 CODE:
2932{ 3455{
2933 HV *hv; 3456 HV *hv;
2934 SV **svp; 3457 SV **svp;
2935 NV x, y, w, h; 3458 NV x, y, w, h;
2936 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
2937 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
2938 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
2939 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines