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.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 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
98#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
99 106
100#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
102 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}
128
103static AV *texture_av; 129static AV *texture_av;
104 130
105static struct 131static struct
106{ 132{
107#define GL_FUNC(ptr,name) ptr name; 133#define GL_FUNC(ptr,name) ptr name;
163{ 189{
164 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
165 191
166 while (attrs) 192 while (attrs)
167 { 193 {
168 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
169 195
170 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
171 return 1; 197 return 1;
172 198
173 attrs = attrs->next; 199 attrs = attrs->next;
174 } 200 }
175 201
176 return 0; 202 return 0;
177} 203}
178 204
179typedef struct cf_layout { 205struct cf_layout {
180 PangoLayout *pl; 206 PangoLayout *pl;
181 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
182 int base_height; 208 int base_height;
183 DC__Font font; 209 DC__Font font;
184 rc_t *rc; 210 rc_t rc;
185} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
186 214
187static DC__Font default_font; 215static DC__Font default_font;
188static PangoContext *opengl_context; 216static PangoContext *opengl_context;
189static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
190 218
191static void 219static void
192substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
193{ 221{
194 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
195#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
196 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197#endif 225#endif
198 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199} 227}
200 228
201static void 229static void
231} 259}
232 260
233typedef uint16_t tileid; 261typedef uint16_t tileid;
234typedef uint16_t faceid; 262typedef uint16_t faceid;
235 263
236typedef struct { 264struct maptex
265{
237 GLuint name; 266 GLuint name;
238 int w, h; 267 int w, h;
239 float s, t; 268 float s, t;
240 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
241 tileid smoothtile; 270 tileid smoothtile;
242 uint8_t smoothlevel; 271 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
244} maptex; 273};
245 274
246typedef struct { 275struct mapcell
276{
247 uint32_t player; 277 uint32_t player;
248 tileid tile[3]; 278 tileid tile[3];
249 uint16_t darkness; 279 uint16_t darkness;
250 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
251} mapcell; 281};
252 282
253typedef struct { 283struct maprow
284{
254 int32_t c0, c1; 285 int32_t c0, c1;
255 mapcell *col; 286 mapcell *col;
256} maprow; 287};
257 288
258typedef struct map { 289struct mapgrid {
259 int x, y, w, h; 290 int x, y, w, h;
260 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
261 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
262 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
263 294
264 int32_t rows; 295 int32_t rows;
265 maprow *row; 296 maprow *row;
266} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
267 300
268static char * 301static char *
269prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
270{ 303{
271 char *p; 304 char *p;
289 322
290#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))
291#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))
292 325
293static void 326static void
294need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
295{ 328{
296 while (self->faces <= face) 329 while (self->faces <= face)
297 { 330 {
298 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
299 self->faces *= 2; 332 self->faces *= 2;
300 } 333 }
301} 334}
302 335
303static void 336static void
304need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
305{ 338{
306 while (self->texs <= texid) 339 while (self->texs <= texid)
307 { 340 {
308 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
309 self->texs *= 2; 342 self->texs *= 2;
310 } 343 }
311} 344}
312 345
313static maprow * 346static maprow *
314map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
315{ 348{
316 if (0 > y) 349 if (0 > y)
317 { 350 {
318 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
319 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
357 390
358 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
359} 392}
360 393
361static mapcell * 394static mapcell *
362map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
363{ 396{
364 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
365} 398}
366 399
367static void 400static void
368map_clear (DC__Map self) 401map_clear (mapgrid *self)
369{ 402{
370 int r; 403 int r;
371 404
372 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
373 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
391 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
392 (cell)->player = 0; \ 425 (cell)->player = 0; \
393 } while (0) 426 } while (0)
394 427
395static void 428static void
396map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
397{ 430{
398 int x, y; 431 int x, y;
399 maprow *row; 432 maprow *row;
400 mapcell *cell; 433 mapcell *cell;
401 434
418 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
419 } 452 }
420 } 453 }
421} 454}
422 455
423typedef struct { 456struct smooth_key
457{
424 tileid tile; 458 tileid tile;
425 uint8_t x, y, level; 459 uint8_t x, y, level;
426} 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}
427 479
428static void 480static void
429smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
430{ 482{
431 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
432 484
433 if (SvIOK (*sv)) 485 if (it == h.end ())
434 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
435 else 487 else
436 sv_setiv (*sv, bits); 488 it->second |= bits;
437} 489}
438 490
439static void 491static void
440music_finished (void) 492music_finished (void)
441{ 493{
458 ev.code = 1; 510 ev.code = 1;
459 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
460 ev.data2 = 0; 512 ev.data2 = 0;
461 513
462 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;
463} 522}
464 523
465static unsigned int 524static unsigned int
466minpot (unsigned int n) 525minpot (unsigned int n)
467{ 526{
550 609
551 return mod; 610 return mod;
552} 611}
553 612
554static void 613static void
555deliantra_main () 614deliantra_main (SV *real_main)
556{ 615{
557 char *argv[] = { 0 }; 616 dSP;
558 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
559} 620}
560 621
561#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
562 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
564 * 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,
565 * 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,
566 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
567 */ 630 */
568 extern C_LINKAGE int 631 extern C_LINKAGE int
569 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
570 { 633 {
571 deliantra_main (); 634 deliantra_main (real_main);
572 } 635 }
573 636
574 #undef main 637 #undef main
575 638
576 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
577 640
578 static void 641 static void
579 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
580 { 643 {
644 real_main = real_main_;
645
581 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv); 647 (main) (1, argv);
583 } 648 }
584#else 649#else
585 static void 650 static void
586 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
587 { 652 {
588 deliantra_main (); 653 deliantra_main (real_main);
589 } 654 }
590#endif 655#endif
591 656
592MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
593 658
794 859
795 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
796# undef const_iv 861# undef const_iv
797 }; 862 };
798 863
799 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--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 866
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 869}
805 870
844#endif 909#endif
845} 910}
846 911
847char *SDL_GetError () 912char *SDL_GetError ()
848 913
849void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
850 916
851int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
852 918
853int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
854 920
855void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
856 922
857void SDL_Quit () 923void SDL_Quit ()
858 924
859int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
860 927
861int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
862 CODE: 929 CODE:
863 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
864 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
865 OUTPUT: 932 OUTPUT:
866 RETVAL 933 RETVAL
867 934
868void 935void
923 ); 990 );
924 991
925 if (RETVAL) 992 if (RETVAL)
926 { 993 {
927 av_clear (texture_av); 994 av_clear (texture_av);
928
929 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
930#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);
931#include "glfunc.h" 996#include "glfunc.h"
932#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
933 } 1000 }
934} 1001}
935 OUTPUT: 1002 OUTPUT:
936 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
937 1007
938void 1008void
939SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
940 1010
941char * 1011char *
942SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
943 1014
944int 1015int
945SDL_GetAppState () 1016SDL_GetAppState ()
946 1017
947int 1018int
948SDL_GetModState () 1019SDL_GetModState ()
949 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
950void 1025void
1026SDL_PumpEvents ()
1027
1028void
951poll_events () 1029peep_events ()
952 PPCODE: 1030 PPCODE:
953{ 1031{
954 SDL_Event ev; 1032 SDL_Event ev;
955 1033
956 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1022 1100
1023 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))));
1024 } 1102 }
1025} 1103}
1026 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
1027int 1118int
1028Mix_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)
1029 POSTCALL: 1120 POSTCALL:
1030 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1031 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1032 1123
1033void 1124void
1034Mix_QuerySpec () 1125Mix_QuerySpec ()
1093add_font (char *file) 1184add_font (char *file)
1094 CODE: 1185 CODE:
1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT: 1187 OUTPUT:
1097 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)
1098 1196
1099void 1197void
1100load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1101 ALIAS: 1199 ALIAS:
1102 load_image_file = 1 1200 load_image_file = 1
1148 1246
1149 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1150 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1151 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1152 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1153 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1154 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)));
1155 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1156 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1157 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1158 1256
1230MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1231 1329
1232PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1233 1331
1234DC::Font 1332DC::Font
1235new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1236 CODE: 1334 CODE:
1237{ 1335{
1238 int count; 1336 int count;
1239 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1240 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1269 PROTOTYPE: 1367 PROTOTYPE:
1270 CODE: 1368 CODE:
1271 tc_restore (); 1369 tc_restore ();
1272 1370
1273DC::Layout 1371DC::Layout
1274new (SV *class) 1372new (SV *klass)
1275 CODE: 1373 CODE:
1276 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1277 1375
1278 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1279 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1280 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1281 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1282 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1283 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1284 RETVAL->font = 0; 1382 RETVAL->font = 0;
1285 RETVAL->rc = rc_alloc ();
1286 1383
1287 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1288 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1289 OUTPUT: 1386 OUTPUT:
1290 RETVAL 1387 RETVAL
1291 1388
1292void 1389void
1293DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1294 CODE: 1391 CODE:
1295 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1296 rc_free (self->rc);
1297 Safefree (self); 1393 delete self;
1298 1394
1299void 1395void
1300set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1301 CODE: 1397 CODE:
1302{ 1398{
1428 1524
1429void 1525void
1430set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1431 CODE: 1527 CODE:
1432 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1433 { 1529 {
1434 self->base_height = base_height; 1530 self->base_height = base_height;
1435 layout_update_font (self); 1531 layout_update_font (self);
1436 } 1532 }
1437 1533
1438void 1534void
1556} 1652}
1557 1653
1558void 1654void
1559render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1560 CODE: 1656 CODE:
1561 rc_clear (self->rc); 1657 self->rc.clear ();
1562 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1563 self->pl, 1659 self->pl,
1564 self->rc, 1660 &self->rc,
1565 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1566 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1567 flags 1663 flags
1568 ); 1664 );
1569 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1580 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1581 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1582 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1583 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1584 1680
1585 rc_draw (self->rc); 1681 self->rc.draw ();
1586 1682
1587 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1588 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1589 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1590} 1686}
1670void 1766void
1671draw_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) 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)
1672 PROTOTYPE: @ 1768 PROTOTYPE: @
1673 CODE: 1769 CODE:
1674{ 1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1675 glEnable (GL_TEXTURE_2D); 1773 glEnable (GL_TEXTURE_2D);
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678 glBindTexture (GL_TEXTURE_2D, name1); 1774 glBindTexture (GL_TEXTURE_2D, name1);
1679 1775
1680 glColor3f (intensity, intensity, intensity); 1776 glColor3f (intensity, intensity, intensity);
1681 glPushMatrix (); 1777 glPushMatrix ();
1682 glScalef (1./3, 1./3, 1.); 1778 glScalef (1./3, 1./3, 1.);
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
1802MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1803 1899
1804PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1805 1901
1806DC::Map 1902DC::Map
1807new (SV *class) 1903new (SV *klass)
1808 CODE: 1904 CODE:
1809 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1810 RETVAL->x = 0; 1906 RETVAL->x = 0;
1811 RETVAL->y = 0; 1907 RETVAL->y = 0;
1812 RETVAL->w = 0; 1908 RETVAL->w = 0;
1813 RETVAL->h = 0; 1909 RETVAL->h = 0;
1814 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1851 1947
1852void 1948void
1853set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1854 CODE: 1950 CODE:
1855{ 1951{
1856 tileid texid; 1952 tileid texid;
1857 maptex *tex; 1953 maptex *tex;
1858 1954
1859 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1860 return; 1956 return;
1861 1957
1862 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1863 return; 1959 return;
1864 1960
1865 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1866 1962
1867 if (!texid) 1963 if (!texid)
1868 return; 1964 return;
1869 1965
1870 tex = self->tex + texid; 1966 tex = self->tex + texid;
1903} 1999}
1904 2000
1905void 2001void
1906expire_textures (DC::Map self, int texid, int count) 2002expire_textures (DC::Map self, int texid, int count)
1907 PPCODE: 2003 PPCODE:
1908 for (; texid < self->texs && count; ++texid, --count) 2004 for (; texid < self->texs && count; ++texid, --count)
1909 { 2005 {
1910 maptex *tex = self->tex + texid; 2006 maptex *tex = self->tex + texid;
1911 2007
1912 if (tex->name) 2008 if (tex->name)
1913 { 2009 {
1968 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1969 } 2065 }
1970} 2066}
1971 2067
1972SV * 2068SV *
1973map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1974 CODE: 2070 CODE:
1975{ 2071{
1976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1977 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1978 mapcell *cell; 2074 mapcell *cell;
1999 2095
2000 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
2001 2097
2002 if (flags & 8) 2098 if (flags & 8)
2003 { 2099 {
2100 uint8_t ext, cmd;
2101
2004 if (extmap) 2102 do
2005 { 2103 {
2006 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
2007 2106
2008 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
2009 { 2110 {
2010 ext = *data++;
2011 cmd = ext & 0x7f;
2012
2013 if (cmd < 4)
2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2015 else if (cmd == 5) // health
2016 {
2017 cell->stat_width = 1; 2111 cell->stat_width = 1;
2018 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
2019 }
2020 else if (cmd == 6) // monster width
2021 cell->stat_width = *data++ + 1;
2022 else if (cmd == 0x47)
2023 {
2024 if (*data == 1) cell->player = data [1];
2025 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2026 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2027 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2028
2029 data += *data + 1;
2030 }
2031 else if (cmd == 8) // cell flags
2032 cell->flags = *data++;
2033 else if (ext & 0x40) // unknown, multibyte => skip
2034 data += *data + 1;
2035 else
2036 data++;
2037 } 2113 }
2038 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++;
2039 } 2131 }
2040 else 2132 while (ext & 0x80);
2041 cell->darkness = *data++ + 1;
2042 } 2133 }
2043 2134
2044 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
2045 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
2046 { 2137 {
2094 ? self->row + y 2185 ? self->row + y
2095 : 0; 2186 : 0;
2096 2187
2097 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
2098 { 2189 {
2099 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
2100 2191
2101 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
2102 { 2193 {
2103 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
2104 2195
2106 { 2197 {
2107 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
2108 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
2109 int a1 = tex.a; 2200 int a1 = tex.a;
2110 2201
2111 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
2112 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
2113 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
2114 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
2115 } 2206 }
2116 } 2207 }
2117 2208
2118 *map++ = (r ) 2209 *map++ = (r )
2119 | (g << 8) 2210 | (g << 8)
2120 | (b << 16) 2211 | (b << 16)
2121 | (a << 24); 2212 | (a << 24);
2122 } 2213 }
2123 } 2214 }
2124 2215
2125 RETVAL = map_sv; 2216 RETVAL = map_sv;
2126} 2217}
2127 OUTPUT: 2218 OUTPUT:
2128 RETVAL 2219 RETVAL
2129 2220
2130void 2221void
2131draw (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)
2132 CODE: 2223 CODE:
2133{ 2224{
2134 int x, y, z; 2225 int x, y, z;
2135 2226
2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2137 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2138 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!
2139 smooth_key skey;
2140 int pl_x, pl_y; 2228 int pl_x, pl_y;
2141 maptex pl_tex; 2229 maptex pl_tex;
2142 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2143 rc_t *rc_ov = rc_alloc (); 2231 rc_t rc_ov;
2144 rc_key_t key; 2232 rc_key_t key;
2145 rc_array_t *arr; 2233 rc_t::array_t *arr;
2146 2234
2147 pl_tex.name = 0; 2235 pl_tex.name = 0;
2148 2236
2149 // that's current max. sorry. 2237 // that's current max. sorry.
2150 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
2151 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
2152
2153 // clear key, in case of extra padding
2154 memset (&skey, 0, sizeof (skey));
2155 2240
2156 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
2157 key.r = 255; 2242 key.r = 255;
2158 key.g = 255; 2243 key.g = 255;
2159 key.b = 255; 2244 key.b = 255;
2165 my += self->y; 2250 my += self->y;
2166 2251
2167 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
2168 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
2169 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
2170 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2171 2256
2172 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
2173 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
2174 { 2259 {
2175 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2192 2277
2193 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
2194 { 2279 {
2195 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;
2196 key.texname = -1; 2283 key.texname = -1;
2197 2284
2198 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
2199 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
2200 { 2287 {
2217 2304
2218 if (!tex.name) 2305 if (!tex.name)
2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2220 2307
2221 key.texname = tex.name; 2308 key.texname = tex.name;
2222 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
2223 } 2310 }
2224 2311
2225 px = (x + 1) * T - tex.w; 2312 px = (x + 1) * Th - tex.w;
2226 py = (y + 1) * T - tex.h; 2313 py = (y + 1) * Tw - tex.h;
2227 2314
2228 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
2229 { 2316 {
2230 pl_x = px; 2317 pl_x = px;
2231 pl_y = py; 2318 pl_y = py;
2232 pl_tex = tex; 2319 pl_tex = tex;
2233 continue; 2320 continue;
2234 } 2321 }
2235 2322
2236 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2237 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2238 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);
2239 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2240 2327
2241 // update smooth hash 2328 // update smooth hash
2242 if (tex.smoothtile) 2329 if (tex.smoothtile)
2243 { 2330 {
2244 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
2245 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
2246 2333
2247 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
2248 2335
2249 // 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
2250 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
2251 2338
2252 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
2260 2347
2261 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2262 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
2263 2350
2264 // full tile 2351 // full tile
2265 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);
2266 2353
2267 // borders 2354 // borders
2268 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);
2269 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);
2270 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);
2271 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);
2272 2359
2273 // corners 2360 // corners
2274 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);
2275 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);
2276 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);
2277 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);
2278 } 2365 }
2279 } 2366 }
2280 2367
2281 if (expect_false (z == 2) && expect_false (cell->flags)) 2368 if (expect_false (z == 2) && expect_false (cell->flags))
2282 { 2369 {
2283 // overlays such as the speech bubble, probably more to come 2370 // overlays such as the speech bubble, probably more to come
2284 if (cell->flags & 1) 2371 if (cell->flags & 1)
2285 { 2372 {
2286 rc_key_t key_ov = key; 2373 rc_key_t key_ov = key;
2287 maptex tex = self->tex [TEXID_SPEECH]; 2374 maptex tex = self->tex[TEXID_SPEECH];
2288 rc_array_t *arr;
2289 int px = x * T + T * 2 / 32; 2375 int px = x * Tw + Tw * 2 / 32;
2290 int py = y * T - T * 6 / 32; 2376 int py = y * Th - Th * 6 / 32;
2291 2377
2292 key_ov.texname = tex.name; 2378 key_ov.texname = tex.name;
2293 arr = rc_array (rc_ov, &key_ov); 2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2294 2380
2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2297 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);
2298 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2299 } 2385 }
2300 } 2386 }
2301 } 2387 }
2302 } 2388 }
2303 2389
2304 rc_draw (rc); 2390 rc.draw ();
2305 rc_clear (rc); 2391 rc.clear ();
2306 2392
2307 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2308 // this is basically counting sort 2394 // this is basically counting sort
2309 { 2395 {
2310 int w, b; 2396 int w, b;
2311 2397
2312 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2313 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2314 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)
2315 { 2403 {
2316 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2317 if (smask) 2405 IV bits = it->second;
2318 for (b = 0; b < 32; ++b) 2406
2319 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2320 { 2410 {
2321 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
2322 HE *he; 2419 if (tex.name)
2323
2324 hv_iterinit (smooth);
2325 while ((he = hv_iternext (smooth)))
2326 { 2420 {
2327 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2328 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2329 2423 if (key.texname != tex.name)
2330 if (!(bits & 0x1000)
2331 && skey->level == level
2332 && level > smooth_max [skey->x][skey->y])
2333 { 2424 {
2334 maptex tex = self->tex [skey->tile];
2335 int px = (((int)skey->x) - 1) * T;
2336 int py = (((int)skey->y) - 1) * T;
2337 int border = bits & 15;
2338 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2339 float dx = tex.s * .0625f; // 16 images/row
2340 float dy = tex.t * .5f ; // 2 images/column
2341
2342 if (tex.name)
2343 {
2344 // this time avoiding texture state changes
2345 // save gobs of state changes.
2346 if (key.texname != tex.name)
2347 {
2348 self->tex [skey->tile].unused = 0; 2425 self->tex [skey.tile].unused = 0;
2349 2426
2350 glEnd (); 2427 glEnd ();
2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2352 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2353 } 2430 }
2354 2431
2355 if (border) 2432 if (border)
2356 { 2433 {
2357 float ox = border * dx; 2434 float ox = border * dx;
2358 2435
2359 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2360 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2361 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2362 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2363 } 2440 }
2364 2441
2365 if (corner) 2442 if (corner)
2366 { 2443 {
2367 float ox = corner * dx; 2444 float ox = corner * dx;
2368 2445
2369 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2370 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2371 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2372 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2373 }
2374 }
2375 } 2450 }
2376 } 2451 }
2377 } 2452 }
2378 } 2453 }
2379 2454
2380 glEnd (); 2455 glEnd ();
2381 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2382 key.texname = -1; 2457 key.texname = -1;
2383 } 2458 }
2384
2385 hv_clear (smooth);
2386 } 2459 }
2387 2460
2388 if (pl_tex.name) 2461 if (pl_tex.name)
2389 { 2462 {
2390 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2391 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2392 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2393 2466
2394 key.texname = tex.name; 2467 key.texname = tex.name;
2395 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2396 2469
2397 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2398 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2399 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);
2400 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2401 2474
2402 rc_draw (rc); 2475 rc.draw ();
2403 } 2476 }
2404 2477
2405 rc_draw (rc_ov); 2478 rc_ov.draw ();
2406 rc_clear (rc_ov); 2479 rc_ov.clear ();
2407 2480
2408 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2409 rc_free (rc);
2410 rc_free (rc_ov);
2411 2482
2412 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2413 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2414 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2415 { 2486 {
2418 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2419 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2420 { 2491 {
2421 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2422 2493
2423 int px = x * T; 2494 int px = x * Tw;
2424 int py = y * T; 2495 int py = y * Th;
2425 2496
2426 if (expect_false (cell->player == player)) 2497 if (expect_false (cell->player == player))
2427 { 2498 {
2428 px += sdx; 2499 px += sdx;
2429 py += sdy; 2500 py += sdy;
2430 } 2501 }
2431 2502
2432 if (cell->stat_hp) 2503 if (cell->stat_hp)
2433 { 2504 {
2434 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2436 2507
2437 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2438 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2439 px + width - 1, py); 2510 px + width - 1, py);
2440 2511
2520 int x, y; 2591 int x, y;
2521 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2522 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2523 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2524 int sw3 = sw * 3; 2595 int sw3 = sw * 3;
2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2599 memset (darkness1, 0, sw1*sh1);
2528 2600
2529 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2530 SvCUR_set (darkness3_sv, sw3 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2531 2603
2532 mx += self->x - 1; 2604 mx += self->x - 1;
2658 else 2730 else
2659 *data++ = 0; 2731 *data++ = 0;
2660 } 2732 }
2661 } 2733 }
2662 2734
2663 /* 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 */
2664 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2665 { 2737 {
2666 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2667 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668 } 2740 }
2669 2741
2670 RETVAL = data_sv; 2742 RETVAL = data_sv;
2671} 2743}
2672 OUTPUT: 2744 OUTPUT:
2673 RETVAL 2745 RETVAL
2674 2746
2675void 2747void
2682 STRLEN len; 2754 STRLEN len;
2683 uint8_t *data, *end; 2755 uint8_t *data, *end;
2684 2756
2685 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2686 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2687 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2688 end = data + len + 8; 2760 end = data + len + 8;
2689 2761
2690 if (len < 5) 2762 if (len < 5)
2691 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2692 2764
2753} 2825}
2754 2826
2755MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2756 2828
2757DC::RW 2829DC::RW
2758new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2759 CODE: 2831 CODE:
2760{ 2832{
2761 STRLEN datalen; 2833 STRLEN datalen;
2762 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2763 2835
2765} 2837}
2766 OUTPUT: 2838 OUTPUT:
2767 RETVAL 2839 RETVAL
2768 2840
2769DC::RW 2841DC::RW
2770new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2771 CODE: 2843 CODE:
2772 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2773 OUTPUT: 2845 OUTPUT:
2774 RETVAL 2846 RETVAL
2775 2847
2793 if (RETVAL < 0) 2865 if (RETVAL < 0)
2794 { 2866 {
2795 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2796 2868
2797 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)
2798 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2799 2876 }
2877 else
2800 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2801 } 2879 }
2802 2880
2803 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2804 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2805} 2883}
2865 2943
2866MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2867 2945
2868PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2869 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
2870DC::MixChunk 2960DC::MixChunk
2871new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2872 CODE: 2962 CODE:
2873 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2874 OUTPUT: 2964 OUTPUT:
2875 RETVAL 2965 RETVAL
2876 2966
2906 OUTPUT: 2996 OUTPUT:
2907 RETVAL 2997 RETVAL
2908 2998
2909MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2910 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
2911int 3013int
2912volume (int volume = -1) 3014volume (int volume = -1)
2913 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2914 CODE: 3016 CODE:
2915 if (items > 0) 3017 if (items > 0)
2926void 3028void
2927halt () 3029halt ()
2928 CODE: 3030 CODE:
2929 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2930 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2931DC::MixMusic 3040DC::MixMusic
2932new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2933 CODE: 3042 CODE:
2934 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2935 OUTPUT: 3044 OUTPUT:
2936 RETVAL 3045 RETVAL
2937 3046
3074 const_iv (GL_FUNC_SUBTRACT), 3183 const_iv (GL_FUNC_SUBTRACT),
3075 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3076# undef const_iv 3185# undef const_iv
3077 }; 3186 };
3078 3187
3079 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--)
3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3081 3190
3082 texture_av = newAV (); 3191 texture_av = newAV ();
3083 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
3084} 3193}
3085 3194
3090 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
3091 3200
3092void 3201void
3093apple_nvidia_bug (int enable) 3202apple_nvidia_bug (int enable)
3094 3203
3095char * 3204const char *
3096gl_vendor () 3205gl_vendor ()
3097 CODE: 3206 CODE:
3098 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
3099 OUTPUT: 3208 OUTPUT:
3100 RETVAL 3209 RETVAL
3101 3210
3102char * 3211const char *
3103gl_version () 3212gl_version ()
3104 CODE: 3213 CODE:
3105 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
3106 OUTPUT: 3215 OUTPUT:
3107 RETVAL 3216 RETVAL
3108 3217
3109char * 3218const char *
3110gl_extensions () 3219gl_extensions ()
3111 CODE: 3220 CODE:
3112 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3113 OUTPUT: 3222 OUTPUT:
3114 RETVAL 3223 RETVAL
3115 3224
3116const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
3117 3230
3118GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
3119 CODE: 3232 CODE:
3120 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
3121 OUTPUT: 3234 OUTPUT:
3128 RETVAL 3241 RETVAL
3129 3242
3130int glGetError () 3243int glGetError ()
3131 3244
3132void glFinish () 3245void glFinish ()
3246
3247void glFlush ()
3133 3248
3134void glClear (int mask) 3249void glClear (int mask)
3135 3250
3136void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
3137 PROTOTYPE: @ 3252 PROTOTYPE: @
3322 3437
3323void 3438void
3324find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3325 PPCODE: 3440 PPCODE:
3326{ 3441{
3327 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3328 XPUSHs (self); 3443 XPUSHs (self);
3329} 3444}
3330 3445
3331BOOT: 3446BOOT:
3332{ 3447{
3340 3455
3341void 3456void
3342draw (SV *self) 3457draw (SV *self)
3343 CODE: 3458 CODE:
3344{ 3459{
3345 HV *hv; 3460 HV *hv;
3346 SV **svp; 3461 SV **svp;
3347 NV x, y, w, h; 3462 NV x, y, w, h;
3348 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3349 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3350 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3351 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