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.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC

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

Diff Legend

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