ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines