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.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 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)
104
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}
95 128
96static AV *texture_av; 129static AV *texture_av;
97 130
98static struct 131static struct
99{ 132{
156{ 189{
157 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
158 191
159 while (attrs) 192 while (attrs)
160 { 193 {
161 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 195
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 197 return 1;
165 198
166 attrs = attrs->next; 199 attrs = attrs->next;
167 } 200 }
168 201
169 return 0; 202 return 0;
170} 203}
171 204
172typedef struct cf_layout { 205struct cf_layout {
173 PangoLayout *pl; 206 PangoLayout *pl;
174 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
175 int base_height; 208 int base_height;
176 DC__Font font; 209 DC__Font font;
177 rc_t *rc; 210 rc_t rc;
178} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
179 214
180static DC__Font default_font; 215static DC__Font default_font;
181static PangoContext *opengl_context; 216static PangoContext *opengl_context;
182static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
183 218
184static void 219static void
185substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
186{ 221{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 225#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 227}
193 228
194static void 229static void
224} 259}
225 260
226typedef uint16_t tileid; 261typedef uint16_t tileid;
227typedef uint16_t faceid; 262typedef uint16_t faceid;
228 263
229typedef struct { 264struct maptex
265{
230 GLuint name; 266 GLuint name;
231 int w, h; 267 int w, h;
232 float s, t; 268 float s, t;
233 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
234 tileid smoothtile; 270 tileid smoothtile;
235 uint8_t smoothlevel; 271 uint8_t smoothlevel;
236} maptex; 272 uint8_t unused; /* set to zero on use */
273};
237 274
238typedef struct { 275struct mapcell
276{
239 uint32_t player; 277 uint32_t player;
240 tileid tile[3]; 278 tileid tile[3];
241 uint16_t darkness; 279 uint16_t darkness;
242 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
243} mapcell; 281};
244 282
245typedef struct { 283struct maprow
284{
246 int32_t c0, c1; 285 int32_t c0, c1;
247 mapcell *col; 286 mapcell *col;
248} maprow; 287};
249 288
250typedef struct map { 289struct mapgrid {
251 int x, y, w, h; 290 int x, y, w, h;
252 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
253 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
254 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
255 294
256 int32_t rows; 295 int32_t rows;
257 maprow *row; 296 maprow *row;
258} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
259 300
260static char * 301static char *
261prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
262{ 303{
263 char *p; 304 char *p;
281 322
282#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))
283#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))
284 325
285static void 326static void
286need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
287{ 328{
288 while (self->faces <= face) 329 while (self->faces <= face)
289 { 330 {
290 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
291 self->faces *= 2; 332 self->faces *= 2;
292 } 333 }
293} 334}
294 335
295static void 336static void
296need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
297{ 338{
298 while (self->texs <= texid) 339 while (self->texs <= texid)
299 { 340 {
300 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
301 self->texs *= 2; 342 self->texs *= 2;
302 } 343 }
303} 344}
304 345
305static maprow * 346static maprow *
306map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
307{ 348{
308 if (0 > y) 349 if (0 > y)
309 { 350 {
310 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
349 390
350 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
351} 392}
352 393
353static mapcell * 394static mapcell *
354map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
355{ 396{
356 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
357} 398}
358 399
359static void 400static void
360map_clear (DC__Map self) 401map_clear (mapgrid *self)
361{ 402{
362 int r; 403 int r;
363 404
364 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
384 (cell)->player = 0; \ 425 (cell)->player = 0; \
385 } while (0) 426 } while (0)
386 427
387static void 428static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 430{
390 int x, y; 431 int x, y;
391 maprow *row; 432 maprow *row;
392 mapcell *cell; 433 mapcell *cell;
393 434
410 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
411 } 452 }
412 } 453 }
413} 454}
414 455
415typedef struct { 456struct smooth_key
457{
416 tileid tile; 458 tileid tile;
417 uint8_t x, y, level; 459 uint8_t x, y, level;
418} 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}
419 479
420static void 480static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 482{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
424 484
425 if (SvIOK (*sv)) 485 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
427 else 487 else
428 sv_setiv (*sv, bits); 488 it->second |= bits;
429} 489}
430 490
431static void 491static void
432music_finished (void) 492music_finished (void)
433{ 493{
450 ev.code = 1; 510 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 512 ev.data2 = 0;
453 513
454 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;
455} 522}
456 523
457static unsigned int 524static unsigned int
458minpot (unsigned int n) 525minpot (unsigned int n)
459{ 526{
527 return 0; 594 return 0;
528 595
529 return 1; 596 return 1;
530} 597}
531 598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
532static void 613static void
533deliantra_main () 614deliantra_main (SV *real_main)
534{ 615{
535 char *argv[] = { 0 }; 616 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
537} 620}
538 621
539#ifdef __MACOSX__ 622#ifdef __MACOSX__
623 static SV *real_main;
624
540 /* to due surprising braindamage on the side of SDL design, we 625 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 626 * do some mind-boggling hack here: SDL requires a custom main()
542 * 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,
543 * 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,
544 * and which calls our main (== SDL_main) back. 629 * and which calls our main (== SDL_main) back.
545 */ 630 */
546 extern C_LINKAGE int 631 extern C_LINKAGE int
547 main (int argc, char *argv[]) 632 main (int argc, char *argv[])
548 { 633 {
549 deliantra_main (); 634 deliantra_main (real_main);
550 } 635 }
551 636
552 #undef main 637 #undef main
553 638
554 extern C_LINKAGE int main (int argc, char *argv[]); 639 extern C_LINKAGE int main (int argc, char *argv[]);
555 640
556 static void 641 static void
557 SDL_braino (void) 642 SDL_main_hack (SV *real_main_)
558 { 643 {
644 real_main = real_main_;
645
559 char *argv[] = { "deliantra client", 0 }; 646 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 647 (main) (1, argv);
561 } 648 }
562#else 649#else
563 static void 650 static void
564 SDL_braino (void) 651 SDL_main_hack (SV *real_main)
565 { 652 {
566 deliantra_main (); 653 deliantra_main (real_main);
567 } 654 }
568#endif 655#endif
569 656
570MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
571 658
737 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
741 828
829 const_iv (KMOD_LRAM),
830
742 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
743 832
744 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
770 859
771 const_iv (FOW_DARKNESS) 860 const_iv (FOW_DARKNESS)
772# undef const_iv 861# undef const_iv
773 }; 862 };
774 863
775 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--)
776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777 866
778 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780} 869}
781 870
797NV ceil (NV x) 886NV ceil (NV x)
798 887
799IV minpot (UV n) 888IV minpot (UV n)
800 889
801IV 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
802 897
803void 898void
804pango_init () 899pango_init ()
805 CODE: 900 CODE:
806{ 901{
814#endif 909#endif
815} 910}
816 911
817char *SDL_GetError () 912char *SDL_GetError ()
818 913
819void SDL_braino () 914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
820 916
821int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
822 918
823int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
824 920
825void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
826 922
827void SDL_Quit () 923void SDL_Quit ()
828 924
829int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
830 927
831int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
832 CODE: 929 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
835 OUTPUT: 932 OUTPUT:
836 RETVAL 933 RETVAL
837 934
838void 935void
893 ); 990 );
894 991
895 if (RETVAL) 992 if (RETVAL)
896 { 993 {
897 av_clear (texture_av); 994 av_clear (texture_av);
898
899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900#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);
901#include "glfunc.h" 996#include "glfunc.h"
902#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 1000 }
904} 1001}
905 OUTPUT: 1002 OUTPUT:
906 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
907 1007
908void 1008void
909SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
910 1010
911char * 1011char *
912SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
913 1014
914int 1015int
915SDL_GetAppState () 1016SDL_GetAppState ()
916 1017
917int 1018int
918SDL_GetModState () 1019SDL_GetModState ()
919 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
920void 1025void
1026SDL_PumpEvents ()
1027
1028void
921poll_events () 1029peep_events ()
922 PPCODE: 1030 PPCODE:
923{ 1031{
924 SDL_Event ev; 1032 SDL_Event ev;
925 1033
926 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
933 { 1041 {
934 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1043 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1049 break;
942 1050
943 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1070 x = ev.motion.x;
963 y = ev.motion.y; 1071 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1073 }
966 1074
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1100
993 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))));
994 } 1102 }
995} 1103}
996 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
997int 1118int
998Mix_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)
999 POSTCALL: 1120 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1002 1123
1003void 1124void
1004Mix_QuerySpec () 1125Mix_QuerySpec ()
1063add_font (char *file) 1184add_font (char *file)
1064 CODE: 1185 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1187 OUTPUT:
1067 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)
1068 1196
1069void 1197void
1070load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
1071 ALIAS: 1199 ALIAS:
1072 load_image_file = 1 1200 load_image_file = 1
1118 1246
1119 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1120 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1121 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1122 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1123 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1124 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)));
1125 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1128 1256
1188#if DEBUG 1316#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1190#endif 1318#endif
1191} 1319}
1192 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1329
1195PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1196 1331
1197DC::Font 1332DC::Font
1198new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1199 CODE: 1334 CODE:
1200{ 1335{
1201 int count; 1336 int count;
1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1232 PROTOTYPE: 1367 PROTOTYPE:
1233 CODE: 1368 CODE:
1234 tc_restore (); 1369 tc_restore ();
1235 1370
1236DC::Layout 1371DC::Layout
1237new (SV *class) 1372new (SV *klass)
1238 CODE: 1373 CODE:
1239 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1240 1375
1241 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1242 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1243 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1244 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1245 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1246 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1247 RETVAL->font = 0; 1382 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1249 1383
1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1251 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1252 OUTPUT: 1386 OUTPUT:
1253 RETVAL 1387 RETVAL
1254 1388
1255void 1389void
1256DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1257 CODE: 1391 CODE:
1258 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1259 rc_free (self->rc);
1260 Safefree (self); 1393 delete self;
1261 1394
1262void 1395void
1263set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1264 CODE: 1397 CODE:
1265{ 1398{
1391 1524
1392void 1525void
1393set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1394 CODE: 1527 CODE:
1395 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1396 { 1529 {
1397 self->base_height = base_height; 1530 self->base_height = base_height;
1398 layout_update_font (self); 1531 layout_update_font (self);
1399 } 1532 }
1400 1533
1401void 1534void
1519} 1652}
1520 1653
1521void 1654void
1522render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1523 CODE: 1656 CODE:
1524 rc_clear (self->rc); 1657 self->rc.clear ();
1525 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1526 self->pl, 1659 self->pl,
1527 self->rc, 1660 &self->rc,
1528 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1529 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1530 flags 1663 flags
1531 ); 1664 );
1532 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1547 1680
1548 rc_draw (self->rc); 1681 self->rc.draw ();
1549 1682
1550 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1553} 1686}
1628 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1630 } 1763 }
1631} 1764}
1632 1765
1766void
1767draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1633IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1634 CODE: 1888 CODE:
1635{ 1889{
1636 GLint width; 1890 GLint width;
1637 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1644MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1645 1899
1646PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1647 1901
1648DC::Map 1902DC::Map
1649new (SV *class) 1903new (SV *klass)
1650 CODE: 1904 CODE:
1651 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1652 RETVAL->x = 0; 1906 RETVAL->x = 0;
1653 RETVAL->y = 0; 1907 RETVAL->y = 0;
1654 RETVAL->w = 0; 1908 RETVAL->w = 0;
1655 RETVAL->h = 0; 1909 RETVAL->h = 0;
1656 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1693 1947
1694void 1948void
1695set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1696 CODE: 1950 CODE:
1697{ 1951{
1698 tileid texid; 1952 tileid texid;
1699 maptex *tex; 1953 maptex *tex;
1700 1954
1701 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1702 return; 1956 return;
1703 1957
1704 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1705 return; 1959 return;
1706 1960
1707 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1708 1962
1709 if (!texid) 1963 if (!texid)
1710 return; 1964 return;
1711 1965
1712 tex = self->tex + texid; 1966 tex = self->tex + texid;
1741 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1995 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1742 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 1999}
2000
2001void
2002expire_textures (DC::Map self, int texid, int count)
2003 PPCODE:
2004 for (; texid < self->texs && count; ++texid, --count)
2005 {
2006 maptex *tex = self->tex + texid;
2007
2008 if (tex->name)
2009 {
2010 if (tex->unused)
2011 {
2012 tex->name = 0;
2013 tex->unused = 0;
2014 XPUSHs (sv_2mortal (newSViv (texid)));
2015 }
2016 else
2017 tex->unused = 1;
2018 }
2019 }
1746 2020
1747int 2021int
1748ox (DC::Map self) 2022ox (DC::Map self)
1749 ALIAS: 2023 ALIAS:
1750 oy = 1 2024 oy = 1
1790 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1791 } 2065 }
1792} 2066}
1793 2067
1794SV * 2068SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1796 CODE: 2070 CODE:
1797{ 2071{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2074 mapcell *cell;
1821 2095
1822 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1823 2097
1824 if (flags & 8) 2098 if (flags & 8)
1825 { 2099 {
2100 uint8_t ext, cmd;
2101
1826 if (extmap) 2102 do
1827 { 2103 {
1828 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1829 2106
1830 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1831 { 2110 {
1832 ext = *data++;
1833 cmd = ext & 0x7f;
1834
1835 if (cmd < 4)
1836 cell->darkness = 255 - ext * 64 + 1;
1837 else if (cmd == 5) // health
1838 {
1839 cell->stat_width = 1; 2111 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1841 }
1842 else if (cmd == 6) // monster width
1843 cell->stat_width = *data++ + 1;
1844 else if (cmd == 0x47)
1845 {
1846 if (*data == 1) cell->player = data [1];
1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1850
1851 data += *data + 1;
1852 }
1853 else if (cmd == 8) // cell flags
1854 cell->flags = *data++;
1855 else if (ext & 0x40) // unknown, multibyte => skip
1856 data += *data + 1;
1857 else
1858 data++;
1859 } 2113 }
1860 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1861 } 2131 }
1862 else 2132 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2133 }
1865 2134
1866 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1868 { 2137 {
1871 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1872 2141
1873 if (cell->tile [z]) 2142 if (cell->tile [z])
1874 { 2143 {
1875 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1876 if (!tex->name) 2146 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1878 2148
1879 if (tex->smoothtile) 2149 if (tex->smoothtile)
1880 { 2150 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1882 if (!smooth->name) 2153 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1884 } 2155 }
1885 } 2156 }
1886 } 2157 }
1914 ? self->row + y 2185 ? self->row + y
1915 : 0; 2186 : 0;
1916 2187
1917 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1918 { 2189 {
1919 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2191
1921 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1922 { 2193 {
1923 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1924 2195
1926 { 2197 {
1927 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2200 int a1 = tex.a;
1930 2201
1931 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1935 } 2206 }
1936 } 2207 }
1937 2208
1938 *map++ = (r ) 2209 *map++ = (r )
1939 | (g << 8) 2210 | (g << 8)
1940 | (b << 16) 2211 | (b << 16)
1941 | (a << 24); 2212 | (a << 24);
1942 } 2213 }
1943 } 2214 }
1944 2215
1945 RETVAL = map_sv; 2216 RETVAL = map_sv;
1946} 2217}
1947 OUTPUT: 2218 OUTPUT:
1948 RETVAL 2219 RETVAL
1949 2220
1950void 2221void
1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1952 CODE: 2223 CODE:
1953{ 2224{
1954 int x, y, z; 2225 int x, y, z;
1955 2226
1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1959 smooth_key skey;
1960 int pl_x, pl_y; 2228 int pl_x, pl_y;
1961 maptex pl_tex; 2229 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1963 rc_key_t key; 2232 rc_key_t key;
1964 rc_array_t *arr; 2233 rc_t::array_t *arr;
1965 2234
1966 pl_tex.name = 0; 2235 pl_tex.name = 0;
1967 2236
1968 // thats current max. sorry. 2237 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1971
1972 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey));
1974 2240
1975 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1976 key.r = 255; 2242 key.r = 255;
1977 key.g = 255; 2243 key.g = 255;
1978 key.b = 255; 2244 key.b = 255;
1979 key.a = 255; 2245 key.a = 255;
1980 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2248
1984 mx += self->x; 2249 mx += self->x;
1985 my += self->y; 2250 my += self->y;
1986 2251
1987 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1988 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1989 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1990 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1991 2256
1992 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1994 { 2259 {
1995 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2277
2013 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
2014 { 2279 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2283 key.texname = -1;
2016 2284
2017 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
2019 { 2287 {
2020 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
2027 2295
2028 if (tile) 2296 if (tile)
2029 { 2297 {
2030 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2299 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2300
2034 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
2035 { 2302 {
2303 self->tex [tile].unused = 0;
2304
2036 if (!tex.name) 2305 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2307
2039 key.texname = tex.name; 2308 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
2041 } 2310 }
2311
2312 px = (x + 1) * Th - tex.w;
2313 py = (y + 1) * Tw - tex.h;
2042 2314
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
2044 { 2316 {
2045 pl_x = px; 2317 pl_x = px;
2046 pl_y = py; 2318 pl_y = py;
2047 pl_tex = tex; 2319 pl_tex = tex;
2048 continue; 2320 continue;
2049 } 2321 }
2050 2322
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2055
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
2059 if (cell->flags & 1)
2060 {
2061 maptex tex = self->tex [1];
2062 int px = x * T + T * 2 / 32;
2063 int py = y * T - T * 6 / 32;
2064
2065 if (tex.name)
2066 {
2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077 }
2078 }
2079 }
2080 2327
2081 // update smooth hash 2328 // update smooth hash
2082 if (tex.smoothtile) 2329 if (tex.smoothtile)
2083 { 2330 {
2084 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
2086 2333
2087 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
2088 2335
2089 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
2090 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
2091 2338
2092 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
2100 2347
2101 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2102 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
2103 2350
2104 // full tile 2351 // full tile
2105 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2106 2353
2107 // borders 2354 // borders
2108 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2109 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2356 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2110 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2357 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2111 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2112 2359
2113 // corners 2360 // corners
2114 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2115 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2362 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2116 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2363 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2117 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2118 } 2385 }
2119 } 2386 }
2120 } 2387 }
2121 } 2388 }
2122 2389
2123 rc_draw (rc); 2390 rc.draw ();
2124 rc_clear (rc); 2391 rc.clear ();
2125 2392
2126 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2127 // this is basically counting sort 2394 // this is basically counting sort
2128 { 2395 {
2129 int w, b; 2396 int w, b;
2130 2397
2131 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2133 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2134 { 2403 {
2135 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2136 if (smask) 2405 IV bits = it->second;
2137 for (b = 0; b < 32; ++b) 2406
2138 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2139 { 2410 {
2140 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
2141 HE *he; 2419 if (tex.name)
2142
2143 hv_iterinit (smooth);
2144 while ((he = hv_iternext (smooth)))
2145 { 2420 {
2146 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2147 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2148 2423 if (key.texname != tex.name)
2149 if (!(bits & 0x1000)
2150 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y])
2152 { 2424 {
2153 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
2154 int px = (((int)skey->x) - 1) * T;
2155 int py = (((int)skey->y) - 1) * T;
2156 int border = bits & 15;
2157 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2158 float dx = tex.s * .0625f; // 16 images/row
2159 float dy = tex.t * .5f ; // 2 images/column
2160 2426
2161 if (tex.name)
2162 {
2163 // this time avoiding texture state changes
2164 // save gobs of state changes.
2165 if (key.texname != tex.name)
2166 {
2167 glEnd (); 2427 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2170 } 2430 }
2171 2431
2172 if (border) 2432 if (border)
2173 { 2433 {
2174 float ox = border * dx; 2434 float ox = border * dx;
2175 2435
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2440 }
2181 2441
2182 if (corner) 2442 if (corner)
2183 { 2443 {
2184 float ox = corner * dx; 2444 float ox = corner * dx;
2185 2445
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 }
2191 }
2192 } 2450 }
2193 } 2451 }
2194 } 2452 }
2195 } 2453 }
2196 2454
2197 glEnd (); 2455 glEnd ();
2198 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1; 2457 key.texname = -1;
2200 } 2458 }
2201
2202 hv_clear (smooth);
2203 } 2459 }
2204 2460
2205 if (pl_tex.name) 2461 if (pl_tex.name)
2206 { 2462 {
2207 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2208 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2209 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2210 2466
2211 key.texname = tex.name; 2467 key.texname = tex.name;
2212 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2213 2469
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2218 2474
2219 rc_draw (rc); 2475 rc.draw ();
2220 } 2476 }
2221 2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2222 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2223 rc_free (rc);
2224 2482
2225 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2228 { 2486 {
2231 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2491 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2235 2493
2236 int px = x * T; 2494 int px = x * Tw;
2237 int py = y * T; 2495 int py = y * Th;
2496
2497 if (expect_false (cell->player == player))
2498 {
2499 px += sdx;
2500 py += sdy;
2501 }
2238 2502
2239 if (cell->stat_hp) 2503 if (cell->stat_hp)
2240 { 2504 {
2241 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2507
2244 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2510 px + width - 1, py);
2247 2511
2253 } 2517 }
2254 } 2518 }
2255} 2519}
2256 2520
2257void 2521void
2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2259 CODE: 2523 CODE:
2260{ 2524{
2261 static float color[16][3] = { 2525 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2266 2530
2267 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2271 2535
2272 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2276 2540
2277 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2278 2542
2279 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2282 }; 2546 };
2283 2547
2284 int x, y; 2548 int x, y;
2285 2549
2286 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2291 2561
2292 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2296 2566
2297 if (m) 2567 if (m)
2298 { 2568 {
2299 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2300 2570
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2303 2573
2304 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2579 }
2317void 2587void
2318fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2319 PPCODE: 2589 PPCODE:
2320{ 2590{
2321 int x, y; 2591 int x, y;
2322 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2325 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2600
2330 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2603
2333 mx += self->x - 1; 2604 mx += self->x - 1;
2334 my += self->y - 1; 2605 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2606
2338 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2340 { 2609 {
2341 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2614 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2347 2616
2348 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2620 }
2352 } 2621 }
2353 2622
2354 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2374 2643
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2647
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2657 }
2389 2658
2390 free (darkness1); 2659 free (darkness1);
2391 2660
2392 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2396} 2665}
2397 2666
2398SV * 2667SV *
2461 else 2730 else
2462 *data++ = 0; 2731 *data++ = 0;
2463 } 2732 }
2464 } 2733 }
2465 2734
2466 /* if size is w*h + 5 then no data has been found */ 2735 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 { 2737 {
2469 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 } 2740 }
2472 2741
2473 RETVAL = data_sv; 2742 RETVAL = data_sv;
2474} 2743}
2475 OUTPUT: 2744 OUTPUT:
2476 RETVAL 2745 RETVAL
2477 2746
2478void 2747void
2485 STRLEN len; 2754 STRLEN len;
2486 uint8_t *data, *end; 2755 uint8_t *data, *end;
2487 2756
2488 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491 end = data + len + 8; 2760 end = data + len + 8;
2492 2761
2493 if (len < 5) 2762 if (len < 5)
2494 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2495 2764
2556} 2825}
2557 2826
2558MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2559 2828
2560DC::RW 2829DC::RW
2561new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2562 CODE: 2831 CODE:
2563{ 2832{
2564 STRLEN datalen; 2833 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2566 2835
2568} 2837}
2569 OUTPUT: 2838 OUTPUT:
2570 RETVAL 2839 RETVAL
2571 2840
2572DC::RW 2841DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574 CODE: 2843 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT: 2845 OUTPUT:
2577 RETVAL 2846 RETVAL
2578 2847
2596 if (RETVAL < 0) 2865 if (RETVAL < 0)
2597 { 2866 {
2598 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2599 2868
2600 if (RETVAL < 0) 2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2601 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2602 2876 }
2877 else
2603 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2604 } 2879 }
2605 2880
2606 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2608} 2883}
2655void 2930void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2932 CODE:
2658{ 2933{
2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2937}
2663 2938
2664void 2939void
2665set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2668 2943
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2945
2671PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2672 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2673DC::MixChunk 2960DC::MixChunk
2674new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2675 CODE: 2962 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT: 2964 OUTPUT:
2678 RETVAL 2965 RETVAL
2679 2966
2709 OUTPUT: 2996 OUTPUT:
2710 RETVAL 2997 RETVAL
2711 2998
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
3012
2714int 3013int
2715volume (int volume = -1) 3014volume (int volume = -1)
2716 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2717 CODE: 3016 CODE:
2718 if (items > 0) 3017 if (items > 0)
2729void 3028void
2730halt () 3029halt ()
2731 CODE: 3030 CODE:
2732 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2733 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2734DC::MixMusic 3040DC::MixMusic
2735new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2736 CODE: 3042 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2738 OUTPUT: 3044 OUTPUT:
2739 RETVAL 3045 RETVAL
2740 3046
2768 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2870 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2871# undef const_iv 3185# undef const_iv
2872 }; 3186 };
2873 3187
2874 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3190
2877 texture_av = newAV (); 3191 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2879} 3193}
2880 3194
2882disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2883 CODE: 3197 CODE:
2884 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2886 3200
2887char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2888gl_vendor () 3205gl_vendor ()
2889 CODE: 3206 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3208 OUTPUT:
2892 RETVAL 3209 RETVAL
2893 3210
2894char * 3211const char *
2895gl_version () 3212gl_version ()
2896 CODE: 3213 CODE:
2897 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2898 OUTPUT: 3215 OUTPUT:
2899 RETVAL 3216 RETVAL
2900 3217
2901char * 3218const char *
2902gl_extensions () 3219gl_extensions ()
2903 CODE: 3220 CODE:
2904 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905 OUTPUT: 3222 OUTPUT:
2906 RETVAL 3223 RETVAL
2907 3224
2908const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2909 3230
2910GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2911 CODE: 3232 CODE:
2912 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT: 3234 OUTPUT:
2921 3242
2922int glGetError () 3243int glGetError ()
2923 3244
2924void glFinish () 3245void glFinish ()
2925 3246
3247void glFlush ()
3248
2926void glClear (int mask) 3249void glClear (int mask)
2927 3250
2928void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3252 PROTOTYPE: @
2930 3253
2939void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2940 3263
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3265 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2944 3269
2945void glDepthMask (int flag) 3270void glDepthMask (int flag)
2946 3271
2947void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2948 3273
2983void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2984 CODE: 3309 CODE:
2985 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2986 3311
2987void glColor (float r, float g, float b, float a = 1.0) 3312void glColor (float r, float g, float b, float a = 1.0)
3313 PROTOTYPE: @
2988 ALIAS: 3314 ALIAS:
2989 glColor_premultiply = 1 3315 glColor_premultiply = 1
2990 CODE: 3316 CODE:
2991 if (ix) 3317 if (ix)
2992 { 3318 {
3098 3424
3099void glEndList () 3425void glEndList ()
3100 3426
3101void glCallList (int list) 3427void glCallList (int list)
3102 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3435
3105PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
3106 3437
3107void 3438void
3108find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3109 PPCODE: 3440 PPCODE:
3110{ 3441{
3111 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3112 XPUSHs (self); 3443 XPUSHs (self);
3113} 3444}
3114 3445
3115BOOT: 3446BOOT:
3116{ 3447{
3124 3455
3125void 3456void
3126draw (SV *self) 3457draw (SV *self)
3127 CODE: 3458 CODE:
3128{ 3459{
3129 HV *hv; 3460 HV *hv;
3130 SV **svp; 3461 SV **svp;
3131 NV x, y, w, h; 3462 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3135 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines