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.300 by root, Thu Dec 24 10:47:45 2009 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 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>
48#endif 53#endif
49 54
50#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
52 57
53#include <glib/gmacros.h> 58#include <glib.h>
54 59
55#include <pango/pango.h> 60#include <pango/pango.h>
56 61
57#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
100#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
101 106
102#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
104 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
105static AV *texture_av; 129static AV *texture_av;
106 130
107static struct 131static struct
108{ 132{
109#define GL_FUNC(ptr,name) ptr name; 133#define GL_FUNC(ptr,name) ptr name;
165{ 189{
166 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
167 191
168 while (attrs) 192 while (attrs)
169 { 193 {
170 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 195
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 197 return 1;
174 198
175 attrs = attrs->next; 199 attrs = attrs->next;
176 } 200 }
177 201
178 return 0; 202 return 0;
179} 203}
180 204
181typedef struct cf_layout { 205struct cf_layout {
182 PangoLayout *pl; 206 PangoLayout *pl;
183 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
184 int base_height; 208 int base_height;
185 DC__Font font; 209 DC__Font font;
186 rc_t *rc; 210 rc_t rc;
187} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
188 214
189static DC__Font default_font; 215static DC__Font default_font;
190static PangoContext *opengl_context; 216static PangoContext *opengl_context;
191static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
192 218
193static void 219static void
194substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
195{ 221{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 225#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 227}
202 228
203static void 229static void
233} 259}
234 260
235typedef uint16_t tileid; 261typedef uint16_t tileid;
236typedef uint16_t faceid; 262typedef uint16_t faceid;
237 263
238typedef struct { 264struct maptex
265{
239 GLuint name; 266 GLuint name;
240 int w, h; 267 int w, h;
241 float s, t; 268 float s, t;
242 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
243 tileid smoothtile; 270 tileid smoothtile;
244 uint8_t smoothlevel; 271 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
246} maptex; 273};
247 274
248typedef struct { 275struct mapcell
276{
249 uint32_t player; 277 uint32_t player;
250 tileid tile[3]; 278 tileid tile[3];
251 uint16_t darkness; 279 uint16_t darkness;
252 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
253} mapcell; 281};
254 282
255typedef struct { 283struct maprow
284{
256 int32_t c0, c1; 285 int32_t c0, c1;
257 mapcell *col; 286 mapcell *col;
258} maprow; 287};
259 288
260typedef struct map { 289struct mapgrid {
261 int x, y, w, h; 290 int x, y, w, h;
262 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
263 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
264 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
265 294
266 int32_t rows; 295 int32_t rows;
267 maprow *row; 296 maprow *row;
268} *DC__Map; 297};
269 298
270static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
271prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
272{ 304{
273 char *p; 305 T *p;
274 306
275 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
276 Zero (p, inc, char);
277 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
278 Safefree (ptr); 309 Safefree (ptr);
279 310
280 return p; 311 ptr = p;
281} 312}
282 313
283static char * 314template<typename T>
284append (char *ptr, int sze, int inc)
285{
286 Renew (ptr, sze + inc, char);
287 Zero (ptr + sze, inc, char);
288
289 return ptr;
290}
291
292#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294
295static void 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
296need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
297{ 324{
298 while (self->faces <= face) 325 while (self->faces <= face)
299 { 326 {
300 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
301 self->faces *= 2; 328 self->faces *= 2;
302 } 329 }
303} 330}
304 331
305static void 332static void
306need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
307{ 334{
308 while (self->texs <= texid) 335 while (self->texs <= texid)
309 { 336 {
310 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
311 self->texs *= 2; 338 self->texs *= 2;
312 } 339 }
313} 340}
314 341
315static maprow * 342static maprow *
316map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
317{ 344{
318 if (0 > y) 345 if (0 > y)
319 { 346 {
320 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
321 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
322 349
323 self->rows += extend; 350 self->rows += extend;
324 self->y += extend; 351 self->y += extend;
325 y += extend; 352 y += extend;
326 } 353 }
327 else if (y >= self->rows) 354 else if (y >= self->rows)
328 { 355 {
329 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
330 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
331 self->rows += extend; 358 self->rows += extend;
332 } 359 }
333 360
334 return self->row + y; 361 return self->row + y;
335} 362}
345 } 372 }
346 373
347 if (row->c0 > x) 374 if (row->c0 > x)
348 { 375 {
349 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
350 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
351 row->c0 -= extend; 378 row->c0 -= extend;
352 } 379 }
353 else if (x >= row->c1) 380 else if (x >= row->c1)
354 { 381 {
355 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
356 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
357 row->c1 += extend; 384 row->c1 += extend;
358 } 385 }
359 386
360 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
361} 388}
362 389
363static mapcell * 390static mapcell *
364map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
365{ 392{
366 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
367} 394}
368 395
369static void 396static void
370map_clear (DC__Map self) 397map_clear (mapgrid *self)
371{ 398{
372 int r; 399 int r;
373 400
374 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
375 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
393 (cell)->flags = 0; \ 420 (cell)->flags = 0; \
394 (cell)->player = 0; \ 421 (cell)->player = 0; \
395 } while (0) 422 } while (0)
396 423
397static void 424static void
398map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
399{ 426{
400 int x, y; 427 int x, y;
401 maprow *row; 428 maprow *row;
402 mapcell *cell; 429 mapcell *cell;
403 430
420 CELL_CLEAR (cell); 447 CELL_CLEAR (cell);
421 } 448 }
422 } 449 }
423} 450}
424 451
425typedef struct { 452struct smooth_key
453{
426 tileid tile; 454 tileid tile;
427 uint8_t x, y, level; 455 uint8_t x, y, level;
428} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
429 475
430static void 476static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 478{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
434 480
435 if (SvIOK (*sv)) 481 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
437 else 483 else
438 sv_setiv (*sv, bits); 484 it->second |= bits;
439} 485}
440 486
441static void 487static void
442music_finished (void) 488music_finished (void)
443{ 489{
460 ev.code = 1; 506 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 508 ev.data2 = 0;
463 509
464 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
465} 518}
466 519
467static unsigned int 520static unsigned int
468minpot (unsigned int n) 521minpot (unsigned int n)
469{ 522{
552 605
553 return mod; 606 return mod;
554} 607}
555 608
556static void 609static void
557deliantra_main () 610deliantra_main (SV *real_main)
558{ 611{
559 char *argv[] = { 0 }; 612 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
561} 616}
562 617
563#ifdef __MACOSX__ 618#ifdef __MACOSX__
619 static SV *real_main;
620
564 /* to due surprising braindamage on the side of SDL design, we 621 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 622 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which, 623 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 625 * and which calls our main (== SDL_main) back.
569 */ 626 */
570 extern C_LINKAGE int 627 extern C_LINKAGE int
571 main (int argc, char *argv[]) 628 main (int argc, char *argv[])
572 { 629 {
573 deliantra_main (); 630 deliantra_main (real_main);
574 } 631 }
575 632
576 #undef main 633 #undef main
577 634
578 extern C_LINKAGE int main (int argc, char *argv[]); 635 extern C_LINKAGE int main (int argc, char *argv[]);
579 636
580 static void 637 static void
581 SDL_braino (void) 638 SDL_main_hack (SV *real_main_)
582 { 639 {
640 real_main = real_main_;
641
583 char *argv[] = { "deliantra client", 0 }; 642 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 643 (main) (1, argv);
585 } 644 }
586#else 645#else
587 static void 646 static void
588 SDL_braino (void) 647 SDL_main_hack (SV *real_main)
589 { 648 {
590 deliantra_main (); 649 deliantra_main (real_main);
591 } 650 }
592#endif 651#endif
593 652
594MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
595 654
796 855
797 const_iv (FOW_DARKNESS) 856 const_iv (FOW_DARKNESS)
798# undef const_iv 857# undef const_iv
799 }; 858 };
800 859
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 862
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 865}
807 866
846#endif 905#endif
847} 906}
848 907
849char *SDL_GetError () 908char *SDL_GetError ()
850 909
851void SDL_braino () 910void SDL_main_hack (SV *real_main)
911 PROTOTYPE: &
852 912
853int SDL_Init (U32 flags) 913int SDL_Init (U32 flags)
854 914
855int SDL_InitSubSystem (U32 flags) 915int SDL_InitSubSystem (U32 flags)
856 916
857void SDL_QuitSubSystem (U32 flags) 917void SDL_QuitSubSystem (U32 flags)
858 918
859void SDL_Quit () 919void SDL_Quit ()
860 920
861int SDL_GL_SetAttribute (int attr, int value) 921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
862 923
863int SDL_GL_GetAttribute (int attr) 924int SDL_GL_GetAttribute (int attr)
864 CODE: 925 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 927 XSRETURN_UNDEF;
867 OUTPUT: 928 OUTPUT:
868 RETVAL 929 RETVAL
869 930
870void 931void
925 ); 986 );
926 987
927 if (RETVAL) 988 if (RETVAL)
928 { 989 {
929 av_clear (texture_av); 990 av_clear (texture_av);
930
931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 992#include "glfunc.h"
934#undef GL_FUNC 993#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938 } 996 }
939} 997}
940 OUTPUT: 998 OUTPUT:
941 RETVAL 999 RETVAL
942 1000
943void 1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
1003
1004void
944SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
945 1006
946char * 1007char *
947SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
948 1010
949int 1011int
950SDL_GetAppState () 1012SDL_GetAppState ()
951 1013
952int 1014int
953SDL_GetModState () 1015SDL_GetModState ()
954 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
955void 1021void
1022SDL_PumpEvents ()
1023
1024void
956poll_events () 1025peep_events ()
957 PPCODE: 1026 PPCODE:
958{ 1027{
959 SDL_Event ev; 1028 SDL_Event ev;
960 1029
961 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
1027 1096
1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1029 } 1098 }
1030} 1099}
1031 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
1032int 1114int
1033Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1034 POSTCALL: 1116 POSTCALL:
1035 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
1036 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
1037 1119
1038void 1120void
1039Mix_QuerySpec () 1121Mix_QuerySpec ()
1098add_font (char *file) 1180add_font (char *file)
1099 CODE: 1181 CODE:
1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT: 1183 OUTPUT:
1102 RETVAL 1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1103 1192
1104void 1193void
1105load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
1106 ALIAS: 1195 ALIAS:
1107 load_image_file = 1 1196 load_image_file = 1
1153 1242
1154 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
1155 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
1156 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
1157 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
1158 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1159 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1160 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1161 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1162 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
1163 1252
1235MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1236 1325
1237PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1238 1327
1239DC::Font 1328DC::Font
1240new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1241 CODE: 1330 CODE:
1242{ 1331{
1243 int count; 1332 int count;
1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1245 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1274 PROTOTYPE: 1363 PROTOTYPE:
1275 CODE: 1364 CODE:
1276 tc_restore (); 1365 tc_restore ();
1277 1366
1278DC::Layout 1367DC::Layout
1279new (SV *class) 1368new (SV *klass)
1280 CODE: 1369 CODE:
1281 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1282 1371
1283 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1284 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1285 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1286 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1287 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1288 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1289 RETVAL->font = 0; 1378 RETVAL->font = 0;
1290 RETVAL->rc = rc_alloc ();
1291 1379
1292 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1293 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1294 OUTPUT: 1382 OUTPUT:
1295 RETVAL 1383 RETVAL
1296 1384
1297void 1385void
1298DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1299 CODE: 1387 CODE:
1300 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1301 rc_free (self->rc);
1302 Safefree (self); 1389 delete self;
1303 1390
1304void 1391void
1305set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1306 CODE: 1393 CODE:
1307{ 1394{
1433 1520
1434void 1521void
1435set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1436 CODE: 1523 CODE:
1437 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1438 { 1525 {
1439 self->base_height = base_height; 1526 self->base_height = base_height;
1440 layout_update_font (self); 1527 layout_update_font (self);
1441 } 1528 }
1442 1529
1443void 1530void
1561} 1648}
1562 1649
1563void 1650void
1564render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1565 CODE: 1652 CODE:
1566 rc_clear (self->rc); 1653 self->rc.clear ();
1567 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1568 self->pl, 1655 self->pl,
1569 self->rc, 1656 &self->rc,
1570 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1571 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1572 flags 1659 flags
1573 ); 1660 );
1574 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1585 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1586 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1587 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1588 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1589 1676
1590 rc_draw (self->rc); 1677 self->rc.draw ();
1591 1678
1592 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1593 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1594 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1595} 1682}
1807MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1808 1895
1809PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1810 1897
1811DC::Map 1898DC::Map
1812new (SV *class) 1899new (SV *klass)
1813 CODE: 1900 CODE:
1814 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1815 RETVAL->x = 0; 1902 RETVAL->x = 0;
1816 RETVAL->y = 0; 1903 RETVAL->y = 0;
1817 RETVAL->w = 0; 1904 RETVAL->w = 0;
1818 RETVAL->h = 0; 1905 RETVAL->h = 0;
1819 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1856 1943
1857void 1944void
1858set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1859 CODE: 1946 CODE:
1860{ 1947{
1861 tileid texid; 1948 tileid texid;
1862 maptex *tex; 1949 maptex *tex;
1863 1950
1864 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1865 return; 1952 return;
1866 1953
1867 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1868 return; 1955 return;
1869 1956
1870 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1871 1958
1872 if (!texid) 1959 if (!texid)
1873 return; 1960 return;
1874 1961
1875 tex = self->tex + texid; 1962 tex = self->tex + texid;
1908} 1995}
1909 1996
1910void 1997void
1911expire_textures (DC::Map self, int texid, int count) 1998expire_textures (DC::Map self, int texid, int count)
1912 PPCODE: 1999 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count) 2000 for (; texid < self->texs && count; ++texid, --count)
1914 { 2001 {
1915 maptex *tex = self->tex + texid; 2002 maptex *tex = self->tex + texid;
1916 2003
1917 if (tex->name) 2004 if (tex->name)
1918 { 2005 {
1965 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1966 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1967 2054
1968 while (self->y < 0) 2055 while (self->y < 0)
1969 { 2056 {
1970 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1971 2058
1972 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1973 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1974 } 2061 }
1975} 2062}
1976 2063
1977SV * 2064SV *
1978map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1979 CODE: 2066 CODE:
1980{ 2067{
1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1982 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1983 mapcell *cell; 2070 mapcell *cell;
2004 2091
2005 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
2006 2093
2007 if (flags & 8) 2094 if (flags & 8)
2008 { 2095 {
2096 uint8_t ext, cmd;
2097
2009 if (extmap) 2098 do
2010 { 2099 {
2011 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
2012 2102
2013 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
2014 { 2106 {
2015 ext = *data++;
2016 cmd = ext & 0x7f;
2017
2018 if (cmd < 4)
2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2020 else if (cmd == 5) // health
2021 {
2022 cell->stat_width = 1; 2107 cell->stat_width = 1;
2023 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
2024 }
2025 else if (cmd == 6) // monster width
2026 cell->stat_width = *data++ + 1;
2027 else if (cmd == 0x47)
2028 {
2029 if (*data == 1) cell->player = data [1];
2030 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2033
2034 data += *data + 1;
2035 }
2036 else if (cmd == 8) // cell flags
2037 cell->flags = *data++;
2038 else if (ext & 0x40) // unknown, multibyte => skip
2039 data += *data + 1;
2040 else
2041 data++;
2042 } 2109 }
2043 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
2044 } 2127 }
2045 else 2128 while (ext & 0x80);
2046 cell->darkness = *data++ + 1;
2047 } 2129 }
2048 2130
2049 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
2050 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
2051 { 2133 {
2099 ? self->row + y 2181 ? self->row + y
2100 : 0; 2182 : 0;
2101 2183
2102 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
2103 { 2185 {
2104 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
2105 2187
2106 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
2107 { 2189 {
2108 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
2109 2191
2111 { 2193 {
2112 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
2113 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
2114 int a1 = tex.a; 2196 int a1 = tex.a;
2115 2197
2116 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
2117 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
2118 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
2119 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
2120 } 2202 }
2121 } 2203 }
2122 2204
2123 *map++ = (r ) 2205 *map++ = (r )
2124 | (g << 8) 2206 | (g << 8)
2125 | (b << 16) 2207 | (b << 16)
2126 | (a << 24); 2208 | (a << 24);
2127 } 2209 }
2128 } 2210 }
2129 2211
2130 RETVAL = map_sv; 2212 RETVAL = map_sv;
2131} 2213}
2132 OUTPUT: 2214 OUTPUT:
2133 RETVAL 2215 RETVAL
2134 2216
2135void 2217void
2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2218draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2137 CODE: 2219 CODE:
2138{ 2220{
2139 int x, y, z; 2221 int x, y, z;
2140 2222
2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2142 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2223 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2144 smooth_key skey;
2145 int pl_x, pl_y; 2224 int pl_x, pl_y;
2146 maptex pl_tex; 2225 maptex pl_tex;
2147 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2148 rc_t *rc_ov = rc_alloc (); 2227 rc_t rc_ov;
2149 rc_key_t key; 2228 rc_key_t key;
2150 rc_array_t *arr; 2229 rc_t::array_t *arr;
2151 2230
2152 pl_tex.name = 0; 2231 pl_tex.name = 0;
2153 2232
2154 // that's current max. sorry. 2233 // that's current max. sorry.
2155 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
2156 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
2157
2158 // clear key, in case of extra padding
2159 memset (&skey, 0, sizeof (skey));
2160 2236
2161 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
2162 key.r = 255; 2238 key.r = 255;
2163 key.g = 255; 2239 key.g = 255;
2164 key.b = 255; 2240 key.b = 255;
2170 my += self->y; 2246 my += self->y;
2171 2247
2172 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
2173 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
2174 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
2175 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2176 2252
2177 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
2179 { 2255 {
2180 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
2195 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2197 2273
2198 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
2199 { 2275 {
2200 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2201 key.texname = -1; 2279 key.texname = -1;
2202 2280
2203 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
2204 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
2205 { 2283 {
2222 2300
2223 if (!tex.name) 2301 if (!tex.name)
2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2225 2303
2226 key.texname = tex.name; 2304 key.texname = tex.name;
2227 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
2228 } 2306 }
2229 2307
2230 px = (x + 1) * T - tex.w; 2308 px = (x + 1) * Th - tex.w;
2231 py = (y + 1) * T - tex.h; 2309 py = (y + 1) * Tw - tex.h;
2232 2310
2233 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
2234 { 2312 {
2235 pl_x = px; 2313 pl_x = px;
2236 pl_y = py; 2314 pl_y = py;
2237 pl_tex = tex; 2315 pl_tex = tex;
2238 continue; 2316 continue;
2239 } 2317 }
2240 2318
2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2243 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2321 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2244 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2245 2323
2246 // update smooth hash 2324 // update smooth hash
2247 if (tex.smoothtile) 2325 if (tex.smoothtile)
2248 { 2326 {
2249 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
2250 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
2251 2329
2252 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
2253 2331
2254 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
2255 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
2256 2334
2257 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2265 2343
2266 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2267 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2268 2346
2269 // full tile 2347 // full tile
2270 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2271 2349
2272 // borders 2350 // borders
2273 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2274 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2352 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2275 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2353 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2276 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2277 2355
2278 // corners 2356 // corners
2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2280 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2358 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2281 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2359 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2283 } 2361 }
2284 } 2362 }
2285 2363
2286 if (expect_false (z == 2) && expect_false (cell->flags)) 2364 if (expect_false (z == 2) && expect_false (cell->flags))
2287 { 2365 {
2288 // overlays such as the speech bubble, probably more to come 2366 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1) 2367 if (cell->flags & 1)
2290 { 2368 {
2291 rc_key_t key_ov = key; 2369 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH]; 2370 maptex tex = self->tex[TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32; 2371 int px = x * Tw + Tw * 2 / 32;
2295 int py = y * T - T * 6 / 32; 2372 int py = y * Th - Th * 6 / 32;
2296 2373
2297 key_ov.texname = tex.name; 2374 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov); 2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2299 2376
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2304 } 2381 }
2305 } 2382 }
2306 } 2383 }
2307 } 2384 }
2308 2385
2309 rc_draw (rc); 2386 rc.draw ();
2310 rc_clear (rc); 2387 rc.clear ();
2311 2388
2312 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2313 // this is basically counting sort 2390 // this is basically counting sort
2314 { 2391 {
2315 int w, b; 2392 int w, b;
2316 2393
2317 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2318 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2319 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2320 { 2399 {
2321 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2322 if (smask) 2401 IV bits = it->second;
2323 for (b = 0; b < 32; ++b) 2402
2324 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2325 { 2406 {
2326 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
2327 HE *he; 2415 if (tex.name)
2328
2329 hv_iterinit (smooth);
2330 while ((he = hv_iternext (smooth)))
2331 { 2416 {
2332 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2333 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2334 2419 if (key.texname != tex.name)
2335 if (!(bits & 0x1000)
2336 && skey->level == level
2337 && level > smooth_max [skey->x][skey->y])
2338 { 2420 {
2339 maptex tex = self->tex [skey->tile];
2340 int px = (((int)skey->x) - 1) * T;
2341 int py = (((int)skey->y) - 1) * T;
2342 int border = bits & 15;
2343 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2344 float dx = tex.s * .0625f; // 16 images/row
2345 float dy = tex.t * .5f ; // 2 images/column
2346
2347 if (tex.name)
2348 {
2349 // this time avoiding texture state changes
2350 // save gobs of state changes.
2351 if (key.texname != tex.name)
2352 {
2353 self->tex [skey->tile].unused = 0; 2421 self->tex [skey.tile].unused = 0;
2354 2422
2355 glEnd (); 2423 glEnd ();
2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2357 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2358 } 2426 }
2359 2427
2360 if (border) 2428 if (border)
2361 { 2429 {
2362 float ox = border * dx; 2430 float ox = border * dx;
2363 2431
2364 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2365 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2366 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2367 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2368 } 2436 }
2369 2437
2370 if (corner) 2438 if (corner)
2371 { 2439 {
2372 float ox = corner * dx; 2440 float ox = corner * dx;
2373 2441
2374 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2375 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2376 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2377 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2378 }
2379 }
2380 } 2446 }
2381 } 2447 }
2382 } 2448 }
2383 } 2449 }
2384 2450
2385 glEnd (); 2451 glEnd ();
2386 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2387 key.texname = -1; 2453 key.texname = -1;
2388 } 2454 }
2389
2390 hv_clear (smooth);
2391 } 2455 }
2392 2456
2393 if (pl_tex.name) 2457 if (pl_tex.name)
2394 { 2458 {
2395 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2396 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2397 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2398 2462
2399 key.texname = tex.name; 2463 key.texname = tex.name;
2400 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2401 2465
2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2403 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2468 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2406 2470
2407 rc_draw (rc); 2471 rc.draw ();
2408 } 2472 }
2409 2473
2410 rc_draw (rc_ov); 2474 rc_ov.draw ();
2411 rc_clear (rc_ov); 2475 rc_ov.clear ();
2412 2476
2413 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2414 rc_free (rc);
2415 rc_free (rc_ov);
2416 2478
2417 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2418 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2419 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2420 { 2482 {
2423 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2424 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2425 { 2487 {
2426 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2427 2489
2428 int px = x * T; 2490 int px = x * Tw;
2429 int py = y * T; 2491 int py = y * Th;
2430 2492
2431 if (expect_false (cell->player == player)) 2493 if (expect_false (cell->player == player))
2432 { 2494 {
2433 px += sdx; 2495 px += sdx;
2434 py += sdy; 2496 py += sdy;
2435 } 2497 }
2436 2498
2437 if (cell->stat_hp) 2499 if (cell->stat_hp)
2438 { 2500 {
2439 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2441 2503
2442 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2443 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2444 px + width - 1, py); 2506 px + width - 1, py);
2445 2507
2525 int x, y; 2587 int x, y;
2526 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2527 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2528 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2529 int sw3 = sw * 3; 2591 int sw3 = sw * 3;
2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2595 memset (darkness1, 0, sw1*sh1);
2533 2596
2534 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2535 SvCUR_set (darkness3_sv, sw3 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2536 2599
2537 mx += self->x - 1; 2600 mx += self->x - 1;
2663 else 2726 else
2664 *data++ = 0; 2727 *data++ = 0;
2665 } 2728 }
2666 } 2729 }
2667 2730
2668 /* if size is w*h + 5 then no data has been found */ 2731 /* if size is w*h + 5 then no data has been found */
2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2670 { 2733 {
2671 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 } 2736 }
2674 2737
2675 RETVAL = data_sv; 2738 RETVAL = data_sv;
2676} 2739}
2677 OUTPUT: 2740 OUTPUT:
2678 RETVAL 2741 RETVAL
2679 2742
2680void 2743void
2687 STRLEN len; 2750 STRLEN len;
2688 uint8_t *data, *end; 2751 uint8_t *data, *end;
2689 2752
2690 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2693 end = data + len + 8; 2756 end = data + len + 8;
2694 2757
2695 if (len < 5) 2758 if (len < 5)
2696 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2697 2760
2758} 2821}
2759 2822
2760MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2761 2824
2762DC::RW 2825DC::RW
2763new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2764 CODE: 2827 CODE:
2765{ 2828{
2766 STRLEN datalen; 2829 STRLEN datalen;
2767 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2768 2831
2770} 2833}
2771 OUTPUT: 2834 OUTPUT:
2772 RETVAL 2835 RETVAL
2773 2836
2774DC::RW 2837DC::RW
2775new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2776 CODE: 2839 CODE:
2777 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2778 OUTPUT: 2841 OUTPUT:
2779 RETVAL 2842 RETVAL
2780 2843
2798 if (RETVAL < 0) 2861 if (RETVAL < 0)
2799 { 2862 {
2800 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2801 2864
2802 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2803 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2804 2872 }
2873 else
2805 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2806 } 2875 }
2807 2876
2808 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2809 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2810} 2879}
2870 2939
2871MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2872 2941
2873PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2874 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2875DC::MixChunk 2956DC::MixChunk
2876new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2877 CODE: 2958 CODE:
2878 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2879 OUTPUT: 2960 OUTPUT:
2880 RETVAL 2961 RETVAL
2881 2962
2911 OUTPUT: 2992 OUTPUT:
2912 RETVAL 2993 RETVAL
2913 2994
2914MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2915 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2916int 3009int
2917volume (int volume = -1) 3010volume (int volume = -1)
2918 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2919 CODE: 3012 CODE:
2920 if (items > 0) 3013 if (items > 0)
2931void 3024void
2932halt () 3025halt ()
2933 CODE: 3026 CODE:
2934 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2935 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2936DC::MixMusic 3036DC::MixMusic
2937new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2938 CODE: 3038 CODE:
2939 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2940 OUTPUT: 3040 OUTPUT:
2941 RETVAL 3041 RETVAL
2942 3042
3079 const_iv (GL_FUNC_SUBTRACT), 3179 const_iv (GL_FUNC_SUBTRACT),
3080 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3081# undef const_iv 3181# undef const_iv
3082 }; 3182 };
3083 3183
3084 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3085 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3086 3186
3087 texture_av = newAV (); 3187 texture_av = newAV ();
3088 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
3089} 3189}
3090 3190
3095 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
3096 3196
3097void 3197void
3098apple_nvidia_bug (int enable) 3198apple_nvidia_bug (int enable)
3099 3199
3100char * 3200const char *
3101gl_vendor () 3201gl_vendor ()
3102 CODE: 3202 CODE:
3103 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
3104 OUTPUT: 3204 OUTPUT:
3105 RETVAL 3205 RETVAL
3106 3206
3107char * 3207const char *
3108gl_version () 3208gl_version ()
3109 CODE: 3209 CODE:
3110 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
3111 OUTPUT: 3211 OUTPUT:
3112 RETVAL 3212 RETVAL
3113 3213
3114char * 3214const char *
3115gl_extensions () 3215gl_extensions ()
3116 CODE: 3216 CODE:
3117 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3118 OUTPUT: 3218 OUTPUT:
3119 RETVAL 3219 RETVAL
3120 3220
3121const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
3122 3226
3123GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
3124 CODE: 3228 CODE:
3125 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
3126 OUTPUT: 3230 OUTPUT:
3133 RETVAL 3237 RETVAL
3134 3238
3135int glGetError () 3239int glGetError ()
3136 3240
3137void glFinish () 3241void glFinish ()
3242
3243void glFlush ()
3138 3244
3139void glClear (int mask) 3245void glClear (int mask)
3140 3246
3141void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
3142 PROTOTYPE: @ 3248 PROTOTYPE: @
3327 3433
3328void 3434void
3329find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3330 PPCODE: 3436 PPCODE:
3331{ 3437{
3332 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3333 XPUSHs (self); 3439 XPUSHs (self);
3334} 3440}
3335 3441
3336BOOT: 3442BOOT:
3337{ 3443{
3345 3451
3346void 3452void
3347draw (SV *self) 3453draw (SV *self)
3348 CODE: 3454 CODE:
3349{ 3455{
3350 HV *hv; 3456 HV *hv;
3351 SV **svp; 3457 SV **svp;
3352 NV x, y, w, h; 3458 NV x, y, w, h;
3353 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3354 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3355 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3356 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines