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.292 by root, Fri Dec 4 15:04:56 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 roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 64 94#define FOW_DARKNESS 50
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
820NV ceil (NV x) 886NV ceil (NV x)
821 887
822IV minpot (UV n) 888IV minpot (UV n)
823 889
824IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
825 897
826void 898void
827pango_init () 899pango_init ()
828 CODE: 900 CODE:
829{ 901{
837#endif 909#endif
838} 910}
839 911
840char *SDL_GetError () 912char *SDL_GetError ()
841 913
842void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
843 916
844int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
845 918
846int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
847 920
848void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
849 922
850void SDL_Quit () 923void SDL_Quit ()
851 924
852int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
853 927
854int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
855 CODE: 929 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
858 OUTPUT: 932 OUTPUT:
859 RETVAL 933 RETVAL
860 934
861void 935void
916 ); 990 );
917 991
918 if (RETVAL) 992 if (RETVAL)
919 { 993 {
920 av_clear (texture_av); 994 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); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924#include "glfunc.h" 996#include "glfunc.h"
925#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 1000 }
927} 1001}
928 OUTPUT: 1002 OUTPUT:
929 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
930 1007
931void 1008void
932SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
933 1010
934char * 1011char *
935SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
936 1014
937int 1015int
938SDL_GetAppState () 1016SDL_GetAppState ()
939 1017
940int 1018int
941SDL_GetModState () 1019SDL_GetModState ()
942 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
943void 1025void
1026SDL_PumpEvents ()
1027
1028void
944poll_events () 1029peep_events ()
945 PPCODE: 1030 PPCODE:
946{ 1031{
947 SDL_Event ev; 1032 SDL_Event ev;
948 1033
949 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1015 1100
1016 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))));
1017 } 1102 }
1018} 1103}
1019 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
1020int 1118int
1021Mix_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)
1022 POSTCALL: 1120 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1025 1123
1026void 1124void
1027Mix_QuerySpec () 1125Mix_QuerySpec ()
1086add_font (char *file) 1184add_font (char *file)
1087 CODE: 1185 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1187 OUTPUT:
1090 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)
1091 1196
1092void 1197void
1093load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1094 ALIAS: 1199 ALIAS:
1095 load_image_file = 1 1200 load_image_file = 1
1141 1246
1142 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 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))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1151 1256
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1329
1225PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1226 1331
1227DC::Font 1332DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1334 CODE:
1230{ 1335{
1231 int count; 1336 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1367 PROTOTYPE:
1263 CODE: 1368 CODE:
1264 tc_restore (); 1369 tc_restore ();
1265 1370
1266DC::Layout 1371DC::Layout
1267new (SV *class) 1372new (SV *klass)
1268 CODE: 1373 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1270 1375
1271 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1421 1526
1422void 1527void
1423set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1424 CODE: 1529 CODE:
1425 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1426 { 1531 {
1427 self->base_height = base_height; 1532 self->base_height = base_height;
1428 layout_update_font (self); 1533 layout_update_font (self);
1429 } 1534 }
1430 1535
1431void 1536void
1658 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1659 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1660 } 1765 }
1661} 1766}
1662 1767
1768void
1769draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1663IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664 CODE: 1890 CODE:
1665{ 1891{
1666 GLint width; 1892 GLint width;
1667 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1674MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1675 1901
1676PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1677 1903
1678DC::Map 1904DC::Map
1679new (SV *class) 1905new (SV *klass)
1680 CODE: 1906 CODE:
1681 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1682 RETVAL->x = 0; 1908 RETVAL->x = 0;
1683 RETVAL->y = 0; 1909 RETVAL->y = 0;
1684 RETVAL->w = 0; 1910 RETVAL->w = 0;
1685 RETVAL->h = 0; 1911 RETVAL->h = 0;
1686 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1723 1949
1724void 1950void
1725set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1726 CODE: 1952 CODE:
1727{ 1953{
1728 tileid texid; 1954 tileid texid;
1729 maptex *tex; 1955 maptex *tex;
1730 1956
1731 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1732 return; 1958 return;
1733 1959
1734 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1735 return; 1961 return;
1736 1962
1737 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1738 1964
1739 if (!texid) 1965 if (!texid)
1740 return; 1966 return;
1741 1967
1742 tex = self->tex + texid; 1968 tex = self->tex + texid;
1775} 2001}
1776 2002
1777void 2003void
1778expire_textures (DC::Map self, int texid, int count) 2004expire_textures (DC::Map self, int texid, int count)
1779 PPCODE: 2005 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count) 2006 for (; texid < self->texs && count; ++texid, --count)
1781 { 2007 {
1782 maptex *tex = self->tex + texid; 2008 maptex *tex = self->tex + texid;
1783 2009
1784 if (tex->name) 2010 if (tex->name)
1785 { 2011 {
1840 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1841 } 2067 }
1842} 2068}
1843 2069
1844SV * 2070SV *
1845map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1846 CODE: 2072 CODE:
1847{ 2073{
1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1849 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1850 mapcell *cell; 2076 mapcell *cell;
1871 2097
1872 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1873 2099
1874 if (flags & 8) 2100 if (flags & 8)
1875 { 2101 {
2102 uint8_t ext, cmd;
2103
1876 if (extmap) 2104 do
1877 { 2105 {
1878 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1879 2108
1880 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
1881 { 2112 {
1882 ext = *data++;
1883 cmd = ext & 0x7f;
1884
1885 if (cmd < 4)
1886 cell->darkness = 255 - ext * 64 + 1;
1887 else if (cmd == 5) // health
1888 {
1889 cell->stat_width = 1; 2113 cell->stat_width = 1;
1890 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1891 }
1892 else if (cmd == 6) // monster width
1893 cell->stat_width = *data++ + 1;
1894 else if (cmd == 0x47)
1895 {
1896 if (*data == 1) cell->player = data [1];
1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1900
1901 data += *data + 1;
1902 }
1903 else if (cmd == 8) // cell flags
1904 cell->flags = *data++;
1905 else if (ext & 0x40) // unknown, multibyte => skip
1906 data += *data + 1;
1907 else
1908 data++;
1909 } 2115 }
1910 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++;
1911 } 2133 }
1912 else 2134 while (ext & 0x80);
1913 cell->darkness = *data++ + 1;
1914 } 2135 }
1915 2136
1916 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1917 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1918 { 2139 {
1966 ? self->row + y 2187 ? self->row + y
1967 : 0; 2188 : 0;
1968 2189
1969 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1970 { 2191 {
1971 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1972 2193
1973 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1974 { 2195 {
1975 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1976 2197
1978 { 2199 {
1979 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1980 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1981 int a1 = tex.a; 2202 int a1 = tex.a;
1982 2203
1983 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1984 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1985 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1986 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1987 } 2208 }
1988 } 2209 }
1989 2210
1990 *map++ = (r ) 2211 *map++ = (r )
1991 | (g << 8) 2212 | (g << 8)
1992 | (b << 16) 2213 | (b << 16)
1993 | (a << 24); 2214 | (a << 24);
1994 } 2215 }
1995 } 2216 }
1996 2217
1997 RETVAL = map_sv; 2218 RETVAL = map_sv;
1998} 2219}
1999 OUTPUT: 2220 OUTPUT:
2000 RETVAL 2221 RETVAL
2001 2222
2002void 2223void
2003draw (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)
2004 CODE: 2225 CODE:
2005{ 2226{
2006 int x, y, z; 2227 int x, y, z;
2007 2228
2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2010 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!
2011 smooth_key skey;
2012 int pl_x, pl_y; 2230 int pl_x, pl_y;
2013 maptex pl_tex; 2231 maptex pl_tex;
2014 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc (); 2233 rc_t *rc_ov = rc_alloc ();
2016 rc_key_t key; 2234 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden; 2235 rc_array_t *arr;
2018 2236
2019 pl_tex.name = 0; 2237 pl_tex.name = 0;
2020 2238
2021 // that's current max. sorry. 2239 // that's current max. sorry.
2022 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
2023 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
2024
2025 // clear key, in case of extra padding
2026 memset (&skey, 0, sizeof (skey));
2027 2242
2028 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
2029 key.r = 255; 2244 key.r = 255;
2030 key.g = 255; 2245 key.g = 255;
2031 key.b = 255; 2246 key.b = 255;
2037 my += self->y; 2252 my += self->y;
2038 2253
2039 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2040 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2041 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2042 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2043 2258
2044 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2046 { 2261 {
2047 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2060 2275
2061 glEnable (GL_BLEND); 2276 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064 2279
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
2068 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2069 { 2281 {
2070 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;
2071 key.texname = -1; 2285 key.texname = -1;
2072 2286
2073 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
2075 { 2289 {
2095 2309
2096 key.texname = tex.name; 2310 key.texname = tex.name;
2097 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
2098 } 2312 }
2099 2313
2100 px = (x + 1) * T - tex.w; 2314 px = (x + 1) * Th - tex.w;
2101 py = (y + 1) * T - tex.h; 2315 py = (y + 1) * Tw - tex.h;
2102 2316
2103 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
2104 { 2318 {
2105 pl_x = px; 2319 pl_x = px;
2106 pl_y = py; 2320 pl_y = py;
2117 if (tex.smoothtile) 2331 if (tex.smoothtile)
2118 { 2332 {
2119 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
2120 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
2121 2335
2122 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
2123 2337
2124 // 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
2125 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2126 2340
2127 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2135 2349
2136 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2137 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2138 2352
2139 // full tile 2353 // full tile
2140 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);
2141 2355
2142 // borders 2356 // borders
2143 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);
2144 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);
2145 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);
2146 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);
2147 2361
2148 // corners 2362 // corners
2149 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);
2150 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);
2151 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);
2152 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);
2153 } 2367 }
2154 } 2368 }
2155 2369
2156 if (expect_false (z == 2)) 2370 if (expect_false (z == 2) && expect_false (cell->flags))
2157 { 2371 {
2158 /* draw question marks on top of hidden spaces */ 2372 // overlays such as the speech bubble, probably more to come
2159 if (!cell->darkness) 2373 if (cell->flags & 1)
2160 { 2374 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key; 2375 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH]; 2376 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr; 2377 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32; 2378 int px = x * Tw + Tw * 2 / 32;
2180 int py = y * T - T * 6 / 32; 2379 int py = y * Th - Th * 6 / 32;
2181 2380
2182 key_ov.texname = tex.name; 2381 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov); 2382 arr = rc_array (rc_ov, &key_ov);
2184 2383
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2187 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);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2189 }
2190 } 2388 }
2191 } 2389 }
2192 } 2390 }
2193 } 2391 }
2194 2392
2200 { 2398 {
2201 int w, b; 2399 int w, b;
2202 2400
2203 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2204 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2205 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)
2206 { 2406 {
2207 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2208 if (smask) 2408 IV bits = it->second;
2209 for (b = 0; b < 32; ++b) 2409
2210 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2211 { 2413 {
2212 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
2213 HE *he; 2422 if (tex.name)
2214
2215 hv_iterinit (smooth);
2216 while ((he = hv_iternext (smooth)))
2217 { 2423 {
2218 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2219 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2220 2426 if (key.texname != tex.name)
2221 if (!(bits & 0x1000)
2222 && skey->level == level
2223 && level > smooth_max [skey->x][skey->y])
2224 { 2427 {
2225 maptex tex = self->tex [skey->tile];
2226 int px = (((int)skey->x) - 1) * T;
2227 int py = (((int)skey->y) - 1) * T;
2228 int border = bits & 15;
2229 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2230 float dx = tex.s * .0625f; // 16 images/row
2231 float dy = tex.t * .5f ; // 2 images/column
2232
2233 if (tex.name)
2234 {
2235 // this time avoiding texture state changes
2236 // save gobs of state changes.
2237 if (key.texname != tex.name)
2238 {
2239 self->tex [skey->tile].unused = 0; 2428 self->tex [skey.tile].unused = 0;
2240 2429
2241 glEnd (); 2430 glEnd ();
2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2243 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2244 } 2433 }
2245 2434
2246 if (border) 2435 if (border)
2247 { 2436 {
2248 float ox = border * dx; 2437 float ox = border * dx;
2249 2438
2250 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2251 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2252 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2253 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2254 } 2443 }
2255 2444
2256 if (corner) 2445 if (corner)
2257 { 2446 {
2258 float ox = corner * dx; 2447 float ox = corner * dx;
2259 2448
2260 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2261 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2262 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2263 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2264 }
2265 }
2266 } 2453 }
2267 } 2454 }
2268 } 2455 }
2269 } 2456 }
2270 2457
2271 glEnd (); 2458 glEnd ();
2272 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2273 key.texname = -1; 2460 key.texname = -1;
2274 } 2461 }
2275
2276 hv_clear (smooth);
2277 } 2462 }
2278 2463
2279 if (pl_tex.name) 2464 if (pl_tex.name)
2280 { 2465 {
2281 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2309 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2310 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2311 { 2496 {
2312 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2313 2498
2314 int px = x * T; 2499 int px = x * Tw;
2315 int py = y * T; 2500 int py = y * Th;
2316 2501
2317 if (expect_false (cell->player == player)) 2502 if (expect_false (cell->player == player))
2318 { 2503 {
2319 px += sdx; 2504 px += sdx;
2320 py += sdy; 2505 py += sdy;
2321 } 2506 }
2322 2507
2323 if (cell->stat_hp) 2508 if (cell->stat_hp)
2324 { 2509 {
2325 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2327 2512
2328 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2329 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2330 px + width - 1, py); 2515 px + width - 1, py);
2331 2516
2337 } 2522 }
2338 } 2523 }
2339} 2524}
2340 2525
2341void 2526void
2342draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2527draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2343 CODE: 2528 CODE:
2344{ 2529{
2345 static float color[16][3] = { 2530 static float color[16][3] = {
2346 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
2347 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
2348 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
2349 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
2350 2535
2351 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
2352 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
2353 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
2354 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
2355 2540
2356 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
2357 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
2358 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
2359 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
2360 2545
2361 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
2362 2547
2363 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
2364 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
2365 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
2366 }; 2551 };
2367 2552
2368 int x, y; 2553 int x, y;
2369 2554
2370 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2371 /* 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,
2372 * but the nvidia driver (185.18.14) mishandles alpha textures 2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2373 * ansd takes the colour from god knows where instead of using 2558 * and takes the colour from god knows where instead of using
2374 * Cp. MODULATE results in the same colour, but slightly different 2559 * Cp. MODULATE results in the same colour, but slightly different
2375 * alpha, but atcually gives us the correct colour with nvidia. 2560 * alpha, but atcually gives us the correct colour with nvidia.
2376 */ 2561 */
2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2378 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2386 2571
2387 if (m) 2572 if (m)
2388 { 2573 {
2389 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2390 2575
2391 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2392 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2393 2578
2394 glColor4f (c[0], c[1], c[2], 1); 2579 glColor4f (c[0], c[1], c[2], 1);
2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2407void 2592void
2408fow_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)
2409 PPCODE: 2594 PPCODE:
2410{ 2595{
2411 int x, y; 2596 int x, y;
2412 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2413 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2414 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2415 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);
2416 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2417 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2418 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2419 2605
2420 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2421 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2422 2608
2423 mx += self->x - 1; 2609 mx += self->x - 1;
2424 my += self->y - 1; 2610 my += self->y - 1;
2425
2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2427 2611
2428 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2429 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2430 { 2614 {
2431 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2434 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2435 { 2619 {
2436 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2437 2621
2438 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2439 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2440 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2441 } 2625 }
2442 } 2626 }
2443 2627
2444 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2445 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2464 2648
2465 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2466 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2467 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2468 2652
2469 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2470 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2471 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2472 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2473 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 */
2474 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2475 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2476 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2477 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2478 } 2662 }
2479 2663
2480 free (darkness1); 2664 free (darkness1);
2481 2665
2482 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2483 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2484 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2485 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2486} 2670}
2487 2671
2488SV * 2672SV *
2551 else 2735 else
2552 *data++ = 0; 2736 *data++ = 0;
2553 } 2737 }
2554 } 2738 }
2555 2739
2556 /* 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 */
2557 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2558 { 2742 {
2559 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2560 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2561 } 2745 }
2562 2746
2563 RETVAL = data_sv; 2747 RETVAL = data_sv;
2564} 2748}
2565 OUTPUT: 2749 OUTPUT:
2566 RETVAL 2750 RETVAL
2567 2751
2568void 2752void
2575 STRLEN len; 2759 STRLEN len;
2576 uint8_t *data, *end; 2760 uint8_t *data, *end;
2577 2761
2578 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2579 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2580 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2581 end = data + len + 8; 2765 end = data + len + 8;
2582 2766
2583 if (len < 5) 2767 if (len < 5)
2584 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2585 2769
2646} 2830}
2647 2831
2648MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2649 2833
2650DC::RW 2834DC::RW
2651new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2652 CODE: 2836 CODE:
2653{ 2837{
2654 STRLEN datalen; 2838 STRLEN datalen;
2655 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2656 2840
2658} 2842}
2659 OUTPUT: 2843 OUTPUT:
2660 RETVAL 2844 RETVAL
2661 2845
2662DC::RW 2846DC::RW
2663new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2664 CODE: 2848 CODE:
2665 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2666 OUTPUT: 2850 OUTPUT:
2667 RETVAL 2851 RETVAL
2668 2852
2686 if (RETVAL < 0) 2870 if (RETVAL < 0)
2687 { 2871 {
2688 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2689 2873
2690 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)
2691 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2692 2881 }
2882 else
2693 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2694 } 2884 }
2695 2885
2696 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2697 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2698} 2888}
2745void 2935void
2746set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2747 CODE: 2937 CODE:
2748{ 2938{
2749 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2939 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2750 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2751 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2752} 2942}
2753 2943
2754void 2944void
2755set_reverse_stereo (DC::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2758 2948
2759MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2760 2950
2761PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2762 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
2763DC::MixChunk 2965DC::MixChunk
2764new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2765 CODE: 2967 CODE:
2766 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2767 OUTPUT: 2969 OUTPUT:
2768 RETVAL 2970 RETVAL
2769 2971
2799 OUTPUT: 3001 OUTPUT:
2800 RETVAL 3002 RETVAL
2801 3003
2802MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2803 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
2804int 3018int
2805volume (int volume = -1) 3019volume (int volume = -1)
2806 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2807 CODE: 3021 CODE:
2808 if (items > 0) 3022 if (items > 0)
2819void 3033void
2820halt () 3034halt ()
2821 CODE: 3035 CODE:
2822 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2823 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2824DC::MixMusic 3045DC::MixMusic
2825new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2826 CODE: 3047 CODE:
2827 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2828 OUTPUT: 3049 OUTPUT:
2829 RETVAL 3050 RETVAL
2830 3051
2858 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2859# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2860 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2861 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2862 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2863 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2864 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2865 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2866 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2867 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2879 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2880 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2881 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2882 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2883 const_iv (GL_ONE_MINUS_DST_ALPHA), 3105 const_iv (GL_ONE_MINUS_DST_ALPHA),
3106 const_iv (GL_SRC_COLOR),
3107 const_iv (GL_DST_COLOR),
3108 const_iv (GL_ONE_MINUS_SRC_COLOR),
3109 const_iv (GL_ONE_MINUS_DST_COLOR),
2884 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2885 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2886 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2887 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2888 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2962 const_iv (GL_FUNC_SUBTRACT), 3188 const_iv (GL_FUNC_SUBTRACT),
2963 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2964# undef const_iv 3190# undef const_iv
2965 }; 3191 };
2966 3192
2967 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--)
2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2969 3195
2970 texture_av = newAV (); 3196 texture_av = newAV ();
2971 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2972} 3198}
2973 3199
2978 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
2979 3205
2980void 3206void
2981apple_nvidia_bug (int enable) 3207apple_nvidia_bug (int enable)
2982 3208
2983char * 3209const char *
2984gl_vendor () 3210gl_vendor ()
2985 CODE: 3211 CODE:
2986 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2987 OUTPUT: 3213 OUTPUT:
2988 RETVAL 3214 RETVAL
2989 3215
2990char * 3216const char *
2991gl_version () 3217gl_version ()
2992 CODE: 3218 CODE:
2993 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2994 OUTPUT: 3220 OUTPUT:
2995 RETVAL 3221 RETVAL
2996 3222
2997char * 3223const char *
2998gl_extensions () 3224gl_extensions ()
2999 CODE: 3225 CODE:
3000 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3001 OUTPUT: 3227 OUTPUT:
3002 RETVAL 3228 RETVAL
3003 3229
3004const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
3005 3235
3006GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
3007 CODE: 3237 CODE:
3008 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
3009 OUTPUT: 3239 OUTPUT:
3016 RETVAL 3246 RETVAL
3017 3247
3018int glGetError () 3248int glGetError ()
3019 3249
3020void glFinish () 3250void glFinish ()
3251
3252void glFlush ()
3021 3253
3022void glClear (int mask) 3254void glClear (int mask)
3023 3255
3024void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
3025 PROTOTYPE: @ 3257 PROTOTYPE: @
3197 3429
3198void glEndList () 3430void glEndList ()
3199 3431
3200void glCallList (int list) 3432void glCallList (int list)
3201 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3202MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3203 3440
3204PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3205 3442
3206void 3443void
3207find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3208 PPCODE: 3445 PPCODE:
3209{ 3446{
3210 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3211 XPUSHs (self); 3448 XPUSHs (self);
3212} 3449}
3213 3450
3214BOOT: 3451BOOT:
3215{ 3452{
3223 3460
3224void 3461void
3225draw (SV *self) 3462draw (SV *self)
3226 CODE: 3463 CODE:
3227{ 3464{
3228 HV *hv; 3465 HV *hv;
3229 SV **svp; 3466 SV **svp;
3230 NV x, y, w, h; 3467 NV x, y, w, h;
3231 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3232 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3233 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3234 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