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.284 by elmex, Thu Dec 11 00:17:47 2008 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 16 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
92 101
93/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
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}
97 128
98static AV *texture_av; 129static AV *texture_av;
99 130
100static struct 131static struct
101{ 132{
158{ 189{
159 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
160 191
161 while (attrs) 192 while (attrs)
162 { 193 {
163 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 195
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 197 return 1;
167 198
168 attrs = attrs->next; 199 attrs = attrs->next;
169 } 200 }
170 201
171 return 0; 202 return 0;
172} 203}
173 204
174typedef struct cf_layout { 205struct cf_layout {
175 PangoLayout *pl; 206 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
177 int base_height; 208 int base_height;
178 DC__Font font; 209 DC__Font font;
179 rc_t *rc; 210 rc_t *rc;
180} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
181 214
182static DC__Font default_font; 215static DC__Font default_font;
183static PangoContext *opengl_context; 216static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
185 218
186static void 219static void
187substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
188{ 221{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 225#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 227}
195 228
196static void 229static void
226} 259}
227 260
228typedef uint16_t tileid; 261typedef uint16_t tileid;
229typedef uint16_t faceid; 262typedef uint16_t faceid;
230 263
231typedef struct { 264struct maptex
265{
232 GLuint name; 266 GLuint name;
233 int w, h; 267 int w, h;
234 float s, t; 268 float s, t;
235 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
236 tileid smoothtile; 270 tileid smoothtile;
237 uint8_t smoothlevel; 271 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
239} maptex; 273};
240 274
241typedef struct { 275struct mapcell
276{
242 uint32_t player; 277 uint32_t player;
243 tileid tile[3]; 278 tileid tile[3];
244 uint16_t darkness; 279 uint16_t darkness;
245 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
246} mapcell; 281};
247 282
248typedef struct { 283struct maprow
284{
249 int32_t c0, c1; 285 int32_t c0, c1;
250 mapcell *col; 286 mapcell *col;
251} maprow; 287};
252 288
253typedef struct map { 289struct mapgrid {
254 int x, y, w, h; 290 int x, y, w, h;
255 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
256 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
257 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
258 294
259 int32_t rows; 295 int32_t rows;
260 maprow *row; 296 maprow *row;
261} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
262 300
263static char * 301static char *
264prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
265{ 303{
266 char *p; 304 char *p;
284 322
285#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))
286#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))
287 325
288static void 326static void
289need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
290{ 328{
291 while (self->faces <= face) 329 while (self->faces <= face)
292 { 330 {
293 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
294 self->faces *= 2; 332 self->faces *= 2;
295 } 333 }
296} 334}
297 335
298static void 336static void
299need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
300{ 338{
301 while (self->texs <= texid) 339 while (self->texs <= texid)
302 { 340 {
303 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
304 self->texs *= 2; 342 self->texs *= 2;
305 } 343 }
306} 344}
307 345
308static maprow * 346static maprow *
309map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
310{ 348{
311 if (0 > y) 349 if (0 > y)
312 { 350 {
313 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
314 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
352 390
353 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
354} 392}
355 393
356static mapcell * 394static mapcell *
357map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
358{ 396{
359 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
360} 398}
361 399
362static void 400static void
363map_clear (DC__Map self) 401map_clear (mapgrid *self)
364{ 402{
365 int r; 403 int r;
366 404
367 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
368 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
386 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
387 (cell)->player = 0; \ 425 (cell)->player = 0; \
388 } while (0) 426 } while (0)
389 427
390static void 428static void
391map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
392{ 430{
393 int x, y; 431 int x, y;
394 maprow *row; 432 maprow *row;
395 mapcell *cell; 433 mapcell *cell;
396 434
413 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
414 } 452 }
415 } 453 }
416} 454}
417 455
418typedef struct { 456struct smooth_key
457{
419 tileid tile; 458 tileid tile;
420 uint8_t x, y, level; 459 uint8_t x, y, level;
421} 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}
422 479
423static void 480static void
424smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
425{ 482{
426 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
427 484
428 if (SvIOK (*sv)) 485 if (it == h.end ())
429 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
430 else 487 else
431 sv_setiv (*sv, bits); 488 it->second |= bits;
432} 489}
433 490
434static void 491static void
435music_finished (void) 492music_finished (void)
436{ 493{
453 ev.code = 1; 510 ev.code = 1;
454 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
455 ev.data2 = 0; 512 ev.data2 = 0;
456 513
457 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;
458} 522}
459 523
460static unsigned int 524static unsigned int
461minpot (unsigned int n) 525minpot (unsigned int n)
462{ 526{
545 609
546 return mod; 610 return mod;
547} 611}
548 612
549static void 613static void
550deliantra_main () 614deliantra_main (SV *real_main)
551{ 615{
552 char *argv[] = { 0 }; 616 dSP;
553 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
554} 620}
555 621
556#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
557 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
559 * 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,
560 * 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,
561 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
562 */ 630 */
563 extern C_LINKAGE int 631 extern C_LINKAGE int
564 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
565 { 633 {
566 deliantra_main (); 634 deliantra_main (real_main);
567 } 635 }
568 636
569 #undef main 637 #undef main
570 638
571 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
572 640
573 static void 641 static void
574 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
575 { 643 {
644 real_main = real_main_;
645
576 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv); 647 (main) (1, argv);
578 } 648 }
579#else 649#else
580 static void 650 static void
581 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
582 { 652 {
583 deliantra_main (); 653 deliantra_main (real_main);
584 } 654 }
585#endif 655#endif
586 656
587MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
588 658
789 859
790 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
791# undef const_iv 861# undef const_iv
792 }; 862 };
793 863
794 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--)
795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796 866
797 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799} 869}
800 870
816NV ceil (NV x) 886NV ceil (NV x)
817 887
818IV minpot (UV n) 888IV minpot (UV n)
819 889
820IV 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
821 897
822void 898void
823pango_init () 899pango_init ()
824 CODE: 900 CODE:
825{ 901{
833#endif 909#endif
834} 910}
835 911
836char *SDL_GetError () 912char *SDL_GetError ()
837 913
838void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
839 916
840int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
841 918
842int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
843 920
844void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
845 922
846void SDL_Quit () 923void SDL_Quit ()
847 924
848int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
849 927
850int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
851 CODE: 929 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
853 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
854 OUTPUT: 932 OUTPUT:
855 RETVAL 933 RETVAL
856 934
857void 935void
912 ); 990 );
913 991
914 if (RETVAL) 992 if (RETVAL)
915 { 993 {
916 av_clear (texture_av); 994 av_clear (texture_av);
917
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919#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);
920#include "glfunc.h" 996#include "glfunc.h"
921#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 1000 }
923} 1001}
924 OUTPUT: 1002 OUTPUT:
925 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
926 1007
927void 1008void
928SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
929 1010
930char * 1011char *
931SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
932 1014
933int 1015int
934SDL_GetAppState () 1016SDL_GetAppState ()
935 1017
936int 1018int
937SDL_GetModState () 1019SDL_GetModState ()
938 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
939void 1025void
1026SDL_PumpEvents ()
1027
1028void
940poll_events () 1029peep_events ()
941 PPCODE: 1030 PPCODE:
942{ 1031{
943 SDL_Event ev; 1032 SDL_Event ev;
944 1033
945 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1011 1100
1012 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))));
1013 } 1102 }
1014} 1103}
1015 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
1016int 1118int
1017Mix_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)
1018 POSTCALL: 1120 POSTCALL:
1019 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1020 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1021 1123
1022void 1124void
1023Mix_QuerySpec () 1125Mix_QuerySpec ()
1082add_font (char *file) 1184add_font (char *file)
1083 CODE: 1185 CODE:
1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT: 1187 OUTPUT:
1086 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)
1087 1196
1088void 1197void
1089load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1090 ALIAS: 1199 ALIAS:
1091 load_image_file = 1 1200 load_image_file = 1
1137 1246
1138 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1139 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1140 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1141 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1142 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1143 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)));
1144 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1145 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1146 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1147 1256
1219MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1220 1329
1221PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1222 1331
1223DC::Font 1332DC::Font
1224new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1225 CODE: 1334 CODE:
1226{ 1335{
1227 int count; 1336 int count;
1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1229 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1258 PROTOTYPE: 1367 PROTOTYPE:
1259 CODE: 1368 CODE:
1260 tc_restore (); 1369 tc_restore ();
1261 1370
1262DC::Layout 1371DC::Layout
1263new (SV *class) 1372new (SV *klass)
1264 CODE: 1373 CODE:
1265 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1266 1375
1267 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1268 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1417 1526
1418void 1527void
1419set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1420 CODE: 1529 CODE:
1421 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1422 { 1531 {
1423 self->base_height = base_height; 1532 self->base_height = base_height;
1424 layout_update_font (self); 1533 layout_update_font (self);
1425 } 1534 }
1426 1535
1427void 1536void
1654 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1656 } 1765 }
1657} 1766}
1658 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
1659IV 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)
1660 CODE: 1890 CODE:
1661{ 1891{
1662 GLint width; 1892 GLint width;
1663 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);
1670MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1671 1901
1672PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1673 1903
1674DC::Map 1904DC::Map
1675new (SV *class) 1905new (SV *klass)
1676 CODE: 1906 CODE:
1677 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1678 RETVAL->x = 0; 1908 RETVAL->x = 0;
1679 RETVAL->y = 0; 1909 RETVAL->y = 0;
1680 RETVAL->w = 0; 1910 RETVAL->w = 0;
1681 RETVAL->h = 0; 1911 RETVAL->h = 0;
1682 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1719 1949
1720void 1950void
1721set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1722 CODE: 1952 CODE:
1723{ 1953{
1724 tileid texid; 1954 tileid texid;
1725 maptex *tex; 1955 maptex *tex;
1726 1956
1727 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1728 return; 1958 return;
1729 1959
1730 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1731 return; 1961 return;
1732 1962
1733 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1734 1964
1735 if (!texid) 1965 if (!texid)
1736 return; 1966 return;
1737 1967
1738 tex = self->tex + texid; 1968 tex = self->tex + texid;
1771} 2001}
1772 2002
1773void 2003void
1774expire_textures (DC::Map self, int texid, int count) 2004expire_textures (DC::Map self, int texid, int count)
1775 PPCODE: 2005 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count) 2006 for (; texid < self->texs && count; ++texid, --count)
1777 { 2007 {
1778 maptex *tex = self->tex + texid; 2008 maptex *tex = self->tex + texid;
1779 2009
1780 if (tex->name) 2010 if (tex->name)
1781 { 2011 {
1836 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1837 } 2067 }
1838} 2068}
1839 2069
1840SV * 2070SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1842 CODE: 2072 CODE:
1843{ 2073{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2076 mapcell *cell;
1867 2097
1868 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1869 2099
1870 if (flags & 8) 2100 if (flags & 8)
1871 { 2101 {
2102 uint8_t ext, cmd;
2103
1872 if (extmap) 2104 do
1873 { 2105 {
1874 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1875 2108
1876 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
1877 { 2112 {
1878 ext = *data++;
1879 cmd = ext & 0x7f;
1880
1881 if (cmd < 4)
1882 cell->darkness = 255 - ext * 64 + 1;
1883 else if (cmd == 5) // health
1884 {
1885 cell->stat_width = 1; 2113 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1887 }
1888 else if (cmd == 6) // monster width
1889 cell->stat_width = *data++ + 1;
1890 else if (cmd == 0x47)
1891 {
1892 if (*data == 1) cell->player = data [1];
1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1896
1897 data += *data + 1;
1898 }
1899 else if (cmd == 8) // cell flags
1900 cell->flags = *data++;
1901 else if (ext & 0x40) // unknown, multibyte => skip
1902 data += *data + 1;
1903 else
1904 data++;
1905 } 2115 }
1906 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++;
1907 } 2133 }
1908 else 2134 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2135 }
1911 2136
1912 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1914 { 2139 {
1962 ? self->row + y 2187 ? self->row + y
1963 : 0; 2188 : 0;
1964 2189
1965 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1966 { 2191 {
1967 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2193
1969 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1970 { 2195 {
1971 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1972 2197
1974 { 2199 {
1975 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2202 int a1 = tex.a;
1978 2203
1979 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1983 } 2208 }
1984 } 2209 }
1985 2210
1986 *map++ = (r ) 2211 *map++ = (r )
1987 | (g << 8) 2212 | (g << 8)
1988 | (b << 16) 2213 | (b << 16)
1989 | (a << 24); 2214 | (a << 24);
1990 } 2215 }
1991 } 2216 }
1992 2217
1993 RETVAL = map_sv; 2218 RETVAL = map_sv;
1994} 2219}
1995 OUTPUT: 2220 OUTPUT:
1996 RETVAL 2221 RETVAL
1997 2222
1998void 2223void
1999draw (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)
2000 CODE: 2225 CODE:
2001{ 2226{
2002 int x, y, z; 2227 int x, y, z;
2003 2228
2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2006 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!
2007 smooth_key skey;
2008 int pl_x, pl_y; 2230 int pl_x, pl_y;
2009 maptex pl_tex; 2231 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
2011 rc_key_t key; 2234 rc_key_t key;
2012 rc_array_t *arr; 2235 rc_array_t *arr;
2013 2236
2014 pl_tex.name = 0; 2237 pl_tex.name = 0;
2015 2238
2016 // thats current max. sorry. 2239 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
2019
2020 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey));
2022 2242
2023 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
2024 key.r = 255; 2244 key.r = 255;
2025 key.g = 255; 2245 key.g = 255;
2026 key.b = 255; 2246 key.b = 255;
2032 my += self->y; 2252 my += self->y;
2033 2253
2034 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2035 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2036 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2037 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2038 2258
2039 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2040 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2041 { 2261 {
2042 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2057 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2059 2279
2060 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2061 { 2281 {
2282 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2062 memset (smooth_level, 0, sizeof (smooth_level)); 2285 memset (smooth_level, 0, sizeof (smooth_level));
2063 key.texname = -1; 2286 key.texname = -1;
2064 2287
2065 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh; y++)
2066 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2074 tileid tile = cell->tile [z]; 2297 tileid tile = cell->tile [z];
2075 2298
2076 if (tile) 2299 if (tile)
2077 { 2300 {
2078 maptex tex = self->tex [tile]; 2301 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2302 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2303
2082 if (key.texname != tex.name) 2304 if (key.texname != tex.name)
2083 { 2305 {
2084 self->tex [tile].unused = 0; 2306 self->tex [tile].unused = 0;
2085 2307
2086 if (!tex.name) 2308 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2309 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2310
2089 key.texname = tex.name; 2311 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2312 arr = rc_array (rc, &key);
2091 } 2313 }
2314
2315 px = (x + 1) * Th - tex.w;
2316 py = (y + 1) * Tw - tex.h;
2092 2317
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2318 if (expect_false (cell->player == player) && expect_false (z == 2))
2094 { 2319 {
2095 pl_x = px; 2320 pl_x = px;
2096 pl_y = py; 2321 pl_y = py;
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2326 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2327 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2328 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2329 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105 2330
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 /* this is a workaround to make speech bubbles drawn
2109 * for example above walls, work. */
2110 rc_draw (rc);
2111 rc_clear (rc);
2112 key.texname = -1;
2113
2114 // overlays such as the speech bubble, probably more to come
2115 if (cell->flags & 1)
2116 {
2117 maptex tex = self->tex [1];
2118 int px = x * T + T * 2 / 32;
2119 int py = y * T - T * 6 / 32;
2120
2121 if (tex.name)
2122 {
2123 if (key.texname != tex.name)
2124 {
2125 key.texname = tex.name;
2126 arr = rc_array (rc, &key);
2127 }
2128
2129 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2130 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2131 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2132 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2133 }
2134 }
2135 }
2136
2137 // update smooth hash 2331 // update smooth hash
2138 if (tex.smoothtile) 2332 if (tex.smoothtile)
2139 { 2333 {
2140 skey.tile = tex.smoothtile; 2334 skey.tile = tex.smoothtile;
2141 skey.level = tex.smoothlevel; 2335 skey.level = tex.smoothlevel;
2156 2350
2157 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2351 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2158 // ·· ·· ·┏ ┓· 2352 // ·· ·· ·┏ ┓·
2159 2353
2160 // full tile 2354 // full tile
2161 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2355 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2162 2356
2163 // borders 2357 // borders
2164 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2358 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2165 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2359 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2166 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2360 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2167 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2361 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2168 2362
2169 // corners 2363 // corners
2170 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2364 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2171 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2365 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2172 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2366 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2173 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2367 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2368 }
2369 }
2370
2371 if (expect_false (z == 2) && expect_false (cell->flags))
2372 {
2373 // overlays such as the speech bubble, probably more to come
2374 if (cell->flags & 1)
2375 {
2376 rc_key_t key_ov = key;
2377 maptex tex = self->tex [TEXID_SPEECH];
2378 rc_array_t *arr;
2379 int px = x * Tw + Tw * 2 / 32;
2380 int py = y * Th - Th * 6 / 32;
2381
2382 key_ov.texname = tex.name;
2383 arr = rc_array (rc_ov, &key_ov);
2384
2385 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2386 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2388 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2174 } 2389 }
2175 } 2390 }
2176 } 2391 }
2177 } 2392 }
2178 2393
2194 if (smask & (((uint32_t)1) << b)) 2409 if (smask & (((uint32_t)1) << b))
2195 { 2410 {
2196 int level = (w << 5) | b; 2411 int level = (w << 5) | b;
2197 HE *he; 2412 HE *he;
2198 2413
2199 hv_iterinit (smooth); 2414 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2200 while ((he = hv_iternext (smooth)))
2201 { 2415 {
2202 smooth_key *skey = (smooth_key *)HeKEY (he); 2416 smooth_key &skey = it->first;
2203 IV bits = SvIVX (HeVAL (he)); 2417 IV bits = it->second;
2204 2418
2205 if (!(bits & 0x1000) 2419 if (!(bits & 0x1000)
2206 && skey->level == level 2420 && skey.level == level
2207 && level > smooth_max [skey->x][skey->y]) 2421 && level > smooth_max [skey.x][skey.y])
2208 { 2422 {
2209 maptex tex = self->tex [skey->tile]; 2423 maptex tex = self->tex [skey.tile];
2210 int px = (((int)skey->x) - 1) * T; 2424 int px = (((int)skey.x) - 1) * Tw;
2211 int py = (((int)skey->y) - 1) * T; 2425 int py = (((int)skey.y) - 1) * Th;
2212 int border = bits & 15; 2426 int border = bits & 15;
2213 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2427 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2214 float dx = tex.s * .0625f; // 16 images/row 2428 float dx = tex.s * .0625f; // 16 images/row
2215 float dy = tex.t * .5f ; // 2 images/column 2429 float dy = tex.t * .5f ; // 2 images/column
2216 2430
2218 { 2432 {
2219 // this time avoiding texture state changes 2433 // this time avoiding texture state changes
2220 // save gobs of state changes. 2434 // save gobs of state changes.
2221 if (key.texname != tex.name) 2435 if (key.texname != tex.name)
2222 { 2436 {
2223 self->tex [skey->tile].unused = 0; 2437 self->tex [skey.tile].unused = 0;
2224 2438
2225 glEnd (); 2439 glEnd ();
2226 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2440 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2227 glBegin (GL_QUADS); 2441 glBegin (GL_QUADS);
2228 } 2442 }
2229 2443
2230 if (border) 2444 if (border)
2231 { 2445 {
2232 float ox = border * dx; 2446 float ox = border * dx;
2233 2447
2234 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2448 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2235 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2236 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2450 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2237 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2451 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2238 } 2452 }
2239 2453
2240 if (corner) 2454 if (corner)
2241 { 2455 {
2242 float ox = corner * dx; 2456 float ox = corner * dx;
2243 2457
2244 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2458 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2245 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2459 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2246 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2460 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2247 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2461 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2248 } 2462 }
2249 } 2463 }
2250 } 2464 }
2251 } 2465 }
2252 } 2466 }
2254 2468
2255 glEnd (); 2469 glEnd ();
2256 glDisable (GL_TEXTURE_2D); 2470 glDisable (GL_TEXTURE_2D);
2257 key.texname = -1; 2471 key.texname = -1;
2258 } 2472 }
2259
2260 hv_clear (smooth);
2261 } 2473 }
2262 2474
2263 if (pl_tex.name) 2475 if (pl_tex.name)
2264 { 2476 {
2265 maptex tex = pl_tex; 2477 maptex tex = pl_tex;
2275 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2487 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2276 2488
2277 rc_draw (rc); 2489 rc_draw (rc);
2278 } 2490 }
2279 2491
2492 rc_draw (rc_ov);
2493 rc_clear (rc_ov);
2494
2280 glDisable (GL_BLEND); 2495 glDisable (GL_BLEND);
2281 rc_free (rc); 2496 rc_free (rc);
2497 rc_free (rc_ov);
2282 2498
2283 // top layer: overlays such as the health bar 2499 // top layer: overlays such as the health bar
2284 for (y = 0; y < sh; y++) 2500 for (y = 0; y < sh; y++)
2285 if (0 <= y + my && y + my < self->rows) 2501 if (0 <= y + my && y + my < self->rows)
2286 { 2502 {
2289 for (x = 0; x < sw; x++) 2505 for (x = 0; x < sw; x++)
2290 if (row->c0 <= x + mx && x + mx < row->c1) 2506 if (row->c0 <= x + mx && x + mx < row->c1)
2291 { 2507 {
2292 mapcell *cell = row->col + (x + mx - row->c0); 2508 mapcell *cell = row->col + (x + mx - row->c0);
2293 2509
2294 int px = x * T; 2510 int px = x * Tw;
2295 int py = y * T; 2511 int py = y * Th;
2296 2512
2297 if (expect_false (cell->player == player)) 2513 if (expect_false (cell->player == player))
2298 { 2514 {
2299 px += sdx; 2515 px += sdx;
2300 py += sdy; 2516 py += sdy;
2301 } 2517 }
2302 2518
2303 if (cell->stat_hp) 2519 if (cell->stat_hp)
2304 { 2520 {
2305 int width = cell->stat_width * T; 2521 int width = cell->stat_width * Tw;
2306 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2522 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2307 2523
2308 glColor3ub (0, 0, 0); 2524 glColor3ub (0, 0, 0);
2309 glRectf (px + 1, py - thick - 2, 2525 glRectf (px + 1, py - thick - 2,
2310 px + width - 1, py); 2526 px + width - 1, py);
2311 2527
2317 } 2533 }
2318 } 2534 }
2319} 2535}
2320 2536
2321void 2537void
2322draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2538draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2323 CODE: 2539 CODE:
2324{ 2540{
2325 static float color[16][3] = { 2541 static float color[16][3] = {
2326 { 0.00F, 0.00F, 0.00F }, 2542 { 0.00f, 0.00f, 0.00f },
2327 { 1.00F, 1.00F, 1.00F }, 2543 { 1.00f, 1.00f, 1.00f },
2328 { 0.00F, 0.00F, 0.55F }, 2544 { 0.00f, 0.00f, 0.55f },
2329 { 1.00F, 0.00F, 0.00F }, 2545 { 1.00f, 0.00f, 0.00f },
2330 2546
2331 { 1.00F, 0.54F, 0.00F }, 2547 { 1.00f, 0.54f, 0.00f },
2332 { 0.11F, 0.56F, 1.00F }, 2548 { 0.11f, 0.56f, 1.00f },
2333 { 0.93F, 0.46F, 0.00F }, 2549 { 0.93f, 0.46f, 0.00f },
2334 { 0.18F, 0.54F, 0.34F }, 2550 { 0.18f, 0.54f, 0.34f },
2335 2551
2336 { 0.56F, 0.73F, 0.56F }, 2552 { 0.56f, 0.73f, 0.56f },
2337 { 0.80F, 0.80F, 0.80F }, 2553 { 0.80f, 0.80f, 0.80f },
2338 { 0.55F, 0.41F, 0.13F }, 2554 { 0.55f, 0.41f, 0.13f },
2339 { 0.99F, 0.77F, 0.26F }, 2555 { 0.99f, 0.77f, 0.26f },
2340 2556
2341 { 0.74F, 0.65F, 0.41F }, 2557 { 0.74f, 0.65f, 0.41f },
2342 2558
2343 { 0.00F, 1.00F, 1.00F }, 2559 { 0.00f, 1.00f, 1.00f },
2344 { 1.00F, 0.00F, 1.00F }, 2560 { 1.00f, 0.00f, 1.00f },
2345 { 1.00F, 1.00F, 0.00F }, 2561 { 1.00f, 1.00f, 0.00f },
2346 }; 2562 };
2347 2563
2348 int x, y; 2564 int x, y;
2349 2565
2350 glEnable (GL_TEXTURE_2D); 2566 glEnable (GL_TEXTURE_2D);
2567 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2568 * but the nvidia driver (185.18.14) mishandles alpha textures
2569 * and takes the colour from god knows where instead of using
2570 * Cp. MODULATE results in the same colour, but slightly different
2571 * alpha, but atcually gives us the correct colour with nvidia.
2572 */
2351 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2573 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2352 glEnable (GL_BLEND); 2574 glEnable (GL_BLEND);
2353 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2575 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2354 glBegin (GL_QUADS); 2576 glBegin (GL_QUADS);
2355 2577
2356 for (y = 0; y < h; y++) 2578 for (y = 0; y < h; y++)
2360 2582
2361 if (m) 2583 if (m)
2362 { 2584 {
2363 float *c = color [m & 15]; 2585 float *c = color [m & 15];
2364 2586
2365 float tx1 = m & 0x40 ? 0.5 : 0.; 2587 float tx1 = m & 0x40 ? 0.5f : 0.f;
2366 float tx2 = tx1 + 0.5; 2588 float tx2 = tx1 + 0.5f;
2367 2589
2368 glColor4f (c[0], c[1], c[2], 0.75); 2590 glColor4f (c[0], c[1], c[2], 1);
2369 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2591 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2370 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2592 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2371 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2593 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2372 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2594 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2373 } 2595 }
2381void 2603void
2382fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2604fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2383 PPCODE: 2605 PPCODE:
2384{ 2606{
2385 int x, y; 2607 int x, y;
2386 int sw1 = sw + 2; 2608 int sw1 = sw + 2;
2387 int sh1 = sh + 2; 2609 int sh1 = sh + 2;
2388 int sh3 = sh * 3; 2610 int sh3 = sh * 3;
2389 int sw34 = (sw * 3 + 3) & ~3; 2611 int sw3 = sw * 3;
2612 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2613 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2390 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2614 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2391 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2615 memset (darkness1, 0, sw1*sh1);
2392 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2393 2616
2394 SvPOK_only (darkness3_sv); 2617 SvPOK_only (darkness3_sv);
2395 SvCUR_set (darkness3_sv, sw34 * sh3); 2618 SvCUR_set (darkness3_sv, sw3 * sh3);
2396 2619
2397 mx += self->x - 1; 2620 mx += self->x - 1;
2398 my += self->y - 1; 2621 my += self->y - 1;
2399
2400 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2401 2622
2402 for (y = 0; y < sh1; y++) 2623 for (y = 0; y < sh1; y++)
2403 if (0 <= y + my && y + my < self->rows) 2624 if (0 <= y + my && y + my < self->rows)
2404 { 2625 {
2405 maprow *row = self->row + (y + my); 2626 maprow *row = self->row + (y + my);
2408 if (row->c0 <= x + mx && x + mx < row->c1) 2629 if (row->c0 <= x + mx && x + mx < row->c1)
2409 { 2630 {
2410 mapcell *cell = row->col + (x + mx - row->c0); 2631 mapcell *cell = row->col + (x + mx - row->c0);
2411 2632
2412 darkness1 [y * sw1 + x] = cell->darkness 2633 darkness1 [y * sw1 + x] = cell->darkness
2413 ? 255 - (cell->darkness - 1) 2634 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2414 : 255 - FOW_DARKNESS; 2635 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2415 } 2636 }
2416 } 2637 }
2417 2638
2418 for (y = 0; y < sh; ++y) 2639 for (y = 0; y < sh; ++y)
2419 for (x = 0; x < sw; ++x) 2640 for (x = 0; x < sw; ++x)
2438 2659
2439 uint8_t r13 = (d13 + d23 + d12) / 3; 2660 uint8_t r13 = (d13 + d23 + d12) / 3;
2440 uint8_t r23 = d23; 2661 uint8_t r23 = d23;
2441 uint8_t r33 = (d23 + d33 + d32) / 3; 2662 uint8_t r33 = (d23 + d33 + d32) / 3;
2442 2663
2443 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2664 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2444 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2665 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2445 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2446 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2667 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2447 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2668 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2448 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2449 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2670 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2450 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2671 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2451 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2452 } 2673 }
2453 2674
2454 free (darkness1); 2675 free (darkness1);
2455 2676
2456 EXTEND (SP, 3); 2677 EXTEND (SP, 3);
2457 PUSHs (sv_2mortal (newSViv (sw34))); 2678 PUSHs (sv_2mortal (newSViv (sw3)));
2458 PUSHs (sv_2mortal (newSViv (sh3))); 2679 PUSHs (sv_2mortal (newSViv (sh3)));
2459 PUSHs (darkness3_sv); 2680 PUSHs (darkness3_sv);
2460} 2681}
2461 2682
2462SV * 2683SV *
2525 else 2746 else
2526 *data++ = 0; 2747 *data++ = 0;
2527 } 2748 }
2528 } 2749 }
2529 2750
2530 /* if size is w*h + 5 then no data has been found */ 2751 /* if size is w*h + 5 then no data has been found */
2531 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2752 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2532 { 2753 {
2533 SvPOK_only (data_sv); 2754 SvPOK_only (data_sv);
2534 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2755 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2535 } 2756 }
2536 2757
2537 RETVAL = data_sv; 2758 RETVAL = data_sv;
2538} 2759}
2539 OUTPUT: 2760 OUTPUT:
2540 RETVAL 2761 RETVAL
2541 2762
2542void 2763void
2549 STRLEN len; 2770 STRLEN len;
2550 uint8_t *data, *end; 2771 uint8_t *data, *end;
2551 2772
2552 len = SvLEN (data_sv); 2773 len = SvLEN (data_sv);
2553 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2774 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2554 data = SvPVbyte_nolen (data_sv); 2775 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2555 end = data + len + 8; 2776 end = data + len + 8;
2556 2777
2557 if (len < 5) 2778 if (len < 5)
2558 XSRETURN_EMPTY; 2779 XSRETURN_EMPTY;
2559 2780
2620} 2841}
2621 2842
2622MODULE = Deliantra::Client PACKAGE = DC::RW 2843MODULE = Deliantra::Client PACKAGE = DC::RW
2623 2844
2624DC::RW 2845DC::RW
2625new (SV *class, SV *data_sv) 2846new (SV *klass, SV *data_sv)
2626 CODE: 2847 CODE:
2627{ 2848{
2628 STRLEN datalen; 2849 STRLEN datalen;
2629 char *data = SvPVbyte (data_sv, datalen); 2850 char *data = SvPVbyte (data_sv, datalen);
2630 2851
2632} 2853}
2633 OUTPUT: 2854 OUTPUT:
2634 RETVAL 2855 RETVAL
2635 2856
2636DC::RW 2857DC::RW
2637new_from_file (SV *class, const char *path, const char *mode = "rb") 2858new_from_file (SV *klass, const char *path, const char *mode = "rb")
2638 CODE: 2859 CODE:
2639 RETVAL = SDL_RWFromFile (path, mode); 2860 RETVAL = SDL_RWFromFile (path, mode);
2640 OUTPUT: 2861 OUTPUT:
2641 RETVAL 2862 RETVAL
2642 2863
2660 if (RETVAL < 0) 2881 if (RETVAL < 0)
2661 { 2882 {
2662 RETVAL = Mix_GroupOldest (-1); 2883 RETVAL = Mix_GroupOldest (-1);
2663 2884
2664 if (RETVAL < 0) 2885 if (RETVAL < 0)
2886 {
2887 // happens sometimes, maybe it just stopped playing(?)
2888 RETVAL = Mix_GroupAvailable (-1);
2889
2890 if (RETVAL < 0)
2665 XSRETURN_UNDEF; 2891 XSRETURN_UNDEF;
2666 2892 }
2893 else
2667 Mix_HaltChannel (RETVAL); 2894 Mix_HaltChannel (RETVAL);
2668 } 2895 }
2669 2896
2670 Mix_UnregisterAllEffects (RETVAL); 2897 Mix_UnregisterAllEffects (RETVAL);
2671 Mix_Volume (RETVAL, 128); 2898 Mix_Volume (RETVAL, 128);
2672} 2899}
2719void 2946void
2720set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2947set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2721 CODE: 2948 CODE:
2722{ 2949{
2723 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2950 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2724 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2951 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2725 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2952 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2726} 2953}
2727 2954
2728void 2955void
2729set_reverse_stereo (DC::Channel self, int flip) 2956set_reverse_stereo (DC::Channel self, int flip)
2732 2959
2733MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2960MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2734 2961
2735PROTOTYPES: DISABLE 2962PROTOTYPES: DISABLE
2736 2963
2964void
2965decoders ()
2966 PPCODE:
2967#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2968 int i, num = Mix_GetNumChunkDecoders ();
2969 EXTEND (SP, num);
2970 for (i = 0; i < num; ++i)
2971 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2972#else
2973 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2974#endif
2975
2737DC::MixChunk 2976DC::MixChunk
2738new (SV *class, DC::RW rwops) 2977new (SV *klass, DC::RW rwops)
2739 CODE: 2978 CODE:
2740 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2979 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2741 OUTPUT: 2980 OUTPUT:
2742 RETVAL 2981 RETVAL
2743 2982
2773 OUTPUT: 3012 OUTPUT:
2774 RETVAL 3013 RETVAL
2775 3014
2776MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3015MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2777 3016
3017void
3018decoders ()
3019 PPCODE:
3020#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3021 int i, num = Mix_GetNumMusicDecoders ();
3022 EXTEND (SP, num);
3023 for (i = 0; i < num; ++i)
3024 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3025#else
3026 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3027#endif
3028
2778int 3029int
2779volume (int volume = -1) 3030volume (int volume = -1)
2780 PROTOTYPE: ;$ 3031 PROTOTYPE: ;$
2781 CODE: 3032 CODE:
2782 if (items > 0) 3033 if (items > 0)
2793void 3044void
2794halt () 3045halt ()
2795 CODE: 3046 CODE:
2796 Mix_HaltMusic (); 3047 Mix_HaltMusic ();
2797 3048
3049int
3050playing ()
3051 CODE:
3052 RETVAL = Mix_PlayingMusic ();
3053 OUTPUT:
3054 RETVAL
3055
2798DC::MixMusic 3056DC::MixMusic
2799new (SV *class, DC::RW rwops) 3057new (SV *klass, DC::RW rwops)
2800 CODE: 3058 CODE:
2801 RETVAL = Mix_LoadMUS_RW (rwops); 3059 RETVAL = Mix_LoadMUS_RW (rwops);
2802 OUTPUT: 3060 OUTPUT:
2803 RETVAL 3061 RETVAL
2804 3062
2832 } *civ, const_iv[] = { 3090 } *civ, const_iv[] = {
2833# define const_iv(name) { # name, (IV)name } 3091# define const_iv(name) { # name, (IV)name }
2834 const_iv (GL_VENDOR), 3092 const_iv (GL_VENDOR),
2835 const_iv (GL_VERSION), 3093 const_iv (GL_VERSION),
2836 const_iv (GL_EXTENSIONS), 3094 const_iv (GL_EXTENSIONS),
3095 const_iv (GL_MAX_TEXTURE_UNITS),
2837 const_iv (GL_COLOR_MATERIAL), 3096 const_iv (GL_COLOR_MATERIAL),
2838 const_iv (GL_SMOOTH), 3097 const_iv (GL_SMOOTH),
2839 const_iv (GL_FLAT), 3098 const_iv (GL_FLAT),
2840 const_iv (GL_DITHER), 3099 const_iv (GL_DITHER),
2841 const_iv (GL_BLEND), 3100 const_iv (GL_BLEND),
2853 const_iv (GL_ZERO), 3112 const_iv (GL_ZERO),
2854 const_iv (GL_SRC_ALPHA), 3113 const_iv (GL_SRC_ALPHA),
2855 const_iv (GL_DST_ALPHA), 3114 const_iv (GL_DST_ALPHA),
2856 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3115 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2857 const_iv (GL_ONE_MINUS_DST_ALPHA), 3116 const_iv (GL_ONE_MINUS_DST_ALPHA),
3117 const_iv (GL_SRC_COLOR),
3118 const_iv (GL_DST_COLOR),
3119 const_iv (GL_ONE_MINUS_SRC_COLOR),
3120 const_iv (GL_ONE_MINUS_DST_COLOR),
2858 const_iv (GL_SRC_ALPHA_SATURATE), 3121 const_iv (GL_SRC_ALPHA_SATURATE),
2859 const_iv (GL_RGB), 3122 const_iv (GL_RGB),
2860 const_iv (GL_RGBA), 3123 const_iv (GL_RGBA),
2861 const_iv (GL_RGBA4), 3124 const_iv (GL_RGBA4),
2862 const_iv (GL_RGBA8), 3125 const_iv (GL_RGBA8),
2930 const_iv (GL_NICEST), 3193 const_iv (GL_NICEST),
2931 const_iv (GL_V2F), 3194 const_iv (GL_V2F),
2932 const_iv (GL_V3F), 3195 const_iv (GL_V3F),
2933 const_iv (GL_T2F_V3F), 3196 const_iv (GL_T2F_V3F),
2934 const_iv (GL_T2F_N3F_V3F), 3197 const_iv (GL_T2F_N3F_V3F),
3198 const_iv (GL_FUNC_ADD),
3199 const_iv (GL_FUNC_SUBTRACT),
3200 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2935# undef const_iv 3201# undef const_iv
2936 }; 3202 };
2937 3203
2938 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3204 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2939 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3205 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2940 3206
2941 texture_av = newAV (); 3207 texture_av = newAV ();
2942 AvREAL_off (texture_av); 3208 AvREAL_off (texture_av);
2943} 3209}
2944 3210
2946disable_GL_EXT_blend_func_separate () 3212disable_GL_EXT_blend_func_separate ()
2947 CODE: 3213 CODE:
2948 gl.BlendFuncSeparate = 0; 3214 gl.BlendFuncSeparate = 0;
2949 gl.BlendFuncSeparateEXT = 0; 3215 gl.BlendFuncSeparateEXT = 0;
2950 3216
2951char * 3217void
3218apple_nvidia_bug (int enable)
3219
3220const char *
2952gl_vendor () 3221gl_vendor ()
2953 CODE: 3222 CODE:
2954 RETVAL = (char *)glGetString (GL_VENDOR); 3223 RETVAL = (const char *)glGetString (GL_VENDOR);
2955 OUTPUT: 3224 OUTPUT:
2956 RETVAL 3225 RETVAL
2957 3226
2958char * 3227const char *
2959gl_version () 3228gl_version ()
2960 CODE: 3229 CODE:
2961 RETVAL = (char *)glGetString (GL_VERSION); 3230 RETVAL = (const char *)glGetString (GL_VERSION);
2962 OUTPUT: 3231 OUTPUT:
2963 RETVAL 3232 RETVAL
2964 3233
2965char * 3234const char *
2966gl_extensions () 3235gl_extensions ()
2967 CODE: 3236 CODE:
2968 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3237 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2969 OUTPUT: 3238 OUTPUT:
2970 RETVAL 3239 RETVAL
2971 3240
2972const char *glGetString (GLenum pname) 3241const char *glGetString (GLenum pname)
3242 CODE:
3243 RETVAL = (const char *)glGetString (pname);
3244 OUTPUT:
3245 RETVAL
2973 3246
2974GLint glGetInteger (GLenum pname) 3247GLint glGetInteger (GLenum pname)
2975 CODE: 3248 CODE:
2976 glGetIntegerv (pname, &RETVAL); 3249 glGetIntegerv (pname, &RETVAL);
2977 OUTPUT: 3250 OUTPUT:
2985 3258
2986int glGetError () 3259int glGetError ()
2987 3260
2988void glFinish () 3261void glFinish ()
2989 3262
3263void glFlush ()
3264
2990void glClear (int mask) 3265void glClear (int mask)
2991 3266
2992void glClearColor (float r, float g, float b, float a = 1.0) 3267void glClearColor (float r, float g, float b, float a = 1.0)
2993 PROTOTYPE: @ 3268 PROTOTYPE: @
2994 3269
3003void glBlendFunc (int sfactor, int dfactor) 3278void glBlendFunc (int sfactor, int dfactor)
3004 3279
3005void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3280void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3006 CODE: 3281 CODE:
3007 gl_BlendFuncSeparate (sa, da, saa, daa); 3282 gl_BlendFuncSeparate (sa, da, saa, daa);
3283
3284# void glBlendEquation (int se)
3008 3285
3009void glDepthMask (int flag) 3286void glDepthMask (int flag)
3010 3287
3011void glLogicOp (int opcode) 3288void glLogicOp (int opcode)
3012 3289
3163 3440
3164void glEndList () 3441void glEndList ()
3165 3442
3166void glCallList (int list) 3443void glCallList (int list)
3167 3444
3445void c_init ()
3446 CODE:
3447 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3448 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3449
3168MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3450MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3169 3451
3170PROTOTYPES: DISABLE 3452PROTOTYPES: DISABLE
3171 3453
3172void 3454void
3173find_widget (SV *self, NV x, NV y) 3455find_widget (SV *self, NV x, NV y)
3174 PPCODE: 3456 PPCODE:
3175{ 3457{
3176 if (within_widget (self, x, y)) 3458 if (within_widget (self, x, y))
3177 XPUSHs (self); 3459 XPUSHs (self);
3178} 3460}
3179 3461
3180BOOT: 3462BOOT:
3181{ 3463{
3189 3471
3190void 3472void
3191draw (SV *self) 3473draw (SV *self)
3192 CODE: 3474 CODE:
3193{ 3475{
3194 HV *hv; 3476 HV *hv;
3195 SV **svp; 3477 SV **svp;
3196 NV x, y, w, h; 3478 NV x, y, w, h;
3197 SV *draw_x_sv = GvSV (draw_x_gv); 3479 SV *draw_x_sv = GvSV (draw_x_gv);
3198 SV *draw_y_sv = GvSV (draw_y_gv); 3480 SV *draw_y_sv = GvSV (draw_y_gv);
3199 SV *draw_w_sv = GvSV (draw_w_gv); 3481 SV *draw_w_sv = GvSV (draw_w_gv);
3200 SV *draw_h_sv = GvSV (draw_h_gv); 3482 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines