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.262 by root, Wed Jul 16 20:12:27 2008 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 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>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
50 60
51#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
78 88
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
82 95
83#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
85 98
86#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
87 100
88/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90 103
91#if 1 104#define KMOD_LRAM 0x10000 // our extension
92# define PARACHUTE SDL_INIT_NOPARACHUTE 105
93#else 106#define TEXID_SPEECH 1
94# define PARACHUTE 0 107#define TEXID_NOFACE 2
95#endif 108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
96 127
97static AV *texture_av; 128static AV *texture_av;
98 129
99static struct 130static struct
100{ 131{
157{ 188{
158 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
159 190
160 while (attrs) 191 while (attrs)
161 { 192 {
162 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
163 194
164 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
165 return 1; 196 return 1;
166 197
167 attrs = attrs->next; 198 attrs = attrs->next;
168 } 199 }
169 200
170 return 0; 201 return 0;
171} 202}
172 203
173typedef struct cf_layout { 204struct cf_layout {
174 PangoLayout *pl; 205 PangoLayout *pl;
175 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
176 int base_height; 207 int base_height;
177 DC__Font font; 208 DC__Font font;
178 rc_t *rc; 209 rc_t *rc;
179} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
180 213
181static DC__Font default_font; 214static DC__Font default_font;
182static PangoContext *opengl_context; 215static PangoContext *opengl_context;
183static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
184 217
185static void 218static void
186substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
187{ 220{
188 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
189#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
190 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
191#endif 224#endif
192 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
193} 226}
194 227
195static void 228static void
225} 258}
226 259
227typedef uint16_t tileid; 260typedef uint16_t tileid;
228typedef uint16_t faceid; 261typedef uint16_t faceid;
229 262
230typedef struct { 263struct maptex
264{
231 GLuint name; 265 GLuint name;
232 int w, h; 266 int w, h;
233 float s, t; 267 float s, t;
234 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
235 tileid smoothtile; 269 tileid smoothtile;
236 uint8_t smoothlevel; 270 uint8_t smoothlevel;
237} maptex; 271 uint8_t unused; /* set to zero on use */
272};
238 273
239typedef struct { 274struct mapcell
275{
240 uint32_t player; 276 uint32_t player;
241 tileid tile[3]; 277 tileid tile[3];
242 uint16_t darkness; 278 uint16_t darkness;
243 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
244} mapcell; 280};
245 281
246typedef struct { 282struct maprow
283{
247 int32_t c0, c1; 284 int32_t c0, c1;
248 mapcell *col; 285 mapcell *col;
249} maprow; 286};
250 287
251typedef struct map { 288struct mapgrid {
252 int x, y, w, h; 289 int x, y, w, h;
253 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
254 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
255 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
256 293
257 int32_t rows; 294 int32_t rows;
258 maprow *row; 295 maprow *row;
259} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
260 299
261static char * 300static char *
262prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
263{ 302{
264 char *p; 303 char *p;
282 321
283#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
284#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
285 324
286static void 325static void
287need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
288{ 327{
289 while (self->faces <= face) 328 while (self->faces <= face)
290 { 329 {
291 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
292 self->faces *= 2; 331 self->faces *= 2;
293 } 332 }
294} 333}
295 334
296static void 335static void
297need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
298{ 337{
299 while (self->texs <= texid) 338 while (self->texs <= texid)
300 { 339 {
301 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
302 self->texs *= 2; 341 self->texs *= 2;
303 } 342 }
304} 343}
305 344
306static maprow * 345static maprow *
307map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
308{ 347{
309 if (0 > y) 348 if (0 > y)
310 { 349 {
311 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
312 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
350 389
351 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
352} 391}
353 392
354static mapcell * 393static mapcell *
355map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
356{ 395{
357 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
358} 397}
359 398
360static void 399static void
361map_clear (DC__Map self) 400map_clear (mapgrid *self)
362{ 401{
363 int r; 402 int r;
364 403
365 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
366 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
373 self->oy = 0; 412 self->oy = 0;
374 self->row = 0; 413 self->row = 0;
375 self->rows = 0; 414 self->rows = 0;
376} 415}
377 416
417#define CELL_CLEAR(cell) \
418 do { \
419 if ((cell)->player) \
420 (cell)->tile [2] = 0; \
421 (cell)->darkness = 0; \
422 (cell)->stat_hp = 0; \
423 (cell)->flags = 0; \
424 (cell)->player = 0; \
425 } while (0)
426
378static void 427static void
379map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
380{ 429{
381 int x, y; 430 int x, y;
382 maprow *row; 431 maprow *row;
383 mapcell *cell; 432 mapcell *cell;
384 433
396 if (x >= row->c1) 445 if (x >= row->c1)
397 break; 446 break;
398 447
399 cell = row->col + x - row->c0; 448 cell = row->col + x - row->c0;
400 449
401 cell->darkness = 0; 450 CELL_CLEAR (cell);
402 cell->stat_hp = 0;
403 cell->flags = 0;
404 cell->player = 0;
405 } 451 }
406 } 452 }
407} 453}
408 454
409typedef struct { 455struct smooth_key
456{
410 tileid tile; 457 tileid tile;
411 uint8_t x, y, level; 458 uint8_t x, y, level;
412} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
413 478
414static void 479static void
415smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
416{ 481{
417 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
418 483
419 if (SvIOK (*sv)) 484 if (it == h.end ())
420 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
421 else 486 else
422 sv_setiv (*sv, bits); 487 it->second |= bits;
423} 488}
424 489
425static void 490static void
426music_finished (void) 491music_finished (void)
427{ 492{
444 ev.code = 1; 509 ev.code = 1;
445 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
446 ev.data2 = 0; 511 ev.data2 = 0;
447 512
448 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
514}
515
516// approximately divide by 255
517static unsigned int
518div255 (unsigned int n)
519{
520 return (n + (n >> 8)) >> 8;
449} 521}
450 522
451static unsigned int 523static unsigned int
452minpot (unsigned int n) 524minpot (unsigned int n)
453{ 525{
520 if (!svp || !SvTRUE (*svp)) 592 if (!svp || !SvTRUE (*svp))
521 return 0; 593 return 0;
522 594
523 return 1; 595 return 1;
524} 596}
597
598/******************************************************************************/
599
600/* process keyboard modifiers */
601static int
602mod_munge (int mod)
603{
604 mod &= MOD_MASK;
605
606 if (mod & (KMOD_META | KMOD_ALT))
607 mod |= KMOD_LRAM;
608
609 return mod;
610}
611
612static void
613deliantra_main (SV *real_main)
614{
615 dSP;
616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
619}
620
621#ifdef __MACOSX__
622 static SV *real_main;
623
624 /* to due surprising braindamage on the side of SDL design, we
625 * do some mind-boggling hack here: SDL requires a custom main()
626 * on OS X, so... we provide one and call the original main(), which,
627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
628 * and which calls our main (== SDL_main) back.
629 */
630 extern C_LINKAGE int
631 main (int argc, char *argv[])
632 {
633 deliantra_main (real_main);
634 }
635
636 #undef main
637
638 extern C_LINKAGE int main (int argc, char *argv[]);
639
640 static void
641 SDL_main_hack (SV *real_main_)
642 {
643 real_main = real_main_;
644
645 char *argv[] = { "deliantra client", 0 };
646 (main) (1, argv);
647 }
648#else
649 static void
650 SDL_main_hack (SV *real_main)
651 {
652 deliantra_main (real_main);
653 }
654#endif
525 655
526MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
527 657
528PROTOTYPES: ENABLE 658PROTOTYPES: ENABLE
529 659
558 const_iv (SDL_USEREVENT), 688 const_iv (SDL_USEREVENT),
559 689
560 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
561 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
562 const_iv (SDL_APPACTIVE), 692 const_iv (SDL_APPACTIVE),
693
694
695 const_iv (SDLK_UNKNOWN),
696 const_iv (SDLK_FIRST),
697 const_iv (SDLK_BACKSPACE),
698 const_iv (SDLK_TAB),
699 const_iv (SDLK_CLEAR),
700 const_iv (SDLK_RETURN),
701 const_iv (SDLK_PAUSE),
702 const_iv (SDLK_ESCAPE),
703 const_iv (SDLK_SPACE),
704 const_iv (SDLK_EXCLAIM),
705 const_iv (SDLK_QUOTEDBL),
706 const_iv (SDLK_HASH),
707 const_iv (SDLK_DOLLAR),
708 const_iv (SDLK_AMPERSAND),
709 const_iv (SDLK_QUOTE),
710 const_iv (SDLK_LEFTPAREN),
711 const_iv (SDLK_RIGHTPAREN),
712 const_iv (SDLK_ASTERISK),
713 const_iv (SDLK_PLUS),
714 const_iv (SDLK_COMMA),
715 const_iv (SDLK_MINUS),
716 const_iv (SDLK_PERIOD),
717 const_iv (SDLK_SLASH),
718 const_iv (SDLK_0),
719 const_iv (SDLK_1),
720 const_iv (SDLK_2),
721 const_iv (SDLK_3),
722 const_iv (SDLK_4),
723 const_iv (SDLK_5),
724 const_iv (SDLK_6),
725 const_iv (SDLK_7),
726 const_iv (SDLK_8),
727 const_iv (SDLK_9),
728 const_iv (SDLK_COLON),
729 const_iv (SDLK_SEMICOLON),
730 const_iv (SDLK_LESS),
731 const_iv (SDLK_EQUALS),
732 const_iv (SDLK_GREATER),
733 const_iv (SDLK_QUESTION),
734 const_iv (SDLK_AT),
735
736 const_iv (SDLK_LEFTBRACKET),
737 const_iv (SDLK_BACKSLASH),
738 const_iv (SDLK_RIGHTBRACKET),
739 const_iv (SDLK_CARET),
740 const_iv (SDLK_UNDERSCORE),
741 const_iv (SDLK_BACKQUOTE),
742 const_iv (SDLK_DELETE),
563 743
564 const_iv (SDLK_FIRST), 744 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST), 745 const_iv (SDLK_LAST),
566 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
567 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
643 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
644 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
645 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
646 const_iv (KMOD_MODE), 826 const_iv (KMOD_MODE),
647 827
828 const_iv (KMOD_LRAM),
829
648 const_iv (MIX_DEFAULT_FORMAT), 830 const_iv (MIX_DEFAULT_FORMAT),
831
832 const_iv (SDL_INIT_TIMER),
833 const_iv (SDL_INIT_AUDIO),
834 const_iv (SDL_INIT_VIDEO),
835 const_iv (SDL_INIT_CDROM),
836 const_iv (SDL_INIT_JOYSTICK),
837 const_iv (SDL_INIT_EVERYTHING),
838 const_iv (SDL_INIT_NOPARACHUTE),
839 const_iv (SDL_INIT_EVENTTHREAD),
840
841 const_iv (SDL_GL_RED_SIZE),
842 const_iv (SDL_GL_GREEN_SIZE),
843 const_iv (SDL_GL_BLUE_SIZE),
844 const_iv (SDL_GL_ALPHA_SIZE),
845 const_iv (SDL_GL_DOUBLEBUFFER),
846 const_iv (SDL_GL_BUFFER_SIZE),
847 const_iv (SDL_GL_DEPTH_SIZE),
848 const_iv (SDL_GL_STENCIL_SIZE),
849 const_iv (SDL_GL_ACCUM_RED_SIZE),
850 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
851 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
852 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
853 const_iv (SDL_GL_STEREO),
854 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
855 const_iv (SDL_GL_MULTISAMPLESAMPLES),
856 const_iv (SDL_GL_ACCELERATED_VISUAL),
857 const_iv (SDL_GL_SWAP_CONTROL),
858
859 const_iv (FOW_DARKNESS)
649# undef const_iv 860# undef const_iv
650 }; 861 };
651 862
652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 863 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
654 865
655 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
656 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
657} 868}
658 869
674NV ceil (NV x) 885NV ceil (NV x)
675 886
676IV minpot (UV n) 887IV minpot (UV n)
677 888
678IV popcount (UV n) 889IV popcount (UV n)
890
891NV distance (NV dx, NV dy)
892 CODE:
893 RETVAL = pow (dx * dx + dy * dy, 0.5);
894 OUTPUT:
895 RETVAL
679 896
680void 897void
681pango_init () 898pango_init ()
682 CODE: 899 CODE:
683{ 900{
689 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 906 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 907 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif 908#endif
692} 909}
693 910
694char *
695SDL_GetError () 911char *SDL_GetError ()
696 912
697int 913void SDL_main_hack (SV *real_main)
698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 914 PROTOTYPE: &
699 915
700void 916int SDL_Init (U32 flags)
917
918int SDL_InitSubSystem (U32 flags)
919
920void SDL_QuitSubSystem (U32 flags)
921
701SDL_Quit () 922void SDL_Quit ()
923
924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
926
927int SDL_GL_GetAttribute (int attr)
928 CODE:
929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
930 XSRETURN_UNDEF;
931 OUTPUT:
932 RETVAL
702 933
703void 934void
704SDL_ListModes (int rgb, int alpha) 935SDL_ListModes (int rgb, int alpha)
705 PPCODE: 936 PPCODE:
706{ 937{
718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
721 952
722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 953 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
723#if SDL_VERSION_ATLEAST(1,2,10)
724 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
725 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 954 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
726#endif
727 955
728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 956 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
729 957
730 if (m && m != (SDL_Rect **)-1) 958 if (m && m != (SDL_Rect **)-1)
731 while (*m) 959 while (*m)
732 { 960 {
733 if ((*m)->w >= 800 && (*m)->h >= 480) 961 if ((*m)->w >= 400 && (*m)->h >= 300)
734 { 962 {
735 AV *av = newAV (); 963 AV *av = newAV ();
736 av_push (av, newSViv ((*m)->w)); 964 av_push (av, newSViv ((*m)->w));
737 av_push (av, newSViv ((*m)->h)); 965 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb)); 966 av_push (av, newSViv (rgb));
761 ); 989 );
762 990
763 if (RETVAL) 991 if (RETVAL)
764 { 992 {
765 av_clear (texture_av); 993 av_clear (texture_av);
766
767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
768#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
769#include "glfunc.h" 995#include "glfunc.h"
770#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
771 } 999 }
772} 1000}
773 OUTPUT: 1001 OUTPUT:
774 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
775 1006
776void 1007void
777SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
778 1009
779char * 1010char *
780SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
781 1013
782int 1014int
783SDL_GetAppState () 1015SDL_GetAppState ()
784 1016
785int 1017int
786SDL_GetModState () 1018SDL_GetModState ()
787 1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
788void 1024void
1025SDL_PumpEvents ()
1026
1027void
789poll_events () 1028peep_events ()
790 PPCODE: 1029 PPCODE:
791{ 1030{
792 SDL_Event ev; 1031 SDL_Event ev;
793 1032
794 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
801 { 1040 {
802 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
803 case SDL_KEYUP: 1042 case SDL_KEYUP:
804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1045 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1046 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
809 break; 1048 break;
810 1049
811 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
830 x = ev.motion.x; 1069 x = ev.motion.x;
831 y = ev.motion.y; 1070 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 } 1072 }
834 1073
835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
836 hv_store (hv, "state", 5, newSViv (state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
837 hv_store (hv, "x", 1, newSViv (x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
838 hv_store (hv, "y", 1, newSViv (y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
839 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
840 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
860 1099
861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1100 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
862 } 1101 }
863} 1102}
864 1103
1104char *
1105SDL_AudioDriverName ()
1106 CODE:
1107{
1108 char buf [256];
1109 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1110 XSRETURN_UNDEF;
1111
1112 RETVAL = buf;
1113}
1114 OUTPUT:
1115 RETVAL
1116
865int 1117int
866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
867 POSTCALL: 1119 POSTCALL:
868 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
869 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
870 1122
871void 1123void
872Mix_QuerySpec () 1124Mix_QuerySpec ()
931add_font (char *file) 1183add_font (char *file)
932 CODE: 1184 CODE:
933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT: 1186 OUTPUT:
935 RETVAL 1187 RETVAL
1188
1189void
1190IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1191
1192# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1193void
1194Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
936 1195
937void 1196void
938load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
939 ALIAS: 1198 ALIAS:
940 load_image_file = 1 1199 load_image_file = 1
986 1245
987 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
988 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
989 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
990 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
991 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
992 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
993 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
994 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
995 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
996 1255
1056#if DEBUG 1315#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK; 1316 VALGRIND_DO_LEAK_CHECK;
1058#endif 1317#endif
1059} 1318}
1060 1319
1320int
1321SvREFCNT (SV *sv)
1322 CODE:
1323 RETVAL = SvREFCNT (sv);
1324 OUTPUT:
1325 RETVAL
1326
1061MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1062 1328
1063PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1064 1330
1065DC::Font 1331DC::Font
1066new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1067 CODE: 1333 CODE:
1068{ 1334{
1069 int count; 1335 int count;
1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1071 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1100 PROTOTYPE: 1366 PROTOTYPE:
1101 CODE: 1367 CODE:
1102 tc_restore (); 1368 tc_restore ();
1103 1369
1104DC::Layout 1370DC::Layout
1105new (SV *class) 1371new (SV *klass)
1106 CODE: 1372 CODE:
1107 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1108 1374
1109 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1110 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1259 1525
1260void 1526void
1261set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1262 CODE: 1528 CODE:
1263 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1264 { 1530 {
1265 self->base_height = base_height; 1531 self->base_height = base_height;
1266 layout_update_font (self); 1532 layout_update_font (self);
1267 } 1533 }
1268 1534
1269void 1535void
1496 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1497 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1498 } 1764 }
1499} 1765}
1500 1766
1767void
1768draw_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)
1769 PROTOTYPE: @
1770 CODE:
1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1774 glEnable (GL_TEXTURE_2D);
1775 glBindTexture (GL_TEXTURE_2D, name1);
1776
1777 glColor3f (intensity, intensity, intensity);
1778 glPushMatrix ();
1779 glScalef (1./3, 1./3, 1.);
1780
1781 if (blend > 0.f)
1782 {
1783 float dx3 = dx * -3.f / w;
1784 float dy3 = dy * -3.f / h;
1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1786
1787 /* interpolate the two shadow textures */
1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1790
1791 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1792 gl.ActiveTexture (GL_TEXTURE1);
1793 glEnable (GL_TEXTURE_2D);
1794 glBindTexture (GL_TEXTURE_2D, name2);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1796
1797 /* rgb == rgb(glcolor) */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1801
1802 /* alpha = interpolate t0, t1 by env_alpha */
1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1808
1809 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1811
1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1814
1815 glBegin (GL_QUADS);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 gl.ActiveTexture (GL_TEXTURE0);
1824 }
1825 else
1826 {
1827 /* simple blending of one texture, also opengl <1.3 path */
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1829
1830 glBegin (GL_QUADS);
1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1832 glTexCoord2f (0, t); glVertex2f (0, h);
1833 glTexCoord2f (s, t); glVertex2f (w, h);
1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1835 glEnd ();
1836 }
1837
1838 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1839 {
1840 int x, y;
1841 int dx3 = dx * 3;
1842 int dy3 = dy * 3;
1843
1844 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1845 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1846 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1847 glTranslatef (-1., -1., 0);
1848 glBegin (GL_QUADS);
1849
1850 for (y = 1; y < h; y += 3)
1851 {
1852 int y1 = y - dy3;
1853 int y1valid = y1 >= 0 && y1 < h;
1854
1855 for (x = 1; x < w; x += 3)
1856 {
1857 int x1 = x - dx3;
1858 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 uint8_t h2;
1860
1861 if (y1valid && x1 >= 0 && x1 < w)
1862 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1863 else
1864 h2 = 1; /* out of range == invisible */
1865
1866 if (h1 || h2)
1867 {
1868 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1869 glColor4f (1., 1., 1., alpha);
1870
1871 glTexCoord2f (0, 0.); glVertex2i (x , y );
1872 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1873 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1874 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1875 }
1876 }
1877 }
1878 }
1879
1880 glEnd ();
1881
1882 glPopMatrix ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886}
1887
1501IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1888IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1502 CODE: 1889 CODE:
1503{ 1890{
1504 GLint width; 1891 GLint width;
1505 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1892 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1512MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1513 1900
1514PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1515 1902
1516DC::Map 1903DC::Map
1517new (SV *class) 1904new (SV *klass)
1518 CODE: 1905 CODE:
1519 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1520 RETVAL->x = 0; 1907 RETVAL->x = 0;
1521 RETVAL->y = 0; 1908 RETVAL->y = 0;
1522 RETVAL->w = 0; 1909 RETVAL->w = 0;
1523 RETVAL->h = 0; 1910 RETVAL->h = 0;
1524 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1561 1948
1562void 1949void
1563set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1564 CODE: 1951 CODE:
1565{ 1952{
1566 tileid texid; 1953 tileid texid;
1567 maptex *tex; 1954 maptex *tex;
1568 1955
1569 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1570 return; 1957 return;
1571 1958
1572 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1573 return; 1960 return;
1574 1961
1575 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1576 1963
1577 if (!texid) 1964 if (!texid)
1578 return; 1965 return;
1579 1966
1580 tex = self->tex + texid; 1967 tex = self->tex + texid;
1609 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1996 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1610 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1611 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1613} 2000}
2001
2002void
2003expire_textures (DC::Map self, int texid, int count)
2004 PPCODE:
2005 for (; texid < self->texs && count; ++texid, --count)
2006 {
2007 maptex *tex = self->tex + texid;
2008
2009 if (tex->name)
2010 {
2011 if (tex->unused)
2012 {
2013 tex->name = 0;
2014 tex->unused = 0;
2015 XPUSHs (sv_2mortal (newSViv (texid)));
2016 }
2017 else
2018 tex->unused = 1;
2019 }
2020 }
1614 2021
1615int 2022int
1616ox (DC::Map self) 2023ox (DC::Map self)
1617 ALIAS: 2024 ALIAS:
1618 oy = 1 2025 oy = 1
1658 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1659 } 2066 }
1660} 2067}
1661 2068
1662SV * 2069SV *
1663map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1664 CODE: 2071 CODE:
1665{ 2072{
1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1667 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1668 mapcell *cell; 2075 mapcell *cell;
1689 2096
1690 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1691 2098
1692 if (flags & 8) 2099 if (flags & 8)
1693 { 2100 {
2101 uint8_t ext, cmd;
2102
1694 if (extmap) 2103 do
1695 { 2104 {
1696 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1697 2107
1698 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
1699 { 2111 {
1700 ext = *data++;
1701 cmd = ext & 0x7f;
1702
1703 if (cmd < 4)
1704 cell->darkness = 255 - ext * 64 + 1;
1705 else if (cmd == 5) // health
1706 {
1707 cell->stat_width = 1; 2112 cell->stat_width = 1;
1708 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1709 }
1710 else if (cmd == 6) // monster width
1711 cell->stat_width = *data++ + 1;
1712 else if (cmd == 0x47)
1713 {
1714 if (*data == 1) cell->player = data [1];
1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1718
1719 data += *data + 1;
1720 }
1721 else if (cmd == 8) // cell flags
1722 cell->flags = *data++;
1723 else if (ext & 0x40) // unknown, multibyte => skip
1724 data += *data + 1;
1725 else
1726 data++;
1727 } 2114 }
1728 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
1729 } 2132 }
1730 else 2133 while (ext & 0x80);
1731 cell->darkness = *data++ + 1;
1732 } 2134 }
1733 2135
1734 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1735 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1736 { 2138 {
1739 cell->tile [z] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
1740 2142
1741 if (cell->tile [z]) 2143 if (cell->tile [z])
1742 { 2144 {
1743 maptex *tex = self->tex + cell->tile [z]; 2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
1744 if (!tex->name) 2147 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z])); 2148 av_push (missing, newSViv (cell->tile [z]));
1746 2149
1747 if (tex->smoothtile) 2150 if (tex->smoothtile)
1748 { 2151 {
1749 maptex *smooth = self->tex + tex->smoothtile; 2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
1750 if (!smooth->name) 2154 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile)); 2155 av_push (missing, newSViv (tex->smoothtile));
1752 } 2156 }
1753 } 2157 }
1754 } 2158 }
1755 } 2159 }
1756 else 2160 else
1757 cell->darkness = 0; 2161 CELL_CLEAR (cell);
1758 } 2162 }
1759} 2163}
1760 OUTPUT: 2164 OUTPUT:
1761 RETVAL 2165 RETVAL
1762 2166
1782 ? self->row + y 2186 ? self->row + y
1783 : 0; 2187 : 0;
1784 2188
1785 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1786 { 2190 {
1787 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1788 2192
1789 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1790 { 2194 {
1791 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1792 2196
1794 { 2198 {
1795 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1796 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1797 int a1 = tex.a; 2201 int a1 = tex.a;
1798 2202
1799 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1800 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1801 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1802 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1803 } 2207 }
1804 } 2208 }
1805 2209
1806 *map++ = (r ) 2210 *map++ = (r )
1807 | (g << 8) 2211 | (g << 8)
1808 | (b << 16) 2212 | (b << 16)
1809 | (a << 24); 2213 | (a << 24);
1810 } 2214 }
1811 } 2215 }
1812 2216
1813 RETVAL = map_sv; 2217 RETVAL = map_sv;
1814} 2218}
1815 OUTPUT: 2219 OUTPUT:
1816 RETVAL 2220 RETVAL
1817 2221
1818void 2222void
1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1820 CODE: 2224 CODE:
1821{ 2225{
1822 int x, y, z; 2226 int x, y, z;
1823 2227
1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1827 smooth_key skey; 2230 smooth_key skey;
1828 int pl_x, pl_y; 2231 int pl_x, pl_y;
1829 maptex pl_tex; 2232 maptex pl_tex;
1830 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
1831 rc_key_t key; 2235 rc_key_t key;
1832 rc_array_t *arr; 2236 rc_array_t *arr;
1833 2237
1834 pl_tex.name = 0; 2238 pl_tex.name = 0;
1835 2239
1836 // thats current max. sorry. 2240 // that's current max. sorry.
1837 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1838 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1839 2243
1840 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1841 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
1845 key.g = 255; 2249 key.g = 255;
1846 key.b = 255; 2250 key.b = 255;
1847 key.a = 255; 2251 key.a = 255;
1848 key.mode = GL_QUADS; 2252 key.mode = GL_QUADS;
1849 key.format = GL_T2F_V3F; 2253 key.format = GL_T2F_V3F;
1850 key.texname = -1;
1851 2254
1852 mx += self->x; 2255 mx += self->x;
1853 my += self->y; 2256 my += self->y;
1854 2257
1855 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
1878 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1880 2283
1881 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1882 { 2285 {
2286 smooth_hash smooth;
1883 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1884 2289
1885 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1887 { 2292 {
1888 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
1894 tileid tile = cell->tile [z]; 2299 tileid tile = cell->tile [z];
1895 2300
1896 if (tile) 2301 if (tile)
1897 { 2302 {
1898 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1899 int px = (x + 1) * T - tex.w; 2304 int px, py;
1900 int py = (y + 1) * T - tex.h;
1901 2305
1902 if (key.texname != tex.name) 2306 if (key.texname != tex.name)
1903 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1904 if (!tex.name) 2310 if (!tex.name)
1905 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1906 2312
1907 key.texname = tex.name; 2313 key.texname = tex.name;
1908 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
1909 } 2315 }
2316
2317 px = (x + 1) * Th - tex.w;
2318 py = (y + 1) * Tw - tex.h;
1910 2319
1911 if (expect_false (cell->player == player) && expect_false (z == 2)) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
1912 { 2321 {
1913 pl_x = px; 2322 pl_x = px;
1914 pl_y = py; 2323 pl_y = py;
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1921 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1923 2332
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1927 if (cell->flags & 1)
1928 {
1929 maptex tex = self->tex [1];
1930 int px = x * T + T * 2 / 32;
1931 int py = y * T - T * 6 / 32;
1932
1933 if (tex.name)
1934 {
1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1945 }
1946 }
1947 }
1948
1949 // update smooth hash 2333 // update smooth hash
1950 if (tex.smoothtile) 2334 if (tex.smoothtile)
1951 { 2335 {
1952 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
1953 skey.level = tex.smoothlevel; 2337 skey.level = tex.smoothlevel;
1968 2352
1969 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1970 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
1971 2355
1972 // full tile 2356 // full tile
1973 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1974 2358
1975 // borders 2359 // borders
1976 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1977 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1978 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1979 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1980 2364
1981 // corners 2365 // corners
1982 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1983 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1984 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1985 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2370 }
2371 }
2372
2373 if (expect_false (z == 2) && expect_false (cell->flags))
2374 {
2375 // overlays such as the speech bubble, probably more to come
2376 if (cell->flags & 1)
2377 {
2378 rc_key_t key_ov = key;
2379 maptex tex = self->tex [TEXID_SPEECH];
2380 rc_array_t *arr;
2381 int px = x * Tw + Tw * 2 / 32;
2382 int py = y * Th - Th * 6 / 32;
2383
2384 key_ov.texname = tex.name;
2385 arr = rc_array (rc_ov, &key_ov);
2386
2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1986 } 2391 }
1987 } 2392 }
1988 } 2393 }
1989 } 2394 }
1990 2395
2006 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2007 { 2412 {
2008 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2009 HE *he; 2414 HE *he;
2010 2415
2011 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2012 while ((he = hv_iternext (smooth)))
2013 { 2417 {
2014 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2015 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2016 2420
2017 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2018 && skey->level == level 2422 && skey.level == level
2019 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2020 { 2424 {
2021 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2022 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
2023 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
2024 int border = bits & 15; 2428 int border = bits & 15;
2025 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2026 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2027 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2028 2432
2030 { 2434 {
2031 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2032 // save gobs of state changes. 2436 // save gobs of state changes.
2033 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2034 { 2438 {
2439 self->tex [skey.tile].unused = 0;
2440
2035 glEnd (); 2441 glEnd ();
2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2037 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2038 } 2444 }
2039 2445
2040 if (border) 2446 if (border)
2041 { 2447 {
2042 float ox = border * dx; 2448 float ox = border * dx;
2043 2449
2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2048 } 2454 }
2049 2455
2050 if (corner) 2456 if (corner)
2051 { 2457 {
2052 float ox = corner * dx; 2458 float ox = corner * dx;
2053 2459
2054 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2058 } 2464 }
2059 } 2465 }
2060 } 2466 }
2061 } 2467 }
2062 } 2468 }
2064 2470
2065 glEnd (); 2471 glEnd ();
2066 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1; 2473 key.texname = -1;
2068 } 2474 }
2069
2070 hv_clear (smooth);
2071 } 2475 }
2072 2476
2073 if (pl_tex.name) 2477 if (pl_tex.name)
2074 { 2478 {
2075 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2076 int px = pl_x + pdx; 2480 int px = pl_x + sdx;
2077 int py = pl_y + pdy; 2481 int py = pl_y + sdy;
2078 2482
2079 key.texname = tex.name; 2483 key.texname = tex.name;
2080 arr = rc_array (rc, &key); 2484 arr = rc_array (rc, &key);
2081 2485
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2486 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086 2490
2087 rc_draw (rc); 2491 rc_draw (rc);
2088 } 2492 }
2089 2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
2496
2090 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2091 rc_free (rc); 2498 rc_free (rc);
2499 rc_free (rc_ov);
2092 2500
2093 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
2094 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
2095 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
2096 { 2504 {
2099 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2100 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2101 { 2509 {
2102 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2103 2511
2104 int px = x * T; 2512 int px = x * Tw;
2105 int py = y * T; 2513 int py = y * Th;
2514
2515 if (expect_false (cell->player == player))
2516 {
2517 px += sdx;
2518 py += sdy;
2519 }
2106 2520
2107 if (cell->stat_hp) 2521 if (cell->stat_hp)
2108 { 2522 {
2109 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2110 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2111 2525
2112 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2113 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2114 px + width - 1, py); 2528 px + width - 1, py);
2115 2529
2121 } 2535 }
2122 } 2536 }
2123} 2537}
2124 2538
2125void 2539void
2126draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2540draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2127 CODE: 2541 CODE:
2128{ 2542{
2129 static float color[16][3] = { 2543 static float color[16][3] = {
2130 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
2131 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
2132 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
2133 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
2134 2548
2135 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2136 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2137 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2138 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2139 2553
2140 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2141 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2142 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2143 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2144 2558
2145 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2146 2560
2147 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2148 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2149 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2150 }; 2564 };
2151 2565
2152 int x, y; 2566 int x, y;
2153 2567
2154 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2569 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2571 * and takes the colour from god knows where instead of using
2572 * Cp. MODULATE results in the same colour, but slightly different
2573 * alpha, but atcually gives us the correct colour with nvidia.
2574 */
2155 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2156 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
2159 2579
2160 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
2164 2584
2165 if (m) 2585 if (m)
2166 { 2586 {
2167 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2168 2588
2169 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2170 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2171 2591
2172 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
2173 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2174 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2175 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2176 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2177 } 2597 }
2185void 2605void
2186fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2606fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2187 PPCODE: 2607 PPCODE:
2188{ 2608{
2189 int x, y; 2609 int x, y;
2190 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2191 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2192 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2193 int sw34 = (sw * 3 + 3) & ~3; 2613 int sw3 = sw * 3;
2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2194 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2195 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2196 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2197 2618
2198 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2199 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2200 2621
2201 mx += self->x - 1; 2622 mx += self->x - 1;
2202 my += self->y - 1; 2623 my += self->y - 1;
2203
2204 memset (darkness1, 255, sw1 * sh1);
2205 2624
2206 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2207 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2208 { 2627 {
2209 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
2212 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2213 { 2632 {
2214 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2215 2634
2216 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2217 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2218 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2219 } 2638 }
2220 } 2639 }
2221 2640
2222 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2223 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
2242 2661
2243 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2244 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2245 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2246 2665
2247 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2250 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2670 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2253 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2256 } 2675 }
2257 2676
2258 free (darkness1); 2677 free (darkness1);
2259 2678
2260 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2261 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2262 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2263 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2264} 2683}
2265 2684
2266SV * 2685SV *
2329 else 2748 else
2330 *data++ = 0; 2749 *data++ = 0;
2331 } 2750 }
2332 } 2751 }
2333 2752
2334 /* if size is w*h + 5 then no data has been found */ 2753 /* if size is w*h + 5 then no data has been found */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 { 2755 {
2337 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 } 2758 }
2340 2759
2341 RETVAL = data_sv; 2760 RETVAL = data_sv;
2342} 2761}
2343 OUTPUT: 2762 OUTPUT:
2344 RETVAL 2763 RETVAL
2345 2764
2346void 2765void
2353 STRLEN len; 2772 STRLEN len;
2354 uint8_t *data, *end; 2773 uint8_t *data, *end;
2355 2774
2356 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2359 end = data + len + 8; 2778 end = data + len + 8;
2360 2779
2361 if (len < 5) 2780 if (len < 5)
2362 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2363 2782
2424} 2843}
2425 2844
2426MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2427 2846
2428DC::RW 2847DC::RW
2429new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2430 CODE: 2849 CODE:
2431{ 2850{
2432 STRLEN datalen; 2851 STRLEN datalen;
2433 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2434 2853
2436} 2855}
2437 OUTPUT: 2856 OUTPUT:
2438 RETVAL 2857 RETVAL
2439 2858
2440DC::RW 2859DC::RW
2441new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2442 CODE: 2861 CODE:
2443 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2444 OUTPUT: 2863 OUTPUT:
2445 RETVAL 2864 RETVAL
2446 2865
2464 if (RETVAL < 0) 2883 if (RETVAL < 0)
2465 { 2884 {
2466 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2467 2886
2468 if (RETVAL < 0) 2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2469 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2470 2894 }
2895 else
2471 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2472 } 2897 }
2473 2898
2474 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2476} 2901}
2523void 2948void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE: 2950 CODE:
2526{ 2951{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2952 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2953 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530} 2955}
2531 2956
2532void 2957void
2533set_reverse_stereo (DC::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2536 2961
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538 2963
2539PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2540 2965
2966void
2967decoders ()
2968 PPCODE:
2969#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2970 int i, num = Mix_GetNumChunkDecoders ();
2971 EXTEND (SP, num);
2972 for (i = 0; i < num; ++i)
2973 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2974#else
2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2976#endif
2977
2541DC::MixChunk 2978DC::MixChunk
2542new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2543 CODE: 2980 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2545 OUTPUT: 2982 OUTPUT:
2546 RETVAL 2983 RETVAL
2547 2984
2577 OUTPUT: 3014 OUTPUT:
2578 RETVAL 3015 RETVAL
2579 3016
2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2581 3018
3019void
3020decoders ()
3021 PPCODE:
3022#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3023 int i, num = Mix_GetNumMusicDecoders ();
3024 EXTEND (SP, num);
3025 for (i = 0; i < num; ++i)
3026 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3027#else
3028 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3029#endif
3030
2582int 3031int
2583volume (int volume = -1) 3032volume (int volume = -1)
2584 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2585 CODE: 3034 CODE:
2586 if (items > 0) 3035 if (items > 0)
2597void 3046void
2598halt () 3047halt ()
2599 CODE: 3048 CODE:
2600 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2601 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2602DC::MixMusic 3058DC::MixMusic
2603new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2604 CODE: 3060 CODE:
2605 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2606 OUTPUT: 3062 OUTPUT:
2607 RETVAL 3063 RETVAL
2608 3064
2636 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2637# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
2638 const_iv (GL_VENDOR), 3094 const_iv (GL_VENDOR),
2639 const_iv (GL_VERSION), 3095 const_iv (GL_VERSION),
2640 const_iv (GL_EXTENSIONS), 3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2641 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2642 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2643 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2644 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2645 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
2657 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2658 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2659 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2660 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2661 const_iv (GL_ONE_MINUS_DST_ALPHA), 3118 const_iv (GL_ONE_MINUS_DST_ALPHA),
3119 const_iv (GL_SRC_COLOR),
3120 const_iv (GL_DST_COLOR),
3121 const_iv (GL_ONE_MINUS_SRC_COLOR),
3122 const_iv (GL_ONE_MINUS_DST_COLOR),
2662 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2663 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2664 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2665 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2666 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
2734 const_iv (GL_NICEST), 3195 const_iv (GL_NICEST),
2735 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2736 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2737 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2738 const_iv (GL_T2F_N3F_V3F), 3199 const_iv (GL_T2F_N3F_V3F),
3200 const_iv (GL_FUNC_ADD),
3201 const_iv (GL_FUNC_SUBTRACT),
3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2739# undef const_iv 3203# undef const_iv
2740 }; 3204 };
2741 3205
2742 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3206 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2743 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2744 3208
2745 texture_av = newAV (); 3209 texture_av = newAV ();
2746 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
2747} 3211}
2748 3212
2750disable_GL_EXT_blend_func_separate () 3214disable_GL_EXT_blend_func_separate ()
2751 CODE: 3215 CODE:
2752 gl.BlendFuncSeparate = 0; 3216 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
2754 3218
2755char * 3219void
3220apple_nvidia_bug (int enable)
3221
3222const char *
2756gl_vendor () 3223gl_vendor ()
2757 CODE: 3224 CODE:
2758 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2759 OUTPUT: 3226 OUTPUT:
2760 RETVAL 3227 RETVAL
2761 3228
2762char * 3229const char *
2763gl_version () 3230gl_version ()
2764 CODE: 3231 CODE:
2765 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2766 OUTPUT: 3233 OUTPUT:
2767 RETVAL 3234 RETVAL
2768 3235
2769char * 3236const char *
2770gl_extensions () 3237gl_extensions ()
2771 CODE: 3238 CODE:
2772 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2773 OUTPUT: 3240 OUTPUT:
2774 RETVAL 3241 RETVAL
2775 3242
2776const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
2777 3248
2778GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
2779 CODE: 3250 CODE:
2780 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
2781 OUTPUT: 3252 OUTPUT:
2789 3260
2790int glGetError () 3261int glGetError ()
2791 3262
2792void glFinish () 3263void glFinish ()
2793 3264
3265void glFlush ()
3266
2794void glClear (int mask) 3267void glClear (int mask)
2795 3268
2796void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2797 PROTOTYPE: @ 3270 PROTOTYPE: @
2798 3271
2807void glBlendFunc (int sfactor, int dfactor) 3280void glBlendFunc (int sfactor, int dfactor)
2808 3281
2809void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2810 CODE: 3283 CODE:
2811 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
3285
3286# void glBlendEquation (int se)
2812 3287
2813void glDepthMask (int flag) 3288void glDepthMask (int flag)
2814 3289
2815void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2816 3291
2851void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2852 CODE: 3327 CODE:
2853 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2854 3329
2855void glColor (float r, float g, float b, float a = 1.0) 3330void glColor (float r, float g, float b, float a = 1.0)
3331 PROTOTYPE: @
2856 ALIAS: 3332 ALIAS:
2857 glColor_premultiply = 1 3333 glColor_premultiply = 1
2858 CODE: 3334 CODE:
2859 if (ix) 3335 if (ix)
2860 { 3336 {
2966 3442
2967void glEndList () 3443void glEndList ()
2968 3444
2969void glCallList (int list) 3445void glCallList (int list)
2970 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2972 3453
2973PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
2974 3455
2975void 3456void
2976find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
2977 PPCODE: 3458 PPCODE:
2978{ 3459{
2979 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
2980 XPUSHs (self); 3461 XPUSHs (self);
2981} 3462}
2982 3463
2983BOOT: 3464BOOT:
2984{ 3465{
2992 3473
2993void 3474void
2994draw (SV *self) 3475draw (SV *self)
2995 CODE: 3476 CODE:
2996{ 3477{
2997 HV *hv; 3478 HV *hv;
2998 SV **svp; 3479 SV **svp;
2999 NV x, y, w, h; 3480 NV x, y, w, h;
3000 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3001 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3002 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3003 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines