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.302 by root, Tue Apr 20 10:53:11 2010 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 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 std::vector<tileid> tile;
264 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
265 294
266 int32_t rows; 295 int32_t rows;
267 maprow *row; 296 maprow *row;
268} *DC__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
269 307
270static char * 308static char *
271prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
272{ 310{
273 char *p; 311 char *p;
290} 328}
291 329
292#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 330#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)) 331#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294 332
295static void
296need_facenum (struct map *self, faceid face)
297{
298 while (self->faces <= face)
299 {
300 Append (tileid, self->face2tile, self->faces, self->faces);
301 self->faces *= 2;
302 }
303}
304
305static void
306need_texid (struct map *self, int texid)
307{
308 while (self->texs <= texid)
309 {
310 Append (maptex, self->tex, self->texs, self->texs);
311 self->texs *= 2;
312 }
313}
314
315static maprow * 333static maprow *
316map_get_row (DC__Map self, int y) 334map_get_row (mapgrid *self, int y)
317{ 335{
318 if (0 > y) 336 if (0 > y)
319 { 337 {
320 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
321 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
359 377
360 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
361} 379}
362 380
363static mapcell * 381static mapcell *
364map_get_cell (DC__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
365{ 383{
366 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
367} 385}
368 386
369static void 387void mapgrid::clear_cells ()
370map_clear (DC__Map self)
371{ 388{
372 int r; 389 int r;
373 390
374 for (r = 0; r < self->rows; r++) 391 for (r = 0; r < rows; r++)
375 Safefree (self->row[r].col); 392 Safefree (row[r].col);
376 393
377 Safefree (self->row); 394 Safefree (row);
378 395
379 self->x = 0; 396 x = 0;
380 self->y = 0; 397 y = 0;
381 self->ox = 0; 398 ox = 0;
382 self->oy = 0; 399 oy = 0;
383 self->row = 0; 400 row = 0;
384 self->rows = 0; 401 rows = 0;
385} 402}
386 403
387#define CELL_CLEAR(cell) \ 404#define CELL_CLEAR(cell) \
388 do { \ 405 do { \
389 if ((cell)->player) \ 406 if ((cell)->player) \
393 (cell)->flags = 0; \ 410 (cell)->flags = 0; \
394 (cell)->player = 0; \ 411 (cell)->player = 0; \
395 } while (0) 412 } while (0)
396 413
397static void 414static void
398map_blank (DC__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
399{ 416{
400 int x, y; 417 int x, y;
401 maprow *row; 418 maprow *row;
402 mapcell *cell; 419 mapcell *cell;
403 420
420 CELL_CLEAR (cell); 437 CELL_CLEAR (cell);
421 } 438 }
422 } 439 }
423} 440}
424 441
425typedef struct { 442struct smooth_key
443{
426 tileid tile; 444 tileid tile;
427 uint8_t x, y, level; 445 uint8_t x, y, level;
428} smooth_key; 446
447 bool operator == (const smooth_key &o) const
448 {
449 return tile == o.tile && x == o.x && y == o.y && level == o.level;
450 }
451};
452
453typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
454
455namespace std {
456 template <>
457 struct hash<smooth_key>
458 {
459 size_t operator () (const smooth_key &v) const
460 {
461 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
462 }
463 };
464}
429 465
430static void 466static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 468{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
434 470
435 if (SvIOK (*sv)) 471 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
437 else 473 else
438 sv_setiv (*sv, bits); 474 it->second |= bits;
439} 475}
440 476
441static void 477static void
442music_finished (void) 478music_finished (void)
443{ 479{
460 ev.code = 1; 496 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 497 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 498 ev.data2 = 0;
463 499
464 SDL_PushEvent ((SDL_Event *)&ev); 500 SDL_PushEvent ((SDL_Event *)&ev);
501}
502
503// approximately divide by 255
504static unsigned int
505div255 (unsigned int n)
506{
507 return (n + (n >> 8)) >> 8;
465} 508}
466 509
467static unsigned int 510static unsigned int
468minpot (unsigned int n) 511minpot (unsigned int n)
469{ 512{
552 595
553 return mod; 596 return mod;
554} 597}
555 598
556static void 599static void
557deliantra_main () 600deliantra_main (SV *real_main)
558{ 601{
559 char *argv[] = { 0 }; 602 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 603
604 PUSHMARK (SP);
605 call_sv (real_main, G_DISCARD | G_VOID);
561} 606}
562 607
563#ifdef __MACOSX__ 608#ifdef __MACOSX__
609 static SV *real_main;
610
564 /* to due surprising braindamage on the side of SDL design, we 611 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 612 * 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, 613 * 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, 614 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 615 * and which calls our main (== SDL_main) back.
569 */ 616 */
570 extern C_LINKAGE int 617 extern C_LINKAGE int
571 main (int argc, char *argv[]) 618 main (int argc, char *argv[])
572 { 619 {
573 deliantra_main (); 620 deliantra_main (real_main);
574 } 621 }
575 622
576 #undef main 623 #undef main
577 624
578 extern C_LINKAGE int main (int argc, char *argv[]); 625 extern C_LINKAGE int main (int argc, char *argv[]);
579 626
580 static void 627 static void
581 SDL_braino (void) 628 SDL_main_hack (SV *real_main_)
582 { 629 {
630 real_main = real_main_;
631
583 char *argv[] = { "deliantra client", 0 }; 632 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 633 (main) (1, argv);
585 } 634 }
586#else 635#else
587 static void 636 static void
588 SDL_braino (void) 637 SDL_main_hack (SV *real_main)
589 { 638 {
590 deliantra_main (); 639 deliantra_main (real_main);
591 } 640 }
592#endif 641#endif
593 642
594MODULE = Deliantra::Client PACKAGE = DC 643MODULE = Deliantra::Client PACKAGE = DC
595 644
796 845
797 const_iv (FOW_DARKNESS) 846 const_iv (FOW_DARKNESS)
798# undef const_iv 847# undef const_iv
799 }; 848 };
800 849
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 850 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 852
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 855}
807 856
846#endif 895#endif
847} 896}
848 897
849char *SDL_GetError () 898char *SDL_GetError ()
850 899
851void SDL_braino () 900void SDL_main_hack (SV *real_main)
901 PROTOTYPE: &
852 902
853int SDL_Init (U32 flags) 903int SDL_Init (U32 flags)
854 904
855int SDL_InitSubSystem (U32 flags) 905int SDL_InitSubSystem (U32 flags)
856 906
857void SDL_QuitSubSystem (U32 flags) 907void SDL_QuitSubSystem (U32 flags)
858 908
859void SDL_Quit () 909void SDL_Quit ()
860 910
861int SDL_GL_SetAttribute (int attr, int value) 911int SDL_GL_SetAttribute (int attr, int value)
912 C_ARGS: (SDL_GLattr)attr, value
862 913
863int SDL_GL_GetAttribute (int attr) 914int SDL_GL_GetAttribute (int attr)
864 CODE: 915 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 916 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 917 XSRETURN_UNDEF;
867 OUTPUT: 918 OUTPUT:
868 RETVAL 919 RETVAL
869 920
870void 921void
925 ); 976 );
926 977
927 if (RETVAL) 978 if (RETVAL)
928 { 979 {
929 av_clear (texture_av); 980 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); 981#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 982#include "glfunc.h"
934#undef GL_FUNC 983#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938 } 986 }
939} 987}
940 OUTPUT: 988 OUTPUT:
941 RETVAL 989 RETVAL
942 990
943void 991void
992SDL_WM_SetCaption (const char *title, const char *icon)
993
994void
944SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
945 996
946char * 997char *
947SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
948 1000
949int 1001int
950SDL_GetAppState () 1002SDL_GetAppState ()
951 1003
952int 1004int
953SDL_GetModState () 1005SDL_GetModState ()
954 1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
955void 1011void
1012SDL_PumpEvents ()
1013
1014void
956poll_events () 1015peep_events ()
957 PPCODE: 1016 PPCODE:
958{ 1017{
959 SDL_Event ev; 1018 SDL_Event ev;
960 1019
961 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
1027 1086
1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1087 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1029 } 1088 }
1030} 1089}
1031 1090
1091char *
1092SDL_AudioDriverName ()
1093 CODE:
1094{
1095 char buf [256];
1096 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1097 XSRETURN_UNDEF;
1098
1099 RETVAL = buf;
1100}
1101 OUTPUT:
1102 RETVAL
1103
1032int 1104int
1033Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1105Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1034 POSTCALL: 1106 POSTCALL:
1035 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
1036 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
1037 1109
1038void 1110void
1039Mix_QuerySpec () 1111Mix_QuerySpec ()
1098add_font (char *file) 1170add_font (char *file)
1099 CODE: 1171 CODE:
1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1172 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT: 1173 OUTPUT:
1102 RETVAL 1174 RETVAL
1175
1176void
1177IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1178
1179# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1180void
1181Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1103 1182
1104void 1183void
1105load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
1106 ALIAS: 1185 ALIAS:
1107 load_image_file = 1 1186 load_image_file = 1
1153 1232
1154 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
1155 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
1156 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
1157 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
1158 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 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))); 1238 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1160 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1161 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1162 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
1163 1242
1235MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1236 1315
1237PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1238 1317
1239DC::Font 1318DC::Font
1240new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1241 CODE: 1320 CODE:
1242{ 1321{
1243 int count; 1322 int count;
1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1245 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1274 PROTOTYPE: 1353 PROTOTYPE:
1275 CODE: 1354 CODE:
1276 tc_restore (); 1355 tc_restore ();
1277 1356
1278DC::Layout 1357DC::Layout
1279new (SV *class) 1358new (SV *klass)
1280 CODE: 1359 CODE:
1281 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1282 1361
1283 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1284 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1285 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1286 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1287 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1288 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1289 RETVAL->font = 0; 1368 RETVAL->font = 0;
1290 RETVAL->rc = rc_alloc ();
1291 1369
1292 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1293 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1294 OUTPUT: 1372 OUTPUT:
1295 RETVAL 1373 RETVAL
1296 1374
1297void 1375void
1298DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1299 CODE: 1377 CODE:
1300 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1301 rc_free (self->rc);
1302 Safefree (self); 1379 delete self;
1303 1380
1304void 1381void
1305set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1306 CODE: 1383 CODE:
1307{ 1384{
1433 1510
1434void 1511void
1435set_height (DC::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1436 CODE: 1513 CODE:
1437 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1438 { 1515 {
1439 self->base_height = base_height; 1516 self->base_height = base_height;
1440 layout_update_font (self); 1517 layout_update_font (self);
1441 } 1518 }
1442 1519
1443void 1520void
1561} 1638}
1562 1639
1563void 1640void
1564render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1565 CODE: 1642 CODE:
1566 rc_clear (self->rc); 1643 self->rc.clear ();
1567 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1568 self->pl, 1645 self->pl,
1569 self->rc, 1646 &self->rc,
1570 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1571 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1572 flags 1649 flags
1573 ); 1650 );
1574 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1585 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1586 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1587 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1588 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1589 1666
1590 rc_draw (self->rc); 1667 self->rc.draw ();
1591 1668
1592 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1593 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1594 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1595} 1672}
1807MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1808 1885
1809PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1810 1887
1811DC::Map 1888DC::Map
1812new (SV *class) 1889new (SV *klass)
1813 CODE: 1890 CODE:
1814 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1815 RETVAL->x = 0; 1892 RETVAL->x = 0;
1816 RETVAL->y = 0; 1893 RETVAL->y = 0;
1817 RETVAL->w = 0; 1894 RETVAL->w = 0;
1818 RETVAL->h = 0; 1895 RETVAL->h = 0;
1819 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1820 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1821 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1822 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1823 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1824 RETVAL->row = 0; 1899 RETVAL->row = 0;
1825 OUTPUT: 1900 OUTPUT:
1826 RETVAL 1901 RETVAL
1827 1902
1828void 1903void
1829DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1830 CODE: 1905 CODE:
1831{ 1906{
1832 map_clear (self);
1833 Safefree (self->face2tile);
1834 Safefree (self->tex);
1835 Safefree (self); 1907 delete self;
1836} 1908}
1837 1909
1838void 1910void
1839resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1840 CODE: 1912 CODE:
1842 self->h = map_height; 1914 self->h = map_height;
1843 1915
1844void 1916void
1845clear (DC::Map self) 1917clear (DC::Map self)
1846 CODE: 1918 CODE:
1847 map_clear (self); 1919 self->clear_cells ();
1848 1920
1849void 1921void
1850set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1851 CODE: 1923 CODE:
1852{ 1924{
1853 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1854 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1855} 1928}
1856 1929
1857void 1930void
1858set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1859 CODE: 1932 CODE:
1860{ 1933{
1861 tileid texid;
1862 maptex *tex;
1863
1864 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1865 return; 1935 return;
1866 1936
1867 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1868 return; 1938 return;
1869 1939
1870 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1871 1941
1872 if (!texid) 1942 if (!texid)
1873 return; 1943 return;
1874 1944
1875 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1876 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1877 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1878} 1948}
1879 1949
1880void 1950void
1881set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1951set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1882 CODE: 1952 CODE:
1883{ 1953{
1884 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1885 1955
1886 { 1956 {
1887 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1888 1958
1889 tex->name = name; 1959 tex.name = name;
1890 tex->w = w; 1960 tex.w = w;
1891 tex->h = h; 1961 tex.h = h;
1892 tex->s = s; 1962 tex.s = s;
1893 tex->t = t; 1963 tex.t = t;
1894 tex->r = r; 1964 tex.r = r;
1895 tex->g = g; 1965 tex.g = g;
1896 tex->b = b; 1966 tex.b = b;
1897 tex->a = a; 1967 tex.a = a;
1898 } 1968 }
1899 1969
1900 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1901 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1902 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1908} 1978}
1909 1979
1910void 1980void
1911expire_textures (DC::Map self, int texid, int count) 1981expire_textures (DC::Map self, int texid, int count)
1912 PPCODE: 1982 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count) 1983 for (; texid < self->tex.size () && count; ++texid, --count)
1914 { 1984 {
1915 maptex *tex = self->tex + texid; 1985 maptex &tex = self->tex[texid];
1916 1986
1917 if (tex->name) 1987 if (tex.name)
1918 { 1988 {
1919 if (tex->unused) 1989 if (tex.unused)
1920 { 1990 {
1921 tex->name = 0; 1991 tex.name = 0;
1922 tex->unused = 0; 1992 tex.unused = 0;
1923 XPUSHs (sv_2mortal (newSViv (texid))); 1993 XPUSHs (sv_2mortal (newSViv (texid)));
1924 } 1994 }
1925 else 1995 else
1926 tex->unused = 1; 1996 tex.unused = 1;
1927 } 1997 }
1928 } 1998 }
1929 1999
1930int 2000int
1931ox (DC::Map self) 2001ox (DC::Map self)
1973 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1974 } 2044 }
1975} 2045}
1976 2046
1977SV * 2047SV *
1978map1a_update (DC::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1979 CODE: 2049 CODE:
1980{ 2050{
1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1982 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1983 mapcell *cell; 2053 mapcell *cell;
2004 2074
2005 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
2006 2076
2007 if (flags & 8) 2077 if (flags & 8)
2008 { 2078 {
2079 uint8_t ext, cmd;
2080
2009 if (extmap) 2081 do
2010 { 2082 {
2011 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
2012 2085
2013 do 2086 if (cmd < 4)
2087 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2088 else if (cmd == 5) // health
2014 { 2089 {
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; 2090 cell->stat_width = 1;
2023 cell->stat_hp = *data++; 2091 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 } 2092 }
2043 while (ext & 0x80); 2093 else if (cmd == 6) // monster width
2094 cell->stat_width = *data++ + 1;
2095 else if (cmd == 0x47)
2096 {
2097 if (*data == 1) cell->player = data [1];
2098 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2099 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2100 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2101
2102 data += *data + 1;
2103 }
2104 else if (cmd == 8) // cell flags
2105 cell->flags = *data++;
2106 else if (ext & 0x40) // unknown, multibyte => skip
2107 data += *data + 1;
2108 else
2109 data++;
2044 } 2110 }
2045 else 2111 while (ext & 0x80);
2046 cell->darkness = *data++ + 1;
2047 } 2112 }
2048 2113
2049 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
2050 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
2051 { 2116 {
2052 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
2053 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
2054 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
2055 2120
2056 if (cell->tile [z]) 2121 if (cell->tile[z])
2057 { 2122 {
2058 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2059 tex->unused = 0; 2124 tex.unused = 0;
2060 if (!tex->name) 2125 if (!tex.name)
2061 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
2062 2127
2063 if (tex->smoothtile) 2128 if (tex.smoothtile)
2064 { 2129 {
2065 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2066 smooth->unused = 0; 2131 smooth.unused = 0;
2067 if (!smooth->name) 2132 if (!smooth.name)
2068 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
2069 } 2134 }
2070 } 2135 }
2071 } 2136 }
2072 } 2137 }
2073 else 2138 else
2099 ? self->row + y 2164 ? self->row + y
2100 : 0; 2165 : 0;
2101 2166
2102 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
2103 { 2168 {
2104 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
2105 2170
2106 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
2107 { 2172 {
2108 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
2109 2174
2111 { 2176 {
2112 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
2113 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
2114 int a1 = tex.a; 2179 int a1 = tex.a;
2115 2180
2116 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
2117 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
2118 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
2119 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
2120 } 2185 }
2121 } 2186 }
2122 2187
2123 *map++ = (r ) 2188 *map++ = (r )
2124 | (g << 8) 2189 | (g << 8)
2125 | (b << 16) 2190 | (b << 16)
2126 | (a << 24); 2191 | (a << 24);
2127 } 2192 }
2128 } 2193 }
2129 2194
2130 RETVAL = map_sv; 2195 RETVAL = map_sv;
2131} 2196}
2132 OUTPUT: 2197 OUTPUT:
2133 RETVAL 2198 RETVAL
2134 2199
2135void 2200void
2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2201draw (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: 2202 CODE:
2138{ 2203{
2139 int x, y, z; 2204 int x, y, z;
2140 2205
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) 2206 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; 2207 int pl_x, pl_y;
2146 maptex pl_tex; 2208 maptex pl_tex;
2147 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2148 rc_t *rc_ov = rc_alloc (); 2210 rc_t rc_ov;
2149 rc_key_t key; 2211 rc_key_t key;
2150 rc_array_t *arr; 2212 rc_t::array_t *arr;
2151 2213
2152 pl_tex.name = 0; 2214 pl_tex.name = 0;
2153 2215
2154 // that's current max. sorry. 2216 // that's current max. sorry.
2155 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
2156 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
2157
2158 // clear key, in case of extra padding
2159 memset (&skey, 0, sizeof (skey));
2160 2219
2161 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
2162 key.r = 255; 2221 key.r = 255;
2163 key.g = 255; 2222 key.g = 255;
2164 key.b = 255; 2223 key.b = 255;
2170 my += self->y; 2229 my += self->y;
2171 2230
2172 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
2173 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
2174 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
2175 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2176 2235
2177 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
2179 { 2238 {
2180 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
2195 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2197 2256
2198 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2199 { 2258 {
2200 memset (smooth_level, 0, sizeof (smooth_level)); 2259 std::bitset<256> smooth_level; // one bit for every possible smooth level
2260 smooth_key skey;
2261 smooth_hash smooth;
2201 key.texname = -1; 2262 key.texname = -1;
2202 2263
2203 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
2204 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
2205 { 2266 {
2222 2283
2223 if (!tex.name) 2284 if (!tex.name)
2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2225 2286
2226 key.texname = tex.name; 2287 key.texname = tex.name;
2227 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
2228 } 2289 }
2229 2290
2230 px = (x + 1) * T - tex.w; 2291 px = (x + 1) * Th - tex.w;
2231 py = (y + 1) * T - tex.h; 2292 py = (y + 1) * Tw - tex.h;
2232 2293
2233 if (expect_false (cell->player == player) && expect_false (z == 2)) 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
2234 { 2295 {
2235 pl_x = px; 2296 pl_x = px;
2236 pl_y = py; 2297 pl_y = py;
2237 pl_tex = tex; 2298 pl_tex = tex;
2238 continue; 2299 continue;
2239 } 2300 }
2240 2301
2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2302 arr->t2f_v3f (0 , 0 , px , py , 0);
2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2303 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); 2304 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); 2305 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2245 2306
2246 // update smooth hash 2307 // update smooth hash
2247 if (tex.smoothtile) 2308 if (tex.smoothtile)
2248 { 2309 {
2249 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
2250 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
2251 2312
2252 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
2253 2314
2254 // add bits to current tile and all neighbours. skey.x|y is 2315 // add bits to current tile and all neighbours. skey.x|y is
2255 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
2256 2317
2257 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
2265 2326
2266 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2267 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
2268 2329
2269 // full tile 2330 // full tile
2270 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2331 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2271 2332
2272 // borders 2333 // borders
2273 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2334 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); 2335 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); 2336 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); 2337 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2277 2338
2278 // corners 2339 // corners
2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2340 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); 2341 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); 2342 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); 2343 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2283 } 2344 }
2284 } 2345 }
2285 2346
2286 if (expect_false (z == 2) && expect_false (cell->flags)) 2347 if (expect_false (z == 2) && expect_false (cell->flags))
2287 { 2348 {
2288 // overlays such as the speech bubble, probably more to come 2349 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1) 2350 if (cell->flags & 1)
2290 { 2351 {
2291 rc_key_t key_ov = key; 2352 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH]; 2353 maptex tex = self->tex[TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32; 2354 int px = x * Tw + Tw * 2 / 32;
2295 int py = y * T - T * 6 / 32; 2355 int py = y * Th - Th * 6 / 32;
2296 2356
2297 key_ov.texname = tex.name; 2357 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov); 2358 rc_t::array_t &arr = rc_ov.array (key_ov);
2299 2359
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2360 arr.t2f_v3f (0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2361 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2362 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2363 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2304 } 2364 }
2305 } 2365 }
2306 } 2366 }
2307 } 2367 }
2308 2368
2309 rc_draw (rc); 2369 rc.draw ();
2310 rc_clear (rc); 2370 rc.clear ();
2311 2371
2312 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
2313 // this is basically counting sort 2373 // this is basically counting sort
2314 { 2374 {
2315 int w, b; 2375 int w, b;
2316 2376
2317 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
2318 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
2319 for (w = 0; w < 256 / 32; ++w) 2379 for (int level = 0; level < smooth_level.size (); ++level)
2380 if (smooth_level[level])
2381 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2320 { 2382 {
2321 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
2322 if (smask) 2384 IV bits = it->second;
2323 for (b = 0; b < 32; ++b) 2385
2324 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
2325 { 2389 {
2326 int level = (w << 5) | b; 2390 maptex tex = self->tex [skey.tile];
2391 int px = (((int)skey.x) - 1) * Tw;
2392 int py = (((int)skey.y) - 1) * Th;
2393 int border = bits & 15;
2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2395 float dx = tex.s * .0625f; // 16 images/row
2396 float dy = tex.t * .5f ; // 2 images/column
2397
2327 HE *he; 2398 if (tex.name)
2328
2329 hv_iterinit (smooth);
2330 while ((he = hv_iternext (smooth)))
2331 { 2399 {
2332 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
2333 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
2334 2402 if (key.texname != tex.name)
2335 if (!(bits & 0x1000)
2336 && skey->level == level
2337 && level > smooth_max [skey->x][skey->y])
2338 { 2403 {
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; 2404 self->tex [skey.tile].unused = 0;
2354 2405
2355 glEnd (); 2406 glEnd ();
2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2357 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2358 } 2409 }
2359 2410
2360 if (border) 2411 if (border)
2361 { 2412 {
2362 float ox = border * dx; 2413 float ox = border * dx;
2363 2414
2364 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2365 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2366 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2367 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2368 } 2419 }
2369 2420
2370 if (corner) 2421 if (corner)
2371 { 2422 {
2372 float ox = corner * dx; 2423 float ox = corner * dx;
2373 2424
2374 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2375 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2376 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2377 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2378 }
2379 }
2380 } 2429 }
2381 } 2430 }
2382 } 2431 }
2383 } 2432 }
2384 2433
2385 glEnd (); 2434 glEnd ();
2386 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2387 key.texname = -1; 2436 key.texname = -1;
2388 } 2437 }
2389
2390 hv_clear (smooth);
2391 } 2438 }
2392 2439
2393 if (pl_tex.name) 2440 if (pl_tex.name)
2394 { 2441 {
2395 maptex tex = pl_tex; 2442 maptex tex = pl_tex;
2396 int px = pl_x + sdx; 2443 int px = pl_x + sdx;
2397 int py = pl_y + sdy; 2444 int py = pl_y + sdy;
2398 2445
2399 key.texname = tex.name; 2446 key.texname = tex.name;
2400 arr = rc_array (rc, &key); 2447 rc_t::array_t &arr = rc.array (key);
2401 2448
2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2449 arr.t2f_v3f (0 , 0 , px , py , 0);
2403 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2450 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); 2451 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); 2452 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2406 2453
2407 rc_draw (rc); 2454 rc.draw ();
2408 } 2455 }
2409 2456
2410 rc_draw (rc_ov); 2457 rc_ov.draw ();
2411 rc_clear (rc_ov); 2458 rc_ov.clear ();
2412 2459
2413 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2414 rc_free (rc);
2415 rc_free (rc_ov);
2416 2461
2417 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2418 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2419 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2420 { 2465 {
2423 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2424 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2425 { 2470 {
2426 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2427 2472
2428 int px = x * T; 2473 int px = x * Tw;
2429 int py = y * T; 2474 int py = y * Th;
2430 2475
2431 if (expect_false (cell->player == player)) 2476 if (expect_false (cell->player == player))
2432 { 2477 {
2433 px += sdx; 2478 px += sdx;
2434 py += sdy; 2479 py += sdy;
2435 } 2480 }
2436 2481
2437 if (cell->stat_hp) 2482 if (cell->stat_hp)
2438 { 2483 {
2439 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2441 2486
2442 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2443 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2444 px + width - 1, py); 2489 px + width - 1, py);
2445 2490
2525 int x, y; 2570 int x, y;
2526 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2527 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2528 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2529 int sw3 = sw * 3; 2574 int sw3 = sw * 3;
2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2575 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2576 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2578 memset (darkness1, 0, sw1*sh1);
2533 2579
2534 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2535 SvCUR_set (darkness3_sv, sw3 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2536 2582
2537 mx += self->x - 1; 2583 mx += self->x - 1;
2663 else 2709 else
2664 *data++ = 0; 2710 *data++ = 0;
2665 } 2711 }
2666 } 2712 }
2667 2713
2668 /* if size is w*h + 5 then no data has been found */ 2714 /* if size is w*h + 5 then no data has been found */
2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2715 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2670 { 2716 {
2671 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 } 2719 }
2674 2720
2675 RETVAL = data_sv; 2721 RETVAL = data_sv;
2676} 2722}
2677 OUTPUT: 2723 OUTPUT:
2678 RETVAL 2724 RETVAL
2679 2725
2680void 2726void
2687 STRLEN len; 2733 STRLEN len;
2688 uint8_t *data, *end; 2734 uint8_t *data, *end;
2689 2735
2690 len = SvLEN (data_sv); 2736 len = SvLEN (data_sv);
2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2737 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692 data = SvPVbyte_nolen (data_sv); 2738 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2693 end = data + len + 8; 2739 end = data + len + 8;
2694 2740
2695 if (len < 5) 2741 if (len < 5)
2696 XSRETURN_EMPTY; 2742 XSRETURN_EMPTY;
2697 2743
2741 2787
2742 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2743 { 2789 {
2744 tileid t = tile [z]; 2790 tileid t = tile [z];
2745 2791
2746 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2747 { 2793 {
2748 PUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2749 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2750 } 2796 }
2751 2797
2752 cell->tile [z] = t; 2798 cell->tile[z] = t;
2753 } 2799 }
2754 } 2800 }
2755 } 2801 }
2756 } 2802 }
2757 } 2803 }
2758} 2804}
2759 2805
2760MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2761 2807
2762DC::RW 2808DC::RW
2763new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2764 CODE: 2810 CODE:
2765{ 2811{
2766 STRLEN datalen; 2812 STRLEN datalen;
2767 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2768 2814
2770} 2816}
2771 OUTPUT: 2817 OUTPUT:
2772 RETVAL 2818 RETVAL
2773 2819
2774DC::RW 2820DC::RW
2775new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2776 CODE: 2822 CODE:
2777 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2778 OUTPUT: 2824 OUTPUT:
2779 RETVAL 2825 RETVAL
2780 2826
2889#else 2935#else
2890 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2936 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2891#endif 2937#endif
2892 2938
2893DC::MixChunk 2939DC::MixChunk
2894new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2895 CODE: 2941 CODE:
2896 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2897 OUTPUT: 2943 OUTPUT:
2898 RETVAL 2944 RETVAL
2899 2945
2969 RETVAL = Mix_PlayingMusic (); 3015 RETVAL = Mix_PlayingMusic ();
2970 OUTPUT: 3016 OUTPUT:
2971 RETVAL 3017 RETVAL
2972 3018
2973DC::MixMusic 3019DC::MixMusic
2974new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
2975 CODE: 3021 CODE:
2976 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2977 OUTPUT: 3023 OUTPUT:
2978 RETVAL 3024 RETVAL
2979 3025
3116 const_iv (GL_FUNC_SUBTRACT), 3162 const_iv (GL_FUNC_SUBTRACT),
3117 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3163 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3118# undef const_iv 3164# undef const_iv
3119 }; 3165 };
3120 3166
3121 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3167 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3122 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3123 3169
3124 texture_av = newAV (); 3170 texture_av = newAV ();
3125 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
3126} 3172}
3127 3173
3132 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
3133 3179
3134void 3180void
3135apple_nvidia_bug (int enable) 3181apple_nvidia_bug (int enable)
3136 3182
3137char * 3183const char *
3138gl_vendor () 3184gl_vendor ()
3139 CODE: 3185 CODE:
3140 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
3141 OUTPUT: 3187 OUTPUT:
3142 RETVAL 3188 RETVAL
3143 3189
3144char * 3190const char *
3145gl_version () 3191gl_version ()
3146 CODE: 3192 CODE:
3147 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
3148 OUTPUT: 3194 OUTPUT:
3149 RETVAL 3195 RETVAL
3150 3196
3151char * 3197const char *
3152gl_extensions () 3198gl_extensions ()
3153 CODE: 3199 CODE:
3154 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3155 OUTPUT: 3201 OUTPUT:
3156 RETVAL 3202 RETVAL
3157 3203
3158const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
3159 3209
3160GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
3161 CODE: 3211 CODE:
3162 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
3163 OUTPUT: 3213 OUTPUT:
3170 RETVAL 3220 RETVAL
3171 3221
3172int glGetError () 3222int glGetError ()
3173 3223
3174void glFinish () 3224void glFinish ()
3225
3226void glFlush ()
3175 3227
3176void glClear (int mask) 3228void glClear (int mask)
3177 3229
3178void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
3179 PROTOTYPE: @ 3231 PROTOTYPE: @
3364 3416
3365void 3417void
3366find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
3367 PPCODE: 3419 PPCODE:
3368{ 3420{
3369 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
3370 XPUSHs (self); 3422 XPUSHs (self);
3371} 3423}
3372 3424
3373BOOT: 3425BOOT:
3374{ 3426{
3382 3434
3383void 3435void
3384draw (SV *self) 3436draw (SV *self)
3385 CODE: 3437 CODE:
3386{ 3438{
3387 HV *hv; 3439 HV *hv;
3388 SV **svp; 3440 SV **svp;
3389 NV x, y, w, h; 3441 NV x, y, w, h;
3390 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
3391 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
3392 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
3393 SV *draw_h_sv = GvSV (draw_h_gv); 3445 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines