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.293 by root, Thu Dec 17 02:49:38 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
94#define DARKNESS_ADJUST(n) (n)
87 95
88#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
90 98
91#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
95 103
96#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
97 105
98#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
100#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}
101 127
102static AV *texture_av; 128static AV *texture_av;
103 129
104static struct 130static struct
105{ 131{
162{ 188{
163 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
164 190
165 while (attrs) 191 while (attrs)
166 { 192 {
167 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 194
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 196 return 1;
171 197
172 attrs = attrs->next; 198 attrs = attrs->next;
173 } 199 }
174 200
175 return 0; 201 return 0;
176} 202}
177 203
178typedef struct cf_layout { 204struct cf_layout {
179 PangoLayout *pl; 205 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
181 int base_height; 207 int base_height;
182 DC__Font font; 208 DC__Font font;
183 rc_t *rc; 209 rc_t *rc;
184} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
185 213
186static DC__Font default_font; 214static DC__Font default_font;
187static PangoContext *opengl_context; 215static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
189 217
190static void 218static void
191substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
192{ 220{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 224#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 226}
199 227
200static void 228static void
230} 258}
231 259
232typedef uint16_t tileid; 260typedef uint16_t tileid;
233typedef uint16_t faceid; 261typedef uint16_t faceid;
234 262
235typedef struct { 263struct maptex
264{
236 GLuint name; 265 GLuint name;
237 int w, h; 266 int w, h;
238 float s, t; 267 float s, t;
239 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
240 tileid smoothtile; 269 tileid smoothtile;
241 uint8_t smoothlevel; 270 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 271 uint8_t unused; /* set to zero on use */
243} maptex; 272};
244 273
245typedef struct { 274struct mapcell
275{
246 uint32_t player; 276 uint32_t player;
247 tileid tile[3]; 277 tileid tile[3];
248 uint16_t darkness; 278 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 280};
251 281
252typedef struct { 282struct maprow
283{
253 int32_t c0, c1; 284 int32_t c0, c1;
254 mapcell *col; 285 mapcell *col;
255} maprow; 286};
256 287
257typedef struct map { 288struct mapgrid {
258 int x, y, w, h; 289 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
261 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
262 293
263 int32_t rows; 294 int32_t rows;
264 maprow *row; 295 maprow *row;
265} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
266 299
267static char * 300static char *
268prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
269{ 302{
270 char *p; 303 char *p;
288 321
289#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))
290#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))
291 324
292static void 325static void
293need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
294{ 327{
295 while (self->faces <= face) 328 while (self->faces <= face)
296 { 329 {
297 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
298 self->faces *= 2; 331 self->faces *= 2;
299 } 332 }
300} 333}
301 334
302static void 335static void
303need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
304{ 337{
305 while (self->texs <= texid) 338 while (self->texs <= texid)
306 { 339 {
307 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
308 self->texs *= 2; 341 self->texs *= 2;
309 } 342 }
310} 343}
311 344
312static maprow * 345static maprow *
313map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
314{ 347{
315 if (0 > y) 348 if (0 > y)
316 { 349 {
317 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
356 389
357 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
358} 391}
359 392
360static mapcell * 393static mapcell *
361map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
362{ 395{
363 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
364} 397}
365 398
366static void 399static void
367map_clear (DC__Map self) 400map_clear (mapgrid *self)
368{ 401{
369 int r; 402 int r;
370 403
371 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
372 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
390 (cell)->flags = 0; \ 423 (cell)->flags = 0; \
391 (cell)->player = 0; \ 424 (cell)->player = 0; \
392 } while (0) 425 } while (0)
393 426
394static void 427static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 429{
397 int x, y; 430 int x, y;
398 maprow *row; 431 maprow *row;
399 mapcell *cell; 432 mapcell *cell;
400 433
417 CELL_CLEAR (cell); 450 CELL_CLEAR (cell);
418 } 451 }
419 } 452 }
420} 453}
421 454
422typedef struct { 455struct smooth_key
456{
423 tileid tile; 457 tileid tile;
424 uint8_t x, y, level; 458 uint8_t x, y, level;
425} 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}
426 478
427static void 479static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 481{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
431 483
432 if (SvIOK (*sv)) 484 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
434 else 486 else
435 sv_setiv (*sv, bits); 487 it->second |= bits;
436} 488}
437 489
438static void 490static void
439music_finished (void) 491music_finished (void)
440{ 492{
457 ev.code = 1; 509 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 511 ev.data2 = 0;
460 512
461 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;
462} 521}
463 522
464static unsigned int 523static unsigned int
465minpot (unsigned int n) 524minpot (unsigned int n)
466{ 525{
549 608
550 return mod; 609 return mod;
551} 610}
552 611
553static void 612static void
554deliantra_main () 613deliantra_main (SV *real_main)
555{ 614{
556 char *argv[] = { 0 }; 615 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
558} 619}
559 620
560#ifdef __MACOSX__ 621#ifdef __MACOSX__
622 static SV *real_main;
623
561 /* to due surprising braindamage on the side of SDL design, we 624 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 625 * do some mind-boggling hack here: SDL requires a custom main()
563 * 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,
564 * 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,
565 * and which calls our main (== SDL_main) back. 628 * and which calls our main (== SDL_main) back.
566 */ 629 */
567 extern C_LINKAGE int 630 extern C_LINKAGE int
568 main (int argc, char *argv[]) 631 main (int argc, char *argv[])
569 { 632 {
570 deliantra_main (); 633 deliantra_main (real_main);
571 } 634 }
572 635
573 #undef main 636 #undef main
574 637
575 extern C_LINKAGE int main (int argc, char *argv[]); 638 extern C_LINKAGE int main (int argc, char *argv[]);
576 639
577 static void 640 static void
578 SDL_braino (void) 641 SDL_main_hack (SV *real_main_)
579 { 642 {
643 real_main = real_main_;
644
580 char *argv[] = { "deliantra client", 0 }; 645 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 646 (main) (1, argv);
582 } 647 }
583#else 648#else
584 static void 649 static void
585 SDL_braino (void) 650 SDL_main_hack (SV *real_main)
586 { 651 {
587 deliantra_main (); 652 deliantra_main (real_main);
588 } 653 }
589#endif 654#endif
590 655
591MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
592 657
793 858
794 const_iv (FOW_DARKNESS) 859 const_iv (FOW_DARKNESS)
795# undef const_iv 860# undef const_iv
796 }; 861 };
797 862
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 865
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 868}
804 869
820NV ceil (NV x) 885NV ceil (NV x)
821 886
822IV minpot (UV n) 887IV minpot (UV n)
823 888
824IV 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
825 896
826void 897void
827pango_init () 898pango_init ()
828 CODE: 899 CODE:
829{ 900{
837#endif 908#endif
838} 909}
839 910
840char *SDL_GetError () 911char *SDL_GetError ()
841 912
842void SDL_braino () 913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
843 915
844int SDL_Init (U32 flags) 916int SDL_Init (U32 flags)
845 917
846int SDL_InitSubSystem (U32 flags) 918int SDL_InitSubSystem (U32 flags)
847 919
848void SDL_QuitSubSystem (U32 flags) 920void SDL_QuitSubSystem (U32 flags)
849 921
850void SDL_Quit () 922void SDL_Quit ()
851 923
852int SDL_GL_SetAttribute (int attr, int value) 924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
853 926
854int SDL_GL_GetAttribute (int attr) 927int SDL_GL_GetAttribute (int attr)
855 CODE: 928 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 930 XSRETURN_UNDEF;
858 OUTPUT: 931 OUTPUT:
859 RETVAL 932 RETVAL
860 933
861void 934void
916 ); 989 );
917 990
918 if (RETVAL) 991 if (RETVAL)
919 { 992 {
920 av_clear (texture_av); 993 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#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);
924#include "glfunc.h" 995#include "glfunc.h"
925#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 999 }
927} 1000}
928 OUTPUT: 1001 OUTPUT:
929 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
930 1006
931void 1007void
932SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
933 1009
934char * 1010char *
935SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
936 1013
937int 1014int
938SDL_GetAppState () 1015SDL_GetAppState ()
939 1016
940int 1017int
941SDL_GetModState () 1018SDL_GetModState ()
942 1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
943void 1024void
1025SDL_PumpEvents ()
1026
1027void
944poll_events () 1028peep_events ()
945 PPCODE: 1029 PPCODE:
946{ 1030{
947 SDL_Event ev; 1031 SDL_Event ev;
948 1032
949 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
1015 1099
1016 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))));
1017 } 1101 }
1018} 1102}
1019 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
1020int 1117int
1021Mix_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)
1022 POSTCALL: 1119 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
1025 1122
1026void 1123void
1027Mix_QuerySpec () 1124Mix_QuerySpec ()
1086add_font (char *file) 1183add_font (char *file)
1087 CODE: 1184 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1186 OUTPUT:
1090 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)
1091 1195
1092void 1196void
1093load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
1094 ALIAS: 1198 ALIAS:
1095 load_image_file = 1 1199 load_image_file = 1
1141 1245
1142 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1147 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)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
1151 1255
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1328
1225PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1226 1330
1227DC::Font 1331DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1333 CODE:
1230{ 1334{
1231 int count; 1335 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1366 PROTOTYPE:
1263 CODE: 1367 CODE:
1264 tc_restore (); 1368 tc_restore ();
1265 1369
1266DC::Layout 1370DC::Layout
1267new (SV *class) 1371new (SV *klass)
1268 CODE: 1372 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1270 1374
1271 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1421 1525
1422void 1526void
1423set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1424 CODE: 1528 CODE:
1425 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1426 { 1530 {
1427 self->base_height = base_height; 1531 self->base_height = base_height;
1428 layout_update_font (self); 1532 layout_update_font (self);
1429 } 1533 }
1430 1534
1431void 1535void
1659 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1660 } 1764 }
1661} 1765}
1662 1766
1663void 1767void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1) 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)
1665 PROTOTYPE: @ 1769 PROTOTYPE: @
1666 CODE: 1770 CODE:
1667{ 1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668 glEnable (GL_TEXTURE_2D); 1774 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND); 1775 glBindTexture (GL_TEXTURE_2D, name1);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 1776
1673 glColor4f (intensity, intensity, intensity, 0.9); 1777 glColor3f (intensity, intensity, intensity);
1674 glPushMatrix (); 1778 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.); 1779 glScalef (1./3, 1./3, 1.);
1676 1780
1781 if (blend > 0.f)
1782 {
1783 float dx3 = dx * -3.f / w;
1784 float dy3 = dy * -3.f / h;
1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1786
1787 /* interpolate the two shadow textures */
1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1790
1791 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1792 gl.ActiveTexture (GL_TEXTURE1);
1793 glEnable (GL_TEXTURE_2D);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1794 glBindTexture (GL_TEXTURE_2D, name2);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678 1796
1797 /* rgb == rgb(glcolor) */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1801
1802 /* alpha = interpolate t0, t1 by env_alpha */
1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1808
1809 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1811
1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1814
1815 glBegin (GL_QUADS);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 gl.ActiveTexture (GL_TEXTURE0);
1824 }
1825 else
1826 {
1827 /* simple blending of one texture, also opengl <1.3 path */
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1829
1830 glBegin (GL_QUADS);
1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1832 glTexCoord2f (0, t); glVertex2f (0, h);
1833 glTexCoord2f (s, t); glVertex2f (w, h);
1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1835 glEnd ();
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);
1679 glBegin (GL_QUADS); 1848 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1849
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1850 for (y = 1; y < h; y += 3)
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1851 {
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 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
1684 glEnd (); 1880 glEnd ();
1685 1881
1686 glPopMatrix (); 1882 glPopMatrix ();
1687 1883
1688 glDisable (GL_TEXTURE_2D); 1884 glDisable (GL_TEXTURE_2D);
1703MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1704 1900
1705PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1706 1902
1707DC::Map 1903DC::Map
1708new (SV *class) 1904new (SV *klass)
1709 CODE: 1905 CODE:
1710 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1711 RETVAL->x = 0; 1907 RETVAL->x = 0;
1712 RETVAL->y = 0; 1908 RETVAL->y = 0;
1713 RETVAL->w = 0; 1909 RETVAL->w = 0;
1714 RETVAL->h = 0; 1910 RETVAL->h = 0;
1715 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1752 1948
1753void 1949void
1754set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1755 CODE: 1951 CODE:
1756{ 1952{
1757 tileid texid; 1953 tileid texid;
1758 maptex *tex; 1954 maptex *tex;
1759 1955
1760 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1761 return; 1957 return;
1762 1958
1763 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1764 return; 1960 return;
1765 1961
1766 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1767 1963
1768 if (!texid) 1964 if (!texid)
1769 return; 1965 return;
1770 1966
1771 tex = self->tex + texid; 1967 tex = self->tex + texid;
1804} 2000}
1805 2001
1806void 2002void
1807expire_textures (DC::Map self, int texid, int count) 2003expire_textures (DC::Map self, int texid, int count)
1808 PPCODE: 2004 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count) 2005 for (; texid < self->texs && count; ++texid, --count)
1810 { 2006 {
1811 maptex *tex = self->tex + texid; 2007 maptex *tex = self->tex + texid;
1812 2008
1813 if (tex->name) 2009 if (tex->name)
1814 { 2010 {
1869 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1870 } 2066 }
1871} 2067}
1872 2068
1873SV * 2069SV *
1874map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1875 CODE: 2071 CODE:
1876{ 2072{
1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1878 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1879 mapcell *cell; 2075 mapcell *cell;
1900 2096
1901 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1902 2098
1903 if (flags & 8) 2099 if (flags & 8)
1904 { 2100 {
2101 uint8_t ext, cmd;
2102
1905 if (extmap) 2103 do
1906 { 2104 {
1907 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1908 2107
1909 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
1910 { 2111 {
1911 ext = *data++;
1912 cmd = ext & 0x7f;
1913
1914 if (cmd < 4)
1915 cell->darkness = 255 - ext * 64 + 1;
1916 else if (cmd == 5) // health
1917 {
1918 cell->stat_width = 1; 2112 cell->stat_width = 1;
1919 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1920 }
1921 else if (cmd == 6) // monster width
1922 cell->stat_width = *data++ + 1;
1923 else if (cmd == 0x47)
1924 {
1925 if (*data == 1) cell->player = data [1];
1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1929
1930 data += *data + 1;
1931 }
1932 else if (cmd == 8) // cell flags
1933 cell->flags = *data++;
1934 else if (ext & 0x40) // unknown, multibyte => skip
1935 data += *data + 1;
1936 else
1937 data++;
1938 } 2114 }
1939 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++;
1940 } 2132 }
1941 else 2133 while (ext & 0x80);
1942 cell->darkness = *data++ + 1;
1943 } 2134 }
1944 2135
1945 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1946 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1947 { 2138 {
1995 ? self->row + y 2186 ? self->row + y
1996 : 0; 2187 : 0;
1997 2188
1998 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1999 { 2190 {
2000 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
2001 2192
2002 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
2003 { 2194 {
2004 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
2005 2196
2007 { 2198 {
2008 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
2009 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
2010 int a1 = tex.a; 2201 int a1 = tex.a;
2011 2202
2012 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
2013 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
2014 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
2015 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
2016 } 2207 }
2017 } 2208 }
2018 2209
2019 *map++ = (r ) 2210 *map++ = (r )
2020 | (g << 8) 2211 | (g << 8)
2021 | (b << 16) 2212 | (b << 16)
2022 | (a << 24); 2213 | (a << 24);
2023 } 2214 }
2024 } 2215 }
2025 2216
2026 RETVAL = map_sv; 2217 RETVAL = map_sv;
2027} 2218}
2028 OUTPUT: 2219 OUTPUT:
2029 RETVAL 2220 RETVAL
2030 2221
2031void 2222void
2032draw (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)
2033 CODE: 2224 CODE:
2034{ 2225{
2035 int x, y, z; 2226 int x, y, z;
2036 2227
2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2038 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
2039 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)
2040 smooth_key skey; 2230 smooth_key skey;
2041 int pl_x, pl_y; 2231 int pl_x, pl_y;
2042 maptex pl_tex; 2232 maptex pl_tex;
2043 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc (); 2234 rc_t *rc_ov = rc_alloc ();
2045 rc_key_t key; 2235 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden; 2236 rc_array_t *arr;
2047 2237
2048 pl_tex.name = 0; 2238 pl_tex.name = 0;
2049 2239
2050 // that's current max. sorry. 2240 // that's current max. sorry.
2051 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
2089 2279
2090 glEnable (GL_BLEND); 2280 glEnable (GL_BLEND);
2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093 2283
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
2097 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
2098 { 2285 {
2286 smooth_hash smooth;
2099 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1; 2288 key.texname = -1;
2101 2289
2102 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
2103 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
2124 2312
2125 key.texname = tex.name; 2313 key.texname = tex.name;
2126 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
2127 } 2315 }
2128 2316
2129 px = (x + 1) * T - tex.w; 2317 px = (x + 1) * Th - tex.w;
2130 py = (y + 1) * T - tex.h; 2318 py = (y + 1) * Tw - tex.h;
2131 2319
2132 if (expect_false (cell->player == player) && expect_false (z == 2)) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 { 2321 {
2134 pl_x = px; 2322 pl_x = px;
2135 pl_y = py; 2323 pl_y = py;
2164 2352
2165 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2166 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
2167 2355
2168 // full tile 2356 // full tile
2169 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);
2170 2358
2171 // borders 2359 // borders
2172 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);
2173 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);
2174 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);
2175 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);
2176 2364
2177 // corners 2365 // corners
2178 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);
2179 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);
2180 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);
2181 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);
2182 } 2370 }
2183 } 2371 }
2184 2372
2185 if (expect_false (z == 2)) 2373 if (expect_false (z == 2) && expect_false (cell->flags))
2186 { 2374 {
2187 /* draw question marks on top of hidden spaces */ 2375 // overlays such as the speech bubble, probably more to come
2188 if (!cell->darkness) 2376 if (cell->flags & 1)
2189 { 2377 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key; 2378 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH]; 2379 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr; 2380 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32; 2381 int px = x * Tw + Tw * 2 / 32;
2209 int py = y * T - T * 6 / 32; 2382 int py = y * Th - Th * 6 / 32;
2210 2383
2211 key_ov.texname = tex.name; 2384 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov); 2385 arr = rc_array (rc_ov, &key_ov);
2213 2386
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2216 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);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2218 }
2219 } 2391 }
2220 } 2392 }
2221 } 2393 }
2222 } 2394 }
2223 2395
2239 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2240 { 2412 {
2241 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2242 HE *he; 2414 HE *he;
2243 2415
2244 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2245 while ((he = hv_iternext (smooth)))
2246 { 2417 {
2247 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2248 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2249 2420
2250 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2251 && skey->level == level 2422 && skey.level == level
2252 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2253 { 2424 {
2254 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2255 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
2256 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
2257 int border = bits & 15; 2428 int border = bits & 15;
2258 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2260 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2261 2432
2263 { 2434 {
2264 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2265 // save gobs of state changes. 2436 // save gobs of state changes.
2266 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2267 { 2438 {
2268 self->tex [skey->tile].unused = 0; 2439 self->tex [skey.tile].unused = 0;
2269 2440
2270 glEnd (); 2441 glEnd ();
2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2272 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2273 } 2444 }
2274 2445
2275 if (border) 2446 if (border)
2276 { 2447 {
2277 float ox = border * dx; 2448 float ox = border * dx;
2278 2449
2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283 } 2454 }
2284 2455
2285 if (corner) 2456 if (corner)
2286 { 2457 {
2287 float ox = corner * dx; 2458 float ox = corner * dx;
2288 2459
2289 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293 } 2464 }
2294 } 2465 }
2295 } 2466 }
2296 } 2467 }
2297 } 2468 }
2299 2470
2300 glEnd (); 2471 glEnd ();
2301 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2302 key.texname = -1; 2473 key.texname = -1;
2303 } 2474 }
2304
2305 hv_clear (smooth);
2306 } 2475 }
2307 2476
2308 if (pl_tex.name) 2477 if (pl_tex.name)
2309 { 2478 {
2310 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2338 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2339 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2340 { 2509 {
2341 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2342 2511
2343 int px = x * T; 2512 int px = x * Tw;
2344 int py = y * T; 2513 int py = y * Th;
2345 2514
2346 if (expect_false (cell->player == player)) 2515 if (expect_false (cell->player == player))
2347 { 2516 {
2348 px += sdx; 2517 px += sdx;
2349 py += sdy; 2518 py += sdy;
2350 } 2519 }
2351 2520
2352 if (cell->stat_hp) 2521 if (cell->stat_hp)
2353 { 2522 {
2354 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356 2525
2357 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2358 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2359 px + width - 1, py); 2528 px + width - 1, py);
2360 2529
2366 } 2535 }
2367 } 2536 }
2368} 2537}
2369 2538
2370void 2539void
2371draw_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)
2372 CODE: 2541 CODE:
2373{ 2542{
2374 static float color[16][3] = { 2543 static float color[16][3] = {
2375 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
2376 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
2377 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
2378 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
2379 2548
2380 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2381 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2382 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2383 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2384 2553
2385 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2386 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2387 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2388 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2389 2558
2390 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2391 2560
2392 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2393 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2394 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2395 }; 2564 };
2396 2565
2397 int x, y; 2566 int x, y;
2398 2567
2399 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2400 /* 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,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures 2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using 2571 * and takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different 2572 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia. 2573 * alpha, but atcually gives us the correct colour with nvidia.
2405 */ 2574 */
2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2415 2584
2416 if (m) 2585 if (m)
2417 { 2586 {
2418 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2419 2588
2420 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2421 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2422 2591
2423 glColor4f (c[0], c[1], c[2], 1); 2592 glColor4f (c[0], c[1], c[2], 1);
2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2436void 2605void
2437fow_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)
2438 PPCODE: 2607 PPCODE:
2439{ 2608{
2440 int x, y; 2609 int x, y;
2441 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2442 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2443 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2444 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);
2445 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2446 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2447 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2448 2618
2449 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2450 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2451 2621
2452 mx += self->x - 1; 2622 mx += self->x - 1;
2453 my += self->y - 1; 2623 my += self->y - 1;
2454
2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456 2624
2457 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2458 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2459 { 2627 {
2460 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
2463 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2464 { 2632 {
2465 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2466 2634
2467 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2468 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470 } 2638 }
2471 } 2639 }
2472 2640
2473 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2474 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
2493 2661
2494 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2495 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2496 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2497 2665
2498 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502 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 */
2503 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507 } 2675 }
2508 2676
2509 free (darkness1); 2677 free (darkness1);
2510 2678
2511 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2512 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2513 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2514 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2515} 2683}
2516 2684
2517SV * 2685SV *
2580 else 2748 else
2581 *data++ = 0; 2749 *data++ = 0;
2582 } 2750 }
2583 } 2751 }
2584 2752
2585 /* 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 */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 { 2755 {
2588 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 } 2758 }
2591 2759
2592 RETVAL = data_sv; 2760 RETVAL = data_sv;
2593} 2761}
2594 OUTPUT: 2762 OUTPUT:
2595 RETVAL 2763 RETVAL
2596 2764
2597void 2765void
2604 STRLEN len; 2772 STRLEN len;
2605 uint8_t *data, *end; 2773 uint8_t *data, *end;
2606 2774
2607 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2610 end = data + len + 8; 2778 end = data + len + 8;
2611 2779
2612 if (len < 5) 2780 if (len < 5)
2613 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2614 2782
2675} 2843}
2676 2844
2677MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2678 2846
2679DC::RW 2847DC::RW
2680new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2681 CODE: 2849 CODE:
2682{ 2850{
2683 STRLEN datalen; 2851 STRLEN datalen;
2684 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2685 2853
2687} 2855}
2688 OUTPUT: 2856 OUTPUT:
2689 RETVAL 2857 RETVAL
2690 2858
2691DC::RW 2859DC::RW
2692new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2693 CODE: 2861 CODE:
2694 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2695 OUTPUT: 2863 OUTPUT:
2696 RETVAL 2864 RETVAL
2697 2865
2715 if (RETVAL < 0) 2883 if (RETVAL < 0)
2716 { 2884 {
2717 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2718 2886
2719 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)
2720 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2721 2894 }
2895 else
2722 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2723 } 2897 }
2724 2898
2725 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2727} 2901}
2774void 2948void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE: 2950 CODE:
2777{ 2951{
2778 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));
2779 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;
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781} 2955}
2782 2956
2783void 2957void
2784set_reverse_stereo (DC::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2787 2961
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789 2963
2790PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2791 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
2792DC::MixChunk 2978DC::MixChunk
2793new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2794 CODE: 2980 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2796 OUTPUT: 2982 OUTPUT:
2797 RETVAL 2983 RETVAL
2798 2984
2828 OUTPUT: 3014 OUTPUT:
2829 RETVAL 3015 RETVAL
2830 3016
2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832 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
2833int 3031int
2834volume (int volume = -1) 3032volume (int volume = -1)
2835 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2836 CODE: 3034 CODE:
2837 if (items > 0) 3035 if (items > 0)
2848void 3046void
2849halt () 3047halt ()
2850 CODE: 3048 CODE:
2851 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2852 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2853DC::MixMusic 3058DC::MixMusic
2854new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2855 CODE: 3060 CODE:
2856 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2857 OUTPUT: 3062 OUTPUT:
2858 RETVAL 3063 RETVAL
2859 3064
2996 const_iv (GL_FUNC_SUBTRACT), 3201 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998# undef const_iv 3203# undef const_iv
2999 }; 3204 };
3000 3205
3001 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--)
3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003 3208
3004 texture_av = newAV (); 3209 texture_av = newAV ();
3005 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
3006} 3211}
3007 3212
3012 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
3013 3218
3014void 3219void
3015apple_nvidia_bug (int enable) 3220apple_nvidia_bug (int enable)
3016 3221
3017char * 3222const char *
3018gl_vendor () 3223gl_vendor ()
3019 CODE: 3224 CODE:
3020 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
3021 OUTPUT: 3226 OUTPUT:
3022 RETVAL 3227 RETVAL
3023 3228
3024char * 3229const char *
3025gl_version () 3230gl_version ()
3026 CODE: 3231 CODE:
3027 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
3028 OUTPUT: 3233 OUTPUT:
3029 RETVAL 3234 RETVAL
3030 3235
3031char * 3236const char *
3032gl_extensions () 3237gl_extensions ()
3033 CODE: 3238 CODE:
3034 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3035 OUTPUT: 3240 OUTPUT:
3036 RETVAL 3241 RETVAL
3037 3242
3038const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
3039 3248
3040GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
3041 CODE: 3250 CODE:
3042 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
3043 OUTPUT: 3252 OUTPUT:
3050 RETVAL 3259 RETVAL
3051 3260
3052int glGetError () 3261int glGetError ()
3053 3262
3054void glFinish () 3263void glFinish ()
3264
3265void glFlush ()
3055 3266
3056void glClear (int mask) 3267void glClear (int mask)
3057 3268
3058void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
3059 PROTOTYPE: @ 3270 PROTOTYPE: @
3231 3442
3232void glEndList () 3443void glEndList ()
3233 3444
3234void glCallList (int list) 3445void glCallList (int list)
3235 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237 3453
3238PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
3239 3455
3240void 3456void
3241find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
3242 PPCODE: 3458 PPCODE:
3243{ 3459{
3244 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
3245 XPUSHs (self); 3461 XPUSHs (self);
3246} 3462}
3247 3463
3248BOOT: 3464BOOT:
3249{ 3465{
3257 3473
3258void 3474void
3259draw (SV *self) 3475draw (SV *self)
3260 CODE: 3476 CODE:
3261{ 3477{
3262 HV *hv; 3478 HV *hv;
3263 SV **svp; 3479 SV **svp;
3264 NV x, y, w, h; 3480 NV x, y, w, h;
3265 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3266 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3267 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3268 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