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.294 by root, Sat Dec 19 05:06:56 2009 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 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 64 94#define FOW_DARKNESS 50
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 95#define DARKNESS_ADJUST(n) (n)
88 96
89#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
90#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
91 99
92#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
96 104
97#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
98 106
99#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3 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}
102 128
103static AV *texture_av; 129static AV *texture_av;
104 130
105static struct 131static struct
106{ 132{
163{ 189{
164 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
165 191
166 while (attrs) 192 while (attrs)
167 { 193 {
168 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
169 195
170 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
171 return 1; 197 return 1;
172 198
173 attrs = attrs->next; 199 attrs = attrs->next;
174 } 200 }
175 201
176 return 0; 202 return 0;
177} 203}
178 204
179typedef struct cf_layout { 205struct cf_layout {
180 PangoLayout *pl; 206 PangoLayout *pl;
181 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
182 int base_height; 208 int base_height;
183 DC__Font font; 209 DC__Font font;
184 rc_t *rc; 210 rc_t *rc;
185} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
186 214
187static DC__Font default_font; 215static DC__Font default_font;
188static PangoContext *opengl_context; 216static PangoContext *opengl_context;
189static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
190 218
191static void 219static void
192substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
193{ 221{
194 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
195#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
196 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197#endif 225#endif
198 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199} 227}
200 228
201static void 229static void
231} 259}
232 260
233typedef uint16_t tileid; 261typedef uint16_t tileid;
234typedef uint16_t faceid; 262typedef uint16_t faceid;
235 263
236typedef struct { 264struct maptex
265{
237 GLuint name; 266 GLuint name;
238 int w, h; 267 int w, h;
239 float s, t; 268 float s, t;
240 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
241 tileid smoothtile; 270 tileid smoothtile;
242 uint8_t smoothlevel; 271 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
244} maptex; 273};
245 274
246typedef struct { 275struct mapcell
276{
247 uint32_t player; 277 uint32_t player;
248 tileid tile[3]; 278 tileid tile[3];
249 uint16_t darkness; 279 uint16_t darkness;
250 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
251} mapcell; 281};
252 282
253typedef struct { 283struct maprow
284{
254 int32_t c0, c1; 285 int32_t c0, c1;
255 mapcell *col; 286 mapcell *col;
256} maprow; 287};
257 288
258typedef struct map { 289struct mapgrid {
259 int x, y, w, h; 290 int x, y, w, h;
260 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
261 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
262 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
263 294
264 int32_t rows; 295 int32_t rows;
265 maprow *row; 296 maprow *row;
266} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
267 300
268static char * 301static char *
269prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
270{ 303{
271 char *p; 304 char *p;
289 322
290#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))
291#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))
292 325
293static void 326static void
294need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
295{ 328{
296 while (self->faces <= face) 329 while (self->faces <= face)
297 { 330 {
298 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
299 self->faces *= 2; 332 self->faces *= 2;
300 } 333 }
301} 334}
302 335
303static void 336static void
304need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
305{ 338{
306 while (self->texs <= texid) 339 while (self->texs <= texid)
307 { 340 {
308 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
309 self->texs *= 2; 342 self->texs *= 2;
310 } 343 }
311} 344}
312 345
313static maprow * 346static maprow *
314map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
315{ 348{
316 if (0 > y) 349 if (0 > y)
317 { 350 {
318 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
319 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
357 390
358 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
359} 392}
360 393
361static mapcell * 394static mapcell *
362map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
363{ 396{
364 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
365} 398}
366 399
367static void 400static void
368map_clear (DC__Map self) 401map_clear (mapgrid *self)
369{ 402{
370 int r; 403 int r;
371 404
372 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
373 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
391 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
392 (cell)->player = 0; \ 425 (cell)->player = 0; \
393 } while (0) 426 } while (0)
394 427
395static void 428static void
396map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
397{ 430{
398 int x, y; 431 int x, y;
399 maprow *row; 432 maprow *row;
400 mapcell *cell; 433 mapcell *cell;
401 434
418 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
419 } 452 }
420 } 453 }
421} 454}
422 455
423typedef struct { 456struct smooth_key
457{
424 tileid tile; 458 tileid tile;
425 uint8_t x, y, level; 459 uint8_t x, y, level;
426} 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}
427 479
428static void 480static void
429smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
430{ 482{
431 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
432 484
433 if (SvIOK (*sv)) 485 if (it == h.end ())
434 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
435 else 487 else
436 sv_setiv (*sv, bits); 488 it->second |= bits;
437} 489}
438 490
439static void 491static void
440music_finished (void) 492music_finished (void)
441{ 493{
458 ev.code = 1; 510 ev.code = 1;
459 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
460 ev.data2 = 0; 512 ev.data2 = 0;
461 513
462 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;
463} 522}
464 523
465static unsigned int 524static unsigned int
466minpot (unsigned int n) 525minpot (unsigned int n)
467{ 526{
550 609
551 return mod; 610 return mod;
552} 611}
553 612
554static void 613static void
555deliantra_main () 614deliantra_main (SV *real_main)
556{ 615{
557 char *argv[] = { 0 }; 616 dSP;
558 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
559} 620}
560 621
561#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
562 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
564 * 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,
565 * 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,
566 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
567 */ 630 */
568 extern C_LINKAGE int 631 extern C_LINKAGE int
569 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
570 { 633 {
571 deliantra_main (); 634 deliantra_main (real_main);
572 } 635 }
573 636
574 #undef main 637 #undef main
575 638
576 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
577 640
578 static void 641 static void
579 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
580 { 643 {
644 real_main = real_main_;
645
581 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv); 647 (main) (1, argv);
583 } 648 }
584#else 649#else
585 static void 650 static void
586 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
587 { 652 {
588 deliantra_main (); 653 deliantra_main (real_main);
589 } 654 }
590#endif 655#endif
591 656
592MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
593 658
794 859
795 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
796# undef const_iv 861# undef const_iv
797 }; 862 };
798 863
799 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--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 866
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 869}
805 870
821NV ceil (NV x) 886NV ceil (NV x)
822 887
823IV minpot (UV n) 888IV minpot (UV n)
824 889
825IV 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
826 897
827void 898void
828pango_init () 899pango_init ()
829 CODE: 900 CODE:
830{ 901{
838#endif 909#endif
839} 910}
840 911
841char *SDL_GetError () 912char *SDL_GetError ()
842 913
843void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
844 916
845int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
846 918
847int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
848 920
849void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
850 922
851void SDL_Quit () 923void SDL_Quit ()
852 924
853int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
854 927
855int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
856 CODE: 929 CODE:
857 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
858 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
859 OUTPUT: 932 OUTPUT:
860 RETVAL 933 RETVAL
861 934
862void 935void
917 ); 990 );
918 991
919 if (RETVAL) 992 if (RETVAL)
920 { 993 {
921 av_clear (texture_av); 994 av_clear (texture_av);
922
923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
924#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);
925#include "glfunc.h" 996#include "glfunc.h"
926#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927 } 1000 }
928} 1001}
929 OUTPUT: 1002 OUTPUT:
930 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
931 1007
932void 1008void
933SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
934 1010
935char * 1011char *
936SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
937 1014
938int 1015int
939SDL_GetAppState () 1016SDL_GetAppState ()
940 1017
941int 1018int
942SDL_GetModState () 1019SDL_GetModState ()
943 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
944void 1025void
1026SDL_PumpEvents ()
1027
1028void
945poll_events () 1029peep_events ()
946 PPCODE: 1030 PPCODE:
947{ 1031{
948 SDL_Event ev; 1032 SDL_Event ev;
949 1033
950 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1016 1100
1017 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))));
1018 } 1102 }
1019} 1103}
1020 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
1021int 1118int
1022Mix_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)
1023 POSTCALL: 1120 POSTCALL:
1024 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1025 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1026 1123
1027void 1124void
1028Mix_QuerySpec () 1125Mix_QuerySpec ()
1087add_font (char *file) 1184add_font (char *file)
1088 CODE: 1185 CODE:
1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT: 1187 OUTPUT:
1091 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)
1092 1196
1093void 1197void
1094load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1095 ALIAS: 1199 ALIAS:
1096 load_image_file = 1 1200 load_image_file = 1
1142 1246
1143 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1144 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1145 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1146 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1147 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1148 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)));
1149 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1150 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1151 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1152 1256
1224MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1225 1329
1226PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1227 1331
1228DC::Font 1332DC::Font
1229new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1230 CODE: 1334 CODE:
1231{ 1335{
1232 int count; 1336 int count;
1233 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1234 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1263 PROTOTYPE: 1367 PROTOTYPE:
1264 CODE: 1368 CODE:
1265 tc_restore (); 1369 tc_restore ();
1266 1370
1267DC::Layout 1371DC::Layout
1268new (SV *class) 1372new (SV *klass)
1269 CODE: 1373 CODE:
1270 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1271 1375
1272 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1273 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1422 1526
1423void 1527void
1424set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1425 CODE: 1529 CODE:
1426 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1427 { 1531 {
1428 self->base_height = base_height; 1532 self->base_height = base_height;
1429 layout_update_font (self); 1533 layout_update_font (self);
1430 } 1534 }
1431 1535
1432void 1536void
1660 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1661 } 1765 }
1662} 1766}
1663 1767
1664void 1768void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 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)
1666 PROTOTYPE: @ 1770 PROTOTYPE: @
1667 CODE: 1771 CODE:
1668{ 1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669 glEnable (GL_TEXTURE_2D); 1775 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1); 1776 glBindTexture (GL_TEXTURE_2D, name1);
1673 1777
1674 glColor3f (intensity, intensity, intensity); 1778 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix (); 1779 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.); 1780 glScalef (1./3, 1./3, 1.);
1677 1781
1678 if (blend > 0.f) 1782 if (blend > 0.f)
1679 { 1783 {
1680 float S2, T2; /* 0. 0. for texture 2 */ 1784 float dx3 = dx * -3.f / w;
1681 float w = w1 > w2 ? w1 : w2; 1785 float dy3 = dy * -3.f / h;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend }; 1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1684 1787
1685 /* interpolate the two shadow textures */ 1788 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1692 glBindTexture (GL_TEXTURE_2D, name2); 1795 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694 1797
1695 /* rgb == rgb(glcolor) */ 1798 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699 1802
1700 /* alpha = interpolate t0, t1 by env_alpha */ 1803 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702 1805
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709 1812
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712 1815
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS); 1816 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729 glEnd (); 1821 glEnd ();
1730 1822
1731 glDisable (GL_TEXTURE_2D); 1823 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0); 1824 gl.ActiveTexture (GL_TEXTURE0);
1733 } 1825 }
1735 { 1827 {
1736 /* simple blending of one texture, also opengl <1.3 path */ 1828 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738 1830
1739 glBegin (GL_QUADS); 1831 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1833 glTexCoord2f (0, t); glVertex2f (0, h);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1834 glTexCoord2f (s, t); glVertex2f (w, h);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1744 glEnd (); 1836 glEnd ();
1745 } 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 ();
1746 1882
1747 glPopMatrix (); 1883 glPopMatrix ();
1748 1884
1749 glDisable (GL_TEXTURE_2D); 1885 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND); 1886 glDisable (GL_BLEND);
1764MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1765 1901
1766PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1767 1903
1768DC::Map 1904DC::Map
1769new (SV *class) 1905new (SV *klass)
1770 CODE: 1906 CODE:
1771 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1772 RETVAL->x = 0; 1908 RETVAL->x = 0;
1773 RETVAL->y = 0; 1909 RETVAL->y = 0;
1774 RETVAL->w = 0; 1910 RETVAL->w = 0;
1775 RETVAL->h = 0; 1911 RETVAL->h = 0;
1776 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1813 1949
1814void 1950void
1815set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1816 CODE: 1952 CODE:
1817{ 1953{
1818 tileid texid; 1954 tileid texid;
1819 maptex *tex; 1955 maptex *tex;
1820 1956
1821 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1822 return; 1958 return;
1823 1959
1824 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1825 return; 1961 return;
1826 1962
1827 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1828 1964
1829 if (!texid) 1965 if (!texid)
1830 return; 1966 return;
1831 1967
1832 tex = self->tex + texid; 1968 tex = self->tex + texid;
1865} 2001}
1866 2002
1867void 2003void
1868expire_textures (DC::Map self, int texid, int count) 2004expire_textures (DC::Map self, int texid, int count)
1869 PPCODE: 2005 PPCODE:
1870 for (; texid < self->texs && count; ++texid, --count) 2006 for (; texid < self->texs && count; ++texid, --count)
1871 { 2007 {
1872 maptex *tex = self->tex + texid; 2008 maptex *tex = self->tex + texid;
1873 2009
1874 if (tex->name) 2010 if (tex->name)
1875 { 2011 {
1930 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1931 } 2067 }
1932} 2068}
1933 2069
1934SV * 2070SV *
1935map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1936 CODE: 2072 CODE:
1937{ 2073{
1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1939 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1940 mapcell *cell; 2076 mapcell *cell;
1961 2097
1962 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1963 2099
1964 if (flags & 8) 2100 if (flags & 8)
1965 { 2101 {
2102 uint8_t ext, cmd;
2103
1966 if (extmap) 2104 do
1967 { 2105 {
1968 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1969 2108
1970 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
1971 { 2112 {
1972 ext = *data++;
1973 cmd = ext & 0x7f;
1974
1975 if (cmd < 4)
1976 cell->darkness = 255 - ext * 64 + 1;
1977 else if (cmd == 5) // health
1978 {
1979 cell->stat_width = 1; 2113 cell->stat_width = 1;
1980 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1981 }
1982 else if (cmd == 6) // monster width
1983 cell->stat_width = *data++ + 1;
1984 else if (cmd == 0x47)
1985 {
1986 if (*data == 1) cell->player = data [1];
1987 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1988 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1989 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1990
1991 data += *data + 1;
1992 }
1993 else if (cmd == 8) // cell flags
1994 cell->flags = *data++;
1995 else if (ext & 0x40) // unknown, multibyte => skip
1996 data += *data + 1;
1997 else
1998 data++;
1999 } 2115 }
2000 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++;
2001 } 2133 }
2002 else 2134 while (ext & 0x80);
2003 cell->darkness = *data++ + 1;
2004 } 2135 }
2005 2136
2006 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
2007 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
2008 { 2139 {
2056 ? self->row + y 2187 ? self->row + y
2057 : 0; 2188 : 0;
2058 2189
2059 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
2060 { 2191 {
2061 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
2062 2193
2063 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
2064 { 2195 {
2065 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
2066 2197
2068 { 2199 {
2069 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
2070 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
2071 int a1 = tex.a; 2202 int a1 = tex.a;
2072 2203
2073 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
2074 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
2075 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
2076 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
2077 } 2208 }
2078 } 2209 }
2079 2210
2080 *map++ = (r ) 2211 *map++ = (r )
2081 | (g << 8) 2212 | (g << 8)
2082 | (b << 16) 2213 | (b << 16)
2083 | (a << 24); 2214 | (a << 24);
2084 } 2215 }
2085 } 2216 }
2086 2217
2087 RETVAL = map_sv; 2218 RETVAL = map_sv;
2088} 2219}
2089 OUTPUT: 2220 OUTPUT:
2090 RETVAL 2221 RETVAL
2091 2222
2092void 2223void
2093draw (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)
2094 CODE: 2225 CODE:
2095{ 2226{
2096 int x, y, z; 2227 int x, y, z;
2097 2228
2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2099 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2100 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!
2101 smooth_key skey;
2102 int pl_x, pl_y; 2230 int pl_x, pl_y;
2103 maptex pl_tex; 2231 maptex pl_tex;
2104 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc (); 2233 rc_t *rc_ov = rc_alloc ();
2106 rc_key_t key; 2234 rc_key_t key;
2107 rc_array_t *arr, *arr_hidden; 2235 rc_array_t *arr;
2108 2236
2109 pl_tex.name = 0; 2237 pl_tex.name = 0;
2110 2238
2111 // that's current max. sorry. 2239 // that's current max. sorry.
2112 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
2113 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
2114
2115 // clear key, in case of extra padding
2116 memset (&skey, 0, sizeof (skey));
2117 2242
2118 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
2119 key.r = 255; 2244 key.r = 255;
2120 key.g = 255; 2245 key.g = 255;
2121 key.b = 255; 2246 key.b = 255;
2127 my += self->y; 2252 my += self->y;
2128 2253
2129 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2130 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2131 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2132 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2133 2258
2134 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2135 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2136 { 2261 {
2137 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2150 2275
2151 glEnable (GL_BLEND); 2276 glEnable (GL_BLEND);
2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154 2279
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
2158 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2159 { 2281 {
2282 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2160 memset (smooth_level, 0, sizeof (smooth_level)); 2285 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1; 2286 key.texname = -1;
2162 2287
2163 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh; y++)
2164 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2185 2310
2186 key.texname = tex.name; 2311 key.texname = tex.name;
2187 arr = rc_array (rc, &key); 2312 arr = rc_array (rc, &key);
2188 } 2313 }
2189 2314
2190 px = (x + 1) * T - tex.w; 2315 px = (x + 1) * Th - tex.w;
2191 py = (y + 1) * T - tex.h; 2316 py = (y + 1) * Tw - tex.h;
2192 2317
2193 if (expect_false (cell->player == player) && expect_false (z == 2)) 2318 if (expect_false (cell->player == player) && expect_false (z == 2))
2194 { 2319 {
2195 pl_x = px; 2320 pl_x = px;
2196 pl_y = py; 2321 pl_y = py;
2225 2350
2226 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2351 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2227 // ·· ·· ·┏ ┓· 2352 // ·· ·· ·┏ ┓·
2228 2353
2229 // full tile 2354 // full tile
2230 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2355 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2231 2356
2232 // borders 2357 // borders
2233 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2358 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2234 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2359 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2235 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2360 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2236 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2361 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2237 2362
2238 // corners 2363 // corners
2239 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2364 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2240 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2365 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2241 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2366 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2242 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2367 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2243 } 2368 }
2244 } 2369 }
2245 2370
2246 if (expect_false (z == 2)) 2371 if (expect_false (z == 2) && expect_false (cell->flags))
2247 { 2372 {
2248 /* draw question marks on top of hidden spaces */ 2373 // overlays such as the speech bubble, probably more to come
2249 if (!cell->darkness) 2374 if (cell->flags & 1)
2250 { 2375 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key; 2376 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH]; 2377 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr; 2378 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32; 2379 int px = x * Tw + Tw * 2 / 32;
2270 int py = y * T - T * 6 / 32; 2380 int py = y * Th - Th * 6 / 32;
2271 2381
2272 key_ov.texname = tex.name; 2382 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov); 2383 arr = rc_array (rc_ov, &key_ov);
2274 2384
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2385 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2386 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2387 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2388 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2279 }
2280 } 2389 }
2281 } 2390 }
2282 } 2391 }
2283 } 2392 }
2284 2393
2300 if (smask & (((uint32_t)1) << b)) 2409 if (smask & (((uint32_t)1) << b))
2301 { 2410 {
2302 int level = (w << 5) | b; 2411 int level = (w << 5) | b;
2303 HE *he; 2412 HE *he;
2304 2413
2305 hv_iterinit (smooth); 2414 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2306 while ((he = hv_iternext (smooth)))
2307 { 2415 {
2308 smooth_key *skey = (smooth_key *)HeKEY (he); 2416 smooth_key &skey = it->first;
2309 IV bits = SvIVX (HeVAL (he)); 2417 IV bits = it->second;
2310 2418
2311 if (!(bits & 0x1000) 2419 if (!(bits & 0x1000)
2312 && skey->level == level 2420 && skey.level == level
2313 && level > smooth_max [skey->x][skey->y]) 2421 && level > smooth_max [skey.x][skey.y])
2314 { 2422 {
2315 maptex tex = self->tex [skey->tile]; 2423 maptex tex = self->tex [skey.tile];
2316 int px = (((int)skey->x) - 1) * T; 2424 int px = (((int)skey.x) - 1) * Tw;
2317 int py = (((int)skey->y) - 1) * T; 2425 int py = (((int)skey.y) - 1) * Th;
2318 int border = bits & 15; 2426 int border = bits & 15;
2319 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2427 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2320 float dx = tex.s * .0625f; // 16 images/row 2428 float dx = tex.s * .0625f; // 16 images/row
2321 float dy = tex.t * .5f ; // 2 images/column 2429 float dy = tex.t * .5f ; // 2 images/column
2322 2430
2324 { 2432 {
2325 // this time avoiding texture state changes 2433 // this time avoiding texture state changes
2326 // save gobs of state changes. 2434 // save gobs of state changes.
2327 if (key.texname != tex.name) 2435 if (key.texname != tex.name)
2328 { 2436 {
2329 self->tex [skey->tile].unused = 0; 2437 self->tex [skey.tile].unused = 0;
2330 2438
2331 glEnd (); 2439 glEnd ();
2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2440 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2333 glBegin (GL_QUADS); 2441 glBegin (GL_QUADS);
2334 } 2442 }
2335 2443
2336 if (border) 2444 if (border)
2337 { 2445 {
2338 float ox = border * dx; 2446 float ox = border * dx;
2339 2447
2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2448 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2450 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2451 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2344 } 2452 }
2345 2453
2346 if (corner) 2454 if (corner)
2347 { 2455 {
2348 float ox = corner * dx; 2456 float ox = corner * dx;
2349 2457
2350 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2458 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2459 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2460 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2461 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2354 } 2462 }
2355 } 2463 }
2356 } 2464 }
2357 } 2465 }
2358 } 2466 }
2360 2468
2361 glEnd (); 2469 glEnd ();
2362 glDisable (GL_TEXTURE_2D); 2470 glDisable (GL_TEXTURE_2D);
2363 key.texname = -1; 2471 key.texname = -1;
2364 } 2472 }
2365
2366 hv_clear (smooth);
2367 } 2473 }
2368 2474
2369 if (pl_tex.name) 2475 if (pl_tex.name)
2370 { 2476 {
2371 maptex tex = pl_tex; 2477 maptex tex = pl_tex;
2399 for (x = 0; x < sw; x++) 2505 for (x = 0; x < sw; x++)
2400 if (row->c0 <= x + mx && x + mx < row->c1) 2506 if (row->c0 <= x + mx && x + mx < row->c1)
2401 { 2507 {
2402 mapcell *cell = row->col + (x + mx - row->c0); 2508 mapcell *cell = row->col + (x + mx - row->c0);
2403 2509
2404 int px = x * T; 2510 int px = x * Tw;
2405 int py = y * T; 2511 int py = y * Th;
2406 2512
2407 if (expect_false (cell->player == player)) 2513 if (expect_false (cell->player == player))
2408 { 2514 {
2409 px += sdx; 2515 px += sdx;
2410 py += sdy; 2516 py += sdy;
2411 } 2517 }
2412 2518
2413 if (cell->stat_hp) 2519 if (cell->stat_hp)
2414 { 2520 {
2415 int width = cell->stat_width * T; 2521 int width = cell->stat_width * Tw;
2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2522 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2417 2523
2418 glColor3ub (0, 0, 0); 2524 glColor3ub (0, 0, 0);
2419 glRectf (px + 1, py - thick - 2, 2525 glRectf (px + 1, py - thick - 2,
2420 px + width - 1, py); 2526 px + width - 1, py);
2421 2527
2427 } 2533 }
2428 } 2534 }
2429} 2535}
2430 2536
2431void 2537void
2432draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2538draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2433 CODE: 2539 CODE:
2434{ 2540{
2435 static float color[16][3] = { 2541 static float color[16][3] = {
2436 { 0.00F, 0.00F, 0.00F }, 2542 { 0.00f, 0.00f, 0.00f },
2437 { 1.00F, 1.00F, 1.00F }, 2543 { 1.00f, 1.00f, 1.00f },
2438 { 0.00F, 0.00F, 0.55F }, 2544 { 0.00f, 0.00f, 0.55f },
2439 { 1.00F, 0.00F, 0.00F }, 2545 { 1.00f, 0.00f, 0.00f },
2440 2546
2441 { 1.00F, 0.54F, 0.00F }, 2547 { 1.00f, 0.54f, 0.00f },
2442 { 0.11F, 0.56F, 1.00F }, 2548 { 0.11f, 0.56f, 1.00f },
2443 { 0.93F, 0.46F, 0.00F }, 2549 { 0.93f, 0.46f, 0.00f },
2444 { 0.18F, 0.54F, 0.34F }, 2550 { 0.18f, 0.54f, 0.34f },
2445 2551
2446 { 0.56F, 0.73F, 0.56F }, 2552 { 0.56f, 0.73f, 0.56f },
2447 { 0.80F, 0.80F, 0.80F }, 2553 { 0.80f, 0.80f, 0.80f },
2448 { 0.55F, 0.41F, 0.13F }, 2554 { 0.55f, 0.41f, 0.13f },
2449 { 0.99F, 0.77F, 0.26F }, 2555 { 0.99f, 0.77f, 0.26f },
2450 2556
2451 { 0.74F, 0.65F, 0.41F }, 2557 { 0.74f, 0.65f, 0.41f },
2452 2558
2453 { 0.00F, 1.00F, 1.00F }, 2559 { 0.00f, 1.00f, 1.00f },
2454 { 1.00F, 0.00F, 1.00F }, 2560 { 1.00f, 0.00f, 1.00f },
2455 { 1.00F, 1.00F, 0.00F }, 2561 { 1.00f, 1.00f, 0.00f },
2456 }; 2562 };
2457 2563
2458 int x, y; 2564 int x, y;
2459 2565
2460 glEnable (GL_TEXTURE_2D); 2566 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2567 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures 2568 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using 2569 * and takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different 2570 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia. 2571 * alpha, but atcually gives us the correct colour with nvidia.
2466 */ 2572 */
2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2573 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468 glEnable (GL_BLEND); 2574 glEnable (GL_BLEND);
2476 2582
2477 if (m) 2583 if (m)
2478 { 2584 {
2479 float *c = color [m & 15]; 2585 float *c = color [m & 15];
2480 2586
2481 float tx1 = m & 0x40 ? 0.5 : 0.; 2587 float tx1 = m & 0x40 ? 0.5f : 0.f;
2482 float tx2 = tx1 + 0.5; 2588 float tx2 = tx1 + 0.5f;
2483 2589
2484 glColor4f (c[0], c[1], c[2], 1); 2590 glColor4f (c[0], c[1], c[2], 1);
2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2591 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2592 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2593 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2497void 2603void
2498fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2604fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2499 PPCODE: 2605 PPCODE:
2500{ 2606{
2501 int x, y; 2607 int x, y;
2502 int sw1 = sw + 2; 2608 int sw1 = sw + 2;
2503 int sh1 = sh + 2; 2609 int sh1 = sh + 2;
2504 int sh3 = sh * 3; 2610 int sh3 = sh * 3;
2505 int sw34 = (sw * 3 + 3) & ~3; 2611 int sw3 = sw * 3;
2612 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2613 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2506 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2614 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2507 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2615 memset (darkness1, 0, sw1*sh1);
2508 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2509 2616
2510 SvPOK_only (darkness3_sv); 2617 SvPOK_only (darkness3_sv);
2511 SvCUR_set (darkness3_sv, sw34 * sh3); 2618 SvCUR_set (darkness3_sv, sw3 * sh3);
2512 2619
2513 mx += self->x - 1; 2620 mx += self->x - 1;
2514 my += self->y - 1; 2621 my += self->y - 1;
2515
2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517 2622
2518 for (y = 0; y < sh1; y++) 2623 for (y = 0; y < sh1; y++)
2519 if (0 <= y + my && y + my < self->rows) 2624 if (0 <= y + my && y + my < self->rows)
2520 { 2625 {
2521 maprow *row = self->row + (y + my); 2626 maprow *row = self->row + (y + my);
2554 2659
2555 uint8_t r13 = (d13 + d23 + d12) / 3; 2660 uint8_t r13 = (d13 + d23 + d12) / 3;
2556 uint8_t r23 = d23; 2661 uint8_t r23 = d23;
2557 uint8_t r33 = (d23 + d33 + d32) / 3; 2662 uint8_t r33 = (d23 + d33 + d32) / 3;
2558 2663
2559 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2664 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2665 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2667 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2668 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2564 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2670 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2671 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568 } 2673 }
2569 2674
2570 free (darkness1); 2675 free (darkness1);
2571 2676
2572 EXTEND (SP, 3); 2677 EXTEND (SP, 3);
2573 PUSHs (sv_2mortal (newSViv (sw34))); 2678 PUSHs (sv_2mortal (newSViv (sw3)));
2574 PUSHs (sv_2mortal (newSViv (sh3))); 2679 PUSHs (sv_2mortal (newSViv (sh3)));
2575 PUSHs (darkness3_sv); 2680 PUSHs (darkness3_sv);
2576} 2681}
2577 2682
2578SV * 2683SV *
2641 else 2746 else
2642 *data++ = 0; 2747 *data++ = 0;
2643 } 2748 }
2644 } 2749 }
2645 2750
2646 /* if size is w*h + 5 then no data has been found */ 2751 /* if size is w*h + 5 then no data has been found */
2647 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2752 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2648 { 2753 {
2649 SvPOK_only (data_sv); 2754 SvPOK_only (data_sv);
2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2755 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 } 2756 }
2652 2757
2653 RETVAL = data_sv; 2758 RETVAL = data_sv;
2654} 2759}
2655 OUTPUT: 2760 OUTPUT:
2656 RETVAL 2761 RETVAL
2657 2762
2658void 2763void
2665 STRLEN len; 2770 STRLEN len;
2666 uint8_t *data, *end; 2771 uint8_t *data, *end;
2667 2772
2668 len = SvLEN (data_sv); 2773 len = SvLEN (data_sv);
2669 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2774 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2670 data = SvPVbyte_nolen (data_sv); 2775 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2671 end = data + len + 8; 2776 end = data + len + 8;
2672 2777
2673 if (len < 5) 2778 if (len < 5)
2674 XSRETURN_EMPTY; 2779 XSRETURN_EMPTY;
2675 2780
2736} 2841}
2737 2842
2738MODULE = Deliantra::Client PACKAGE = DC::RW 2843MODULE = Deliantra::Client PACKAGE = DC::RW
2739 2844
2740DC::RW 2845DC::RW
2741new (SV *class, SV *data_sv) 2846new (SV *klass, SV *data_sv)
2742 CODE: 2847 CODE:
2743{ 2848{
2744 STRLEN datalen; 2849 STRLEN datalen;
2745 char *data = SvPVbyte (data_sv, datalen); 2850 char *data = SvPVbyte (data_sv, datalen);
2746 2851
2748} 2853}
2749 OUTPUT: 2854 OUTPUT:
2750 RETVAL 2855 RETVAL
2751 2856
2752DC::RW 2857DC::RW
2753new_from_file (SV *class, const char *path, const char *mode = "rb") 2858new_from_file (SV *klass, const char *path, const char *mode = "rb")
2754 CODE: 2859 CODE:
2755 RETVAL = SDL_RWFromFile (path, mode); 2860 RETVAL = SDL_RWFromFile (path, mode);
2756 OUTPUT: 2861 OUTPUT:
2757 RETVAL 2862 RETVAL
2758 2863
2776 if (RETVAL < 0) 2881 if (RETVAL < 0)
2777 { 2882 {
2778 RETVAL = Mix_GroupOldest (-1); 2883 RETVAL = Mix_GroupOldest (-1);
2779 2884
2780 if (RETVAL < 0) 2885 if (RETVAL < 0)
2886 {
2887 // happens sometimes, maybe it just stopped playing(?)
2888 RETVAL = Mix_GroupAvailable (-1);
2889
2890 if (RETVAL < 0)
2781 XSRETURN_UNDEF; 2891 XSRETURN_UNDEF;
2782 2892 }
2893 else
2783 Mix_HaltChannel (RETVAL); 2894 Mix_HaltChannel (RETVAL);
2784 } 2895 }
2785 2896
2786 Mix_UnregisterAllEffects (RETVAL); 2897 Mix_UnregisterAllEffects (RETVAL);
2787 Mix_Volume (RETVAL, 128); 2898 Mix_Volume (RETVAL, 128);
2788} 2899}
2835void 2946void
2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2947set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837 CODE: 2948 CODE:
2838{ 2949{
2839 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2950 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2840 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2951 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2952 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842} 2953}
2843 2954
2844void 2955void
2845set_reverse_stereo (DC::Channel self, int flip) 2956set_reverse_stereo (DC::Channel self, int flip)
2848 2959
2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2960MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850 2961
2851PROTOTYPES: DISABLE 2962PROTOTYPES: DISABLE
2852 2963
2964void
2965decoders ()
2966 PPCODE:
2967#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2968 int i, num = Mix_GetNumChunkDecoders ();
2969 EXTEND (SP, num);
2970 for (i = 0; i < num; ++i)
2971 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2972#else
2973 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2974#endif
2975
2853DC::MixChunk 2976DC::MixChunk
2854new (SV *class, DC::RW rwops) 2977new (SV *klass, DC::RW rwops)
2855 CODE: 2978 CODE:
2856 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2979 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2857 OUTPUT: 2980 OUTPUT:
2858 RETVAL 2981 RETVAL
2859 2982
2889 OUTPUT: 3012 OUTPUT:
2890 RETVAL 3013 RETVAL
2891 3014
2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3015MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893 3016
3017void
3018decoders ()
3019 PPCODE:
3020#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3021 int i, num = Mix_GetNumMusicDecoders ();
3022 EXTEND (SP, num);
3023 for (i = 0; i < num; ++i)
3024 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3025#else
3026 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3027#endif
3028
2894int 3029int
2895volume (int volume = -1) 3030volume (int volume = -1)
2896 PROTOTYPE: ;$ 3031 PROTOTYPE: ;$
2897 CODE: 3032 CODE:
2898 if (items > 0) 3033 if (items > 0)
2909void 3044void
2910halt () 3045halt ()
2911 CODE: 3046 CODE:
2912 Mix_HaltMusic (); 3047 Mix_HaltMusic ();
2913 3048
3049int
3050playing ()
3051 CODE:
3052 RETVAL = Mix_PlayingMusic ();
3053 OUTPUT:
3054 RETVAL
3055
2914DC::MixMusic 3056DC::MixMusic
2915new (SV *class, DC::RW rwops) 3057new (SV *klass, DC::RW rwops)
2916 CODE: 3058 CODE:
2917 RETVAL = Mix_LoadMUS_RW (rwops); 3059 RETVAL = Mix_LoadMUS_RW (rwops);
2918 OUTPUT: 3060 OUTPUT:
2919 RETVAL 3061 RETVAL
2920 3062
3057 const_iv (GL_FUNC_SUBTRACT), 3199 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3200 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3059# undef const_iv 3201# undef const_iv
3060 }; 3202 };
3061 3203
3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3204 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3205 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3064 3206
3065 texture_av = newAV (); 3207 texture_av = newAV ();
3066 AvREAL_off (texture_av); 3208 AvREAL_off (texture_av);
3067} 3209}
3068 3210
3073 gl.BlendFuncSeparateEXT = 0; 3215 gl.BlendFuncSeparateEXT = 0;
3074 3216
3075void 3217void
3076apple_nvidia_bug (int enable) 3218apple_nvidia_bug (int enable)
3077 3219
3078char * 3220const char *
3079gl_vendor () 3221gl_vendor ()
3080 CODE: 3222 CODE:
3081 RETVAL = (char *)glGetString (GL_VENDOR); 3223 RETVAL = (const char *)glGetString (GL_VENDOR);
3082 OUTPUT: 3224 OUTPUT:
3083 RETVAL 3225 RETVAL
3084 3226
3085char * 3227const char *
3086gl_version () 3228gl_version ()
3087 CODE: 3229 CODE:
3088 RETVAL = (char *)glGetString (GL_VERSION); 3230 RETVAL = (const char *)glGetString (GL_VERSION);
3089 OUTPUT: 3231 OUTPUT:
3090 RETVAL 3232 RETVAL
3091 3233
3092char * 3234const char *
3093gl_extensions () 3235gl_extensions ()
3094 CODE: 3236 CODE:
3095 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3237 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3096 OUTPUT: 3238 OUTPUT:
3097 RETVAL 3239 RETVAL
3098 3240
3099const char *glGetString (GLenum pname) 3241const char *glGetString (GLenum pname)
3242 CODE:
3243 RETVAL = (const char *)glGetString (pname);
3244 OUTPUT:
3245 RETVAL
3100 3246
3101GLint glGetInteger (GLenum pname) 3247GLint glGetInteger (GLenum pname)
3102 CODE: 3248 CODE:
3103 glGetIntegerv (pname, &RETVAL); 3249 glGetIntegerv (pname, &RETVAL);
3104 OUTPUT: 3250 OUTPUT:
3111 RETVAL 3257 RETVAL
3112 3258
3113int glGetError () 3259int glGetError ()
3114 3260
3115void glFinish () 3261void glFinish ()
3262
3263void glFlush ()
3116 3264
3117void glClear (int mask) 3265void glClear (int mask)
3118 3266
3119void glClearColor (float r, float g, float b, float a = 1.0) 3267void glClearColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @ 3268 PROTOTYPE: @
3292 3440
3293void glEndList () 3441void glEndList ()
3294 3442
3295void glCallList (int list) 3443void glCallList (int list)
3296 3444
3445void c_init ()
3446 CODE:
3447 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3448 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3449
3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3450MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298 3451
3299PROTOTYPES: DISABLE 3452PROTOTYPES: DISABLE
3300 3453
3301void 3454void
3302find_widget (SV *self, NV x, NV y) 3455find_widget (SV *self, NV x, NV y)
3303 PPCODE: 3456 PPCODE:
3304{ 3457{
3305 if (within_widget (self, x, y)) 3458 if (within_widget (self, x, y))
3306 XPUSHs (self); 3459 XPUSHs (self);
3307} 3460}
3308 3461
3309BOOT: 3462BOOT:
3310{ 3463{
3318 3471
3319void 3472void
3320draw (SV *self) 3473draw (SV *self)
3321 CODE: 3474 CODE:
3322{ 3475{
3323 HV *hv; 3476 HV *hv;
3324 SV **svp; 3477 SV **svp;
3325 NV x, y, w, h; 3478 NV x, y, w, h;
3326 SV *draw_x_sv = GvSV (draw_x_gv); 3479 SV *draw_x_sv = GvSV (draw_x_gv);
3327 SV *draw_y_sv = GvSV (draw_y_gv); 3480 SV *draw_y_sv = GvSV (draw_y_gv);
3328 SV *draw_w_sv = GvSV (draw_w_gv); 3481 SV *draw_w_sv = GvSV (draw_w_gv);
3329 SV *draw_h_sv = GvSV (draw_h_gv); 3482 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines