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.279 by root, Thu Oct 2 15:59:40 2008 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 roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef 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);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
92 101
93/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
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}
97 128
98static AV *texture_av; 129static AV *texture_av;
99 130
100static struct 131static struct
101{ 132{
158{ 189{
159 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
160 191
161 while (attrs) 192 while (attrs)
162 { 193 {
163 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 195
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 197 return 1;
167 198
168 attrs = attrs->next; 199 attrs = attrs->next;
169 } 200 }
170 201
171 return 0; 202 return 0;
172} 203}
173 204
174typedef struct cf_layout { 205struct cf_layout {
175 PangoLayout *pl; 206 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
177 int base_height; 208 int base_height;
178 DC__Font font; 209 DC__Font font;
179 rc_t *rc; 210 rc_t rc;
180} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
181 214
182static DC__Font default_font; 215static DC__Font default_font;
183static PangoContext *opengl_context; 216static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
185 218
186static void 219static void
187substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
188{ 221{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 225#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 227}
195 228
196static void 229static void
226} 259}
227 260
228typedef uint16_t tileid; 261typedef uint16_t tileid;
229typedef uint16_t faceid; 262typedef uint16_t faceid;
230 263
231typedef struct { 264struct maptex
265{
232 GLuint name; 266 GLuint name;
233 int w, h; 267 int w, h;
234 float s, t; 268 float s, t;
235 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
236 tileid smoothtile; 270 tileid smoothtile;
237 uint8_t smoothlevel; 271 uint8_t smoothlevel;
238} maptex; 272 uint8_t unused; /* set to zero on use */
273};
239 274
240typedef struct { 275struct mapcell
276{
241 uint32_t player; 277 uint32_t player;
242 tileid tile[3]; 278 tileid tile[3];
243 uint16_t darkness; 279 uint16_t darkness;
244 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
245} mapcell; 281};
246 282
247typedef struct { 283struct maprow
284{
248 int32_t c0, c1; 285 int32_t c0, c1;
249 mapcell *col; 286 mapcell *col;
250} maprow; 287};
251 288
252typedef struct map { 289struct mapgrid {
253 int x, y, w, h; 290 int x, y, w, h;
254 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
255 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
256 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
257 294
258 int32_t rows; 295 int32_t rows;
259 maprow *row; 296 maprow *row;
260} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
261 300
262static char * 301static char *
263prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
264{ 303{
265 char *p; 304 char *p;
283 322
284#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))
285#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))
286 325
287static void 326static void
288need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
289{ 328{
290 while (self->faces <= face) 329 while (self->faces <= face)
291 { 330 {
292 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
293 self->faces *= 2; 332 self->faces *= 2;
294 } 333 }
295} 334}
296 335
297static void 336static void
298need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
299{ 338{
300 while (self->texs <= texid) 339 while (self->texs <= texid)
301 { 340 {
302 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
303 self->texs *= 2; 342 self->texs *= 2;
304 } 343 }
305} 344}
306 345
307static maprow * 346static maprow *
308map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
309{ 348{
310 if (0 > y) 349 if (0 > y)
311 { 350 {
312 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
313 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
351 390
352 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
353} 392}
354 393
355static mapcell * 394static mapcell *
356map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
357{ 396{
358 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
359} 398}
360 399
361static void 400static void
362map_clear (DC__Map self) 401map_clear (mapgrid *self)
363{ 402{
364 int r; 403 int r;
365 404
366 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
367 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
385 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
386 (cell)->player = 0; \ 425 (cell)->player = 0; \
387 } while (0) 426 } while (0)
388 427
389static void 428static void
390map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
391{ 430{
392 int x, y; 431 int x, y;
393 maprow *row; 432 maprow *row;
394 mapcell *cell; 433 mapcell *cell;
395 434
412 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
413 } 452 }
414 } 453 }
415} 454}
416 455
417typedef struct { 456struct smooth_key
457{
418 tileid tile; 458 tileid tile;
419 uint8_t x, y, level; 459 uint8_t x, y, level;
420} 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}
421 479
422static void 480static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
424{ 482{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
426 484
427 if (SvIOK (*sv)) 485 if (it == h.end ())
428 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
429 else 487 else
430 sv_setiv (*sv, bits); 488 it->second |= bits;
431} 489}
432 490
433static void 491static void
434music_finished (void) 492music_finished (void)
435{ 493{
452 ev.code = 1; 510 ev.code = 1;
453 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
454 ev.data2 = 0; 512 ev.data2 = 0;
455 513
456 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;
457} 522}
458 523
459static unsigned int 524static unsigned int
460minpot (unsigned int n) 525minpot (unsigned int n)
461{ 526{
544 609
545 return mod; 610 return mod;
546} 611}
547 612
548static void 613static void
549deliantra_main () 614deliantra_main (SV *real_main)
550{ 615{
551 char *argv[] = { 0 }; 616 dSP;
552 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
553} 620}
554 621
555#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
556 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
558 * 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,
559 * 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,
560 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
561 */ 630 */
562 extern C_LINKAGE int 631 extern C_LINKAGE int
563 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
564 { 633 {
565 deliantra_main (); 634 deliantra_main (real_main);
566 } 635 }
567 636
568 #undef main 637 #undef main
569 638
570 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
571 640
572 static void 641 static void
573 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
574 { 643 {
644 real_main = real_main_;
645
575 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv); 647 (main) (1, argv);
577 } 648 }
578#else 649#else
579 static void 650 static void
580 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
581 { 652 {
582 deliantra_main (); 653 deliantra_main (real_main);
583 } 654 }
584#endif 655#endif
585 656
586MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
587 658
788 859
789 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
790# undef const_iv 861# undef const_iv
791 }; 862 };
792 863
793 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--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795 866
796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798} 869}
799 870
815NV ceil (NV x) 886NV ceil (NV x)
816 887
817IV minpot (UV n) 888IV minpot (UV n)
818 889
819IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
820 897
821void 898void
822pango_init () 899pango_init ()
823 CODE: 900 CODE:
824{ 901{
832#endif 909#endif
833} 910}
834 911
835char *SDL_GetError () 912char *SDL_GetError ()
836 913
837void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
838 916
839int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
840 918
841int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
842 920
843void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
844 922
845void SDL_Quit () 923void SDL_Quit ()
846 924
847int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
848 927
849int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
850 CODE: 929 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
852 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
853 OUTPUT: 932 OUTPUT:
854 RETVAL 933 RETVAL
855 934
856void 935void
911 ); 990 );
912 991
913 if (RETVAL) 992 if (RETVAL)
914 { 993 {
915 av_clear (texture_av); 994 av_clear (texture_av);
916
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918#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);
919#include "glfunc.h" 996#include "glfunc.h"
920#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921 } 1000 }
922} 1001}
923 OUTPUT: 1002 OUTPUT:
924 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
925 1007
926void 1008void
927SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
928 1010
929char * 1011char *
930SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
931 1014
932int 1015int
933SDL_GetAppState () 1016SDL_GetAppState ()
934 1017
935int 1018int
936SDL_GetModState () 1019SDL_GetModState ()
937 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
938void 1025void
1026SDL_PumpEvents ()
1027
1028void
939poll_events () 1029peep_events ()
940 PPCODE: 1030 PPCODE:
941{ 1031{
942 SDL_Event ev; 1032 SDL_Event ev;
943 1033
944 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
1010 1100
1011 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))));
1012 } 1102 }
1013} 1103}
1014 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
1015int 1118int
1016Mix_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)
1017 POSTCALL: 1120 POSTCALL:
1018 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1019 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1020 1123
1021void 1124void
1022Mix_QuerySpec () 1125Mix_QuerySpec ()
1081add_font (char *file) 1184add_font (char *file)
1082 CODE: 1185 CODE:
1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT: 1187 OUTPUT:
1085 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)
1086 1196
1087void 1197void
1088load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1089 ALIAS: 1199 ALIAS:
1090 load_image_file = 1 1200 load_image_file = 1
1136 1246
1137 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1138 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1139 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1140 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1141 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1142 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)));
1143 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1144 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1145 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1146 1256
1206#if DEBUG 1316#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1208#endif 1318#endif
1209} 1319}
1210 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1329
1213PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1214 1331
1215DC::Font 1332DC::Font
1216new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1217 CODE: 1334 CODE:
1218{ 1335{
1219 int count; 1336 int count;
1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1221 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1250 PROTOTYPE: 1367 PROTOTYPE:
1251 CODE: 1368 CODE:
1252 tc_restore (); 1369 tc_restore ();
1253 1370
1254DC::Layout 1371DC::Layout
1255new (SV *class) 1372new (SV *klass)
1256 CODE: 1373 CODE:
1257 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1258 1375
1259 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1260 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1261 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1262 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1263 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1264 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1265 RETVAL->font = 0; 1382 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
1267 1383
1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1269 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1270 OUTPUT: 1386 OUTPUT:
1271 RETVAL 1387 RETVAL
1272 1388
1273void 1389void
1274DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1275 CODE: 1391 CODE:
1276 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1277 rc_free (self->rc);
1278 Safefree (self); 1393 delete self;
1279 1394
1280void 1395void
1281set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1282 CODE: 1397 CODE:
1283{ 1398{
1409 1524
1410void 1525void
1411set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1412 CODE: 1527 CODE:
1413 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1414 { 1529 {
1415 self->base_height = base_height; 1530 self->base_height = base_height;
1416 layout_update_font (self); 1531 layout_update_font (self);
1417 } 1532 }
1418 1533
1419void 1534void
1537} 1652}
1538 1653
1539void 1654void
1540render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1541 CODE: 1656 CODE:
1542 rc_clear (self->rc); 1657 self->rc.clear ();
1543 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1544 self->pl, 1659 self->pl,
1545 self->rc, 1660 &self->rc,
1546 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1547 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1548 flags 1663 flags
1549 ); 1664 );
1550 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1565 1680
1566 rc_draw (self->rc); 1681 self->rc.draw ();
1567 1682
1568 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1571} 1686}
1646 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1648 } 1763 }
1649} 1764}
1650 1765
1766void
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)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1888 CODE:
1653{ 1889{
1654 GLint width; 1890 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1662MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1663 1899
1664PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1665 1901
1666DC::Map 1902DC::Map
1667new (SV *class) 1903new (SV *klass)
1668 CODE: 1904 CODE:
1669 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1670 RETVAL->x = 0; 1906 RETVAL->x = 0;
1671 RETVAL->y = 0; 1907 RETVAL->y = 0;
1672 RETVAL->w = 0; 1908 RETVAL->w = 0;
1673 RETVAL->h = 0; 1909 RETVAL->h = 0;
1674 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1711 1947
1712void 1948void
1713set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1714 CODE: 1950 CODE:
1715{ 1951{
1716 tileid texid; 1952 tileid texid;
1717 maptex *tex; 1953 maptex *tex;
1718 1954
1719 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1720 return; 1956 return;
1721 1957
1722 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1723 return; 1959 return;
1724 1960
1725 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1726 1962
1727 if (!texid) 1963 if (!texid)
1728 return; 1964 return;
1729 1965
1730 tex = self->tex + texid; 1966 tex = self->tex + texid;
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1995 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1999}
2000
2001void
2002expire_textures (DC::Map self, int texid, int count)
2003 PPCODE:
2004 for (; texid < self->texs && count; ++texid, --count)
2005 {
2006 maptex *tex = self->tex + texid;
2007
2008 if (tex->name)
2009 {
2010 if (tex->unused)
2011 {
2012 tex->name = 0;
2013 tex->unused = 0;
2014 XPUSHs (sv_2mortal (newSViv (texid)));
2015 }
2016 else
2017 tex->unused = 1;
2018 }
2019 }
1764 2020
1765int 2021int
1766ox (DC::Map self) 2022ox (DC::Map self)
1767 ALIAS: 2023 ALIAS:
1768 oy = 1 2024 oy = 1
1808 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1809 } 2065 }
1810} 2066}
1811 2067
1812SV * 2068SV *
1813map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1814 CODE: 2070 CODE:
1815{ 2071{
1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1817 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1818 mapcell *cell; 2074 mapcell *cell;
1839 2095
1840 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1841 2097
1842 if (flags & 8) 2098 if (flags & 8)
1843 { 2099 {
2100 uint8_t ext, cmd;
2101
1844 if (extmap) 2102 do
1845 { 2103 {
1846 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1847 2106
1848 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
1849 { 2110 {
1850 ext = *data++;
1851 cmd = ext & 0x7f;
1852
1853 if (cmd < 4)
1854 cell->darkness = 255 - ext * 64 + 1;
1855 else if (cmd == 5) // health
1856 {
1857 cell->stat_width = 1; 2111 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1859 }
1860 else if (cmd == 6) // monster width
1861 cell->stat_width = *data++ + 1;
1862 else if (cmd == 0x47)
1863 {
1864 if (*data == 1) cell->player = data [1];
1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1868
1869 data += *data + 1;
1870 }
1871 else if (cmd == 8) // cell flags
1872 cell->flags = *data++;
1873 else if (ext & 0x40) // unknown, multibyte => skip
1874 data += *data + 1;
1875 else
1876 data++;
1877 } 2113 }
1878 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++;
1879 } 2131 }
1880 else 2132 while (ext & 0x80);
1881 cell->darkness = *data++ + 1;
1882 } 2133 }
1883 2134
1884 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1885 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1886 { 2137 {
1889 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1890 2141
1891 if (cell->tile [z]) 2142 if (cell->tile [z])
1892 { 2143 {
1893 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1894 if (!tex->name) 2146 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1896 2148
1897 if (tex->smoothtile) 2149 if (tex->smoothtile)
1898 { 2150 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1900 if (!smooth->name) 2153 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1902 } 2155 }
1903 } 2156 }
1904 } 2157 }
1932 ? self->row + y 2185 ? self->row + y
1933 : 0; 2186 : 0;
1934 2187
1935 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1936 { 2189 {
1937 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2191
1939 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1940 { 2193 {
1941 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1942 2195
1944 { 2197 {
1945 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2200 int a1 = tex.a;
1948 2201
1949 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1953 } 2206 }
1954 } 2207 }
1955 2208
1956 *map++ = (r ) 2209 *map++ = (r )
1957 | (g << 8) 2210 | (g << 8)
1958 | (b << 16) 2211 | (b << 16)
1959 | (a << 24); 2212 | (a << 24);
1960 } 2213 }
1961 } 2214 }
1962 2215
1963 RETVAL = map_sv; 2216 RETVAL = map_sv;
1964} 2217}
1965 OUTPUT: 2218 OUTPUT:
1966 RETVAL 2219 RETVAL
1967 2220
1968void 2221void
1969draw (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)
1970 CODE: 2223 CODE:
1971{ 2224{
1972 int x, y, z; 2225 int x, y, z;
1973 2226
1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976 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!
1977 smooth_key skey;
1978 int pl_x, pl_y; 2228 int pl_x, pl_y;
1979 maptex pl_tex; 2229 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1981 rc_key_t key; 2232 rc_key_t key;
1982 rc_array_t *arr; 2233 rc_t::array_t *arr;
1983 2234
1984 pl_tex.name = 0; 2235 pl_tex.name = 0;
1985 2236
1986 // thats current max. sorry. 2237 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1989
1990 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey));
1992 2240
1993 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1994 key.r = 255; 2242 key.r = 255;
1995 key.g = 255; 2243 key.g = 255;
1996 key.b = 255; 2244 key.b = 255;
1997 key.a = 255; 2245 key.a = 255;
1998 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2248
2002 mx += self->x; 2249 mx += self->x;
2003 my += self->y; 2250 my += self->y;
2004 2251
2005 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
2006 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
2007 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
2008 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2009 2256
2010 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
2011 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
2012 { 2259 {
2013 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2277
2031 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
2032 { 2279 {
2033 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;
2283 key.texname = -1;
2034 2284
2035 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
2037 { 2287 {
2038 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
2045 2295
2046 if (tile) 2296 if (tile)
2047 { 2297 {
2048 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2299 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2300
2052 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
2053 { 2302 {
2303 self->tex [tile].unused = 0;
2304
2054 if (!tex.name) 2305 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2307
2057 key.texname = tex.name; 2308 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
2059 } 2310 }
2311
2312 px = (x + 1) * Th - tex.w;
2313 py = (y + 1) * Tw - tex.h;
2060 2314
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 { 2316 {
2063 pl_x = px; 2317 pl_x = px;
2064 pl_y = py; 2318 pl_y = py;
2065 pl_tex = tex; 2319 pl_tex = tex;
2066 continue; 2320 continue;
2067 } 2321 }
2068 2322
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2071 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);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098 2327
2099 // update smooth hash 2328 // update smooth hash
2100 if (tex.smoothtile) 2329 if (tex.smoothtile)
2101 { 2330 {
2102 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
2104 2333
2105 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
2106 2335
2107 // 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
2108 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
2109 2338
2110 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
2118 2347
2119 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2120 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
2121 2350
2122 // full tile 2351 // full tile
2123 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);
2124 2353
2125 // borders 2354 // borders
2126 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);
2127 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);
2128 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);
2129 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);
2130 2359
2131 // corners 2360 // corners
2132 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);
2133 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);
2134 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);
2135 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);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2136 } 2385 }
2137 } 2386 }
2138 } 2387 }
2139 } 2388 }
2140 2389
2141 rc_draw (rc); 2390 rc.draw ();
2142 rc_clear (rc); 2391 rc.clear ();
2143 2392
2144 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2145 // this is basically counting sort 2394 // this is basically counting sort
2146 { 2395 {
2147 int w, b; 2396 int w, b;
2148 2397
2149 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2151 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)
2152 { 2403 {
2153 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2154 if (smask) 2405 IV bits = it->second;
2155 for (b = 0; b < 32; ++b) 2406
2156 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2157 { 2410 {
2158 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
2159 HE *he; 2419 if (tex.name)
2160
2161 hv_iterinit (smooth);
2162 while ((he = hv_iternext (smooth)))
2163 { 2420 {
2164 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2165 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2166 2423 if (key.texname != tex.name)
2167 if (!(bits & 0x1000)
2168 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y])
2170 { 2424 {
2171 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
2172 int px = (((int)skey->x) - 1) * T;
2173 int py = (((int)skey->y) - 1) * T;
2174 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column
2178 2426
2179 if (tex.name)
2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
2183 if (key.texname != tex.name)
2184 {
2185 glEnd (); 2427 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2188 } 2430 }
2189 2431
2190 if (border) 2432 if (border)
2191 { 2433 {
2192 float ox = border * dx; 2434 float ox = border * dx;
2193 2435
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2440 }
2199 2441
2200 if (corner) 2442 if (corner)
2201 { 2443 {
2202 float ox = corner * dx; 2444 float ox = corner * dx;
2203 2445
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 }
2209 }
2210 } 2450 }
2211 } 2451 }
2212 } 2452 }
2213 } 2453 }
2214 2454
2215 glEnd (); 2455 glEnd ();
2216 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1; 2457 key.texname = -1;
2218 } 2458 }
2219
2220 hv_clear (smooth);
2221 } 2459 }
2222 2460
2223 if (pl_tex.name) 2461 if (pl_tex.name)
2224 { 2462 {
2225 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2226 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2227 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2228 2466
2229 key.texname = tex.name; 2467 key.texname = tex.name;
2230 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2231 2469
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2234 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);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2236 2474
2237 rc_draw (rc); 2475 rc.draw ();
2238 } 2476 }
2239 2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2240 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2241 rc_free (rc);
2242 2482
2243 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2246 { 2486 {
2249 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2491 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2253 2493
2254 int px = x * T; 2494 int px = x * Tw;
2255 int py = y * T; 2495 int py = y * Th;
2256 2496
2257 if (expect_false (cell->player == player)) 2497 if (expect_false (cell->player == player))
2258 { 2498 {
2259 px += sdx; 2499 px += sdx;
2260 py += sdy; 2500 py += sdy;
2261 } 2501 }
2262 2502
2263 if (cell->stat_hp) 2503 if (cell->stat_hp)
2264 { 2504 {
2265 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2267 2507
2268 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2269 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2270 px + width - 1, py); 2510 px + width - 1, py);
2271 2511
2277 } 2517 }
2278 } 2518 }
2279} 2519}
2280 2520
2281void 2521void
2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2283 CODE: 2523 CODE:
2284{ 2524{
2285 static float color[16][3] = { 2525 static float color[16][3] = {
2286 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2287 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2288 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2289 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2290 2530
2291 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2292 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2293 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2294 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2295 2535
2296 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2297 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2298 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2299 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2300 2540
2301 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2302 2542
2303 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2304 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2305 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2306 }; 2546 };
2307 2547
2308 int x, y; 2548 int x, y;
2309 2549
2310 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
2311 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2312 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2313 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2314 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2315 2561
2316 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2320 2566
2321 if (m) 2567 if (m)
2322 { 2568 {
2323 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2324 2570
2325 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2326 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2327 2573
2328 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2329 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2330 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2331 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2332 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2333 } 2579 }
2341void 2587void
2342fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2343 PPCODE: 2589 PPCODE:
2344{ 2590{
2345 int x, y; 2591 int x, y;
2346 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2347 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2348 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2349 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2350 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2351 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2352 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2353 2600
2354 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2355 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2356 2603
2357 mx += self->x - 1; 2604 mx += self->x - 1;
2358 my += self->y - 1; 2605 my += self->y - 1;
2359
2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2361 2606
2362 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2363 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2364 { 2609 {
2365 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2368 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2369 { 2614 {
2370 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2371 2616
2372 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2373 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2374 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2375 } 2620 }
2376 } 2621 }
2377 2622
2378 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2379 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2398 2643
2399 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2400 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2401 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2402 2647
2403 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2404 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2405 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2406 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2407 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2408 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2409 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2410 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2411 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2412 } 2657 }
2413 2658
2414 free (darkness1); 2659 free (darkness1);
2415 2660
2416 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2417 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2418 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2419 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2420} 2665}
2421 2666
2422SV * 2667SV *
2485 else 2730 else
2486 *data++ = 0; 2731 *data++ = 0;
2487 } 2732 }
2488 } 2733 }
2489 2734
2490 /* 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 */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 { 2737 {
2493 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 } 2740 }
2496 2741
2497 RETVAL = data_sv; 2742 RETVAL = data_sv;
2498} 2743}
2499 OUTPUT: 2744 OUTPUT:
2500 RETVAL 2745 RETVAL
2501 2746
2502void 2747void
2509 STRLEN len; 2754 STRLEN len;
2510 uint8_t *data, *end; 2755 uint8_t *data, *end;
2511 2756
2512 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2515 end = data + len + 8; 2760 end = data + len + 8;
2516 2761
2517 if (len < 5) 2762 if (len < 5)
2518 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2519 2764
2580} 2825}
2581 2826
2582MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2583 2828
2584DC::RW 2829DC::RW
2585new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2586 CODE: 2831 CODE:
2587{ 2832{
2588 STRLEN datalen; 2833 STRLEN datalen;
2589 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2590 2835
2592} 2837}
2593 OUTPUT: 2838 OUTPUT:
2594 RETVAL 2839 RETVAL
2595 2840
2596DC::RW 2841DC::RW
2597new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2598 CODE: 2843 CODE:
2599 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2600 OUTPUT: 2845 OUTPUT:
2601 RETVAL 2846 RETVAL
2602 2847
2620 if (RETVAL < 0) 2865 if (RETVAL < 0)
2621 { 2866 {
2622 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2623 2868
2624 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)
2625 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2626 2876 }
2877 else
2627 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2628 } 2879 }
2629 2880
2630 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2631 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2632} 2883}
2679void 2930void
2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2681 CODE: 2932 CODE:
2682{ 2933{
2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2684 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2686} 2937}
2687 2938
2688void 2939void
2689set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2692 2943
2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2694 2945
2695PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2696 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
2697DC::MixChunk 2960DC::MixChunk
2698new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2699 CODE: 2962 CODE:
2700 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2701 OUTPUT: 2964 OUTPUT:
2702 RETVAL 2965 RETVAL
2703 2966
2733 OUTPUT: 2996 OUTPUT:
2734 RETVAL 2997 RETVAL
2735 2998
2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2737 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
2738int 3013int
2739volume (int volume = -1) 3014volume (int volume = -1)
2740 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2741 CODE: 3016 CODE:
2742 if (items > 0) 3017 if (items > 0)
2753void 3028void
2754halt () 3029halt ()
2755 CODE: 3030 CODE:
2756 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2757 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2758DC::MixMusic 3040DC::MixMusic
2759new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2760 CODE: 3042 CODE:
2761 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2762 OUTPUT: 3044 OUTPUT:
2763 RETVAL 3045 RETVAL
2764 3046
2792 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2793# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2794 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2795 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2796 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2797 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2798 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2799 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2800 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2801 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2813 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2814 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2815 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2816 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2817 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2818 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2819 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2820 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2821 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2822 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2890 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2891 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2892 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2893 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2894 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2895# undef const_iv 3185# undef const_iv
2896 }; 3186 };
2897 3187
2898 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--)
2899 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2900 3190
2901 texture_av = newAV (); 3191 texture_av = newAV ();
2902 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2903} 3193}
2904 3194
2906disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2907 CODE: 3197 CODE:
2908 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2910 3200
2911char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2912gl_vendor () 3205gl_vendor ()
2913 CODE: 3206 CODE:
2914 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2915 OUTPUT: 3208 OUTPUT:
2916 RETVAL 3209 RETVAL
2917 3210
2918char * 3211const char *
2919gl_version () 3212gl_version ()
2920 CODE: 3213 CODE:
2921 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2922 OUTPUT: 3215 OUTPUT:
2923 RETVAL 3216 RETVAL
2924 3217
2925char * 3218const char *
2926gl_extensions () 3219gl_extensions ()
2927 CODE: 3220 CODE:
2928 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2929 OUTPUT: 3222 OUTPUT:
2930 RETVAL 3223 RETVAL
2931 3224
2932const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2933 3230
2934GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2935 CODE: 3232 CODE:
2936 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2937 OUTPUT: 3234 OUTPUT:
2945 3242
2946int glGetError () 3243int glGetError ()
2947 3244
2948void glFinish () 3245void glFinish ()
2949 3246
3247void glFlush ()
3248
2950void glClear (int mask) 3249void glClear (int mask)
2951 3250
2952void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2953 PROTOTYPE: @ 3252 PROTOTYPE: @
2954 3253
2963void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2964 3263
2965void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2966 CODE: 3265 CODE:
2967 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2968 3269
2969void glDepthMask (int flag) 3270void glDepthMask (int flag)
2970 3271
2971void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2972 3273
3123 3424
3124void glEndList () 3425void glEndList ()
3125 3426
3126void glCallList (int list) 3427void glCallList (int list)
3127 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3129 3435
3130PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
3131 3437
3132void 3438void
3133find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3134 PPCODE: 3440 PPCODE:
3135{ 3441{
3136 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3137 XPUSHs (self); 3443 XPUSHs (self);
3138} 3444}
3139 3445
3140BOOT: 3446BOOT:
3141{ 3447{
3149 3455
3150void 3456void
3151draw (SV *self) 3457draw (SV *self)
3152 CODE: 3458 CODE:
3153{ 3459{
3154 HV *hv; 3460 HV *hv;
3155 SV **svp; 3461 SV **svp;
3156 NV x, y, w, h; 3462 NV x, y, w, h;
3157 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3158 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3159 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3160 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