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.276 by root, Sat Aug 30 08:04:01 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} maptex; 272 uint8_t unused; /* set to zero on use */
273};
239 274
240typedef struct { 275struct mapcell
276{
241 uint32_t player; 277 uint32_t player;
242 tileid tile[3]; 278 tileid tile[3];
243 uint16_t darkness; 279 uint16_t darkness;
244 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
245} mapcell; 281};
246 282
247typedef struct { 283struct maprow
284{
248 int32_t c0, c1; 285 int32_t c0, c1;
249 mapcell *col; 286 mapcell *col;
250} maprow; 287};
251 288
252typedef struct map { 289struct mapgrid {
253 int x, y, w, h; 290 int x, y, w, h;
254 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
255 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
256 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
257 294
258 int32_t rows; 295 int32_t rows;
259 maprow *row; 296 maprow *row;
260} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
261 300
262static char * 301static char *
263prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
264{ 303{
265 char *p; 304 char *p;
283 322
284#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))
285#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))
286 325
287static void 326static void
288need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
289{ 328{
290 while (self->faces <= face) 329 while (self->faces <= face)
291 { 330 {
292 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
293 self->faces *= 2; 332 self->faces *= 2;
294 } 333 }
295} 334}
296 335
297static void 336static void
298need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
299{ 338{
300 while (self->texs <= texid) 339 while (self->texs <= texid)
301 { 340 {
302 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
303 self->texs *= 2; 342 self->texs *= 2;
304 } 343 }
305} 344}
306 345
307static maprow * 346static maprow *
308map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
309{ 348{
310 if (0 > y) 349 if (0 > y)
311 { 350 {
312 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
313 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
351 390
352 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
353} 392}
354 393
355static mapcell * 394static mapcell *
356map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
357{ 396{
358 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
359} 398}
360 399
361static void 400static void
362map_clear (DC__Map self) 401map_clear (mapgrid *self)
363{ 402{
364 int r; 403 int r;
365 404
366 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
367 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
385 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
386 (cell)->player = 0; \ 425 (cell)->player = 0; \
387 } while (0) 426 } while (0)
388 427
389static void 428static void
390map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
391{ 430{
392 int x, y; 431 int x, y;
393 maprow *row; 432 maprow *row;
394 mapcell *cell; 433 mapcell *cell;
395 434
412 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
413 } 452 }
414 } 453 }
415} 454}
416 455
417typedef struct { 456struct smooth_key
457{
418 tileid tile; 458 tileid tile;
419 uint8_t x, y, level; 459 uint8_t x, y, level;
420} 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}
421 479
422static void 480static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
424{ 482{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
426 484
427 if (SvIOK (*sv)) 485 if (it == h.end ())
428 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
429 else 487 else
430 sv_setiv (*sv, bits); 488 it->second |= bits;
431} 489}
432 490
433static void 491static void
434music_finished (void) 492music_finished (void)
435{ 493{
452 ev.code = 1; 510 ev.code = 1;
453 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
454 ev.data2 = 0; 512 ev.data2 = 0;
455 513
456 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;
457} 522}
458 523
459static unsigned int 524static unsigned int
460minpot (unsigned int n) 525minpot (unsigned int n)
461{ 526{
529 return 0; 594 return 0;
530 595
531 return 1; 596 return 1;
532} 597}
533 598
599/******************************************************************************/
600
534/* process keyboard modifiers */ 601/* process keyboard modifiers */
535static int 602static int
536mod_munge (int mod) 603mod_munge (int mod)
537{ 604{
538 mod &= MOD_MASK; 605 mod &= MOD_MASK;
542 609
543 return mod; 610 return mod;
544} 611}
545 612
546static void 613static void
547deliantra_main () 614deliantra_main (SV *real_main)
548{ 615{
549 char *argv[] = { 0 }; 616 dSP;
550 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
551} 620}
552 621
553#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
554 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
556 * 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,
557 * 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,
558 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
559 */ 630 */
560 extern C_LINKAGE int 631 extern C_LINKAGE int
561 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
562 { 633 {
563 deliantra_main (); 634 deliantra_main (real_main);
564 } 635 }
565 636
566 #undef main 637 #undef main
567 638
568 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
569 640
570 static void 641 static void
571 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
572 { 643 {
644 real_main = real_main_;
645
573 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv); 647 (main) (1, argv);
575 } 648 }
576#else 649#else
577 static void 650 static void
578 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
579 { 652 {
580 deliantra_main (); 653 deliantra_main (real_main);
581 } 654 }
582#endif 655#endif
583 656
584MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
585 658
786 859
787 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
788# undef const_iv 861# undef const_iv
789 }; 862 };
790 863
791 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--)
792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793 866
794 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796} 869}
797 870
813NV ceil (NV x) 886NV ceil (NV x)
814 887
815IV minpot (UV n) 888IV minpot (UV n)
816 889
817IV 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
818 897
819void 898void
820pango_init () 899pango_init ()
821 CODE: 900 CODE:
822{ 901{
830#endif 909#endif
831} 910}
832 911
833char *SDL_GetError () 912char *SDL_GetError ()
834 913
835void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
836 916
837int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
838 918
839int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
840 920
841void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
842 922
843void SDL_Quit () 923void SDL_Quit ()
844 924
845int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
846 927
847int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
848 CODE: 929 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
850 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
851 OUTPUT: 932 OUTPUT:
852 RETVAL 933 RETVAL
853 934
854void 935void
909 ); 990 );
910 991
911 if (RETVAL) 992 if (RETVAL)
912 { 993 {
913 av_clear (texture_av); 994 av_clear (texture_av);
914
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916#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);
917#include "glfunc.h" 996#include "glfunc.h"
918#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919 } 1000 }
920} 1001}
921 OUTPUT: 1002 OUTPUT:
922 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
923 1007
924void 1008void
925SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
926 1010
927char * 1011char *
928SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
929 1014
930int 1015int
931SDL_GetAppState () 1016SDL_GetAppState ()
932 1017
933int 1018int
934SDL_GetModState () 1019SDL_GetModState ()
935 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
936void 1025void
1026SDL_PumpEvents ()
1027
1028void
937poll_events () 1029peep_events ()
938 PPCODE: 1030 PPCODE:
939{ 1031{
940 SDL_Event ev; 1032 SDL_Event ev;
941 1033
942 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1008 1100
1009 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))));
1010 } 1102 }
1011} 1103}
1012 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
1013int 1118int
1014Mix_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)
1015 POSTCALL: 1120 POSTCALL:
1016 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1017 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1018 1123
1019void 1124void
1020Mix_QuerySpec () 1125Mix_QuerySpec ()
1079add_font (char *file) 1184add_font (char *file)
1080 CODE: 1185 CODE:
1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT: 1187 OUTPUT:
1083 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)
1084 1196
1085void 1197void
1086load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1087 ALIAS: 1199 ALIAS:
1088 load_image_file = 1 1200 load_image_file = 1
1134 1246
1135 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1136 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1137 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1138 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1139 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1140 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)));
1141 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1142 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1143 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1144 1256
1204#if DEBUG 1316#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1206#endif 1318#endif
1207} 1319}
1208 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1209MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1210 1329
1211PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1212 1331
1213DC::Font 1332DC::Font
1214new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1215 CODE: 1334 CODE:
1216{ 1335{
1217 int count; 1336 int count;
1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1219 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1248 PROTOTYPE: 1367 PROTOTYPE:
1249 CODE: 1368 CODE:
1250 tc_restore (); 1369 tc_restore ();
1251 1370
1252DC::Layout 1371DC::Layout
1253new (SV *class) 1372new (SV *klass)
1254 CODE: 1373 CODE:
1255 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1256 1375
1257 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1258 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1407 1526
1408void 1527void
1409set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1410 CODE: 1529 CODE:
1411 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1412 { 1531 {
1413 self->base_height = base_height; 1532 self->base_height = base_height;
1414 layout_update_font (self); 1533 layout_update_font (self);
1415 } 1534 }
1416 1535
1417void 1536void
1644 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1645 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1646 } 1765 }
1647} 1766}
1648 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
1649IV 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)
1650 CODE: 1890 CODE:
1651{ 1891{
1652 GLint width; 1892 GLint width;
1653 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);
1660MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1661 1901
1662PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1663 1903
1664DC::Map 1904DC::Map
1665new (SV *class) 1905new (SV *klass)
1666 CODE: 1906 CODE:
1667 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1668 RETVAL->x = 0; 1908 RETVAL->x = 0;
1669 RETVAL->y = 0; 1909 RETVAL->y = 0;
1670 RETVAL->w = 0; 1910 RETVAL->w = 0;
1671 RETVAL->h = 0; 1911 RETVAL->h = 0;
1672 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1709 1949
1710void 1950void
1711set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1712 CODE: 1952 CODE:
1713{ 1953{
1714 tileid texid; 1954 tileid texid;
1715 maptex *tex; 1955 maptex *tex;
1716 1956
1717 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1718 return; 1958 return;
1719 1959
1720 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1721 return; 1961 return;
1722 1962
1723 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1724 1964
1725 if (!texid) 1965 if (!texid)
1726 return; 1966 return;
1727 1967
1728 tex = self->tex + texid; 1968 tex = self->tex + texid;
1757 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1997 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1758 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1759 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761} 2001}
2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
1762 2022
1763int 2023int
1764ox (DC::Map self) 2024ox (DC::Map self)
1765 ALIAS: 2025 ALIAS:
1766 oy = 1 2026 oy = 1
1806 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1807 } 2067 }
1808} 2068}
1809 2069
1810SV * 2070SV *
1811map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1812 CODE: 2072 CODE:
1813{ 2073{
1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1815 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1816 mapcell *cell; 2076 mapcell *cell;
1837 2097
1838 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1839 2099
1840 if (flags & 8) 2100 if (flags & 8)
1841 { 2101 {
2102 uint8_t ext, cmd;
2103
1842 if (extmap) 2104 do
1843 { 2105 {
1844 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1845 2108
1846 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
1847 { 2112 {
1848 ext = *data++;
1849 cmd = ext & 0x7f;
1850
1851 if (cmd < 4)
1852 cell->darkness = 255 - ext * 64 + 1;
1853 else if (cmd == 5) // health
1854 {
1855 cell->stat_width = 1; 2113 cell->stat_width = 1;
1856 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1857 }
1858 else if (cmd == 6) // monster width
1859 cell->stat_width = *data++ + 1;
1860 else if (cmd == 0x47)
1861 {
1862 if (*data == 1) cell->player = data [1];
1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1866
1867 data += *data + 1;
1868 }
1869 else if (cmd == 8) // cell flags
1870 cell->flags = *data++;
1871 else if (ext & 0x40) // unknown, multibyte => skip
1872 data += *data + 1;
1873 else
1874 data++;
1875 } 2115 }
1876 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++;
1877 } 2133 }
1878 else 2134 while (ext & 0x80);
1879 cell->darkness = *data++ + 1;
1880 } 2135 }
1881 2136
1882 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1883 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1884 { 2139 {
1887 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1888 2143
1889 if (cell->tile [z]) 2144 if (cell->tile [z])
1890 { 2145 {
1891 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1892 if (!tex->name) 2148 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1894 2150
1895 if (tex->smoothtile) 2151 if (tex->smoothtile)
1896 { 2152 {
1897 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1898 if (!smooth->name) 2155 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1900 } 2157 }
1901 } 2158 }
1902 } 2159 }
1930 ? self->row + y 2187 ? self->row + y
1931 : 0; 2188 : 0;
1932 2189
1933 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1934 { 2191 {
1935 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1936 2193
1937 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1938 { 2195 {
1939 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1940 2197
1942 { 2199 {
1943 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1944 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1945 int a1 = tex.a; 2202 int a1 = tex.a;
1946 2203
1947 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1948 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1949 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1950 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1951 } 2208 }
1952 } 2209 }
1953 2210
1954 *map++ = (r ) 2211 *map++ = (r )
1955 | (g << 8) 2212 | (g << 8)
1956 | (b << 16) 2213 | (b << 16)
1957 | (a << 24); 2214 | (a << 24);
1958 } 2215 }
1959 } 2216 }
1960 2217
1961 RETVAL = map_sv; 2218 RETVAL = map_sv;
1962} 2219}
1963 OUTPUT: 2220 OUTPUT:
1964 RETVAL 2221 RETVAL
1965 2222
1966void 2223void
1967draw (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)
1968 CODE: 2225 CODE:
1969{ 2226{
1970 int x, y, z; 2227 int x, y, z;
1971 2228
1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974 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!
1975 smooth_key skey;
1976 int pl_x, pl_y; 2230 int pl_x, pl_y;
1977 maptex pl_tex; 2231 maptex pl_tex;
1978 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1979 rc_key_t key; 2234 rc_key_t key;
1980 rc_array_t *arr; 2235 rc_array_t *arr;
1981 2236
1982 pl_tex.name = 0; 2237 pl_tex.name = 0;
1983 2238
1984 // thats current max. sorry. 2239 // that's current max. sorry.
1985 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1986 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1987
1988 // clear key, in case of extra padding
1989 memset (&skey, 0, sizeof (skey));
1990 2242
1991 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1992 key.r = 255; 2244 key.r = 255;
1993 key.g = 255; 2245 key.g = 255;
1994 key.b = 255; 2246 key.b = 255;
1995 key.a = 255; 2247 key.a = 255;
1996 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1997 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1998 key.texname = -1;
1999 2250
2000 mx += self->x; 2251 mx += self->x;
2001 my += self->y; 2252 my += self->y;
2002 2253
2003 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2004 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2005 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2006 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2007 2258
2008 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2009 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2010 { 2261 {
2011 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028 2279
2029 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2030 { 2281 {
2031 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;
2032 2286
2033 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
2035 { 2289 {
2036 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
2042 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
2043 2297
2044 if (tile) 2298 if (tile)
2045 { 2299 {
2046 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
2047 int px = (x + 1) * T - tex.w; 2301 int px, py;
2048 int py = (y + 1) * T - tex.h;
2049 2302
2050 if (key.texname != tex.name) 2303 if (key.texname != tex.name)
2051 { 2304 {
2305 self->tex [tile].unused = 0;
2306
2052 if (!tex.name) 2307 if (!tex.name)
2053 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054 2309
2055 key.texname = tex.name; 2310 key.texname = tex.name;
2056 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
2057 } 2312 }
2313
2314 px = (x + 1) * Th - tex.w;
2315 py = (y + 1) * Tw - tex.h;
2058 2316
2059 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
2060 { 2318 {
2061 pl_x = px; 2319 pl_x = px;
2062 pl_y = py; 2320 pl_y = py;
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068 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);
2069 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);
2070 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);
2071 2329
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
2075 if (cell->flags & 1)
2076 {
2077 maptex tex = self->tex [1];
2078 int px = x * T + T * 2 / 32;
2079 int py = y * T - T * 6 / 32;
2080
2081 if (tex.name)
2082 {
2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093 }
2094 }
2095 }
2096
2097 // update smooth hash 2330 // update smooth hash
2098 if (tex.smoothtile) 2331 if (tex.smoothtile)
2099 { 2332 {
2100 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
2101 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
2102 2335
2103 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
2104 2337
2105 // 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
2106 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2107 2340
2108 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2116 2349
2117 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2118 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2119 2352
2120 // full tile 2353 // full tile
2121 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);
2122 2355
2123 // borders 2356 // borders
2124 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);
2125 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);
2126 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);
2127 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);
2128 2361
2129 // corners 2362 // corners
2130 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);
2131 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);
2132 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);
2133 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);
2134 } 2388 }
2135 } 2389 }
2136 } 2390 }
2137 } 2391 }
2138 2392
2144 { 2398 {
2145 int w, b; 2399 int w, b;
2146 2400
2147 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2149 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)
2150 { 2406 {
2151 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2152 if (smask) 2408 IV bits = it->second;
2153 for (b = 0; b < 32; ++b) 2409
2154 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2155 { 2413 {
2156 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
2157 HE *he; 2422 if (tex.name)
2158
2159 hv_iterinit (smooth);
2160 while ((he = hv_iternext (smooth)))
2161 { 2423 {
2162 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2163 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2164 2426 if (key.texname != tex.name)
2165 if (!(bits & 0x1000)
2166 && skey->level == level
2167 && level > smooth_max [skey->x][skey->y])
2168 { 2427 {
2169 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
2170 int px = (((int)skey->x) - 1) * T;
2171 int py = (((int)skey->y) - 1) * T;
2172 int border = bits & 15;
2173 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174 float dx = tex.s * .0625f; // 16 images/row
2175 float dy = tex.t * .5f ; // 2 images/column
2176 2429
2177 if (tex.name)
2178 {
2179 // this time avoiding texture state changes
2180 // save gobs of state changes.
2181 if (key.texname != tex.name)
2182 {
2183 glEnd (); 2430 glEnd ();
2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2186 } 2433 }
2187 2434
2188 if (border) 2435 if (border)
2189 { 2436 {
2190 float ox = border * dx; 2437 float ox = border * dx;
2191 2438
2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196 } 2443 }
2197 2444
2198 if (corner) 2445 if (corner)
2199 { 2446 {
2200 float ox = corner * dx; 2447 float ox = corner * dx;
2201 2448
2202 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206 }
2207 }
2208 } 2453 }
2209 } 2454 }
2210 } 2455 }
2211 } 2456 }
2212 2457
2213 glEnd (); 2458 glEnd ();
2214 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1; 2460 key.texname = -1;
2216 } 2461 }
2217
2218 hv_clear (smooth);
2219 } 2462 }
2220 2463
2221 if (pl_tex.name) 2464 if (pl_tex.name)
2222 { 2465 {
2223 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2233 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);
2234 2477
2235 rc_draw (rc); 2478 rc_draw (rc);
2236 } 2479 }
2237 2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
2238 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2239 rc_free (rc); 2485 rc_free (rc);
2486 rc_free (rc_ov);
2240 2487
2241 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
2242 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
2243 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
2244 { 2491 {
2247 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2248 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2249 { 2496 {
2250 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2251 2498
2252 int px = x * T; 2499 int px = x * Tw;
2253 int py = y * T; 2500 int py = y * Th;
2501
2502 if (expect_false (cell->player == player))
2503 {
2504 px += sdx;
2505 py += sdy;
2506 }
2254 2507
2255 if (cell->stat_hp) 2508 if (cell->stat_hp)
2256 { 2509 {
2257 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259 2512
2260 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2261 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2262 px + width - 1, py); 2515 px + width - 1, py);
2263 2516
2269 } 2522 }
2270 } 2523 }
2271} 2524}
2272 2525
2273void 2526void
2274draw_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)
2275 CODE: 2528 CODE:
2276{ 2529{
2277 static float color[16][3] = { 2530 static float color[16][3] = {
2278 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
2279 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
2280 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
2281 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
2282 2535
2283 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
2284 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
2285 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
2286 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
2287 2540
2288 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
2289 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
2290 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
2291 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
2292 2545
2293 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
2294 2547
2295 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
2296 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
2297 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
2298 }; 2551 };
2299 2552
2300 int x, y; 2553 int x, y;
2301 2554
2302 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 */
2303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2305 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
2307 2566
2308 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2312 2571
2313 if (m) 2572 if (m)
2314 { 2573 {
2315 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2316 2575
2317 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2318 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2319 2578
2320 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2321 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325 } 2584 }
2333void 2592void
2334fow_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)
2335 PPCODE: 2594 PPCODE:
2336{ 2595{
2337 int x, y; 2596 int x, y;
2338 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2339 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2340 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2341 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);
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2345 2605
2346 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2347 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2348 2608
2349 mx += self->x - 1; 2609 mx += self->x - 1;
2350 my += self->y - 1; 2610 my += self->y - 1;
2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353 2611
2354 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2355 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2356 { 2614 {
2357 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2360 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2361 { 2619 {
2362 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2363 2621
2364 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2365 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367 } 2625 }
2368 } 2626 }
2369 2627
2370 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2371 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2390 2648
2391 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2392 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2393 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2394 2652
2395 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399 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 */
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404 } 2662 }
2405 2663
2406 free (darkness1); 2664 free (darkness1);
2407 2665
2408 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2409 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2410 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2411 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2412} 2670}
2413 2671
2414SV * 2672SV *
2477 else 2735 else
2478 *data++ = 0; 2736 *data++ = 0;
2479 } 2737 }
2480 } 2738 }
2481 2739
2482 /* 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 */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 { 2742 {
2485 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 } 2745 }
2488 2746
2489 RETVAL = data_sv; 2747 RETVAL = data_sv;
2490} 2748}
2491 OUTPUT: 2749 OUTPUT:
2492 RETVAL 2750 RETVAL
2493 2751
2494void 2752void
2501 STRLEN len; 2759 STRLEN len;
2502 uint8_t *data, *end; 2760 uint8_t *data, *end;
2503 2761
2504 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2507 end = data + len + 8; 2765 end = data + len + 8;
2508 2766
2509 if (len < 5) 2767 if (len < 5)
2510 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2511 2769
2572} 2830}
2573 2831
2574MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2575 2833
2576DC::RW 2834DC::RW
2577new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2578 CODE: 2836 CODE:
2579{ 2837{
2580 STRLEN datalen; 2838 STRLEN datalen;
2581 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2582 2840
2584} 2842}
2585 OUTPUT: 2843 OUTPUT:
2586 RETVAL 2844 RETVAL
2587 2845
2588DC::RW 2846DC::RW
2589new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2590 CODE: 2848 CODE:
2591 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2592 OUTPUT: 2850 OUTPUT:
2593 RETVAL 2851 RETVAL
2594 2852
2612 if (RETVAL < 0) 2870 if (RETVAL < 0)
2613 { 2871 {
2614 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2615 2873
2616 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)
2617 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2618 2881 }
2882 else
2619 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2620 } 2884 }
2621 2885
2622 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2624} 2888}
2671void 2935void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE: 2937 CODE:
2674{ 2938{
2675 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));
2676 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;
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678} 2942}
2679 2943
2680void 2944void
2681set_reverse_stereo (DC::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2684 2948
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686 2950
2687PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2688 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
2689DC::MixChunk 2965DC::MixChunk
2690new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2691 CODE: 2967 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2693 OUTPUT: 2969 OUTPUT:
2694 RETVAL 2970 RETVAL
2695 2971
2725 OUTPUT: 3001 OUTPUT:
2726 RETVAL 3002 RETVAL
2727 3003
2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729 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
2730int 3018int
2731volume (int volume = -1) 3019volume (int volume = -1)
2732 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2733 CODE: 3021 CODE:
2734 if (items > 0) 3022 if (items > 0)
2745void 3033void
2746halt () 3034halt ()
2747 CODE: 3035 CODE:
2748 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2749 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2750DC::MixMusic 3045DC::MixMusic
2751new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2752 CODE: 3047 CODE:
2753 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2754 OUTPUT: 3049 OUTPUT:
2755 RETVAL 3050 RETVAL
2756 3051
2784 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2785# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2786 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2787 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2788 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2789 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2790 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2791 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2792 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2793 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2805 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2806 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2807 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2808 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809 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),
2810 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2811 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2812 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2813 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2814 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2882 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2883 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2884 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2885 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2886 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),
2887# undef const_iv 3190# undef const_iv
2888 }; 3191 };
2889 3192
2890 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--)
2891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892 3195
2893 texture_av = newAV (); 3196 texture_av = newAV ();
2894 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2895} 3198}
2896 3199
2898disable_GL_EXT_blend_func_separate () 3201disable_GL_EXT_blend_func_separate ()
2899 CODE: 3202 CODE:
2900 gl.BlendFuncSeparate = 0; 3203 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
2902 3205
2903char * 3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2904gl_vendor () 3210gl_vendor ()
2905 CODE: 3211 CODE:
2906 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2907 OUTPUT: 3213 OUTPUT:
2908 RETVAL 3214 RETVAL
2909 3215
2910char * 3216const char *
2911gl_version () 3217gl_version ()
2912 CODE: 3218 CODE:
2913 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2914 OUTPUT: 3220 OUTPUT:
2915 RETVAL 3221 RETVAL
2916 3222
2917char * 3223const char *
2918gl_extensions () 3224gl_extensions ()
2919 CODE: 3225 CODE:
2920 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2921 OUTPUT: 3227 OUTPUT:
2922 RETVAL 3228 RETVAL
2923 3229
2924const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2925 3235
2926GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2927 CODE: 3237 CODE:
2928 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2929 OUTPUT: 3239 OUTPUT:
2937 3247
2938int glGetError () 3248int glGetError ()
2939 3249
2940void glFinish () 3250void glFinish ()
2941 3251
3252void glFlush ()
3253
2942void glClear (int mask) 3254void glClear (int mask)
2943 3255
2944void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2945 PROTOTYPE: @ 3257 PROTOTYPE: @
2946 3258
2955void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2956 3268
2957void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958 CODE: 3270 CODE:
2959 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2960 3274
2961void glDepthMask (int flag) 3275void glDepthMask (int flag)
2962 3276
2963void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2964 3278
2999void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
3000 CODE: 3314 CODE:
3001 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
3002 3316
3003void glColor (float r, float g, float b, float a = 1.0) 3317void glColor (float r, float g, float b, float a = 1.0)
3318 PROTOTYPE: @
3004 ALIAS: 3319 ALIAS:
3005 glColor_premultiply = 1 3320 glColor_premultiply = 1
3006 CODE: 3321 CODE:
3007 if (ix) 3322 if (ix)
3008 { 3323 {
3114 3429
3115void glEndList () 3430void glEndList ()
3116 3431
3117void glCallList (int list) 3432void glCallList (int list)
3118 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120 3440
3121PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3122 3442
3123void 3443void
3124find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3125 PPCODE: 3445 PPCODE:
3126{ 3446{
3127 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3128 XPUSHs (self); 3448 XPUSHs (self);
3129} 3449}
3130 3450
3131BOOT: 3451BOOT:
3132{ 3452{
3140 3460
3141void 3461void
3142draw (SV *self) 3462draw (SV *self)
3143 CODE: 3463 CODE:
3144{ 3464{
3145 HV *hv; 3465 HV *hv;
3146 SV **svp; 3466 SV **svp;
3147 NV x, y, w, h; 3467 NV x, y, w, h;
3148 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3149 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3150 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3151 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