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.286 by root, Sun Dec 21 21:30:47 2008 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define 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
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
97 106
98#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
101 128
102static AV *texture_av; 129static AV *texture_av;
103 130
104static struct 131static struct
105{ 132{
162{ 189{
163 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
164 191
165 while (attrs) 192 while (attrs)
166 { 193 {
167 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 195
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 197 return 1;
171 198
172 attrs = attrs->next; 199 attrs = attrs->next;
173 } 200 }
174 201
175 return 0; 202 return 0;
176} 203}
177 204
178typedef struct cf_layout { 205struct cf_layout {
179 PangoLayout *pl; 206 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
181 int base_height; 208 int base_height;
182 DC__Font font; 209 DC__Font font;
183 rc_t *rc; 210 rc_t rc;
184} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
185 214
186static DC__Font default_font; 215static DC__Font default_font;
187static PangoContext *opengl_context; 216static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
189 218
190static void 219static void
191substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
192{ 221{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 225#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 227}
199 228
200static void 229static void
230} 259}
231 260
232typedef uint16_t tileid; 261typedef uint16_t tileid;
233typedef uint16_t faceid; 262typedef uint16_t faceid;
234 263
235typedef struct { 264struct maptex
265{
236 GLuint name; 266 GLuint name;
237 int w, h; 267 int w, h;
238 float s, t; 268 float s, t;
239 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
240 tileid smoothtile; 270 tileid smoothtile;
241 uint8_t smoothlevel; 271 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
243} maptex; 273};
244 274
245typedef struct { 275struct mapcell
276{
246 uint32_t player; 277 uint32_t player;
247 tileid tile[3]; 278 tileid tile[3];
248 uint16_t darkness; 279 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 281};
251 282
252typedef struct { 283struct maprow
284{
253 int32_t c0, c1; 285 int32_t c0, c1;
254 mapcell *col; 286 mapcell *col;
255} maprow; 287};
256 288
257typedef struct map { 289struct mapgrid {
258 int x, y, w, h; 290 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 292 std::vector<tileid> tile;
261 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
262 294
263 int32_t rows; 295 int32_t rows;
264 maprow *row; 296 maprow *row;
265} *DC__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
266 307
267static char * 308static char *
268prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
269{ 310{
270 char *p; 311 char *p;
287} 328}
288 329
289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 330#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 331#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291 332
292static void
293need_facenum (struct map *self, faceid face)
294{
295 while (self->faces <= face)
296 {
297 Append (tileid, self->face2tile, self->faces, self->faces);
298 self->faces *= 2;
299 }
300}
301
302static void
303need_texid (struct map *self, int texid)
304{
305 while (self->texs <= texid)
306 {
307 Append (maptex, self->tex, self->texs, self->texs);
308 self->texs *= 2;
309 }
310}
311
312static maprow * 333static maprow *
313map_get_row (DC__Map self, int y) 334map_get_row (mapgrid *self, int y)
314{ 335{
315 if (0 > y) 336 if (0 > y)
316 { 337 {
317 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
356 377
357 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
358} 379}
359 380
360static mapcell * 381static mapcell *
361map_get_cell (DC__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
362{ 383{
363 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
364} 385}
365 386
366static void 387void mapgrid::clear_cells ()
367map_clear (DC__Map self)
368{ 388{
369 int r; 389 int r;
370 390
371 for (r = 0; r < self->rows; r++) 391 for (r = 0; r < rows; r++)
372 Safefree (self->row[r].col); 392 Safefree (row[r].col);
373 393
374 Safefree (self->row); 394 Safefree (row);
375 395
376 self->x = 0; 396 x = 0;
377 self->y = 0; 397 y = 0;
378 self->ox = 0; 398 ox = 0;
379 self->oy = 0; 399 oy = 0;
380 self->row = 0; 400 row = 0;
381 self->rows = 0; 401 rows = 0;
382} 402}
383 403
384#define CELL_CLEAR(cell) \ 404#define CELL_CLEAR(cell) \
385 do { \ 405 do { \
386 if ((cell)->player) \ 406 if ((cell)->player) \
390 (cell)->flags = 0; \ 410 (cell)->flags = 0; \
391 (cell)->player = 0; \ 411 (cell)->player = 0; \
392 } while (0) 412 } while (0)
393 413
394static void 414static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 416{
397 int x, y; 417 int x, y;
398 maprow *row; 418 maprow *row;
399 mapcell *cell; 419 mapcell *cell;
400 420
417 CELL_CLEAR (cell); 437 CELL_CLEAR (cell);
418 } 438 }
419 } 439 }
420} 440}
421 441
422typedef struct { 442struct smooth_key
443{
423 tileid tile; 444 tileid tile;
424 uint8_t x, y, level; 445 uint8_t x, y, level;
425} smooth_key; 446
447 bool operator == (const smooth_key &o) const
448 {
449 return tile == o.tile && x == o.x && y == o.y && level == o.level;
450 }
451};
452
453typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
454
455namespace std {
456 template <>
457 struct hash<smooth_key>
458 {
459 size_t operator () (const smooth_key &v) const
460 {
461 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
462 }
463 };
464}
426 465
427static void 466static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 468{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
431 470
432 if (SvIOK (*sv)) 471 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
434 else 473 else
435 sv_setiv (*sv, bits); 474 it->second |= bits;
436} 475}
437 476
438static void 477static void
439music_finished (void) 478music_finished (void)
440{ 479{
457 ev.code = 1; 496 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 497 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 498 ev.data2 = 0;
460 499
461 SDL_PushEvent ((SDL_Event *)&ev); 500 SDL_PushEvent ((SDL_Event *)&ev);
501}
502
503// approximately divide by 255
504static unsigned int
505div255 (unsigned int n)
506{
507 return (n + (n >> 8)) >> 8;
462} 508}
463 509
464static unsigned int 510static unsigned int
465minpot (unsigned int n) 511minpot (unsigned int n)
466{ 512{
549 595
550 return mod; 596 return mod;
551} 597}
552 598
553static void 599static void
554deliantra_main () 600deliantra_main (SV *real_main)
555{ 601{
556 char *argv[] = { 0 }; 602 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 603
604 PUSHMARK (SP);
605 call_sv (real_main, G_DISCARD | G_VOID);
558} 606}
559 607
560#ifdef __MACOSX__ 608#ifdef __MACOSX__
609 static SV *real_main;
610
561 /* to due surprising braindamage on the side of SDL design, we 611 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 612 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which, 613 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 614 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 615 * and which calls our main (== SDL_main) back.
566 */ 616 */
567 extern C_LINKAGE int 617 extern C_LINKAGE int
568 main (int argc, char *argv[]) 618 main (int argc, char *argv[])
569 { 619 {
570 deliantra_main (); 620 deliantra_main (real_main);
571 } 621 }
572 622
573 #undef main 623 #undef main
574 624
575 extern C_LINKAGE int main (int argc, char *argv[]); 625 extern C_LINKAGE int main (int argc, char *argv[]);
576 626
577 static void 627 static void
578 SDL_braino (void) 628 SDL_main_hack (SV *real_main_)
579 { 629 {
630 real_main = real_main_;
631
580 char *argv[] = { "deliantra client", 0 }; 632 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 633 (main) (1, argv);
582 } 634 }
583#else 635#else
584 static void 636 static void
585 SDL_braino (void) 637 SDL_main_hack (SV *real_main)
586 { 638 {
587 deliantra_main (); 639 deliantra_main (real_main);
588 } 640 }
589#endif 641#endif
590 642
591MODULE = Deliantra::Client PACKAGE = DC 643MODULE = Deliantra::Client PACKAGE = DC
592 644
793 845
794 const_iv (FOW_DARKNESS) 846 const_iv (FOW_DARKNESS)
795# undef const_iv 847# undef const_iv
796 }; 848 };
797 849
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 850 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 852
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 855}
804 856
820NV ceil (NV x) 872NV ceil (NV x)
821 873
822IV minpot (UV n) 874IV minpot (UV n)
823 875
824IV popcount (UV n) 876IV popcount (UV n)
877
878NV distance (NV dx, NV dy)
879 CODE:
880 RETVAL = pow (dx * dx + dy * dy, 0.5);
881 OUTPUT:
882 RETVAL
825 883
826void 884void
827pango_init () 885pango_init ()
828 CODE: 886 CODE:
829{ 887{
837#endif 895#endif
838} 896}
839 897
840char *SDL_GetError () 898char *SDL_GetError ()
841 899
842void SDL_braino () 900void SDL_main_hack (SV *real_main)
901 PROTOTYPE: &
843 902
844int SDL_Init (U32 flags) 903int SDL_Init (U32 flags)
845 904
846int SDL_InitSubSystem (U32 flags) 905int SDL_InitSubSystem (U32 flags)
847 906
848void SDL_QuitSubSystem (U32 flags) 907void SDL_QuitSubSystem (U32 flags)
849 908
850void SDL_Quit () 909void SDL_Quit ()
851 910
852int SDL_GL_SetAttribute (int attr, int value) 911int SDL_GL_SetAttribute (int attr, int value)
912 C_ARGS: (SDL_GLattr)attr, value
853 913
854int SDL_GL_GetAttribute (int attr) 914int SDL_GL_GetAttribute (int attr)
855 CODE: 915 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 916 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 917 XSRETURN_UNDEF;
858 OUTPUT: 918 OUTPUT:
859 RETVAL 919 RETVAL
860 920
861void 921void
916 ); 976 );
917 977
918 if (RETVAL) 978 if (RETVAL)
919 { 979 {
920 av_clear (texture_av); 980 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 981#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924#include "glfunc.h" 982#include "glfunc.h"
925#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 986 }
927} 987}
928 OUTPUT: 988 OUTPUT:
929 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
930 993
931void 994void
932SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
933 996
934char * 997char *
935SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
936 1000
937int 1001int
938SDL_GetAppState () 1002SDL_GetAppState ()
939 1003
940int 1004int
941SDL_GetModState () 1005SDL_GetModState ()
942 1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
943void 1011void
1012SDL_PumpEvents ()
1013
1014void
944poll_events () 1015peep_events ()
945 PPCODE: 1016 PPCODE:
946{ 1017{
947 SDL_Event ev; 1018 SDL_Event ev;
948 1019
949 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
1015 1086
1016 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1087 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017 } 1088 }
1018} 1089}
1019 1090
1091char *
1092SDL_AudioDriverName ()
1093 CODE:
1094{
1095 char buf [256];
1096 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1097 XSRETURN_UNDEF;
1098
1099 RETVAL = buf;
1100}
1101 OUTPUT:
1102 RETVAL
1103
1020int 1104int
1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1105Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022 POSTCALL: 1106 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
1025 1109
1026void 1110void
1027Mix_QuerySpec () 1111Mix_QuerySpec ()
1086add_font (char *file) 1170add_font (char *file)
1087 CODE: 1171 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1172 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1173 OUTPUT:
1090 RETVAL 1174 RETVAL
1175
1176void
1177IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1178
1179# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1180void
1181Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1091 1182
1092void 1183void
1093load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
1094 ALIAS: 1185 ALIAS:
1095 load_image_file = 1 1186 load_image_file = 1
1141 1232
1142 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1147 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1238 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
1151 1242
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1315
1225PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1226 1317
1227DC::Font 1318DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1320 CODE:
1230{ 1321{
1231 int count; 1322 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1353 PROTOTYPE:
1263 CODE: 1354 CODE:
1264 tc_restore (); 1355 tc_restore ();
1265 1356
1266DC::Layout 1357DC::Layout
1267new (SV *class) 1358new (SV *klass)
1268 CODE: 1359 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1270 1361
1271 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1273 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1274 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1275 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1276 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1277 RETVAL->font = 0; 1368 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1279 1369
1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1281 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1282 OUTPUT: 1372 OUTPUT:
1283 RETVAL 1373 RETVAL
1284 1374
1285void 1375void
1286DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1287 CODE: 1377 CODE:
1288 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1289 rc_free (self->rc);
1290 Safefree (self); 1379 delete self;
1291 1380
1292void 1381void
1293set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1294 CODE: 1383 CODE:
1295{ 1384{
1421 1510
1422void 1511void
1423set_height (DC::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1424 CODE: 1513 CODE:
1425 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1426 { 1515 {
1427 self->base_height = base_height; 1516 self->base_height = base_height;
1428 layout_update_font (self); 1517 layout_update_font (self);
1429 } 1518 }
1430 1519
1431void 1520void
1549} 1638}
1550 1639
1551void 1640void
1552render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1553 CODE: 1642 CODE:
1554 rc_clear (self->rc); 1643 self->rc.clear ();
1555 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1556 self->pl, 1645 self->pl,
1557 self->rc, 1646 &self->rc,
1558 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1559 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1560 flags 1649 flags
1561 ); 1650 );
1562 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1577 1666
1578 rc_draw (self->rc); 1667 self->rc.draw ();
1579 1668
1580 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1583} 1672}
1658 glDisable (GL_ALPHA_TEST); 1747 glDisable (GL_ALPHA_TEST);
1659 glDisable (GL_BLEND); 1748 glDisable (GL_BLEND);
1660 } 1749 }
1661} 1750}
1662 1751
1752void
1753draw_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)
1754 PROTOTYPE: @
1755 CODE:
1756{
1757 glEnable (GL_BLEND);
1758 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1759 glEnable (GL_TEXTURE_2D);
1760 glBindTexture (GL_TEXTURE_2D, name1);
1761
1762 glColor3f (intensity, intensity, intensity);
1763 glPushMatrix ();
1764 glScalef (1./3, 1./3, 1.);
1765
1766 if (blend > 0.f)
1767 {
1768 float dx3 = dx * -3.f / w;
1769 float dy3 = dy * -3.f / h;
1770 GLfloat env_color[4] = { 0., 0., 0., blend };
1771
1772 /* interpolate the two shadow textures */
1773 /* stage 0 == rgb(glcolor) + alpha(t0) */
1774 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1775
1776 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1777 gl.ActiveTexture (GL_TEXTURE1);
1778 glEnable (GL_TEXTURE_2D);
1779 glBindTexture (GL_TEXTURE_2D, name2);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1781
1782 /* rgb == rgb(glcolor) */
1783 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1786
1787 /* alpha = interpolate t0, t1 by env_alpha */
1788 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1789
1790 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1793
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1796
1797 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1799
1800 glBegin (GL_QUADS);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1804 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1805 glEnd ();
1806
1807 glDisable (GL_TEXTURE_2D);
1808 gl.ActiveTexture (GL_TEXTURE0);
1809 }
1810 else
1811 {
1812 /* simple blending of one texture, also opengl <1.3 path */
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1814
1815 glBegin (GL_QUADS);
1816 glTexCoord2f (0, 0); glVertex2f (0, 0);
1817 glTexCoord2f (0, t); glVertex2f (0, h);
1818 glTexCoord2f (s, t); glVertex2f (w, h);
1819 glTexCoord2f (s, 0); glVertex2f (w, 0);
1820 glEnd ();
1821 }
1822
1823 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1824 {
1825 int x, y;
1826 int dx3 = dx * 3;
1827 int dy3 = dy * 3;
1828
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1830 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1831 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1832 glTranslatef (-1., -1., 0);
1833 glBegin (GL_QUADS);
1834
1835 for (y = 1; y < h; y += 3)
1836 {
1837 int y1 = y - dy3;
1838 int y1valid = y1 >= 0 && y1 < h;
1839
1840 for (x = 1; x < w; x += 3)
1841 {
1842 int x1 = x - dx3;
1843 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1844 uint8_t h2;
1845
1846 if (y1valid && x1 >= 0 && x1 < w)
1847 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1848 else
1849 h2 = 1; /* out of range == invisible */
1850
1851 if (h1 || h2)
1852 {
1853 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1854 glColor4f (1., 1., 1., alpha);
1855
1856 glTexCoord2f (0, 0.); glVertex2i (x , y );
1857 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1858 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1859 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1860 }
1861 }
1862 }
1863 }
1864
1865 glEnd ();
1866
1867 glPopMatrix ();
1868
1869 glDisable (GL_TEXTURE_2D);
1870 glDisable (GL_BLEND);
1871}
1872
1663IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1873IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664 CODE: 1874 CODE:
1665{ 1875{
1666 GLint width; 1876 GLint width;
1667 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1877 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1674MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1675 1885
1676PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1677 1887
1678DC::Map 1888DC::Map
1679new (SV *class) 1889new (SV *klass)
1680 CODE: 1890 CODE:
1681 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1682 RETVAL->x = 0; 1892 RETVAL->x = 0;
1683 RETVAL->y = 0; 1893 RETVAL->y = 0;
1684 RETVAL->w = 0; 1894 RETVAL->w = 0;
1685 RETVAL->h = 0; 1895 RETVAL->h = 0;
1686 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1687 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1688 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1689 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1690 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1691 RETVAL->row = 0; 1899 RETVAL->row = 0;
1692 OUTPUT: 1900 OUTPUT:
1693 RETVAL 1901 RETVAL
1694 1902
1695void 1903void
1696DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1697 CODE: 1905 CODE:
1698{ 1906{
1699 map_clear (self);
1700 Safefree (self->face2tile);
1701 Safefree (self->tex);
1702 Safefree (self); 1907 delete self;
1703} 1908}
1704 1909
1705void 1910void
1706resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1707 CODE: 1912 CODE:
1709 self->h = map_height; 1914 self->h = map_height;
1710 1915
1711void 1916void
1712clear (DC::Map self) 1917clear (DC::Map self)
1713 CODE: 1918 CODE:
1714 map_clear (self); 1919 self->clear_cells ();
1715 1920
1716void 1921void
1717set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1718 CODE: 1923 CODE:
1719{ 1924{
1720 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1721 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1722} 1928}
1723 1929
1724void 1930void
1725set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1726 CODE: 1932 CODE:
1727{ 1933{
1728 tileid texid;
1729 maptex *tex;
1730
1731 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1732 return; 1935 return;
1733 1936
1734 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1735 return; 1938 return;
1736 1939
1737 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1738 1941
1739 if (!texid) 1942 if (!texid)
1740 return; 1943 return;
1741 1944
1742 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1743 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1744 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1745} 1948}
1746 1949
1747void 1950void
1748set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1951set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1749 CODE: 1952 CODE:
1750{ 1953{
1751 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1752 1955
1753 { 1956 {
1754 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1755 1958
1756 tex->name = name; 1959 tex.name = name;
1757 tex->w = w; 1960 tex.w = w;
1758 tex->h = h; 1961 tex.h = h;
1759 tex->s = s; 1962 tex.s = s;
1760 tex->t = t; 1963 tex.t = t;
1761 tex->r = r; 1964 tex.r = r;
1762 tex->g = g; 1965 tex.g = g;
1763 tex->b = b; 1966 tex.b = b;
1764 tex->a = a; 1967 tex.a = a;
1765 } 1968 }
1766 1969
1767 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1768 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1769 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1775} 1978}
1776 1979
1777void 1980void
1778expire_textures (DC::Map self, int texid, int count) 1981expire_textures (DC::Map self, int texid, int count)
1779 PPCODE: 1982 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count) 1983 for (; texid < self->tex.size () && count; ++texid, --count)
1781 { 1984 {
1782 maptex *tex = self->tex + texid; 1985 maptex &tex = self->tex[texid];
1783 1986
1784 if (tex->name) 1987 if (tex.name)
1785 { 1988 {
1786 if (tex->unused) 1989 if (tex.unused)
1787 { 1990 {
1788 tex->name = 0; 1991 tex.name = 0;
1789 tex->unused = 0; 1992 tex.unused = 0;
1790 XPUSHs (sv_2mortal (newSViv (texid))); 1993 XPUSHs (sv_2mortal (newSViv (texid)));
1791 } 1994 }
1792 else 1995 else
1793 tex->unused = 1; 1996 tex.unused = 1;
1794 } 1997 }
1795 } 1998 }
1796 1999
1797int 2000int
1798ox (DC::Map self) 2001ox (DC::Map self)
1840 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1841 } 2044 }
1842} 2045}
1843 2046
1844SV * 2047SV *
1845map1a_update (DC::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1846 CODE: 2049 CODE:
1847{ 2050{
1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1849 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1850 mapcell *cell; 2053 mapcell *cell;
1871 2074
1872 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
1873 2076
1874 if (flags & 8) 2077 if (flags & 8)
1875 { 2078 {
2079 uint8_t ext, cmd;
2080
1876 if (extmap) 2081 do
1877 { 2082 {
1878 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
1879 2085
1880 do 2086 if (cmd < 4)
2087 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2088 else if (cmd == 5) // health
1881 { 2089 {
1882 ext = *data++;
1883 cmd = ext & 0x7f;
1884
1885 if (cmd < 4)
1886 cell->darkness = 255 - ext * 64 + 1;
1887 else if (cmd == 5) // health
1888 {
1889 cell->stat_width = 1; 2090 cell->stat_width = 1;
1890 cell->stat_hp = *data++; 2091 cell->stat_hp = *data++;
1891 }
1892 else if (cmd == 6) // monster width
1893 cell->stat_width = *data++ + 1;
1894 else if (cmd == 0x47)
1895 {
1896 if (*data == 1) cell->player = data [1];
1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1900
1901 data += *data + 1;
1902 }
1903 else if (cmd == 8) // cell flags
1904 cell->flags = *data++;
1905 else if (ext & 0x40) // unknown, multibyte => skip
1906 data += *data + 1;
1907 else
1908 data++;
1909 } 2092 }
1910 while (ext & 0x80); 2093 else if (cmd == 6) // monster width
2094 cell->stat_width = *data++ + 1;
2095 else if (cmd == 0x47)
2096 {
2097 if (*data == 1) cell->player = data [1];
2098 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2099 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2100 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2101
2102 data += *data + 1;
2103 }
2104 else if (cmd == 8) // cell flags
2105 cell->flags = *data++;
2106 else if (ext & 0x40) // unknown, multibyte => skip
2107 data += *data + 1;
2108 else
2109 data++;
1911 } 2110 }
1912 else 2111 while (ext & 0x80);
1913 cell->darkness = *data++ + 1;
1914 } 2112 }
1915 2113
1916 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
1917 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
1918 { 2116 {
1919 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
1920 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
1921 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
1922 2120
1923 if (cell->tile [z]) 2121 if (cell->tile[z])
1924 { 2122 {
1925 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
1926 tex->unused = 0; 2124 tex.unused = 0;
1927 if (!tex->name) 2125 if (!tex.name)
1928 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
1929 2127
1930 if (tex->smoothtile) 2128 if (tex.smoothtile)
1931 { 2129 {
1932 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
1933 smooth->unused = 0; 2131 smooth.unused = 0;
1934 if (!smooth->name) 2132 if (!smooth.name)
1935 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
1936 } 2134 }
1937 } 2135 }
1938 } 2136 }
1939 } 2137 }
1940 else 2138 else
1966 ? self->row + y 2164 ? self->row + y
1967 : 0; 2165 : 0;
1968 2166
1969 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
1970 { 2168 {
1971 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
1972 2170
1973 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
1974 { 2172 {
1975 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
1976 2174
1978 { 2176 {
1979 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
1980 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
1981 int a1 = tex.a; 2179 int a1 = tex.a;
1982 2180
1983 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
1984 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
1985 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
1986 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
1987 } 2185 }
1988 } 2186 }
1989 2187
1990 *map++ = (r ) 2188 *map++ = (r )
1991 | (g << 8) 2189 | (g << 8)
1992 | (b << 16) 2190 | (b << 16)
1993 | (a << 24); 2191 | (a << 24);
1994 } 2192 }
1995 } 2193 }
1996 2194
1997 RETVAL = map_sv; 2195 RETVAL = map_sv;
1998} 2196}
1999 OUTPUT: 2197 OUTPUT:
2000 RETVAL 2198 RETVAL
2001 2199
2002void 2200void
2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2201draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2004 CODE: 2202 CODE:
2005{ 2203{
2006 int x, y, z; 2204 int x, y, z;
2007 2205
2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2206 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2011 smooth_key skey;
2012 int pl_x, pl_y; 2207 int pl_x, pl_y;
2013 maptex pl_tex; 2208 maptex pl_tex;
2014 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2015 rc_t *rc_ov = rc_alloc (); 2210 rc_t rc_ov;
2016 rc_key_t key; 2211 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden; 2212 rc_t::array_t *arr;
2018 2213
2019 pl_tex.name = 0; 2214 pl_tex.name = 0;
2020 2215
2021 // thats current max. sorry. 2216 // that's current max. sorry.
2022 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
2023 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
2024
2025 // clear key, in case of extra padding
2026 memset (&skey, 0, sizeof (skey));
2027 2219
2028 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
2029 key.r = 255; 2221 key.r = 255;
2030 key.g = 255; 2222 key.g = 255;
2031 key.b = 255; 2223 key.b = 255;
2037 my += self->y; 2229 my += self->y;
2038 2230
2039 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
2040 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
2041 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
2042 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2043 2235
2044 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
2046 { 2238 {
2047 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
2060 2252
2061 glEnable (GL_BLEND); 2253 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064 2256
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
2068 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2069 { 2258 {
2070 memset (smooth_level, 0, sizeof (smooth_level)); 2259 std::bitset<256> smooth_level; // one bit for every possible smooth level
2260 smooth_key skey;
2261 smooth_hash smooth;
2071 key.texname = -1; 2262 key.texname = -1;
2072 2263
2073 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
2075 { 2266 {
2092 2283
2093 if (!tex.name) 2284 if (!tex.name)
2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2095 2286
2096 key.texname = tex.name; 2287 key.texname = tex.name;
2097 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
2098 } 2289 }
2099 2290
2100 px = (x + 1) * T - tex.w; 2291 px = (x + 1) * Th - tex.w;
2101 py = (y + 1) * T - tex.h; 2292 py = (y + 1) * Tw - tex.h;
2102 2293
2103 if (expect_false (cell->player == player) && expect_false (z == 2)) 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
2104 { 2295 {
2105 pl_x = px; 2296 pl_x = px;
2106 pl_y = py; 2297 pl_y = py;
2107 pl_tex = tex; 2298 pl_tex = tex;
2108 continue; 2299 continue;
2109 } 2300 }
2110 2301
2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2302 arr->t2f_v3f (0 , 0 , px , py , 0);
2112 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2303 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2304 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2305 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2115 2306
2116 // update smooth hash 2307 // update smooth hash
2117 if (tex.smoothtile) 2308 if (tex.smoothtile)
2118 { 2309 {
2119 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
2120 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
2121 2312
2122 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
2123 2314
2124 // add bits to current tile and all neighbours. skey.x|y is 2315 // add bits to current tile and all neighbours. skey.x|y is
2125 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
2126 2317
2127 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
2135 2326
2136 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2137 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
2138 2329
2139 // full tile 2330 // full tile
2140 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2331 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2141 2332
2142 // borders 2333 // borders
2143 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2334 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2144 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2335 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2145 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2336 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2146 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2337 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2147 2338
2148 // corners 2339 // corners
2149 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2340 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2150 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2341 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2151 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2342 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2343 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2153 } 2344 }
2154 } 2345 }
2155 2346
2156 if (expect_false (z == 2)) 2347 if (expect_false (z == 2) && expect_false (cell->flags))
2157 { 2348 {
2158 /* draw question marks on top of hidden spaces */ 2349 // overlays such as the speech bubble, probably more to come
2159 if (!cell->darkness) 2350 if (cell->flags & 1)
2160 { 2351 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key; 2352 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH]; 2353 maptex tex = self->tex[TEXID_SPEECH];
2178 rc_array_t *arr; 2354 int px = x * Tw + Tw * 2 / 32;
2355 int py = y * Th - Th * 6 / 32;
2179 2356
2180 key_ov.texname = tex.name; 2357 key_ov.texname = tex.name;
2181 arr = rc_array (rc_ov, &key_ov); 2358 rc_t::array_t &arr = rc_ov.array (key_ov);
2182 2359
2183 int px = x * T + T * 2 / 32;
2184 int py = y * T - T * 6 / 32;
2185
2186 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2360 arr.t2f_v3f (0 , 0 , px , py , 0);
2187 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2361 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2188 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2362 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2189 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2363 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2190 }
2191 } 2364 }
2192 } 2365 }
2193 } 2366 }
2194 } 2367 }
2195 2368
2196 rc_draw (rc); 2369 rc.draw ();
2197 rc_clear (rc); 2370 rc.clear ();
2198 2371
2199 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
2200 // this is basically counting sort 2373 // this is basically counting sort
2201 { 2374 {
2202 int w, b; 2375 int w, b;
2203 2376
2204 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
2205 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
2206 for (w = 0; w < 256 / 32; ++w) 2379 for (int level = 0; level < smooth_level.size (); ++level)
2380 if (smooth_level[level])
2381 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2207 { 2382 {
2208 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
2209 if (smask) 2384 IV bits = it->second;
2210 for (b = 0; b < 32; ++b) 2385
2211 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
2212 { 2389 {
2213 int level = (w << 5) | b; 2390 maptex tex = self->tex [skey.tile];
2391 int px = (((int)skey.x) - 1) * Tw;
2392 int py = (((int)skey.y) - 1) * Th;
2393 int border = bits & 15;
2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2395 float dx = tex.s * .0625f; // 16 images/row
2396 float dy = tex.t * .5f ; // 2 images/column
2397
2214 HE *he; 2398 if (tex.name)
2215
2216 hv_iterinit (smooth);
2217 while ((he = hv_iternext (smooth)))
2218 { 2399 {
2219 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
2220 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
2221 2402 if (key.texname != tex.name)
2222 if (!(bits & 0x1000)
2223 && skey->level == level
2224 && level > smooth_max [skey->x][skey->y])
2225 { 2403 {
2226 maptex tex = self->tex [skey->tile];
2227 int px = (((int)skey->x) - 1) * T;
2228 int py = (((int)skey->y) - 1) * T;
2229 int border = bits & 15;
2230 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2231 float dx = tex.s * .0625f; // 16 images/row
2232 float dy = tex.t * .5f ; // 2 images/column
2233
2234 if (tex.name)
2235 {
2236 // this time avoiding texture state changes
2237 // save gobs of state changes.
2238 if (key.texname != tex.name)
2239 {
2240 self->tex [skey->tile].unused = 0; 2404 self->tex [skey.tile].unused = 0;
2241 2405
2242 glEnd (); 2406 glEnd ();
2243 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2244 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2245 } 2409 }
2246 2410
2247 if (border) 2411 if (border)
2248 { 2412 {
2249 float ox = border * dx; 2413 float ox = border * dx;
2250 2414
2251 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2252 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2253 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2254 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2255 } 2419 }
2256 2420
2257 if (corner) 2421 if (corner)
2258 { 2422 {
2259 float ox = corner * dx; 2423 float ox = corner * dx;
2260 2424
2261 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2262 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2263 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2264 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2265 }
2266 }
2267 } 2429 }
2268 } 2430 }
2269 } 2431 }
2270 } 2432 }
2271 2433
2272 glEnd (); 2434 glEnd ();
2273 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2274 key.texname = -1; 2436 key.texname = -1;
2275 } 2437 }
2276
2277 hv_clear (smooth);
2278 } 2438 }
2279 2439
2280 if (pl_tex.name) 2440 if (pl_tex.name)
2281 { 2441 {
2282 maptex tex = pl_tex; 2442 maptex tex = pl_tex;
2283 int px = pl_x + sdx; 2443 int px = pl_x + sdx;
2284 int py = pl_y + sdy; 2444 int py = pl_y + sdy;
2285 2445
2286 key.texname = tex.name; 2446 key.texname = tex.name;
2287 arr = rc_array (rc, &key); 2447 rc_t::array_t &arr = rc.array (key);
2288 2448
2289 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2449 arr.t2f_v3f (0 , 0 , px , py , 0);
2290 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2450 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2451 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2292 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2452 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2293 2453
2294 rc_draw (rc); 2454 rc.draw ();
2295 } 2455 }
2296 2456
2297 rc_draw (rc_ov); 2457 rc_ov.draw ();
2298 rc_clear (rc_ov); 2458 rc_ov.clear ();
2299 2459
2300 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2301 rc_free (rc);
2302 rc_free (rc_ov);
2303 2461
2304 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2305 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2306 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2307 { 2465 {
2310 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2311 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2312 { 2470 {
2313 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2314 2472
2315 int px = x * T; 2473 int px = x * Tw;
2316 int py = y * T; 2474 int py = y * Th;
2317 2475
2318 if (expect_false (cell->player == player)) 2476 if (expect_false (cell->player == player))
2319 { 2477 {
2320 px += sdx; 2478 px += sdx;
2321 py += sdy; 2479 py += sdy;
2322 } 2480 }
2323 2481
2324 if (cell->stat_hp) 2482 if (cell->stat_hp)
2325 { 2483 {
2326 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2327 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2328 2486
2329 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2330 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2331 px + width - 1, py); 2489 px + width - 1, py);
2332 2490
2338 } 2496 }
2339 } 2497 }
2340} 2498}
2341 2499
2342void 2500void
2343draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2501draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2344 CODE: 2502 CODE:
2345{ 2503{
2346 static float color[16][3] = { 2504 static float color[16][3] = {
2347 { 0.00F, 0.00F, 0.00F }, 2505 { 0.00f, 0.00f, 0.00f },
2348 { 1.00F, 1.00F, 1.00F }, 2506 { 1.00f, 1.00f, 1.00f },
2349 { 0.00F, 0.00F, 0.55F }, 2507 { 0.00f, 0.00f, 0.55f },
2350 { 1.00F, 0.00F, 0.00F }, 2508 { 1.00f, 0.00f, 0.00f },
2351 2509
2352 { 1.00F, 0.54F, 0.00F }, 2510 { 1.00f, 0.54f, 0.00f },
2353 { 0.11F, 0.56F, 1.00F }, 2511 { 0.11f, 0.56f, 1.00f },
2354 { 0.93F, 0.46F, 0.00F }, 2512 { 0.93f, 0.46f, 0.00f },
2355 { 0.18F, 0.54F, 0.34F }, 2513 { 0.18f, 0.54f, 0.34f },
2356 2514
2357 { 0.56F, 0.73F, 0.56F }, 2515 { 0.56f, 0.73f, 0.56f },
2358 { 0.80F, 0.80F, 0.80F }, 2516 { 0.80f, 0.80f, 0.80f },
2359 { 0.55F, 0.41F, 0.13F }, 2517 { 0.55f, 0.41f, 0.13f },
2360 { 0.99F, 0.77F, 0.26F }, 2518 { 0.99f, 0.77f, 0.26f },
2361 2519
2362 { 0.74F, 0.65F, 0.41F }, 2520 { 0.74f, 0.65f, 0.41f },
2363 2521
2364 { 0.00F, 1.00F, 1.00F }, 2522 { 0.00f, 1.00f, 1.00f },
2365 { 1.00F, 0.00F, 1.00F }, 2523 { 1.00f, 0.00f, 1.00f },
2366 { 1.00F, 1.00F, 0.00F }, 2524 { 1.00f, 1.00f, 0.00f },
2367 }; 2525 };
2368 2526
2369 int x, y; 2527 int x, y;
2370 2528
2371 glEnable (GL_TEXTURE_2D); 2529 glEnable (GL_TEXTURE_2D);
2530 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2531 * but the nvidia driver (185.18.14) mishandles alpha textures
2532 * and takes the colour from god knows where instead of using
2533 * Cp. MODULATE results in the same colour, but slightly different
2534 * alpha, but atcually gives us the correct colour with nvidia.
2535 */
2372 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2536 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2373 glEnable (GL_BLEND); 2537 glEnable (GL_BLEND);
2374 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2538 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2375 glBegin (GL_QUADS); 2539 glBegin (GL_QUADS);
2376 2540
2377 for (y = 0; y < h; y++) 2541 for (y = 0; y < h; y++)
2381 2545
2382 if (m) 2546 if (m)
2383 { 2547 {
2384 float *c = color [m & 15]; 2548 float *c = color [m & 15];
2385 2549
2386 float tx1 = m & 0x40 ? 0.5 : 0.; 2550 float tx1 = m & 0x40 ? 0.5f : 0.f;
2387 float tx2 = tx1 + 0.5; 2551 float tx2 = tx1 + 0.5f;
2388 2552
2389 glColor4f (c[0], c[1], c[2], 0.75); 2553 glColor4f (c[0], c[1], c[2], 1);
2390 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2554 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2391 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2555 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2392 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2556 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2393 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2557 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2394 } 2558 }
2402void 2566void
2403fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2567fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2404 PPCODE: 2568 PPCODE:
2405{ 2569{
2406 int x, y; 2570 int x, y;
2407 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2408 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2409 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2410 int sw34 = (sw * 3 + 3) & ~3; 2574 int sw3 = sw * 3;
2575 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2576 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2411 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2412 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2578 memset (darkness1, 0, sw1*sh1);
2413 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2414 2579
2415 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2416 SvCUR_set (darkness3_sv, sw34 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2417 2582
2418 mx += self->x - 1; 2583 mx += self->x - 1;
2419 my += self->y - 1; 2584 my += self->y - 1;
2420
2421 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2422 2585
2423 for (y = 0; y < sh1; y++) 2586 for (y = 0; y < sh1; y++)
2424 if (0 <= y + my && y + my < self->rows) 2587 if (0 <= y + my && y + my < self->rows)
2425 { 2588 {
2426 maprow *row = self->row + (y + my); 2589 maprow *row = self->row + (y + my);
2429 if (row->c0 <= x + mx && x + mx < row->c1) 2592 if (row->c0 <= x + mx && x + mx < row->c1)
2430 { 2593 {
2431 mapcell *cell = row->col + (x + mx - row->c0); 2594 mapcell *cell = row->col + (x + mx - row->c0);
2432 2595
2433 darkness1 [y * sw1 + x] = cell->darkness 2596 darkness1 [y * sw1 + x] = cell->darkness
2434 ? 255 - (cell->darkness - 1) 2597 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2435 : 255 - FOW_DARKNESS; 2598 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2436 } 2599 }
2437 } 2600 }
2438 2601
2439 for (y = 0; y < sh; ++y) 2602 for (y = 0; y < sh; ++y)
2440 for (x = 0; x < sw; ++x) 2603 for (x = 0; x < sw; ++x)
2459 2622
2460 uint8_t r13 = (d13 + d23 + d12) / 3; 2623 uint8_t r13 = (d13 + d23 + d12) / 3;
2461 uint8_t r23 = d23; 2624 uint8_t r23 = d23;
2462 uint8_t r33 = (d23 + d33 + d32) / 3; 2625 uint8_t r33 = (d23 + d33 + d32) / 3;
2463 2626
2464 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2465 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2466 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2629 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2467 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2468 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2469 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2632 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2470 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2471 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2472 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2635 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2473 } 2636 }
2474 2637
2475 free (darkness1); 2638 free (darkness1);
2476 2639
2477 EXTEND (SP, 3); 2640 EXTEND (SP, 3);
2478 PUSHs (sv_2mortal (newSViv (sw34))); 2641 PUSHs (sv_2mortal (newSViv (sw3)));
2479 PUSHs (sv_2mortal (newSViv (sh3))); 2642 PUSHs (sv_2mortal (newSViv (sh3)));
2480 PUSHs (darkness3_sv); 2643 PUSHs (darkness3_sv);
2481} 2644}
2482 2645
2483SV * 2646SV *
2546 else 2709 else
2547 *data++ = 0; 2710 *data++ = 0;
2548 } 2711 }
2549 } 2712 }
2550 2713
2551 /* if size is w*h + 5 then no data has been found */ 2714 /* if size is w*h + 5 then no data has been found */
2552 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2715 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2553 { 2716 {
2554 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2555 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2556 } 2719 }
2557 2720
2558 RETVAL = data_sv; 2721 RETVAL = data_sv;
2559} 2722}
2560 OUTPUT: 2723 OUTPUT:
2561 RETVAL 2724 RETVAL
2562 2725
2563void 2726void
2570 STRLEN len; 2733 STRLEN len;
2571 uint8_t *data, *end; 2734 uint8_t *data, *end;
2572 2735
2573 len = SvLEN (data_sv); 2736 len = SvLEN (data_sv);
2574 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2737 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2575 data = SvPVbyte_nolen (data_sv); 2738 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2576 end = data + len + 8; 2739 end = data + len + 8;
2577 2740
2578 if (len < 5) 2741 if (len < 5)
2579 XSRETURN_EMPTY; 2742 XSRETURN_EMPTY;
2580 2743
2624 2787
2625 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2626 { 2789 {
2627 tileid t = tile [z]; 2790 tileid t = tile [z];
2628 2791
2629 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2630 { 2793 {
2631 PUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2632 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2633 } 2796 }
2634 2797
2635 cell->tile [z] = t; 2798 cell->tile[z] = t;
2636 } 2799 }
2637 } 2800 }
2638 } 2801 }
2639 } 2802 }
2640 } 2803 }
2641} 2804}
2642 2805
2643MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2644 2807
2645DC::RW 2808DC::RW
2646new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2647 CODE: 2810 CODE:
2648{ 2811{
2649 STRLEN datalen; 2812 STRLEN datalen;
2650 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2651 2814
2653} 2816}
2654 OUTPUT: 2817 OUTPUT:
2655 RETVAL 2818 RETVAL
2656 2819
2657DC::RW 2820DC::RW
2658new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2659 CODE: 2822 CODE:
2660 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2661 OUTPUT: 2824 OUTPUT:
2662 RETVAL 2825 RETVAL
2663 2826
2681 if (RETVAL < 0) 2844 if (RETVAL < 0)
2682 { 2845 {
2683 RETVAL = Mix_GroupOldest (-1); 2846 RETVAL = Mix_GroupOldest (-1);
2684 2847
2685 if (RETVAL < 0) 2848 if (RETVAL < 0)
2849 {
2850 // happens sometimes, maybe it just stopped playing(?)
2851 RETVAL = Mix_GroupAvailable (-1);
2852
2853 if (RETVAL < 0)
2686 XSRETURN_UNDEF; 2854 XSRETURN_UNDEF;
2687 2855 }
2856 else
2688 Mix_HaltChannel (RETVAL); 2857 Mix_HaltChannel (RETVAL);
2689 } 2858 }
2690 2859
2691 Mix_UnregisterAllEffects (RETVAL); 2860 Mix_UnregisterAllEffects (RETVAL);
2692 Mix_Volume (RETVAL, 128); 2861 Mix_Volume (RETVAL, 128);
2693} 2862}
2740void 2909void
2741set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2910set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2742 CODE: 2911 CODE:
2743{ 2912{
2744 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2913 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2745 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2914 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2746 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2915 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2747} 2916}
2748 2917
2749void 2918void
2750set_reverse_stereo (DC::Channel self, int flip) 2919set_reverse_stereo (DC::Channel self, int flip)
2753 2922
2754MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2755 2924
2756PROTOTYPES: DISABLE 2925PROTOTYPES: DISABLE
2757 2926
2927void
2928decoders ()
2929 PPCODE:
2930#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2931 int i, num = Mix_GetNumChunkDecoders ();
2932 EXTEND (SP, num);
2933 for (i = 0; i < num; ++i)
2934 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2935#else
2936 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2937#endif
2938
2758DC::MixChunk 2939DC::MixChunk
2759new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2760 CODE: 2941 CODE:
2761 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2762 OUTPUT: 2943 OUTPUT:
2763 RETVAL 2944 RETVAL
2764 2945
2794 OUTPUT: 2975 OUTPUT:
2795 RETVAL 2976 RETVAL
2796 2977
2797MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2978MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2798 2979
2980void
2981decoders ()
2982 PPCODE:
2983#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2984 int i, num = Mix_GetNumMusicDecoders ();
2985 EXTEND (SP, num);
2986 for (i = 0; i < num; ++i)
2987 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2988#else
2989 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2990#endif
2991
2799int 2992int
2800volume (int volume = -1) 2993volume (int volume = -1)
2801 PROTOTYPE: ;$ 2994 PROTOTYPE: ;$
2802 CODE: 2995 CODE:
2803 if (items > 0) 2996 if (items > 0)
2814void 3007void
2815halt () 3008halt ()
2816 CODE: 3009 CODE:
2817 Mix_HaltMusic (); 3010 Mix_HaltMusic ();
2818 3011
3012int
3013playing ()
3014 CODE:
3015 RETVAL = Mix_PlayingMusic ();
3016 OUTPUT:
3017 RETVAL
3018
2819DC::MixMusic 3019DC::MixMusic
2820new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
2821 CODE: 3021 CODE:
2822 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2823 OUTPUT: 3023 OUTPUT:
2824 RETVAL 3024 RETVAL
2825 3025
2853 } *civ, const_iv[] = { 3053 } *civ, const_iv[] = {
2854# define const_iv(name) { # name, (IV)name } 3054# define const_iv(name) { # name, (IV)name }
2855 const_iv (GL_VENDOR), 3055 const_iv (GL_VENDOR),
2856 const_iv (GL_VERSION), 3056 const_iv (GL_VERSION),
2857 const_iv (GL_EXTENSIONS), 3057 const_iv (GL_EXTENSIONS),
3058 const_iv (GL_MAX_TEXTURE_UNITS),
2858 const_iv (GL_COLOR_MATERIAL), 3059 const_iv (GL_COLOR_MATERIAL),
2859 const_iv (GL_SMOOTH), 3060 const_iv (GL_SMOOTH),
2860 const_iv (GL_FLAT), 3061 const_iv (GL_FLAT),
2861 const_iv (GL_DITHER), 3062 const_iv (GL_DITHER),
2862 const_iv (GL_BLEND), 3063 const_iv (GL_BLEND),
2874 const_iv (GL_ZERO), 3075 const_iv (GL_ZERO),
2875 const_iv (GL_SRC_ALPHA), 3076 const_iv (GL_SRC_ALPHA),
2876 const_iv (GL_DST_ALPHA), 3077 const_iv (GL_DST_ALPHA),
2877 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3078 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2878 const_iv (GL_ONE_MINUS_DST_ALPHA), 3079 const_iv (GL_ONE_MINUS_DST_ALPHA),
3080 const_iv (GL_SRC_COLOR),
3081 const_iv (GL_DST_COLOR),
3082 const_iv (GL_ONE_MINUS_SRC_COLOR),
3083 const_iv (GL_ONE_MINUS_DST_COLOR),
2879 const_iv (GL_SRC_ALPHA_SATURATE), 3084 const_iv (GL_SRC_ALPHA_SATURATE),
2880 const_iv (GL_RGB), 3085 const_iv (GL_RGB),
2881 const_iv (GL_RGBA), 3086 const_iv (GL_RGBA),
2882 const_iv (GL_RGBA4), 3087 const_iv (GL_RGBA4),
2883 const_iv (GL_RGBA8), 3088 const_iv (GL_RGBA8),
2951 const_iv (GL_NICEST), 3156 const_iv (GL_NICEST),
2952 const_iv (GL_V2F), 3157 const_iv (GL_V2F),
2953 const_iv (GL_V3F), 3158 const_iv (GL_V3F),
2954 const_iv (GL_T2F_V3F), 3159 const_iv (GL_T2F_V3F),
2955 const_iv (GL_T2F_N3F_V3F), 3160 const_iv (GL_T2F_N3F_V3F),
3161 const_iv (GL_FUNC_ADD),
3162 const_iv (GL_FUNC_SUBTRACT),
3163 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2956# undef const_iv 3164# undef const_iv
2957 }; 3165 };
2958 3166
2959 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3167 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2960 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2961 3169
2962 texture_av = newAV (); 3170 texture_av = newAV ();
2963 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
2964} 3172}
2965 3173
2967disable_GL_EXT_blend_func_separate () 3175disable_GL_EXT_blend_func_separate ()
2968 CODE: 3176 CODE:
2969 gl.BlendFuncSeparate = 0; 3177 gl.BlendFuncSeparate = 0;
2970 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
2971 3179
2972char * 3180void
3181apple_nvidia_bug (int enable)
3182
3183const char *
2973gl_vendor () 3184gl_vendor ()
2974 CODE: 3185 CODE:
2975 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
2976 OUTPUT: 3187 OUTPUT:
2977 RETVAL 3188 RETVAL
2978 3189
2979char * 3190const char *
2980gl_version () 3191gl_version ()
2981 CODE: 3192 CODE:
2982 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
2983 OUTPUT: 3194 OUTPUT:
2984 RETVAL 3195 RETVAL
2985 3196
2986char * 3197const char *
2987gl_extensions () 3198gl_extensions ()
2988 CODE: 3199 CODE:
2989 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2990 OUTPUT: 3201 OUTPUT:
2991 RETVAL 3202 RETVAL
2992 3203
2993const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
2994 3209
2995GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
2996 CODE: 3211 CODE:
2997 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
2998 OUTPUT: 3213 OUTPUT:
3006 3221
3007int glGetError () 3222int glGetError ()
3008 3223
3009void glFinish () 3224void glFinish ()
3010 3225
3226void glFlush ()
3227
3011void glClear (int mask) 3228void glClear (int mask)
3012 3229
3013void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
3014 PROTOTYPE: @ 3231 PROTOTYPE: @
3015 3232
3024void glBlendFunc (int sfactor, int dfactor) 3241void glBlendFunc (int sfactor, int dfactor)
3025 3242
3026void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3243void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3027 CODE: 3244 CODE:
3028 gl_BlendFuncSeparate (sa, da, saa, daa); 3245 gl_BlendFuncSeparate (sa, da, saa, daa);
3246
3247# void glBlendEquation (int se)
3029 3248
3030void glDepthMask (int flag) 3249void glDepthMask (int flag)
3031 3250
3032void glLogicOp (int opcode) 3251void glLogicOp (int opcode)
3033 3252
3184 3403
3185void glEndList () 3404void glEndList ()
3186 3405
3187void glCallList (int list) 3406void glCallList (int list)
3188 3407
3408void c_init ()
3409 CODE:
3410 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3411 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3412
3189MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3413MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3190 3414
3191PROTOTYPES: DISABLE 3415PROTOTYPES: DISABLE
3192 3416
3193void 3417void
3194find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
3195 PPCODE: 3419 PPCODE:
3196{ 3420{
3197 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
3198 XPUSHs (self); 3422 XPUSHs (self);
3199} 3423}
3200 3424
3201BOOT: 3425BOOT:
3202{ 3426{
3210 3434
3211void 3435void
3212draw (SV *self) 3436draw (SV *self)
3213 CODE: 3437 CODE:
3214{ 3438{
3215 HV *hv; 3439 HV *hv;
3216 SV **svp; 3440 SV **svp;
3217 NV x, y, w, h; 3441 NV x, y, w, h;
3218 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
3219 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
3220 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
3221 SV *draw_h_sv = GvSV (draw_h_gv); 3445 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines