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.326 by root, Sun Nov 18 03:06:13 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
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 RETVAL = new 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.;
1269 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1270 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1271 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1272 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1273 RETVAL->font = 0; 1382 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
1275 1383
1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1277 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1278 OUTPUT: 1386 OUTPUT:
1279 RETVAL 1387 RETVAL
1280 1388
1281void 1389void
1282DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1283 CODE: 1391 CODE:
1284 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1285 rc_free (self->rc);
1286 Safefree (self); 1393 delete self;
1287 1394
1288void 1395void
1289set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1290 CODE: 1397 CODE:
1291{ 1398{
1417 1524
1418void 1525void
1419set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1420 CODE: 1527 CODE:
1421 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1422 { 1529 {
1423 self->base_height = base_height; 1530 self->base_height = base_height;
1424 layout_update_font (self); 1531 layout_update_font (self);
1425 } 1532 }
1426 1533
1427void 1534void
1545} 1652}
1546 1653
1547void 1654void
1548render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1549 CODE: 1656 CODE:
1550 rc_clear (self->rc); 1657 self->rc.clear ();
1551 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1552 self->pl, 1659 self->pl,
1553 self->rc, 1660 &self->rc,
1554 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1555 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1556 flags 1663 flags
1557 ); 1664 );
1558 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1569 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1570 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1571 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1572 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1573 1680
1574 rc_draw (self->rc); 1681 self->rc.draw ();
1575 1682
1576 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1577 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1578 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1579} 1686}
1654 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1656 } 1763 }
1657} 1764}
1658 1765
1766void
1767draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1659IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660 CODE: 1888 CODE:
1661{ 1889{
1662 GLint width; 1890 GLint width;
1663 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1670MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1671 1899
1672PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1673 1901
1674DC::Map 1902DC::Map
1675new (SV *class) 1903new (SV *klass)
1676 CODE: 1904 CODE:
1677 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1678 RETVAL->x = 0; 1906 RETVAL->x = 0;
1679 RETVAL->y = 0; 1907 RETVAL->y = 0;
1680 RETVAL->w = 0; 1908 RETVAL->w = 0;
1681 RETVAL->h = 0; 1909 RETVAL->h = 0;
1682 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1719 1947
1720void 1948void
1721set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1722 CODE: 1950 CODE:
1723{ 1951{
1724 tileid texid; 1952 tileid texid;
1725 maptex *tex; 1953 maptex *tex;
1726 1954
1727 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1728 return; 1956 return;
1729 1957
1730 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1731 return; 1959 return;
1732 1960
1733 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1734 1962
1735 if (!texid) 1963 if (!texid)
1736 return; 1964 return;
1737 1965
1738 tex = self->tex + texid; 1966 tex = self->tex + texid;
1771} 1999}
1772 2000
1773void 2001void
1774expire_textures (DC::Map self, int texid, int count) 2002expire_textures (DC::Map self, int texid, int count)
1775 PPCODE: 2003 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count) 2004 for (; texid < self->texs && count; ++texid, --count)
1777 { 2005 {
1778 maptex *tex = self->tex + texid; 2006 maptex *tex = self->tex + texid;
1779 2007
1780 if (tex->name) 2008 if (tex->name)
1781 { 2009 {
1782 if (tex->unused) 2010 if (tex->unused)
1783 { 2011 {
1784 tex->name = 0; 2012 tex->name = 0;
1785 tex->unused = 0, 2013 tex->unused = 0;
1786 XPUSHs (sv_2mortal (newSViv (texid))); 2014 XPUSHs (sv_2mortal (newSViv (texid)));
1787 } 2015 }
1788 else 2016 else
1789 tex->unused = 1; 2017 tex->unused = 1;
1790 } 2018 }
1836 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1837 } 2065 }
1838} 2066}
1839 2067
1840SV * 2068SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1842 CODE: 2070 CODE:
1843{ 2071{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2074 mapcell *cell;
1867 2095
1868 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1869 2097
1870 if (flags & 8) 2098 if (flags & 8)
1871 { 2099 {
2100 uint8_t ext, cmd;
2101
1872 if (extmap) 2102 do
1873 { 2103 {
1874 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1875 2106
1876 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1877 { 2110 {
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; 2111 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2112 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 } 2113 }
1906 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1907 } 2131 }
1908 else 2132 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2133 }
1911 2134
1912 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1914 { 2137 {
1962 ? self->row + y 2185 ? self->row + y
1963 : 0; 2186 : 0;
1964 2187
1965 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1966 { 2189 {
1967 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2191
1969 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1970 { 2193 {
1971 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1972 2195
1974 { 2197 {
1975 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2200 int a1 = tex.a;
1978 2201
1979 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1983 } 2206 }
1984 } 2207 }
1985 2208
1986 *map++ = (r ) 2209 *map++ = (r )
1987 | (g << 8) 2210 | (g << 8)
1988 | (b << 16) 2211 | (b << 16)
1989 | (a << 24); 2212 | (a << 24);
1990 } 2213 }
1991 } 2214 }
1992 2215
1993 RETVAL = map_sv; 2216 RETVAL = map_sv;
1994} 2217}
1995 OUTPUT: 2218 OUTPUT:
1996 RETVAL 2219 RETVAL
1997 2220
1998void 2221void
1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2000 CODE: 2223 CODE:
2001{ 2224{
2002 int x, y, z; 2225 int x, y, z;
2003 2226
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) 2227 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; 2228 int pl_x, pl_y;
2009 maptex pl_tex; 2229 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
2011 rc_key_t key; 2232 rc_key_t key;
2012 rc_array_t *arr; 2233 rc_t::array_t *arr;
2013 2234
2014 pl_tex.name = 0; 2235 pl_tex.name = 0;
2015 2236
2016 // thats current max. sorry. 2237 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
2019
2020 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey));
2022 2240
2023 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
2024 key.r = 255; 2242 key.r = 255;
2025 key.g = 255; 2243 key.g = 255;
2026 key.b = 255; 2244 key.b = 255;
2027 key.a = 255; 2245 key.a = 255;
2028 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
2029 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
2030 key.texname = -1;
2031 2248
2032 mx += self->x; 2249 mx += self->x;
2033 my += self->y; 2250 my += self->y;
2034 2251
2035 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
2036 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
2037 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
2038 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2039 2256
2040 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
2041 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
2042 { 2259 {
2043 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
2058 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2059 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2060 2277
2061 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
2062 { 2279 {
2063 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2283 key.texname = -1;
2064 2284
2065 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
2066 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
2067 { 2287 {
2068 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
2074 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
2075 2295
2076 if (tile) 2296 if (tile)
2077 { 2297 {
2078 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2299 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2300
2082 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
2083 { 2302 {
2084 self->tex [tile].unused = 0; 2303 self->tex [tile].unused = 0;
2085 2304
2086 if (!tex.name) 2305 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2307
2089 key.texname = tex.name; 2308 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
2091 } 2310 }
2311
2312 px = (x + 1) * Th - tex.w;
2313 py = (y + 1) * Tw - tex.h;
2092 2314
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
2094 { 2316 {
2095 pl_x = px; 2317 pl_x = px;
2096 pl_y = py; 2318 pl_y = py;
2097 pl_tex = tex; 2319 pl_tex = tex;
2098 continue; 2320 continue;
2099 } 2321 }
2100 2322
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2105
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 2327
2131 // update smooth hash 2328 // update smooth hash
2132 if (tex.smoothtile) 2329 if (tex.smoothtile)
2133 { 2330 {
2134 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
2135 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
2136 2333
2137 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
2138 2335
2139 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
2140 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
2141 2338
2142 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
2150 2347
2151 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2152 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
2153 2350
2154 // full tile 2351 // full tile
2155 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2156 2353
2157 // borders 2354 // borders
2158 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2159 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2356 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2160 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2357 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2161 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2162 2359
2163 // corners 2360 // corners
2164 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2165 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2362 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2166 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2363 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2167 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2168 } 2385 }
2169 } 2386 }
2170 } 2387 }
2171 } 2388 }
2172 2389
2173 rc_draw (rc); 2390 rc.draw ();
2174 rc_clear (rc); 2391 rc.clear ();
2175 2392
2176 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2177 // this is basically counting sort 2394 // this is basically counting sort
2178 { 2395 {
2179 int w, b; 2396 int w, b;
2180 2397
2181 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2182 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2183 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2184 { 2403 {
2185 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2186 if (smask) 2405 IV bits = it->second;
2187 for (b = 0; b < 32; ++b) 2406
2188 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2189 { 2410 {
2190 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
2191 HE *he; 2419 if (tex.name)
2192
2193 hv_iterinit (smooth);
2194 while ((he = hv_iternext (smooth)))
2195 { 2420 {
2196 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2197 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2198 2423 if (key.texname != tex.name)
2199 if (!(bits & 0x1000)
2200 && skey->level == level
2201 && level > smooth_max [skey->x][skey->y])
2202 { 2424 {
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; 2425 self->tex [skey.tile].unused = 0;
2218 2426
2219 glEnd (); 2427 glEnd ();
2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2221 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2222 } 2430 }
2223 2431
2224 if (border) 2432 if (border)
2225 { 2433 {
2226 float ox = border * dx; 2434 float ox = border * dx;
2227 2435
2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232 } 2440 }
2233 2441
2234 if (corner) 2442 if (corner)
2235 { 2443 {
2236 float ox = corner * dx; 2444 float ox = corner * dx;
2237 2445
2238 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242 }
2243 }
2244 } 2450 }
2245 } 2451 }
2246 } 2452 }
2247 } 2453 }
2248 2454
2249 glEnd (); 2455 glEnd ();
2250 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2251 key.texname = -1; 2457 key.texname = -1;
2252 } 2458 }
2253
2254 hv_clear (smooth);
2255 } 2459 }
2256 2460
2257 if (pl_tex.name) 2461 if (pl_tex.name)
2258 { 2462 {
2259 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2260 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2261 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2262 2466
2263 key.texname = tex.name; 2467 key.texname = tex.name;
2264 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2265 2469
2266 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2267 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2268 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2270 2474
2271 rc_draw (rc); 2475 rc.draw ();
2272 } 2476 }
2273 2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2274 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2275 rc_free (rc);
2276 2482
2277 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2278 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2279 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2280 { 2486 {
2283 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2284 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2285 { 2491 {
2286 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2287 2493
2288 int px = x * T; 2494 int px = x * Tw;
2289 int py = y * T; 2495 int py = y * Th;
2290 2496
2291 if (expect_false (cell->player == player)) 2497 if (expect_false (cell->player == player))
2292 { 2498 {
2293 px += sdx; 2499 px += sdx;
2294 py += sdy; 2500 py += sdy;
2295 } 2501 }
2296 2502
2297 if (cell->stat_hp) 2503 if (cell->stat_hp)
2298 { 2504 {
2299 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301 2507
2302 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2303 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2304 px + width - 1, py); 2510 px + width - 1, py);
2305 2511
2311 } 2517 }
2312 } 2518 }
2313} 2519}
2314 2520
2315void 2521void
2316draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2317 CODE: 2523 CODE:
2318{ 2524{
2319 static float color[16][3] = { 2525 static float color[16][3] = {
2320 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2321 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2322 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2323 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2324 2530
2325 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2326 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2327 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2328 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2329 2535
2330 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2331 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2332 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2333 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2334 2540
2335 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2336 2542
2337 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2338 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2339 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2340 }; 2546 };
2341 2547
2342 int x, y; 2548 int x, y;
2343 2549
2344 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
2345 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2347 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2349 2561
2350 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2354 2566
2355 if (m) 2567 if (m)
2356 { 2568 {
2357 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2358 2570
2359 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2360 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2361 2573
2362 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2363 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367 } 2579 }
2375void 2587void
2376fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2377 PPCODE: 2589 PPCODE:
2378{ 2590{
2379 int x, y; 2591 int x, y;
2380 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2381 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2382 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2383 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2384 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2385 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2386 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2387 2600
2388 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2389 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2390 2603
2391 mx += self->x - 1; 2604 mx += self->x - 1;
2392 my += self->y - 1; 2605 my += self->y - 1;
2393
2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395 2606
2396 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2397 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2398 { 2609 {
2399 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2402 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2403 { 2614 {
2404 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2405 2616
2406 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2407 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409 } 2620 }
2410 } 2621 }
2411 2622
2412 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2413 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2432 2643
2433 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2434 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2435 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2436 2647
2437 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2442 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446 } 2657 }
2447 2658
2448 free (darkness1); 2659 free (darkness1);
2449 2660
2450 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2451 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2452 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2453 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2454} 2665}
2455 2666
2456SV * 2667SV *
2519 else 2730 else
2520 *data++ = 0; 2731 *data++ = 0;
2521 } 2732 }
2522 } 2733 }
2523 2734
2524 /* if size is w*h + 5 then no data has been found */ 2735 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 { 2737 {
2527 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 } 2740 }
2530 2741
2531 RETVAL = data_sv; 2742 RETVAL = data_sv;
2532} 2743}
2533 OUTPUT: 2744 OUTPUT:
2534 RETVAL 2745 RETVAL
2535 2746
2536void 2747void
2543 STRLEN len; 2754 STRLEN len;
2544 uint8_t *data, *end; 2755 uint8_t *data, *end;
2545 2756
2546 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2549 end = data + len + 8; 2760 end = data + len + 8;
2550 2761
2551 if (len < 5) 2762 if (len < 5)
2552 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2553 2764
2614} 2825}
2615 2826
2616MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2617 2828
2618DC::RW 2829DC::RW
2619new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2620 CODE: 2831 CODE:
2621{ 2832{
2622 STRLEN datalen; 2833 STRLEN datalen;
2623 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2624 2835
2626} 2837}
2627 OUTPUT: 2838 OUTPUT:
2628 RETVAL 2839 RETVAL
2629 2840
2630DC::RW 2841DC::RW
2631new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2632 CODE: 2843 CODE:
2633 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2634 OUTPUT: 2845 OUTPUT:
2635 RETVAL 2846 RETVAL
2636 2847
2654 if (RETVAL < 0) 2865 if (RETVAL < 0)
2655 { 2866 {
2656 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2657 2868
2658 if (RETVAL < 0) 2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2659 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2660 2876 }
2877 else
2661 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2662 } 2879 }
2663 2880
2664 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2665 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2666} 2883}
2713void 2930void
2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715 CODE: 2932 CODE:
2716{ 2933{
2717 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2718 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720} 2937}
2721 2938
2722void 2939void
2723set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2726 2943
2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728 2945
2729PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2730 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2731DC::MixChunk 2960DC::MixChunk
2732new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2733 CODE: 2962 CODE:
2734 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2735 OUTPUT: 2964 OUTPUT:
2736 RETVAL 2965 RETVAL
2737 2966
2767 OUTPUT: 2996 OUTPUT:
2768 RETVAL 2997 RETVAL
2769 2998
2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771 3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
3012
2772int 3013int
2773volume (int volume = -1) 3014volume (int volume = -1)
2774 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2775 CODE: 3016 CODE:
2776 if (items > 0) 3017 if (items > 0)
2787void 3028void
2788halt () 3029halt ()
2789 CODE: 3030 CODE:
2790 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2791 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2792DC::MixMusic 3040DC::MixMusic
2793new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2794 CODE: 3042 CODE:
2795 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2796 OUTPUT: 3044 OUTPUT:
2797 RETVAL 3045 RETVAL
2798 3046
2826 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2827# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2828 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2829 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2830 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2831 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2832 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2833 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2834 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2835 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2847 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2848 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2849 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2850 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2852 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2853 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2854 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2855 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2856 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2924 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2925 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2926 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2927 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2928 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2929# undef const_iv 3185# undef const_iv
2930 }; 3186 };
2931 3187
2932 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2933 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934 3190
2935 texture_av = newAV (); 3191 texture_av = newAV ();
2936 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2937} 3193}
2938 3194
2940disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2941 CODE: 3197 CODE:
2942 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2944 3200
2945char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2946gl_vendor () 3205gl_vendor ()
2947 CODE: 3206 CODE:
2948 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2949 OUTPUT: 3208 OUTPUT:
2950 RETVAL 3209 RETVAL
2951 3210
2952char * 3211const char *
2953gl_version () 3212gl_version ()
2954 CODE: 3213 CODE:
2955 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2956 OUTPUT: 3215 OUTPUT:
2957 RETVAL 3216 RETVAL
2958 3217
2959char * 3218const char *
2960gl_extensions () 3219gl_extensions ()
2961 CODE: 3220 CODE:
2962 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2963 OUTPUT: 3222 OUTPUT:
2964 RETVAL 3223 RETVAL
2965 3224
2966const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2967 3230
2968GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2969 CODE: 3232 CODE:
2970 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2971 OUTPUT: 3234 OUTPUT:
2979 3242
2980int glGetError () 3243int glGetError ()
2981 3244
2982void glFinish () 3245void glFinish ()
2983 3246
3247void glFlush ()
3248
2984void glClear (int mask) 3249void glClear (int mask)
2985 3250
2986void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2987 PROTOTYPE: @ 3252 PROTOTYPE: @
2988 3253
2997void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2998 3263
2999void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000 CODE: 3265 CODE:
3001 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
3002 3269
3003void glDepthMask (int flag) 3270void glDepthMask (int flag)
3004 3271
3005void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
3006 3273
3157 3424
3158void glEndList () 3425void glEndList ()
3159 3426
3160void glCallList (int list) 3427void glCallList (int list)
3161 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163 3435
3164PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
3165 3437
3166void 3438void
3167find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3168 PPCODE: 3440 PPCODE:
3169{ 3441{
3170 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3171 XPUSHs (self); 3443 XPUSHs (self);
3172} 3444}
3173 3445
3174BOOT: 3446BOOT:
3175{ 3447{
3183 3455
3184void 3456void
3185draw (SV *self) 3457draw (SV *self)
3186 CODE: 3458 CODE:
3187{ 3459{
3188 HV *hv; 3460 HV *hv;
3189 SV **svp; 3461 SV **svp;
3190 NV x, y, w, h; 3462 NV x, y, w, h;
3191 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3192 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3193 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3194 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines