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.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines