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.280 by root, Wed Nov 26 23:08:34 2008 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 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);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 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 */
86#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
92 101
93/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
97 128
98static AV *texture_av; 129static AV *texture_av;
99 130
100static struct 131static struct
101{ 132{
158{ 189{
159 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
160 191
161 while (attrs) 192 while (attrs)
162 { 193 {
163 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 195
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 197 return 1;
167 198
168 attrs = attrs->next; 199 attrs = attrs->next;
169 } 200 }
170 201
171 return 0; 202 return 0;
172} 203}
173 204
174typedef struct cf_layout { 205struct cf_layout {
175 PangoLayout *pl; 206 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
177 int base_height; 208 int base_height;
178 DC__Font font; 209 DC__Font font;
179 rc_t *rc; 210 rc_t *rc;
180} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
181 214
182static DC__Font default_font; 215static DC__Font default_font;
183static PangoContext *opengl_context; 216static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
185 218
186static void 219static void
187substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
188{ 221{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 225#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 227}
195 228
196static void 229static void
226} 259}
227 260
228typedef uint16_t tileid; 261typedef uint16_t tileid;
229typedef uint16_t faceid; 262typedef uint16_t faceid;
230 263
231typedef struct { 264struct maptex
265{
232 GLuint name; 266 GLuint name;
233 int w, h; 267 int w, h;
234 float s, t; 268 float s, t;
235 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
236 tileid smoothtile; 270 tileid smoothtile;
237 uint8_t smoothlevel; 271 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
239} maptex; 273};
240 274
241typedef struct { 275struct mapcell
276{
242 uint32_t player; 277 uint32_t player;
243 tileid tile[3]; 278 tileid tile[3];
244 uint16_t darkness; 279 uint16_t darkness;
245 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
246} mapcell; 281};
247 282
248typedef struct { 283struct maprow
284{
249 int32_t c0, c1; 285 int32_t c0, c1;
250 mapcell *col; 286 mapcell *col;
251} maprow; 287};
252 288
253typedef struct map { 289struct mapgrid {
254 int x, y, w, h; 290 int x, y, w, h;
255 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
256 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
257 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
258 294
259 int32_t rows; 295 int32_t rows;
260 maprow *row; 296 maprow *row;
261} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
262 300
263static char * 301static char *
264prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
265{ 303{
266 char *p; 304 char *p;
284 322
285#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
286#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
287 325
288static void 326static void
289need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
290{ 328{
291 while (self->faces <= face) 329 while (self->faces <= face)
292 { 330 {
293 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
294 self->faces *= 2; 332 self->faces *= 2;
295 } 333 }
296} 334}
297 335
298static void 336static void
299need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
300{ 338{
301 while (self->texs <= texid) 339 while (self->texs <= texid)
302 { 340 {
303 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
304 self->texs *= 2; 342 self->texs *= 2;
305 } 343 }
306} 344}
307 345
308static maprow * 346static maprow *
309map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
310{ 348{
311 if (0 > y) 349 if (0 > y)
312 { 350 {
313 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
314 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
352 390
353 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
354} 392}
355 393
356static mapcell * 394static mapcell *
357map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
358{ 396{
359 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
360} 398}
361 399
362static void 400static void
363map_clear (DC__Map self) 401map_clear (mapgrid *self)
364{ 402{
365 int r; 403 int r;
366 404
367 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
368 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
386 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
387 (cell)->player = 0; \ 425 (cell)->player = 0; \
388 } while (0) 426 } while (0)
389 427
390static void 428static void
391map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
392{ 430{
393 int x, y; 431 int x, y;
394 maprow *row; 432 maprow *row;
395 mapcell *cell; 433 mapcell *cell;
396 434
413 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
414 } 452 }
415 } 453 }
416} 454}
417 455
418typedef struct { 456struct smooth_key
457{
419 tileid tile; 458 tileid tile;
420 uint8_t x, y, level; 459 uint8_t x, y, level;
421} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
422 479
423static void 480static void
424smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
425{ 482{
426 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
427 484
428 if (SvIOK (*sv)) 485 if (it == h.end ())
429 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
430 else 487 else
431 sv_setiv (*sv, bits); 488 it->second |= bits;
432} 489}
433 490
434static void 491static void
435music_finished (void) 492music_finished (void)
436{ 493{
453 ev.code = 1; 510 ev.code = 1;
454 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
455 ev.data2 = 0; 512 ev.data2 = 0;
456 513
457 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
458} 522}
459 523
460static unsigned int 524static unsigned int
461minpot (unsigned int n) 525minpot (unsigned int n)
462{ 526{
545 609
546 return mod; 610 return mod;
547} 611}
548 612
549static void 613static void
550deliantra_main () 614deliantra_main (SV *real_main)
551{ 615{
552 char *argv[] = { 0 }; 616 dSP;
553 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
554} 620}
555 621
556#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
557 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which, 627 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
562 */ 630 */
563 extern C_LINKAGE int 631 extern C_LINKAGE int
564 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
565 { 633 {
566 deliantra_main (); 634 deliantra_main (real_main);
567 } 635 }
568 636
569 #undef main 637 #undef main
570 638
571 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
572 640
573 static void 641 static void
574 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
575 { 643 {
644 real_main = real_main_;
645
576 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv); 647 (main) (1, argv);
578 } 648 }
579#else 649#else
580 static void 650 static void
581 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
582 { 652 {
583 deliantra_main (); 653 deliantra_main (real_main);
584 } 654 }
585#endif 655#endif
586 656
587MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
588 658
789 859
790 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
791# undef const_iv 861# undef const_iv
792 }; 862 };
793 863
794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796 866
797 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799} 869}
800 870
816NV ceil (NV x) 886NV ceil (NV x)
817 887
818IV minpot (UV n) 888IV minpot (UV n)
819 889
820IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
821 897
822void 898void
823pango_init () 899pango_init ()
824 CODE: 900 CODE:
825{ 901{
833#endif 909#endif
834} 910}
835 911
836char *SDL_GetError () 912char *SDL_GetError ()
837 913
838void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
839 916
840int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
841 918
842int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
843 920
844void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
845 922
846void SDL_Quit () 923void SDL_Quit ()
847 924
848int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
849 927
850int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
851 CODE: 929 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
853 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
854 OUTPUT: 932 OUTPUT:
855 RETVAL 933 RETVAL
856 934
857void 935void
912 ); 990 );
913 991
914 if (RETVAL) 992 if (RETVAL)
915 { 993 {
916 av_clear (texture_av); 994 av_clear (texture_av);
917
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
920#include "glfunc.h" 996#include "glfunc.h"
921#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 1000 }
923} 1001}
924 OUTPUT: 1002 OUTPUT:
925 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
926 1007
927void 1008void
928SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
929 1010
930char * 1011char *
931SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
932 1014
933int 1015int
934SDL_GetAppState () 1016SDL_GetAppState ()
935 1017
936int 1018int
937SDL_GetModState () 1019SDL_GetModState ()
938 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
939void 1025void
1026SDL_PumpEvents ()
1027
1028void
940poll_events () 1029peep_events ()
941 PPCODE: 1030 PPCODE:
942{ 1031{
943 SDL_Event ev; 1032 SDL_Event ev;
944 1033
945 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1011 1100
1012 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1013 } 1102 }
1014} 1103}
1015 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
1016int 1118int
1017Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1018 POSTCALL: 1120 POSTCALL:
1019 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1020 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1021 1123
1022void 1124void
1023Mix_QuerySpec () 1125Mix_QuerySpec ()
1082add_font (char *file) 1184add_font (char *file)
1083 CODE: 1185 CODE:
1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT: 1187 OUTPUT:
1086 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1087 1196
1088void 1197void
1089load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1090 ALIAS: 1199 ALIAS:
1091 load_image_file = 1 1200 load_image_file = 1
1137 1246
1138 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1139 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1140 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1141 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1142 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1143 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1144 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1145 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1146 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1147 1256
1219MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1220 1329
1221PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1222 1331
1223DC::Font 1332DC::Font
1224new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1225 CODE: 1334 CODE:
1226{ 1335{
1227 int count; 1336 int count;
1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1229 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1258 PROTOTYPE: 1367 PROTOTYPE:
1259 CODE: 1368 CODE:
1260 tc_restore (); 1369 tc_restore ();
1261 1370
1262DC::Layout 1371DC::Layout
1263new (SV *class) 1372new (SV *klass)
1264 CODE: 1373 CODE:
1265 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1266 1375
1267 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1268 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1417 1526
1418void 1527void
1419set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1420 CODE: 1529 CODE:
1421 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1422 { 1531 {
1423 self->base_height = base_height; 1532 self->base_height = base_height;
1424 layout_update_font (self); 1533 layout_update_font (self);
1425 } 1534 }
1426 1535
1427void 1536void
1654 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1656 } 1765 }
1657} 1766}
1658 1767
1768void
1769draw_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)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1659IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660 CODE: 1890 CODE:
1661{ 1891{
1662 GLint width; 1892 GLint width;
1663 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1670MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1671 1901
1672PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1673 1903
1674DC::Map 1904DC::Map
1675new (SV *class) 1905new (SV *klass)
1676 CODE: 1906 CODE:
1677 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1678 RETVAL->x = 0; 1908 RETVAL->x = 0;
1679 RETVAL->y = 0; 1909 RETVAL->y = 0;
1680 RETVAL->w = 0; 1910 RETVAL->w = 0;
1681 RETVAL->h = 0; 1911 RETVAL->h = 0;
1682 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1719 1949
1720void 1950void
1721set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1722 CODE: 1952 CODE:
1723{ 1953{
1724 tileid texid; 1954 tileid texid;
1725 maptex *tex; 1955 maptex *tex;
1726 1956
1727 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1728 return; 1958 return;
1729 1959
1730 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1731 return; 1961 return;
1732 1962
1733 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1734 1964
1735 if (!texid) 1965 if (!texid)
1736 return; 1966 return;
1737 1967
1738 tex = self->tex + texid; 1968 tex = self->tex + texid;
1771} 2001}
1772 2002
1773void 2003void
1774expire_textures (DC::Map self, int texid, int count) 2004expire_textures (DC::Map self, int texid, int count)
1775 PPCODE: 2005 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count) 2006 for (; texid < self->texs && count; ++texid, --count)
1777 { 2007 {
1778 maptex *tex = self->tex + texid; 2008 maptex *tex = self->tex + texid;
1779 2009
1780 if (tex->name) 2010 if (tex->name)
1781 { 2011 {
1782 if (tex->unused) 2012 if (tex->unused)
1783 { 2013 {
1784 tex->name = 0; 2014 tex->name = 0;
1785 tex->unused = 0, 2015 tex->unused = 0;
1786 XPUSHs (sv_2mortal (newSViv (texid))); 2016 XPUSHs (sv_2mortal (newSViv (texid)));
1787 } 2017 }
1788 else 2018 else
1789 tex->unused = 1; 2019 tex->unused = 1;
1790 } 2020 }
1836 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1837 } 2067 }
1838} 2068}
1839 2069
1840SV * 2070SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1842 CODE: 2072 CODE:
1843{ 2073{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2076 mapcell *cell;
1867 2097
1868 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1869 2099
1870 if (flags & 8) 2100 if (flags & 8)
1871 { 2101 {
2102 uint8_t ext, cmd;
2103
1872 if (extmap) 2104 do
1873 { 2105 {
1874 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1875 2108
1876 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1877 { 2112 {
1878 ext = *data++;
1879 cmd = ext & 0x7f;
1880
1881 if (cmd < 4)
1882 cell->darkness = 255 - ext * 64 + 1;
1883 else if (cmd == 5) // health
1884 {
1885 cell->stat_width = 1; 2113 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1887 }
1888 else if (cmd == 6) // monster width
1889 cell->stat_width = *data++ + 1;
1890 else if (cmd == 0x47)
1891 {
1892 if (*data == 1) cell->player = data [1];
1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1896
1897 data += *data + 1;
1898 }
1899 else if (cmd == 8) // cell flags
1900 cell->flags = *data++;
1901 else if (ext & 0x40) // unknown, multibyte => skip
1902 data += *data + 1;
1903 else
1904 data++;
1905 } 2115 }
1906 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1907 } 2133 }
1908 else 2134 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2135 }
1911 2136
1912 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1914 { 2139 {
1962 ? self->row + y 2187 ? self->row + y
1963 : 0; 2188 : 0;
1964 2189
1965 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1966 { 2191 {
1967 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2193
1969 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1970 { 2195 {
1971 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1972 2197
1974 { 2199 {
1975 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2202 int a1 = tex.a;
1978 2203
1979 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1983 } 2208 }
1984 } 2209 }
1985 2210
1986 *map++ = (r ) 2211 *map++ = (r )
1987 | (g << 8) 2212 | (g << 8)
1988 | (b << 16) 2213 | (b << 16)
1989 | (a << 24); 2214 | (a << 24);
1990 } 2215 }
1991 } 2216 }
1992 2217
1993 RETVAL = map_sv; 2218 RETVAL = map_sv;
1994} 2219}
1995 OUTPUT: 2220 OUTPUT:
1996 RETVAL 2221 RETVAL
1997 2222
1998void 2223void
1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2000 CODE: 2225 CODE:
2001{ 2226{
2002 int x, y, z; 2227 int x, y, z;
2003 2228
2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2007 smooth_key skey;
2008 int pl_x, pl_y; 2230 int pl_x, pl_y;
2009 maptex pl_tex; 2231 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
2011 rc_key_t key; 2234 rc_key_t key;
2012 rc_array_t *arr; 2235 rc_array_t *arr;
2013 2236
2014 pl_tex.name = 0; 2237 pl_tex.name = 0;
2015 2238
2016 // thats current max. sorry. 2239 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
2019
2020 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey));
2022 2242
2023 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
2024 key.r = 255; 2244 key.r = 255;
2025 key.g = 255; 2245 key.g = 255;
2026 key.b = 255; 2246 key.b = 255;
2027 key.a = 255; 2247 key.a = 255;
2028 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
2029 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
2030 key.texname = -1;
2031 2250
2032 mx += self->x; 2251 mx += self->x;
2033 my += self->y; 2252 my += self->y;
2034 2253
2035 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2036 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2037 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2038 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2039 2258
2040 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2041 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2042 { 2261 {
2043 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2058 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2059 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2060 2279
2061 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2062 { 2281 {
2063 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2285 key.texname = -1;
2064 2286
2065 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
2066 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
2067 { 2289 {
2068 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
2074 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
2075 2297
2076 if (tile) 2298 if (tile)
2077 { 2299 {
2078 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2301 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2302
2082 if (key.texname != tex.name) 2303 if (key.texname != tex.name)
2083 { 2304 {
2084 self->tex [tile].unused = 0; 2305 self->tex [tile].unused = 0;
2085 2306
2086 if (!tex.name) 2307 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2309
2089 key.texname = tex.name; 2310 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
2091 } 2312 }
2313
2314 px = (x + 1) * Th - tex.w;
2315 py = (y + 1) * Tw - tex.h;
2092 2316
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
2094 { 2318 {
2095 pl_x = px; 2319 pl_x = px;
2096 pl_y = py; 2320 pl_y = py;
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2326 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2327 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2328 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105 2329
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 // overlays such as the speech bubble, probably more to come
2109 if (cell->flags & 1)
2110 {
2111 maptex tex = self->tex [1];
2112 int px = x * T + T * 2 / 32;
2113 int py = y * T - T * 6 / 32;
2114
2115 if (tex.name)
2116 {
2117 if (key.texname != tex.name)
2118 {
2119 key.texname = tex.name;
2120 arr = rc_array (rc, &key);
2121 }
2122
2123 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2127 }
2128 }
2129 }
2130
2131 // update smooth hash 2330 // update smooth hash
2132 if (tex.smoothtile) 2331 if (tex.smoothtile)
2133 { 2332 {
2134 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
2135 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
2136 2335
2137 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
2138 2337
2139 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
2140 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2141 2340
2142 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2150 2349
2151 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2152 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2153 2352
2154 // full tile 2353 // full tile
2155 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2156 2355
2157 // borders 2356 // borders
2158 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2159 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2160 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2161 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2162 2361
2163 // corners 2362 // corners
2164 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2165 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2166 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2167 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2367 }
2368 }
2369
2370 if (expect_false (z == 2) && expect_false (cell->flags))
2371 {
2372 // overlays such as the speech bubble, probably more to come
2373 if (cell->flags & 1)
2374 {
2375 rc_key_t key_ov = key;
2376 maptex tex = self->tex [TEXID_SPEECH];
2377 rc_array_t *arr;
2378 int px = x * Tw + Tw * 2 / 32;
2379 int py = y * Th - Th * 6 / 32;
2380
2381 key_ov.texname = tex.name;
2382 arr = rc_array (rc_ov, &key_ov);
2383
2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2386 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2168 } 2388 }
2169 } 2389 }
2170 } 2390 }
2171 } 2391 }
2172 2392
2178 { 2398 {
2179 int w, b; 2399 int w, b;
2180 2400
2181 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2182 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2183 for (w = 0; w < 256 / 32; ++w) 2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2184 { 2406 {
2185 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2186 if (smask) 2408 IV bits = it->second;
2187 for (b = 0; b < 32; ++b) 2409
2188 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2189 { 2413 {
2190 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
2191 HE *he; 2422 if (tex.name)
2192
2193 hv_iterinit (smooth);
2194 while ((he = hv_iternext (smooth)))
2195 { 2423 {
2196 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2197 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2198 2426 if (key.texname != tex.name)
2199 if (!(bits & 0x1000)
2200 && skey->level == level
2201 && level > smooth_max [skey->x][skey->y])
2202 { 2427 {
2203 maptex tex = self->tex [skey->tile];
2204 int px = (((int)skey->x) - 1) * T;
2205 int py = (((int)skey->y) - 1) * T;
2206 int border = bits & 15;
2207 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2208 float dx = tex.s * .0625f; // 16 images/row
2209 float dy = tex.t * .5f ; // 2 images/column
2210
2211 if (tex.name)
2212 {
2213 // this time avoiding texture state changes
2214 // save gobs of state changes.
2215 if (key.texname != tex.name)
2216 {
2217 self->tex [skey->tile].unused = 0; 2428 self->tex [skey.tile].unused = 0;
2218 2429
2219 glEnd (); 2430 glEnd ();
2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2221 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2222 } 2433 }
2223 2434
2224 if (border) 2435 if (border)
2225 { 2436 {
2226 float ox = border * dx; 2437 float ox = border * dx;
2227 2438
2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232 } 2443 }
2233 2444
2234 if (corner) 2445 if (corner)
2235 { 2446 {
2236 float ox = corner * dx; 2447 float ox = corner * dx;
2237 2448
2238 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242 }
2243 }
2244 } 2453 }
2245 } 2454 }
2246 } 2455 }
2247 } 2456 }
2248 2457
2249 glEnd (); 2458 glEnd ();
2250 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2251 key.texname = -1; 2460 key.texname = -1;
2252 } 2461 }
2253
2254 hv_clear (smooth);
2255 } 2462 }
2256 2463
2257 if (pl_tex.name) 2464 if (pl_tex.name)
2258 { 2465 {
2259 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2476 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270 2477
2271 rc_draw (rc); 2478 rc_draw (rc);
2272 } 2479 }
2273 2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
2274 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2275 rc_free (rc); 2485 rc_free (rc);
2486 rc_free (rc_ov);
2276 2487
2277 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
2278 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
2279 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
2280 { 2491 {
2283 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2284 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2285 { 2496 {
2286 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2287 2498
2288 int px = x * T; 2499 int px = x * Tw;
2289 int py = y * T; 2500 int py = y * Th;
2290 2501
2291 if (expect_false (cell->player == player)) 2502 if (expect_false (cell->player == player))
2292 { 2503 {
2293 px += sdx; 2504 px += sdx;
2294 py += sdy; 2505 py += sdy;
2295 } 2506 }
2296 2507
2297 if (cell->stat_hp) 2508 if (cell->stat_hp)
2298 { 2509 {
2299 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301 2512
2302 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2303 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2304 px + width - 1, py); 2515 px + width - 1, py);
2305 2516
2311 } 2522 }
2312 } 2523 }
2313} 2524}
2314 2525
2315void 2526void
2316draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2527draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2317 CODE: 2528 CODE:
2318{ 2529{
2319 static float color[16][3] = { 2530 static float color[16][3] = {
2320 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
2321 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
2322 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
2323 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
2324 2535
2325 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
2326 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
2327 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
2328 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
2329 2540
2330 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
2331 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
2332 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
2333 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
2334 2545
2335 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
2336 2547
2337 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
2338 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
2339 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
2340 }; 2551 };
2341 2552
2342 int x, y; 2553 int x, y;
2343 2554
2344 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2556 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2558 * and takes the colour from god knows where instead of using
2559 * Cp. MODULATE results in the same colour, but slightly different
2560 * alpha, but atcually gives us the correct colour with nvidia.
2561 */
2345 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2347 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
2349 2566
2350 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2354 2571
2355 if (m) 2572 if (m)
2356 { 2573 {
2357 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2358 2575
2359 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2360 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2361 2578
2362 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2363 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367 } 2584 }
2375void 2592void
2376fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2593fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2377 PPCODE: 2594 PPCODE:
2378{ 2595{
2379 int x, y; 2596 int x, y;
2380 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2381 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2382 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2383 int sw34 = (sw * 3 + 3) & ~3; 2600 int sw3 = sw * 3;
2601 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2602 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2384 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2385 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2386 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2387 2605
2388 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2389 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2390 2608
2391 mx += self->x - 1; 2609 mx += self->x - 1;
2392 my += self->y - 1; 2610 my += self->y - 1;
2393
2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395 2611
2396 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2397 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2398 { 2614 {
2399 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2402 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2403 { 2619 {
2404 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2405 2621
2406 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2407 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409 } 2625 }
2410 } 2626 }
2411 2627
2412 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2413 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2432 2648
2433 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2434 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2435 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2436 2652
2437 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2657 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2442 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446 } 2662 }
2447 2663
2448 free (darkness1); 2664 free (darkness1);
2449 2665
2450 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2451 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2452 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2453 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2454} 2670}
2455 2671
2456SV * 2672SV *
2519 else 2735 else
2520 *data++ = 0; 2736 *data++ = 0;
2521 } 2737 }
2522 } 2738 }
2523 2739
2524 /* if size is w*h + 5 then no data has been found */ 2740 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 { 2742 {
2527 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 } 2745 }
2530 2746
2531 RETVAL = data_sv; 2747 RETVAL = data_sv;
2532} 2748}
2533 OUTPUT: 2749 OUTPUT:
2534 RETVAL 2750 RETVAL
2535 2751
2536void 2752void
2543 STRLEN len; 2759 STRLEN len;
2544 uint8_t *data, *end; 2760 uint8_t *data, *end;
2545 2761
2546 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2549 end = data + len + 8; 2765 end = data + len + 8;
2550 2766
2551 if (len < 5) 2767 if (len < 5)
2552 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2553 2769
2614} 2830}
2615 2831
2616MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2617 2833
2618DC::RW 2834DC::RW
2619new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2620 CODE: 2836 CODE:
2621{ 2837{
2622 STRLEN datalen; 2838 STRLEN datalen;
2623 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2624 2840
2626} 2842}
2627 OUTPUT: 2843 OUTPUT:
2628 RETVAL 2844 RETVAL
2629 2845
2630DC::RW 2846DC::RW
2631new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2632 CODE: 2848 CODE:
2633 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2634 OUTPUT: 2850 OUTPUT:
2635 RETVAL 2851 RETVAL
2636 2852
2654 if (RETVAL < 0) 2870 if (RETVAL < 0)
2655 { 2871 {
2656 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2657 2873
2658 if (RETVAL < 0) 2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2659 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2660 2881 }
2882 else
2661 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2662 } 2884 }
2663 2885
2664 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2665 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2666} 2888}
2713void 2935void
2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715 CODE: 2937 CODE:
2716{ 2938{
2717 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2939 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2718 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720} 2942}
2721 2943
2722void 2944void
2723set_reverse_stereo (DC::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2726 2948
2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728 2950
2729PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2730 2952
2953void
2954decoders ()
2955 PPCODE:
2956#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2957 int i, num = Mix_GetNumChunkDecoders ();
2958 EXTEND (SP, num);
2959 for (i = 0; i < num; ++i)
2960 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2961#else
2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2963#endif
2964
2731DC::MixChunk 2965DC::MixChunk
2732new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2733 CODE: 2967 CODE:
2734 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2735 OUTPUT: 2969 OUTPUT:
2736 RETVAL 2970 RETVAL
2737 2971
2767 OUTPUT: 3001 OUTPUT:
2768 RETVAL 3002 RETVAL
2769 3003
2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771 3005
3006void
3007decoders ()
3008 PPCODE:
3009#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3010 int i, num = Mix_GetNumMusicDecoders ();
3011 EXTEND (SP, num);
3012 for (i = 0; i < num; ++i)
3013 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3014#else
3015 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3016#endif
3017
2772int 3018int
2773volume (int volume = -1) 3019volume (int volume = -1)
2774 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2775 CODE: 3021 CODE:
2776 if (items > 0) 3022 if (items > 0)
2787void 3033void
2788halt () 3034halt ()
2789 CODE: 3035 CODE:
2790 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2791 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2792DC::MixMusic 3045DC::MixMusic
2793new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2794 CODE: 3047 CODE:
2795 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2796 OUTPUT: 3049 OUTPUT:
2797 RETVAL 3050 RETVAL
2798 3051
2826 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2827# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2828 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2829 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2830 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2831 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2832 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2833 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2834 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2835 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2847 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2848 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2849 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2850 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851 const_iv (GL_ONE_MINUS_DST_ALPHA), 3105 const_iv (GL_ONE_MINUS_DST_ALPHA),
3106 const_iv (GL_SRC_COLOR),
3107 const_iv (GL_DST_COLOR),
3108 const_iv (GL_ONE_MINUS_SRC_COLOR),
3109 const_iv (GL_ONE_MINUS_DST_COLOR),
2852 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2853 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2854 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2855 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2856 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2924 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2925 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2926 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2927 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2928 const_iv (GL_T2F_N3F_V3F), 3186 const_iv (GL_T2F_N3F_V3F),
3187 const_iv (GL_FUNC_ADD),
3188 const_iv (GL_FUNC_SUBTRACT),
3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2929# undef const_iv 3190# undef const_iv
2930 }; 3191 };
2931 3192
2932 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3193 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2933 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934 3195
2935 texture_av = newAV (); 3196 texture_av = newAV ();
2936 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2937} 3198}
2938 3199
2940disable_GL_EXT_blend_func_separate () 3201disable_GL_EXT_blend_func_separate ()
2941 CODE: 3202 CODE:
2942 gl.BlendFuncSeparate = 0; 3203 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
2944 3205
2945char * 3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2946gl_vendor () 3210gl_vendor ()
2947 CODE: 3211 CODE:
2948 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2949 OUTPUT: 3213 OUTPUT:
2950 RETVAL 3214 RETVAL
2951 3215
2952char * 3216const char *
2953gl_version () 3217gl_version ()
2954 CODE: 3218 CODE:
2955 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2956 OUTPUT: 3220 OUTPUT:
2957 RETVAL 3221 RETVAL
2958 3222
2959char * 3223const char *
2960gl_extensions () 3224gl_extensions ()
2961 CODE: 3225 CODE:
2962 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2963 OUTPUT: 3227 OUTPUT:
2964 RETVAL 3228 RETVAL
2965 3229
2966const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2967 3235
2968GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2969 CODE: 3237 CODE:
2970 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2971 OUTPUT: 3239 OUTPUT:
2979 3247
2980int glGetError () 3248int glGetError ()
2981 3249
2982void glFinish () 3250void glFinish ()
2983 3251
3252void glFlush ()
3253
2984void glClear (int mask) 3254void glClear (int mask)
2985 3255
2986void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2987 PROTOTYPE: @ 3257 PROTOTYPE: @
2988 3258
2997void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2998 3268
2999void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000 CODE: 3270 CODE:
3001 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
3002 3274
3003void glDepthMask (int flag) 3275void glDepthMask (int flag)
3004 3276
3005void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
3006 3278
3157 3429
3158void glEndList () 3430void glEndList ()
3159 3431
3160void glCallList (int list) 3432void glCallList (int list)
3161 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163 3440
3164PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3165 3442
3166void 3443void
3167find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3168 PPCODE: 3445 PPCODE:
3169{ 3446{
3170 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3171 XPUSHs (self); 3448 XPUSHs (self);
3172} 3449}
3173 3450
3174BOOT: 3451BOOT:
3175{ 3452{
3183 3460
3184void 3461void
3185draw (SV *self) 3462draw (SV *self)
3186 CODE: 3463 CODE:
3187{ 3464{
3188 HV *hv; 3465 HV *hv;
3189 SV **svp; 3466 SV **svp;
3190 NV x, y, w, h; 3467 NV x, y, w, h;
3191 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3192 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3193 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3194 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines