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.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
33 38
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 40
36#include <SDL.h> 41#include <SDL.h>
37#include <SDL_thread.h> 42#include <SDL_thread.h>
41#include <SDL_opengl.h> 46#include <SDL_opengl.h>
42 47
43/* work around os x broken headers */ 48/* work around os x broken headers */
44#ifdef __MACOSX__ 49#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46#endif 53#endif
47 54
48#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
50 57
51#include <glib/gmacros.h> 58#include <glib.h>
52 59
53#include <pango/pango.h> 60#include <pango/pango.h>
54 61
55#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
80#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
82 89
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
85#define FOW_DARKNESS 64 94#define FOW_DARKNESS 50
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
97 106
98#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
101 128
102static AV *texture_av; 129static AV *texture_av;
103 130
104static struct 131static struct
105{ 132{
162{ 189{
163 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
164 191
165 while (attrs) 192 while (attrs)
166 { 193 {
167 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 195
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 197 return 1;
171 198
172 attrs = attrs->next; 199 attrs = attrs->next;
173 } 200 }
174 201
175 return 0; 202 return 0;
176} 203}
177 204
178typedef struct cf_layout { 205struct cf_layout {
179 PangoLayout *pl; 206 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
181 int base_height; 208 int base_height;
182 DC__Font font; 209 DC__Font font;
183 rc_t *rc; 210 rc_t *rc;
184} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
185 214
186static DC__Font default_font; 215static DC__Font default_font;
187static PangoContext *opengl_context; 216static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
189 218
190static void 219static void
191substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
192{ 221{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 225#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 227}
199 228
200static void 229static void
230} 259}
231 260
232typedef uint16_t tileid; 261typedef uint16_t tileid;
233typedef uint16_t faceid; 262typedef uint16_t faceid;
234 263
235typedef struct { 264struct maptex
265{
236 GLuint name; 266 GLuint name;
237 int w, h; 267 int w, h;
238 float s, t; 268 float s, t;
239 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
240 tileid smoothtile; 270 tileid smoothtile;
241 uint8_t smoothlevel; 271 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
243} maptex; 273};
244 274
245typedef struct { 275struct mapcell
276{
246 uint32_t player; 277 uint32_t player;
247 tileid tile[3]; 278 tileid tile[3];
248 uint16_t darkness; 279 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 281};
251 282
252typedef struct { 283struct maprow
284{
253 int32_t c0, c1; 285 int32_t c0, c1;
254 mapcell *col; 286 mapcell *col;
255} maprow; 287};
256 288
257typedef struct map { 289struct mapgrid {
258 int x, y, w, h; 290 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
261 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
262 294
263 int32_t rows; 295 int32_t rows;
264 maprow *row; 296 maprow *row;
265} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
266 300
267static char * 301static char *
268prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
269{ 303{
270 char *p; 304 char *p;
288 322
289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291 325
292static void 326static void
293need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
294{ 328{
295 while (self->faces <= face) 329 while (self->faces <= face)
296 { 330 {
297 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
298 self->faces *= 2; 332 self->faces *= 2;
299 } 333 }
300} 334}
301 335
302static void 336static void
303need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
304{ 338{
305 while (self->texs <= texid) 339 while (self->texs <= texid)
306 { 340 {
307 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
308 self->texs *= 2; 342 self->texs *= 2;
309 } 343 }
310} 344}
311 345
312static maprow * 346static maprow *
313map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
314{ 348{
315 if (0 > y) 349 if (0 > y)
316 { 350 {
317 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
356 390
357 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
358} 392}
359 393
360static mapcell * 394static mapcell *
361map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
362{ 396{
363 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
364} 398}
365 399
366static void 400static void
367map_clear (DC__Map self) 401map_clear (mapgrid *self)
368{ 402{
369 int r; 403 int r;
370 404
371 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
372 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
390 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
391 (cell)->player = 0; \ 425 (cell)->player = 0; \
392 } while (0) 426 } while (0)
393 427
394static void 428static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 430{
397 int x, y; 431 int x, y;
398 maprow *row; 432 maprow *row;
399 mapcell *cell; 433 mapcell *cell;
400 434
417 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
418 } 452 }
419 } 453 }
420} 454}
421 455
422typedef struct { 456struct smooth_key
457{
423 tileid tile; 458 tileid tile;
424 uint8_t x, y, level; 459 uint8_t x, y, level;
425} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
426 479
427static void 480static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 482{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
431 484
432 if (SvIOK (*sv)) 485 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
434 else 487 else
435 sv_setiv (*sv, bits); 488 it->second |= bits;
436} 489}
437 490
438static void 491static void
439music_finished (void) 492music_finished (void)
440{ 493{
457 ev.code = 1; 510 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 512 ev.data2 = 0;
460 513
461 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
462} 522}
463 523
464static unsigned int 524static unsigned int
465minpot (unsigned int n) 525minpot (unsigned int n)
466{ 526{
549 609
550 return mod; 610 return mod;
551} 611}
552 612
553static void 613static void
554deliantra_main () 614deliantra_main (SV *real_main)
555{ 615{
556 char *argv[] = { 0 }; 616 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
558} 620}
559 621
560#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
561 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 626 * 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, 627 * 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, 628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
566 */ 630 */
567 extern C_LINKAGE int 631 extern C_LINKAGE int
568 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
569 { 633 {
570 deliantra_main (); 634 deliantra_main (real_main);
571 } 635 }
572 636
573 #undef main 637 #undef main
574 638
575 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
576 640
577 static void 641 static void
578 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
579 { 643 {
644 real_main = real_main_;
645
580 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 647 (main) (1, argv);
582 } 648 }
583#else 649#else
584 static void 650 static void
585 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
586 { 652 {
587 deliantra_main (); 653 deliantra_main (real_main);
588 } 654 }
589#endif 655#endif
590 656
591MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
592 658
793 859
794 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
795# undef const_iv 861# undef const_iv
796 }; 862 };
797 863
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 866
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 869}
804 870
843#endif 909#endif
844} 910}
845 911
846char *SDL_GetError () 912char *SDL_GetError ()
847 913
848void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
849 916
850int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
851 918
852int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
853 920
854void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
855 922
856void SDL_Quit () 923void SDL_Quit ()
857 924
858int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
859 927
860int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
861 CODE: 929 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
863 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
864 OUTPUT: 932 OUTPUT:
865 RETVAL 933 RETVAL
866 934
867void 935void
922 ); 990 );
923 991
924 if (RETVAL) 992 if (RETVAL)
925 { 993 {
926 av_clear (texture_av); 994 av_clear (texture_av);
927
928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
930#include "glfunc.h" 996#include "glfunc.h"
931#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932 } 1000 }
933} 1001}
934 OUTPUT: 1002 OUTPUT:
935 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
936 1007
937void 1008void
938SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
939 1010
940char * 1011char *
941SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
942 1014
943int 1015int
944SDL_GetAppState () 1016SDL_GetAppState ()
945 1017
946int 1018int
947SDL_GetModState () 1019SDL_GetModState ()
948 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
949void 1025void
1026SDL_PumpEvents ()
1027
1028void
950poll_events () 1029peep_events ()
951 PPCODE: 1030 PPCODE:
952{ 1031{
953 SDL_Event ev; 1032 SDL_Event ev;
954 1033
955 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1021 1100
1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1023 } 1102 }
1024} 1103}
1025 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
1026int 1118int
1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1028 POSTCALL: 1120 POSTCALL:
1029 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1030 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1031 1123
1032void 1124void
1033Mix_QuerySpec () 1125Mix_QuerySpec ()
1092add_font (char *file) 1184add_font (char *file)
1093 CODE: 1185 CODE:
1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT: 1187 OUTPUT:
1096 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1097 1196
1098void 1197void
1099load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1100 ALIAS: 1199 ALIAS:
1101 load_image_file = 1 1200 load_image_file = 1
1147 1246
1148 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1149 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1150 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1151 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1152 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1153 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1154 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1155 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1156 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1157 1256
1229MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1230 1329
1231PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1232 1331
1233DC::Font 1332DC::Font
1234new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1235 CODE: 1334 CODE:
1236{ 1335{
1237 int count; 1336 int count;
1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1239 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1268 PROTOTYPE: 1367 PROTOTYPE:
1269 CODE: 1368 CODE:
1270 tc_restore (); 1369 tc_restore ();
1271 1370
1272DC::Layout 1371DC::Layout
1273new (SV *class) 1372new (SV *klass)
1274 CODE: 1373 CODE:
1275 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1276 1375
1277 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1278 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1427 1526
1428void 1527void
1429set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1430 CODE: 1529 CODE:
1431 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1432 { 1531 {
1433 self->base_height = base_height; 1532 self->base_height = base_height;
1434 layout_update_font (self); 1533 layout_update_font (self);
1435 } 1534 }
1436 1535
1437void 1536void
1665 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1666 } 1765 }
1667} 1766}
1668 1767
1669void 1768void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 1769draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1671 PROTOTYPE: @ 1770 PROTOTYPE: @
1672 CODE: 1771 CODE:
1673{ 1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674 glEnable (GL_TEXTURE_2D); 1775 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1776 glBindTexture (GL_TEXTURE_2D, name1);
1678 1777
1679 glColor3f (intensity, intensity, intensity); 1778 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix (); 1779 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.); 1780 glScalef (1./3, 1./3, 1.);
1682 1781
1683 if (blend > 0.f) 1782 if (blend > 0.f)
1684 { 1783 {
1685 float S2, T2; /* 0. 0. for texture 2 */ 1784 float dx3 = dx * -3.f / w;
1686 float w = w1 > w2 ? w1 : w2; 1785 float dy3 = dy * -3.f / h;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend }; 1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1689 1787
1690 /* interpolate the two shadow textures */ 1788 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1697 glBindTexture (GL_TEXTURE_2D, name2); 1795 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1797
1700 /* rgb == rgb(glcolor) */ 1798 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1802
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1803 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1805
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714 1812
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717 1815
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS); 1816 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1734 glEnd (); 1821 glEnd ();
1735 1822
1736 glDisable (GL_TEXTURE_2D); 1823 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0); 1824 gl.ActiveTexture (GL_TEXTURE0);
1738 } 1825 }
1740 { 1827 {
1741 /* simple blending of one texture, also opengl <1.3 path */ 1828 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743 1830
1744 glBegin (GL_QUADS); 1831 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1833 glTexCoord2f (0, t); glVertex2f (0, h);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1834 glTexCoord2f (s, t); glVertex2f (w, h);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1749 glEnd (); 1836 glEnd ();
1750 } 1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1751 1882
1752 glPopMatrix (); 1883 glPopMatrix ();
1753 1884
1754 glDisable (GL_TEXTURE_2D); 1885 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND); 1886 glDisable (GL_BLEND);
1769MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1770 1901
1771PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1772 1903
1773DC::Map 1904DC::Map
1774new (SV *class) 1905new (SV *klass)
1775 CODE: 1906 CODE:
1776 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1777 RETVAL->x = 0; 1908 RETVAL->x = 0;
1778 RETVAL->y = 0; 1909 RETVAL->y = 0;
1779 RETVAL->w = 0; 1910 RETVAL->w = 0;
1780 RETVAL->h = 0; 1911 RETVAL->h = 0;
1781 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1818 1949
1819void 1950void
1820set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1821 CODE: 1952 CODE:
1822{ 1953{
1823 tileid texid; 1954 tileid texid;
1824 maptex *tex; 1955 maptex *tex;
1825 1956
1826 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1827 return; 1958 return;
1828 1959
1829 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1830 return; 1961 return;
1831 1962
1832 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1833 1964
1834 if (!texid) 1965 if (!texid)
1835 return; 1966 return;
1836 1967
1837 tex = self->tex + texid; 1968 tex = self->tex + texid;
1870} 2001}
1871 2002
1872void 2003void
1873expire_textures (DC::Map self, int texid, int count) 2004expire_textures (DC::Map self, int texid, int count)
1874 PPCODE: 2005 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count) 2006 for (; texid < self->texs && count; ++texid, --count)
1876 { 2007 {
1877 maptex *tex = self->tex + texid; 2008 maptex *tex = self->tex + texid;
1878 2009
1879 if (tex->name) 2010 if (tex->name)
1880 { 2011 {
1935 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1936 } 2067 }
1937} 2068}
1938 2069
1939SV * 2070SV *
1940map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1941 CODE: 2072 CODE:
1942{ 2073{
1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1944 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1945 mapcell *cell; 2076 mapcell *cell;
1966 2097
1967 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1968 2099
1969 if (flags & 8) 2100 if (flags & 8)
1970 { 2101 {
2102 uint8_t ext, cmd;
2103
1971 if (extmap) 2104 do
1972 { 2105 {
1973 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1974 2108
1975 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1976 { 2112 {
1977 ext = *data++;
1978 cmd = ext & 0x7f;
1979
1980 if (cmd < 4)
1981 cell->darkness = 255 - ext * 64 + 1;
1982 else if (cmd == 5) // health
1983 {
1984 cell->stat_width = 1; 2113 cell->stat_width = 1;
1985 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1986 }
1987 else if (cmd == 6) // monster width
1988 cell->stat_width = *data++ + 1;
1989 else if (cmd == 0x47)
1990 {
1991 if (*data == 1) cell->player = data [1];
1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1995
1996 data += *data + 1;
1997 }
1998 else if (cmd == 8) // cell flags
1999 cell->flags = *data++;
2000 else if (ext & 0x40) // unknown, multibyte => skip
2001 data += *data + 1;
2002 else
2003 data++;
2004 } 2115 }
2005 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
2006 } 2133 }
2007 else 2134 while (ext & 0x80);
2008 cell->darkness = *data++ + 1;
2009 } 2135 }
2010 2136
2011 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
2012 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
2013 { 2139 {
2061 ? self->row + y 2187 ? self->row + y
2062 : 0; 2188 : 0;
2063 2189
2064 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
2065 { 2191 {
2066 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
2067 2193
2068 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
2069 { 2195 {
2070 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
2071 2197
2073 { 2199 {
2074 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
2075 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
2076 int a1 = tex.a; 2202 int a1 = tex.a;
2077 2203
2078 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
2079 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
2080 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
2081 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
2082 } 2208 }
2083 } 2209 }
2084 2210
2085 *map++ = (r ) 2211 *map++ = (r )
2086 | (g << 8) 2212 | (g << 8)
2087 | (b << 16) 2213 | (b << 16)
2088 | (a << 24); 2214 | (a << 24);
2089 } 2215 }
2090 } 2216 }
2091 2217
2092 RETVAL = map_sv; 2218 RETVAL = map_sv;
2093} 2219}
2094 OUTPUT: 2220 OUTPUT:
2095 RETVAL 2221 RETVAL
2096 2222
2097void 2223void
2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2099 CODE: 2225 CODE:
2100{ 2226{
2101 int x, y, z; 2227 int x, y, z;
2102 2228
2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2106 smooth_key skey;
2107 int pl_x, pl_y; 2230 int pl_x, pl_y;
2108 maptex pl_tex; 2231 maptex pl_tex;
2109 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc (); 2233 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key; 2234 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden; 2235 rc_array_t *arr;
2113 2236
2114 pl_tex.name = 0; 2237 pl_tex.name = 0;
2115 2238
2116 // that's current max. sorry. 2239 // that's current max. sorry.
2117 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
2118 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
2119
2120 // clear key, in case of extra padding
2121 memset (&skey, 0, sizeof (skey));
2122 2242
2123 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
2124 key.r = 255; 2244 key.r = 255;
2125 key.g = 255; 2245 key.g = 255;
2126 key.b = 255; 2246 key.b = 255;
2132 my += self->y; 2252 my += self->y;
2133 2253
2134 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2135 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2136 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2137 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2138 2258
2139 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2140 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2141 { 2261 {
2142 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2155 2275
2156 glEnable (GL_BLEND); 2276 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159 2279
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
2163 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2164 { 2281 {
2165 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2166 key.texname = -1; 2285 key.texname = -1;
2167 2286
2168 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
2169 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
2170 { 2289 {
2190 2309
2191 key.texname = tex.name; 2310 key.texname = tex.name;
2192 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
2193 } 2312 }
2194 2313
2195 px = (x + 1) * T - tex.w; 2314 px = (x + 1) * Th - tex.w;
2196 py = (y + 1) * T - tex.h; 2315 py = (y + 1) * Tw - tex.h;
2197 2316
2198 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 { 2318 {
2200 pl_x = px; 2319 pl_x = px;
2201 pl_y = py; 2320 pl_y = py;
2212 if (tex.smoothtile) 2331 if (tex.smoothtile)
2213 { 2332 {
2214 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
2215 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
2216 2335
2217 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
2218 2337
2219 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
2220 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2221 2340
2222 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2230 2349
2231 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2232 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2233 2352
2234 // full tile 2353 // full tile
2235 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2236 2355
2237 // borders 2356 // borders
2238 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2239 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2240 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2241 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2242 2361
2243 // corners 2362 // corners
2244 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2248 } 2367 }
2249 } 2368 }
2250 2369
2251 if (expect_false (z == 2)) 2370 if (expect_false (z == 2) && expect_false (cell->flags))
2252 { 2371 {
2253 /* draw question marks on top of hidden spaces */ 2372 // overlays such as the speech bubble, probably more to come
2254 if (!cell->darkness) 2373 if (cell->flags & 1)
2255 { 2374 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key; 2375 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH]; 2376 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr; 2377 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32; 2378 int px = x * Tw + Tw * 2 / 32;
2275 int py = y * T - T * 6 / 32; 2379 int py = y * Th - Th * 6 / 32;
2276 2380
2277 key_ov.texname = tex.name; 2381 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov); 2382 arr = rc_array (rc_ov, &key_ov);
2279 2383
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2386 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2284 }
2285 } 2388 }
2286 } 2389 }
2287 } 2390 }
2288 } 2391 }
2289 2392
2295 { 2398 {
2296 int w, b; 2399 int w, b;
2297 2400
2298 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2300 for (w = 0; w < 256 / 32; ++w) 2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2301 { 2406 {
2302 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2303 if (smask) 2408 IV bits = it->second;
2304 for (b = 0; b < 32; ++b) 2409
2305 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2306 { 2413 {
2307 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
2308 HE *he; 2422 if (tex.name)
2309
2310 hv_iterinit (smooth);
2311 while ((he = hv_iternext (smooth)))
2312 { 2423 {
2313 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2314 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2315 2426 if (key.texname != tex.name)
2316 if (!(bits & 0x1000)
2317 && skey->level == level
2318 && level > smooth_max [skey->x][skey->y])
2319 { 2427 {
2320 maptex tex = self->tex [skey->tile];
2321 int px = (((int)skey->x) - 1) * T;
2322 int py = (((int)skey->y) - 1) * T;
2323 int border = bits & 15;
2324 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325 float dx = tex.s * .0625f; // 16 images/row
2326 float dy = tex.t * .5f ; // 2 images/column
2327
2328 if (tex.name)
2329 {
2330 // this time avoiding texture state changes
2331 // save gobs of state changes.
2332 if (key.texname != tex.name)
2333 {
2334 self->tex [skey->tile].unused = 0; 2428 self->tex [skey.tile].unused = 0;
2335 2429
2336 glEnd (); 2430 glEnd ();
2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2338 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2339 } 2433 }
2340 2434
2341 if (border) 2435 if (border)
2342 { 2436 {
2343 float ox = border * dx; 2437 float ox = border * dx;
2344 2438
2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349 } 2443 }
2350 2444
2351 if (corner) 2445 if (corner)
2352 { 2446 {
2353 float ox = corner * dx; 2447 float ox = corner * dx;
2354 2448
2355 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359 }
2360 }
2361 } 2453 }
2362 } 2454 }
2363 } 2455 }
2364 } 2456 }
2365 2457
2366 glEnd (); 2458 glEnd ();
2367 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1; 2460 key.texname = -1;
2369 } 2461 }
2370
2371 hv_clear (smooth);
2372 } 2462 }
2373 2463
2374 if (pl_tex.name) 2464 if (pl_tex.name)
2375 { 2465 {
2376 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2404 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2405 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2406 { 2496 {
2407 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2408 2498
2409 int px = x * T; 2499 int px = x * Tw;
2410 int py = y * T; 2500 int py = y * Th;
2411 2501
2412 if (expect_false (cell->player == player)) 2502 if (expect_false (cell->player == player))
2413 { 2503 {
2414 px += sdx; 2504 px += sdx;
2415 py += sdy; 2505 py += sdy;
2416 } 2506 }
2417 2507
2418 if (cell->stat_hp) 2508 if (cell->stat_hp)
2419 { 2509 {
2420 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422 2512
2423 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2424 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2425 px + width - 1, py); 2515 px + width - 1, py);
2426 2516
2463 int x, y; 2553 int x, y;
2464 2554
2465 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2556 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures 2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using 2558 * and takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different 2559 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia. 2560 * alpha, but atcually gives us the correct colour with nvidia.
2471 */ 2561 */
2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2502void 2592void
2503fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2593fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2504 PPCODE: 2594 PPCODE:
2505{ 2595{
2506 int x, y; 2596 int x, y;
2507 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2508 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2509 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2510 int sw34 = (sw * 3 + 3) & ~3; 2600 int sw3 = sw * 3;
2601 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2602 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2514 2605
2515 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2516 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2517 2608
2518 mx += self->x - 1; 2609 mx += self->x - 1;
2519 my += self->y - 1; 2610 my += self->y - 1;
2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522 2611
2523 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2524 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2525 { 2614 {
2526 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2559 2648
2560 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2561 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2563 2652
2564 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2657 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2569 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573 } 2662 }
2574 2663
2575 free (darkness1); 2664 free (darkness1);
2576 2665
2577 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2578 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2579 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2580 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2581} 2670}
2582 2671
2583SV * 2672SV *
2646 else 2735 else
2647 *data++ = 0; 2736 *data++ = 0;
2648 } 2737 }
2649 } 2738 }
2650 2739
2651 /* if size is w*h + 5 then no data has been found */ 2740 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 { 2742 {
2654 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 } 2745 }
2657 2746
2658 RETVAL = data_sv; 2747 RETVAL = data_sv;
2659} 2748}
2660 OUTPUT: 2749 OUTPUT:
2661 RETVAL 2750 RETVAL
2662 2751
2663void 2752void
2670 STRLEN len; 2759 STRLEN len;
2671 uint8_t *data, *end; 2760 uint8_t *data, *end;
2672 2761
2673 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2676 end = data + len + 8; 2765 end = data + len + 8;
2677 2766
2678 if (len < 5) 2767 if (len < 5)
2679 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2680 2769
2741} 2830}
2742 2831
2743MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2744 2833
2745DC::RW 2834DC::RW
2746new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2747 CODE: 2836 CODE:
2748{ 2837{
2749 STRLEN datalen; 2838 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2751 2840
2753} 2842}
2754 OUTPUT: 2843 OUTPUT:
2755 RETVAL 2844 RETVAL
2756 2845
2757DC::RW 2846DC::RW
2758new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2759 CODE: 2848 CODE:
2760 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2761 OUTPUT: 2850 OUTPUT:
2762 RETVAL 2851 RETVAL
2763 2852
2781 if (RETVAL < 0) 2870 if (RETVAL < 0)
2782 { 2871 {
2783 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2784 2873
2785 if (RETVAL < 0) 2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2786 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2787 2881 }
2882 else
2788 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2789 } 2884 }
2790 2885
2791 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2793} 2888}
2853 2948
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855 2950
2856PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2857 2952
2953void
2954decoders ()
2955 PPCODE:
2956#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2957 int i, num = Mix_GetNumChunkDecoders ();
2958 EXTEND (SP, num);
2959 for (i = 0; i < num; ++i)
2960 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2961#else
2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2963#endif
2964
2858DC::MixChunk 2965DC::MixChunk
2859new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2860 CODE: 2967 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862 OUTPUT: 2969 OUTPUT:
2863 RETVAL 2970 RETVAL
2864 2971
2894 OUTPUT: 3001 OUTPUT:
2895 RETVAL 3002 RETVAL
2896 3003
2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898 3005
3006void
3007decoders ()
3008 PPCODE:
3009#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3010 int i, num = Mix_GetNumMusicDecoders ();
3011 EXTEND (SP, num);
3012 for (i = 0; i < num; ++i)
3013 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3014#else
3015 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3016#endif
3017
2899int 3018int
2900volume (int volume = -1) 3019volume (int volume = -1)
2901 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2902 CODE: 3021 CODE:
2903 if (items > 0) 3022 if (items > 0)
2914void 3033void
2915halt () 3034halt ()
2916 CODE: 3035 CODE:
2917 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2918 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2919DC::MixMusic 3045DC::MixMusic
2920new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2921 CODE: 3047 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2923 OUTPUT: 3049 OUTPUT:
2924 RETVAL 3050 RETVAL
2925 3051
3062 const_iv (GL_FUNC_SUBTRACT), 3188 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064# undef const_iv 3190# undef const_iv
3065 }; 3191 };
3066 3192
3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3193 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069 3195
3070 texture_av = newAV (); 3196 texture_av = newAV ();
3071 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
3072} 3198}
3073 3199
3078 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
3079 3205
3080void 3206void
3081apple_nvidia_bug (int enable) 3207apple_nvidia_bug (int enable)
3082 3208
3083char * 3209const char *
3084gl_vendor () 3210gl_vendor ()
3085 CODE: 3211 CODE:
3086 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
3087 OUTPUT: 3213 OUTPUT:
3088 RETVAL 3214 RETVAL
3089 3215
3090char * 3216const char *
3091gl_version () 3217gl_version ()
3092 CODE: 3218 CODE:
3093 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
3094 OUTPUT: 3220 OUTPUT:
3095 RETVAL 3221 RETVAL
3096 3222
3097char * 3223const char *
3098gl_extensions () 3224gl_extensions ()
3099 CODE: 3225 CODE:
3100 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3101 OUTPUT: 3227 OUTPUT:
3102 RETVAL 3228 RETVAL
3103 3229
3104const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
3105 3235
3106GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
3107 CODE: 3237 CODE:
3108 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
3109 OUTPUT: 3239 OUTPUT:
3116 RETVAL 3246 RETVAL
3117 3247
3118int glGetError () 3248int glGetError ()
3119 3249
3120void glFinish () 3250void glFinish ()
3251
3252void glFlush ()
3121 3253
3122void glClear (int mask) 3254void glClear (int mask)
3123 3255
3124void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
3125 PROTOTYPE: @ 3257 PROTOTYPE: @
3297 3429
3298void glEndList () 3430void glEndList ()
3299 3431
3300void glCallList (int list) 3432void glCallList (int list)
3301 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303 3440
3304PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3305 3442
3306void 3443void
3307find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3308 PPCODE: 3445 PPCODE:
3309{ 3446{
3310 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3311 XPUSHs (self); 3448 XPUSHs (self);
3312} 3449}
3313 3450
3314BOOT: 3451BOOT:
3315{ 3452{
3323 3460
3324void 3461void
3325draw (SV *self) 3462draw (SV *self)
3326 CODE: 3463 CODE:
3327{ 3464{
3328 HV *hv; 3465 HV *hv;
3329 SV **svp; 3466 SV **svp;
3330 NV x, y, w, h; 3467 NV x, y, w, h;
3331 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3332 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3333 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3334 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines