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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines