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.325 by root, Sun Nov 18 02:04:48 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 New (0, RETVAL, 1, struct 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.;
1409 1526
1410void 1527void
1411set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1412 CODE: 1529 CODE:
1413 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1414 { 1531 {
1415 self->base_height = base_height; 1532 self->base_height = base_height;
1416 layout_update_font (self); 1533 layout_update_font (self);
1417 } 1534 }
1418 1535
1419void 1536void
1646 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1648 } 1765 }
1649} 1766}
1650 1767
1768void
1769draw_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)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1890 CODE:
1653{ 1891{
1654 GLint width; 1892 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1662MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1663 1901
1664PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1665 1903
1666DC::Map 1904DC::Map
1667new (SV *class) 1905new (SV *klass)
1668 CODE: 1906 CODE:
1669 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1670 RETVAL->x = 0; 1908 RETVAL->x = 0;
1671 RETVAL->y = 0; 1909 RETVAL->y = 0;
1672 RETVAL->w = 0; 1910 RETVAL->w = 0;
1673 RETVAL->h = 0; 1911 RETVAL->h = 0;
1674 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1711 1949
1712void 1950void
1713set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1714 CODE: 1952 CODE:
1715{ 1953{
1716 tileid texid; 1954 tileid texid;
1717 maptex *tex; 1955 maptex *tex;
1718 1956
1719 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1720 return; 1958 return;
1721 1959
1722 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1723 return; 1961 return;
1724 1962
1725 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1726 1964
1727 if (!texid) 1965 if (!texid)
1728 return; 1966 return;
1729 1967
1730 tex = self->tex + texid; 1968 tex = self->tex + texid;
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1997 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 2001}
2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
1764 2022
1765int 2023int
1766ox (DC::Map self) 2024ox (DC::Map self)
1767 ALIAS: 2025 ALIAS:
1768 oy = 1 2026 oy = 1
1808 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1809 } 2067 }
1810} 2068}
1811 2069
1812SV * 2070SV *
1813map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1814 CODE: 2072 CODE:
1815{ 2073{
1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1817 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1818 mapcell *cell; 2076 mapcell *cell;
1839 2097
1840 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1841 2099
1842 if (flags & 8) 2100 if (flags & 8)
1843 { 2101 {
2102 uint8_t ext, cmd;
2103
1844 if (extmap) 2104 do
1845 { 2105 {
1846 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1847 2108
1848 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1849 { 2112 {
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; 2113 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2114 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 } 2115 }
1878 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1879 } 2133 }
1880 else 2134 while (ext & 0x80);
1881 cell->darkness = *data++ + 1;
1882 } 2135 }
1883 2136
1884 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1885 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1886 { 2139 {
1889 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1890 2143
1891 if (cell->tile [z]) 2144 if (cell->tile [z])
1892 { 2145 {
1893 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1894 if (!tex->name) 2148 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1896 2150
1897 if (tex->smoothtile) 2151 if (tex->smoothtile)
1898 { 2152 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1900 if (!smooth->name) 2155 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1902 } 2157 }
1903 } 2158 }
1904 } 2159 }
1932 ? self->row + y 2187 ? self->row + y
1933 : 0; 2188 : 0;
1934 2189
1935 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1936 { 2191 {
1937 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2193
1939 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1940 { 2195 {
1941 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1942 2197
1944 { 2199 {
1945 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2202 int a1 = tex.a;
1948 2203
1949 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1953 } 2208 }
1954 } 2209 }
1955 2210
1956 *map++ = (r ) 2211 *map++ = (r )
1957 | (g << 8) 2212 | (g << 8)
1958 | (b << 16) 2213 | (b << 16)
1959 | (a << 24); 2214 | (a << 24);
1960 } 2215 }
1961 } 2216 }
1962 2217
1963 RETVAL = map_sv; 2218 RETVAL = map_sv;
1964} 2219}
1965 OUTPUT: 2220 OUTPUT:
1966 RETVAL 2221 RETVAL
1967 2222
1968void 2223void
1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2224draw (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: 2225 CODE:
1971{ 2226{
1972 int x, y, z; 2227 int x, y, z;
1973 2228
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) 2229 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; 2230 int pl_x, pl_y;
1979 maptex pl_tex; 2231 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1981 rc_key_t key; 2234 rc_key_t key;
1982 rc_array_t *arr; 2235 rc_array_t *arr;
1983 2236
1984 pl_tex.name = 0; 2237 pl_tex.name = 0;
1985 2238
1986 // thats current max. sorry. 2239 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1989
1990 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey));
1992 2242
1993 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1994 key.r = 255; 2244 key.r = 255;
1995 key.g = 255; 2245 key.g = 255;
1996 key.b = 255; 2246 key.b = 255;
1997 key.a = 255; 2247 key.a = 255;
1998 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2250
2002 mx += self->x; 2251 mx += self->x;
2003 my += self->y; 2252 my += self->y;
2004 2253
2005 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2006 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2007 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2008 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2009 2258
2010 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2011 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2012 { 2261 {
2013 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2279
2031 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2032 { 2281 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2285 key.texname = -1;
2034 2286
2035 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
2037 { 2289 {
2038 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
2045 2297
2046 if (tile) 2298 if (tile)
2047 { 2299 {
2048 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2301 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2302
2052 if (key.texname != tex.name) 2303 if (key.texname != tex.name)
2053 { 2304 {
2305 self->tex [tile].unused = 0;
2306
2054 if (!tex.name) 2307 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2309
2057 key.texname = tex.name; 2310 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
2059 } 2312 }
2313
2314 px = (x + 1) * Th - tex.w;
2315 py = (y + 1) * Tw - tex.h;
2060 2316
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 { 2318 {
2063 pl_x = px; 2319 pl_x = px;
2064 pl_y = py; 2320 pl_y = py;
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2326 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2327 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2328 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073 2329
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
2099 // update smooth hash 2330 // update smooth hash
2100 if (tex.smoothtile) 2331 if (tex.smoothtile)
2101 { 2332 {
2102 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
2104 2335
2105 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
2106 2337
2107 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
2108 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2109 2340
2110 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2118 2349
2119 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2120 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2121 2352
2122 // full tile 2353 // full tile
2123 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2124 2355
2125 // borders 2356 // borders
2126 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 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); 2358 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); 2359 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); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2130 2361
2131 // corners 2362 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 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); 2364 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); 2365 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); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2367 }
2368 }
2369
2370 if (expect_false (z == 2) && expect_false (cell->flags))
2371 {
2372 // overlays such as the speech bubble, probably more to come
2373 if (cell->flags & 1)
2374 {
2375 rc_key_t key_ov = key;
2376 maptex tex = self->tex [TEXID_SPEECH];
2377 rc_array_t *arr;
2378 int px = x * Tw + Tw * 2 / 32;
2379 int py = y * Th - Th * 6 / 32;
2380
2381 key_ov.texname = tex.name;
2382 arr = rc_array (rc_ov, &key_ov);
2383
2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2386 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2136 } 2388 }
2137 } 2389 }
2138 } 2390 }
2139 } 2391 }
2140 2392
2146 { 2398 {
2147 int w, b; 2399 int w, b;
2148 2400
2149 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2151 for (w = 0; w < 256 / 32; ++w) 2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2152 { 2406 {
2153 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2154 if (smask) 2408 IV bits = it->second;
2155 for (b = 0; b < 32; ++b) 2409
2156 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2157 { 2413 {
2158 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
2159 HE *he; 2422 if (tex.name)
2160
2161 hv_iterinit (smooth);
2162 while ((he = hv_iternext (smooth)))
2163 { 2423 {
2164 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2165 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2166 2426 if (key.texname != tex.name)
2167 if (!(bits & 0x1000)
2168 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y])
2170 { 2427 {
2171 maptex tex = self->tex [skey->tile]; 2428 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 2429
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 (); 2430 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2188 } 2433 }
2189 2434
2190 if (border) 2435 if (border)
2191 { 2436 {
2192 float ox = border * dx; 2437 float ox = border * dx;
2193 2438
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2443 }
2199 2444
2200 if (corner) 2445 if (corner)
2201 { 2446 {
2202 float ox = corner * dx; 2447 float ox = corner * dx;
2203 2448
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 }
2209 }
2210 } 2453 }
2211 } 2454 }
2212 } 2455 }
2213 } 2456 }
2214 2457
2215 glEnd (); 2458 glEnd ();
2216 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1; 2460 key.texname = -1;
2218 } 2461 }
2219
2220 hv_clear (smooth);
2221 } 2462 }
2222 2463
2223 if (pl_tex.name) 2464 if (pl_tex.name)
2224 { 2465 {
2225 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2476 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236 2477
2237 rc_draw (rc); 2478 rc_draw (rc);
2238 } 2479 }
2239 2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
2240 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2241 rc_free (rc); 2485 rc_free (rc);
2486 rc_free (rc_ov);
2242 2487
2243 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
2246 { 2491 {
2249 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2496 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2253 2498
2254 int px = x * T; 2499 int px = x * Tw;
2255 int py = y * T; 2500 int py = y * Th;
2256 2501
2257 if (expect_false (cell->player == player)) 2502 if (expect_false (cell->player == player))
2258 { 2503 {
2259 px += sdx; 2504 px += sdx;
2260 py += sdy; 2505 py += sdy;
2261 } 2506 }
2262 2507
2263 if (cell->stat_hp) 2508 if (cell->stat_hp)
2264 { 2509 {
2265 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2267 2512
2268 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2269 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2270 px + width - 1, py); 2515 px + width - 1, py);
2271 2516
2277 } 2522 }
2278 } 2523 }
2279} 2524}
2280 2525
2281void 2526void
2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2527draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2283 CODE: 2528 CODE:
2284{ 2529{
2285 static float color[16][3] = { 2530 static float color[16][3] = {
2286 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
2287 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
2288 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
2289 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
2290 2535
2291 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
2292 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
2293 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
2294 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
2295 2540
2296 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
2297 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
2298 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
2299 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
2300 2545
2301 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
2302 2547
2303 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
2304 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
2305 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
2306 }; 2551 };
2307 2552
2308 int x, y; 2553 int x, y;
2309 2554
2310 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2556 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2558 * and takes the colour from god knows where instead of using
2559 * Cp. MODULATE results in the same colour, but slightly different
2560 * alpha, but atcually gives us the correct colour with nvidia.
2561 */
2311 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2312 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2313 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2314 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
2315 2566
2316 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2320 2571
2321 if (m) 2572 if (m)
2322 { 2573 {
2323 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2324 2575
2325 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2326 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2327 2578
2328 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2329 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2330 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2331 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2332 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2333 } 2584 }
2341void 2592void
2342fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2593fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2343 PPCODE: 2594 PPCODE:
2344{ 2595{
2345 int x, y; 2596 int x, y;
2346 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2347 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2348 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2349 int sw34 = (sw * 3 + 3) & ~3; 2600 int sw3 = sw * 3;
2601 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2602 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2350 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2351 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2352 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2353 2605
2354 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2355 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2356 2608
2357 mx += self->x - 1; 2609 mx += self->x - 1;
2358 my += self->y - 1; 2610 my += self->y - 1;
2359
2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2361 2611
2362 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2363 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2364 { 2614 {
2365 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2368 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2369 { 2619 {
2370 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2371 2621
2372 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2373 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2374 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2375 } 2625 }
2376 } 2626 }
2377 2627
2378 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2379 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2398 2648
2399 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2400 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2401 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2402 2652
2403 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2404 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2405 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2406 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2407 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2657 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); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2409 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2410 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2411 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2412 } 2662 }
2413 2663
2414 free (darkness1); 2664 free (darkness1);
2415 2665
2416 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2417 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2418 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2419 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2420} 2670}
2421 2671
2422SV * 2672SV *
2485 else 2735 else
2486 *data++ = 0; 2736 *data++ = 0;
2487 } 2737 }
2488 } 2738 }
2489 2739
2490 /* if size is w*h + 5 then no data has been found */ 2740 /* if size is w*h + 5 then no data has been found */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 { 2742 {
2493 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 } 2745 }
2496 2746
2497 RETVAL = data_sv; 2747 RETVAL = data_sv;
2498} 2748}
2499 OUTPUT: 2749 OUTPUT:
2500 RETVAL 2750 RETVAL
2501 2751
2502void 2752void
2509 STRLEN len; 2759 STRLEN len;
2510 uint8_t *data, *end; 2760 uint8_t *data, *end;
2511 2761
2512 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2515 end = data + len + 8; 2765 end = data + len + 8;
2516 2766
2517 if (len < 5) 2767 if (len < 5)
2518 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2519 2769
2580} 2830}
2581 2831
2582MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2583 2833
2584DC::RW 2834DC::RW
2585new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2586 CODE: 2836 CODE:
2587{ 2837{
2588 STRLEN datalen; 2838 STRLEN datalen;
2589 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2590 2840
2592} 2842}
2593 OUTPUT: 2843 OUTPUT:
2594 RETVAL 2844 RETVAL
2595 2845
2596DC::RW 2846DC::RW
2597new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2598 CODE: 2848 CODE:
2599 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2600 OUTPUT: 2850 OUTPUT:
2601 RETVAL 2851 RETVAL
2602 2852
2620 if (RETVAL < 0) 2870 if (RETVAL < 0)
2621 { 2871 {
2622 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2623 2873
2624 if (RETVAL < 0) 2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2625 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2626 2881 }
2882 else
2627 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2628 } 2884 }
2629 2885
2630 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2631 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2632} 2888}
2679void 2935void
2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2681 CODE: 2937 CODE:
2682{ 2938{
2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2939 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); 2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2686} 2942}
2687 2943
2688void 2944void
2689set_reverse_stereo (DC::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2692 2948
2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2694 2950
2695PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2696 2952
2953void
2954decoders ()
2955 PPCODE:
2956#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2957 int i, num = Mix_GetNumChunkDecoders ();
2958 EXTEND (SP, num);
2959 for (i = 0; i < num; ++i)
2960 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2961#else
2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2963#endif
2964
2697DC::MixChunk 2965DC::MixChunk
2698new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2699 CODE: 2967 CODE:
2700 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2701 OUTPUT: 2969 OUTPUT:
2702 RETVAL 2970 RETVAL
2703 2971
2733 OUTPUT: 3001 OUTPUT:
2734 RETVAL 3002 RETVAL
2735 3003
2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2737 3005
3006void
3007decoders ()
3008 PPCODE:
3009#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3010 int i, num = Mix_GetNumMusicDecoders ();
3011 EXTEND (SP, num);
3012 for (i = 0; i < num; ++i)
3013 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3014#else
3015 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3016#endif
3017
2738int 3018int
2739volume (int volume = -1) 3019volume (int volume = -1)
2740 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2741 CODE: 3021 CODE:
2742 if (items > 0) 3022 if (items > 0)
2753void 3033void
2754halt () 3034halt ()
2755 CODE: 3035 CODE:
2756 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2757 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2758DC::MixMusic 3045DC::MixMusic
2759new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2760 CODE: 3047 CODE:
2761 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2762 OUTPUT: 3049 OUTPUT:
2763 RETVAL 3050 RETVAL
2764 3051
2792 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2793# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2794 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2795 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2796 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2797 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2798 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2799 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2800 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2801 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2813 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2814 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2815 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2816 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2817 const_iv (GL_ONE_MINUS_DST_ALPHA), 3105 const_iv (GL_ONE_MINUS_DST_ALPHA),
3106 const_iv (GL_SRC_COLOR),
3107 const_iv (GL_DST_COLOR),
3108 const_iv (GL_ONE_MINUS_SRC_COLOR),
3109 const_iv (GL_ONE_MINUS_DST_COLOR),
2818 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2819 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2820 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2821 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2822 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2890 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2891 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2892 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2893 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2894 const_iv (GL_T2F_N3F_V3F), 3186 const_iv (GL_T2F_N3F_V3F),
3187 const_iv (GL_FUNC_ADD),
3188 const_iv (GL_FUNC_SUBTRACT),
3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2895# undef const_iv 3190# undef const_iv
2896 }; 3191 };
2897 3192
2898 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3193 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2899 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2900 3195
2901 texture_av = newAV (); 3196 texture_av = newAV ();
2902 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2903} 3198}
2904 3199
2906disable_GL_EXT_blend_func_separate () 3201disable_GL_EXT_blend_func_separate ()
2907 CODE: 3202 CODE:
2908 gl.BlendFuncSeparate = 0; 3203 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
2910 3205
2911char * 3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2912gl_vendor () 3210gl_vendor ()
2913 CODE: 3211 CODE:
2914 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2915 OUTPUT: 3213 OUTPUT:
2916 RETVAL 3214 RETVAL
2917 3215
2918char * 3216const char *
2919gl_version () 3217gl_version ()
2920 CODE: 3218 CODE:
2921 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2922 OUTPUT: 3220 OUTPUT:
2923 RETVAL 3221 RETVAL
2924 3222
2925char * 3223const char *
2926gl_extensions () 3224gl_extensions ()
2927 CODE: 3225 CODE:
2928 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2929 OUTPUT: 3227 OUTPUT:
2930 RETVAL 3228 RETVAL
2931 3229
2932const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2933 3235
2934GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2935 CODE: 3237 CODE:
2936 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2937 OUTPUT: 3239 OUTPUT:
2945 3247
2946int glGetError () 3248int glGetError ()
2947 3249
2948void glFinish () 3250void glFinish ()
2949 3251
3252void glFlush ()
3253
2950void glClear (int mask) 3254void glClear (int mask)
2951 3255
2952void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2953 PROTOTYPE: @ 3257 PROTOTYPE: @
2954 3258
2963void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2964 3268
2965void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2966 CODE: 3270 CODE:
2967 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2968 3274
2969void glDepthMask (int flag) 3275void glDepthMask (int flag)
2970 3276
2971void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2972 3278
3123 3429
3124void glEndList () 3430void glEndList ()
3125 3431
3126void glCallList (int list) 3432void glCallList (int list)
3127 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3129 3440
3130PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3131 3442
3132void 3443void
3133find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3134 PPCODE: 3445 PPCODE:
3135{ 3446{
3136 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3137 XPUSHs (self); 3448 XPUSHs (self);
3138} 3449}
3139 3450
3140BOOT: 3451BOOT:
3141{ 3452{
3149 3460
3150void 3461void
3151draw (SV *self) 3462draw (SV *self)
3152 CODE: 3463 CODE:
3153{ 3464{
3154 HV *hv; 3465 HV *hv;
3155 SV **svp; 3466 SV **svp;
3156 NV x, y, w, h; 3467 NV x, y, w, h;
3157 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3158 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3159 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3160 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines