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.263 by root, Fri Jul 18 21:18:42 2008 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
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);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
78 89
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 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 */
81#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
82 96
83#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
85 99
86#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
87 101
88/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
89#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}
90 128
91static AV *texture_av; 129static AV *texture_av;
92 130
93static struct 131static struct
94{ 132{
151{ 189{
152 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
153 191
154 while (attrs) 192 while (attrs)
155 { 193 {
156 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 195
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 197 return 1;
160 198
161 attrs = attrs->next; 199 attrs = attrs->next;
162 } 200 }
163 201
164 return 0; 202 return 0;
165} 203}
166 204
167typedef struct cf_layout { 205struct cf_layout {
168 PangoLayout *pl; 206 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
170 int base_height; 208 int base_height;
171 DC__Font font; 209 DC__Font font;
172 rc_t *rc; 210 rc_t rc;
173} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
174 214
175static DC__Font default_font; 215static DC__Font default_font;
176static PangoContext *opengl_context; 216static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
178 218
179static void 219static void
180substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
181{ 221{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 225#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 227}
188 228
189static void 229static void
219} 259}
220 260
221typedef uint16_t tileid; 261typedef uint16_t tileid;
222typedef uint16_t faceid; 262typedef uint16_t faceid;
223 263
224typedef struct { 264struct maptex
265{
225 GLuint name; 266 GLuint name;
226 int w, h; 267 int w, h;
227 float s, t; 268 float s, t;
228 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
229 tileid smoothtile; 270 tileid smoothtile;
230 uint8_t smoothlevel; 271 uint8_t smoothlevel;
231} maptex; 272 uint8_t unused; /* set to zero on use */
273};
232 274
233typedef struct { 275struct mapcell
276{
234 uint32_t player; 277 uint32_t player;
235 tileid tile[3]; 278 tileid tile[3];
236 uint16_t darkness; 279 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 281};
239 282
240typedef struct { 283struct maprow
284{
241 int32_t c0, c1; 285 int32_t c0, c1;
242 mapcell *col; 286 mapcell *col;
243} maprow; 287};
244 288
245typedef struct map { 289struct mapgrid {
246 int x, y, w, h; 290 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
250 294
251 int32_t rows; 295 int32_t rows;
252 maprow *row; 296 maprow *row;
253} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
254 300
255static char * 301static char *
256prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
257{ 303{
258 char *p; 304 char *p;
276 322
277#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))
278#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))
279 325
280static void 326static void
281need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
282{ 328{
283 while (self->faces <= face) 329 while (self->faces <= face)
284 { 330 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 332 self->faces *= 2;
287 } 333 }
288} 334}
289 335
290static void 336static void
291need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
292{ 338{
293 while (self->texs <= texid) 339 while (self->texs <= texid)
294 { 340 {
295 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2; 342 self->texs *= 2;
297 } 343 }
298} 344}
299 345
300static maprow * 346static maprow *
301map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
302{ 348{
303 if (0 > y) 349 if (0 > y)
304 { 350 {
305 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
344 390
345 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
346} 392}
347 393
348static mapcell * 394static mapcell *
349map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
350{ 396{
351 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
352} 398}
353 399
354static void 400static void
355map_clear (DC__Map self) 401map_clear (mapgrid *self)
356{ 402{
357 int r; 403 int r;
358 404
359 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
367 self->oy = 0; 413 self->oy = 0;
368 self->row = 0; 414 self->row = 0;
369 self->rows = 0; 415 self->rows = 0;
370} 416}
371 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
372static void 428static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
374{ 430{
375 int x, y; 431 int x, y;
376 maprow *row; 432 maprow *row;
377 mapcell *cell; 433 mapcell *cell;
378 434
390 if (x >= row->c1) 446 if (x >= row->c1)
391 break; 447 break;
392 448
393 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
394 450
395 cell->darkness = 0; 451 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 452 }
400 } 453 }
401} 454}
402 455
403typedef struct { 456struct smooth_key
457{
404 tileid tile; 458 tileid tile;
405 uint8_t x, y, level; 459 uint8_t x, y, level;
406} 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}
407 479
408static void 480static void
409smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
410{ 482{
411 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
412 484
413 if (SvIOK (*sv)) 485 if (it == h.end ())
414 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
415 else 487 else
416 sv_setiv (*sv, bits); 488 it->second |= bits;
417} 489}
418 490
419static void 491static void
420music_finished (void) 492music_finished (void)
421{ 493{
438 ev.code = 1; 510 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 512 ev.data2 = 0;
441 513
442 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;
443} 522}
444 523
445static unsigned int 524static unsigned int
446minpot (unsigned int n) 525minpot (unsigned int n)
447{ 526{
514 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
515 return 0; 594 return 0;
516 595
517 return 1; 596 return 1;
518} 597}
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
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
519 656
520MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
521 658
522PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
523 660
552 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
553 690
554 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
557 744
558 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
641 828
829 const_iv (KMOD_LRAM),
830
642 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
643 832
644 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM), 836 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK), 837 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING), 838 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE), 839 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD), 840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
652# undef const_iv 861# undef const_iv
653 }; 862 };
654 863
655 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--)
656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
657 866
658 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
659 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
660} 869}
661 870
677NV ceil (NV x) 886NV ceil (NV x)
678 887
679IV minpot (UV n) 888IV minpot (UV n)
680 889
681IV 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
682 897
683void 898void
684pango_init () 899pango_init ()
685 CODE: 900 CODE:
686{ 901{
694#endif 909#endif
695} 910}
696 911
697char *SDL_GetError () 912char *SDL_GetError ()
698 913
914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
916
699int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
700 918
701int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
702 920
703void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
704 922
705void SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
706 934
707void 935void
708SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
709 PPCODE: 937 PPCODE:
710{ 938{
722 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
723 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
724 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
725 953
726 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
727#if SDL_VERSION_ATLEAST(1,2,10)
728 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
729 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
730#endif
731 956
732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
733 958
734 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
735 while (*m) 960 while (*m)
736 { 961 {
962 if ((*m)->w >= 400 && (*m)->h >= 300)
963 {
737 AV *av = newAV (); 964 AV *av = newAV ();
738 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
739 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
740 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
741 av_push (av, newSViv (alpha)); 968 av_push (av, newSViv (alpha));
742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 969 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
970 }
743 971
744 ++m; 972 ++m;
745 } 973 }
746} 974}
747 975
762 ); 990 );
763 991
764 if (RETVAL) 992 if (RETVAL)
765 { 993 {
766 av_clear (texture_av); 994 av_clear (texture_av);
767
768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
769#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);
770#include "glfunc.h" 996#include "glfunc.h"
771#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
772 } 1000 }
773} 1001}
774 OUTPUT: 1002 OUTPUT:
775 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
776 1007
777void 1008void
778SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
779 1010
780char * 1011char *
781SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
782 1014
783int 1015int
784SDL_GetAppState () 1016SDL_GetAppState ()
785 1017
786int 1018int
787SDL_GetModState () 1019SDL_GetModState ()
788 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
789void 1025void
1026SDL_PumpEvents ()
1027
1028void
790poll_events () 1029peep_events ()
791 PPCODE: 1030 PPCODE:
792{ 1031{
793 SDL_Event ev; 1032 SDL_Event ev;
794 1033
795 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
802 { 1041 {
803 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
804 case SDL_KEYUP: 1043 case SDL_KEYUP:
805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
807 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);
808 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 */
809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
810 break; 1049 break;
811 1050
812 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
831 x = ev.motion.x; 1070 x = ev.motion.x;
832 y = ev.motion.y; 1071 y = ev.motion.y;
833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
834 } 1073 }
835 1074
836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
837 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
838 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
839 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
840 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
841 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
861 1100
862 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))));
863 } 1102 }
864} 1103}
865 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
866int 1118int
867Mix_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)
868 POSTCALL: 1120 POSTCALL:
869 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
870 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
871 1123
872void 1124void
873Mix_QuerySpec () 1125Mix_QuerySpec ()
932add_font (char *file) 1184add_font (char *file)
933 CODE: 1185 CODE:
934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT: 1187 OUTPUT:
936 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)
937 1196
938void 1197void
939load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
940 ALIAS: 1199 ALIAS:
941 load_image_file = 1 1200 load_image_file = 1
987 1246
988 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
989 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
990 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
991 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
992 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
993 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)));
994 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
995 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
996 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
997 1256
1057#if DEBUG 1316#if DEBUG
1058 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1059#endif 1318#endif
1060} 1319}
1061 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1062MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1063 1329
1064PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1065 1331
1066DC::Font 1332DC::Font
1067new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1068 CODE: 1334 CODE:
1069{ 1335{
1070 int count; 1336 int count;
1071 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1072 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1101 PROTOTYPE: 1367 PROTOTYPE:
1102 CODE: 1368 CODE:
1103 tc_restore (); 1369 tc_restore ();
1104 1370
1105DC::Layout 1371DC::Layout
1106new (SV *class) 1372new (SV *klass)
1107 CODE: 1373 CODE:
1108 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1109 1375
1110 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1111 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1112 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1113 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1114 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1115 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1116 RETVAL->font = 0; 1382 RETVAL->font = 0;
1117 RETVAL->rc = rc_alloc ();
1118 1383
1119 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1120 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1121 OUTPUT: 1386 OUTPUT:
1122 RETVAL 1387 RETVAL
1123 1388
1124void 1389void
1125DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1126 CODE: 1391 CODE:
1127 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1128 rc_free (self->rc);
1129 Safefree (self); 1393 delete self;
1130 1394
1131void 1395void
1132set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1133 CODE: 1397 CODE:
1134{ 1398{
1260 1524
1261void 1525void
1262set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1263 CODE: 1527 CODE:
1264 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1265 { 1529 {
1266 self->base_height = base_height; 1530 self->base_height = base_height;
1267 layout_update_font (self); 1531 layout_update_font (self);
1268 } 1532 }
1269 1533
1270void 1534void
1388} 1652}
1389 1653
1390void 1654void
1391render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1392 CODE: 1656 CODE:
1393 rc_clear (self->rc); 1657 self->rc.clear ();
1394 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1395 self->pl, 1659 self->pl,
1396 self->rc, 1660 &self->rc,
1397 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1398 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1399 flags 1663 flags
1400 ); 1664 );
1401 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1412 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1413 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1414 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1415 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1416 1680
1417 rc_draw (self->rc); 1681 self->rc.draw ();
1418 1682
1419 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1420 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1421 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1422} 1686}
1497 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1498 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1499 } 1763 }
1500} 1764}
1501 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
1502IV 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)
1503 CODE: 1888 CODE:
1504{ 1889{
1505 GLint width; 1890 GLint width;
1506 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);
1513MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1514 1899
1515PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1516 1901
1517DC::Map 1902DC::Map
1518new (SV *class) 1903new (SV *klass)
1519 CODE: 1904 CODE:
1520 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1521 RETVAL->x = 0; 1906 RETVAL->x = 0;
1522 RETVAL->y = 0; 1907 RETVAL->y = 0;
1523 RETVAL->w = 0; 1908 RETVAL->w = 0;
1524 RETVAL->h = 0; 1909 RETVAL->h = 0;
1525 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1562 1947
1563void 1948void
1564set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1565 CODE: 1950 CODE:
1566{ 1951{
1567 tileid texid; 1952 tileid texid;
1568 maptex *tex; 1953 maptex *tex;
1569 1954
1570 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1571 return; 1956 return;
1572 1957
1573 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1574 return; 1959 return;
1575 1960
1576 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1577 1962
1578 if (!texid) 1963 if (!texid)
1579 return; 1964 return;
1580 1965
1581 tex = self->tex + texid; 1966 tex = self->tex + texid;
1610 //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);
1611 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1612 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1614} 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 }
1615 2020
1616int 2021int
1617ox (DC::Map self) 2022ox (DC::Map self)
1618 ALIAS: 2023 ALIAS:
1619 oy = 1 2024 oy = 1
1659 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1660 } 2065 }
1661} 2066}
1662 2067
1663SV * 2068SV *
1664map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1665 CODE: 2070 CODE:
1666{ 2071{
1667 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1668 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1669 mapcell *cell; 2074 mapcell *cell;
1690 2095
1691 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1692 2097
1693 if (flags & 8) 2098 if (flags & 8)
1694 { 2099 {
2100 uint8_t ext, cmd;
2101
1695 if (extmap) 2102 do
1696 { 2103 {
1697 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1698 2106
1699 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
1700 { 2110 {
1701 ext = *data++;
1702 cmd = ext & 0x7f;
1703
1704 if (cmd < 4)
1705 cell->darkness = 255 - ext * 64 + 1;
1706 else if (cmd == 5) // health
1707 {
1708 cell->stat_width = 1; 2111 cell->stat_width = 1;
1709 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1710 }
1711 else if (cmd == 6) // monster width
1712 cell->stat_width = *data++ + 1;
1713 else if (cmd == 0x47)
1714 {
1715 if (*data == 1) cell->player = data [1];
1716 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1717 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1718 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1719
1720 data += *data + 1;
1721 }
1722 else if (cmd == 8) // cell flags
1723 cell->flags = *data++;
1724 else if (ext & 0x40) // unknown, multibyte => skip
1725 data += *data + 1;
1726 else
1727 data++;
1728 } 2113 }
1729 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++;
1730 } 2131 }
1731 else 2132 while (ext & 0x80);
1732 cell->darkness = *data++ + 1;
1733 } 2133 }
1734 2134
1735 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1736 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1737 { 2137 {
1740 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1741 2141
1742 if (cell->tile [z]) 2142 if (cell->tile [z])
1743 { 2143 {
1744 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1745 if (!tex->name) 2146 if (!tex->name)
1746 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1747 2148
1748 if (tex->smoothtile) 2149 if (tex->smoothtile)
1749 { 2150 {
1750 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1751 if (!smooth->name) 2153 if (!smooth->name)
1752 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1753 } 2155 }
1754 } 2156 }
1755 } 2157 }
1756 } 2158 }
1757 else 2159 else
1758 cell->darkness = 0; 2160 CELL_CLEAR (cell);
1759 } 2161 }
1760} 2162}
1761 OUTPUT: 2163 OUTPUT:
1762 RETVAL 2164 RETVAL
1763 2165
1783 ? self->row + y 2185 ? self->row + y
1784 : 0; 2186 : 0;
1785 2187
1786 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1787 { 2189 {
1788 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1789 2191
1790 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1791 { 2193 {
1792 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1793 2195
1795 { 2197 {
1796 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1797 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1798 int a1 = tex.a; 2200 int a1 = tex.a;
1799 2201
1800 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1801 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1802 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1803 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1804 } 2206 }
1805 } 2207 }
1806 2208
1807 *map++ = (r ) 2209 *map++ = (r )
1808 | (g << 8) 2210 | (g << 8)
1809 | (b << 16) 2211 | (b << 16)
1810 | (a << 24); 2212 | (a << 24);
1811 } 2213 }
1812 } 2214 }
1813 2215
1814 RETVAL = map_sv; 2216 RETVAL = map_sv;
1815} 2217}
1816 OUTPUT: 2218 OUTPUT:
1817 RETVAL 2219 RETVAL
1818 2220
1819void 2221void
1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 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)
1821 CODE: 2223 CODE:
1822{ 2224{
1823 int x, y, z; 2225 int x, y, z;
1824 2226
1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1827 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!
1828 smooth_key skey;
1829 int pl_x, pl_y; 2228 int pl_x, pl_y;
1830 maptex pl_tex; 2229 maptex pl_tex;
1831 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1832 rc_key_t key; 2232 rc_key_t key;
1833 rc_array_t *arr; 2233 rc_t::array_t *arr;
1834 2234
1835 pl_tex.name = 0; 2235 pl_tex.name = 0;
1836 2236
1837 // thats current max. sorry. 2237 // that's current max. sorry.
1838 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1839 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1840
1841 // clear key, in case of extra padding
1842 memset (&skey, 0, sizeof (skey));
1843 2240
1844 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1845 key.r = 255; 2242 key.r = 255;
1846 key.g = 255; 2243 key.g = 255;
1847 key.b = 255; 2244 key.b = 255;
1848 key.a = 255; 2245 key.a = 255;
1849 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1850 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1851 key.texname = -1;
1852 2248
1853 mx += self->x; 2249 mx += self->x;
1854 my += self->y; 2250 my += self->y;
1855 2251
1856 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1857 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1858 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1859 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1860 2256
1861 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1863 { 2259 {
1864 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1879 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1880 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1881 2277
1882 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1883 { 2279 {
1884 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;
1885 2284
1886 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1887 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1888 { 2287 {
1889 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
1895 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
1896 2295
1897 if (tile) 2296 if (tile)
1898 { 2297 {
1899 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1900 int px = (x + 1) * T - tex.w; 2299 int px, py;
1901 int py = (y + 1) * T - tex.h;
1902 2300
1903 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
1904 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1905 if (!tex.name) 2305 if (!tex.name)
1906 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1907 2307
1908 key.texname = tex.name; 2308 key.texname = tex.name;
1909 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
1910 } 2310 }
2311
2312 px = (x + 1) * Th - tex.w;
2313 py = (y + 1) * Tw - tex.h;
1911 2314
1912 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
1913 { 2316 {
1914 pl_x = px; 2317 pl_x = px;
1915 pl_y = py; 2318 pl_y = py;
1916 pl_tex = tex; 2319 pl_tex = tex;
1917 continue; 2320 continue;
1918 } 2321 }
1919 2322
1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1922 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);
1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1924
1925 if (expect_false (cell->flags) && expect_false (z == 2))
1926 {
1927 // overlays such as the speech bubble, probably more to come
1928 if (cell->flags & 1)
1929 {
1930 maptex tex = self->tex [1];
1931 int px = x * T + T * 2 / 32;
1932 int py = y * T - T * 6 / 32;
1933
1934 if (tex.name)
1935 {
1936 if (key.texname != tex.name)
1937 {
1938 key.texname = tex.name;
1939 arr = rc_array (rc, &key);
1940 }
1941
1942 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1946 }
1947 }
1948 }
1949 2327
1950 // update smooth hash 2328 // update smooth hash
1951 if (tex.smoothtile) 2329 if (tex.smoothtile)
1952 { 2330 {
1953 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
1954 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
1955 2333
1956 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
1957 2335
1958 // 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
1959 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
1960 2338
1961 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
1969 2347
1970 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1971 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
1972 2350
1973 // full tile 2351 // full tile
1974 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);
1975 2353
1976 // borders 2354 // borders
1977 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);
1978 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);
1979 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);
1980 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);
1981 2359
1982 // corners 2360 // corners
1983 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);
1984 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);
1985 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);
1986 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);
1987 } 2385 }
1988 } 2386 }
1989 } 2387 }
1990 } 2388 }
1991 2389
1992 rc_draw (rc); 2390 rc.draw ();
1993 rc_clear (rc); 2391 rc.clear ();
1994 2392
1995 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
1996 // this is basically counting sort 2394 // this is basically counting sort
1997 { 2395 {
1998 int w, b; 2396 int w, b;
1999 2397
2000 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2001 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2002 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)
2003 { 2403 {
2004 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2005 if (smask) 2405 IV bits = it->second;
2006 for (b = 0; b < 32; ++b) 2406
2007 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2008 { 2410 {
2009 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
2010 HE *he; 2419 if (tex.name)
2011
2012 hv_iterinit (smooth);
2013 while ((he = hv_iternext (smooth)))
2014 { 2420 {
2015 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2016 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2017 2423 if (key.texname != tex.name)
2018 if (!(bits & 0x1000)
2019 && skey->level == level
2020 && level > smooth_max [skey->x][skey->y])
2021 { 2424 {
2022 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
2023 int px = (((int)skey->x) - 1) * T;
2024 int py = (((int)skey->y) - 1) * T;
2025 int border = bits & 15;
2026 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2027 float dx = tex.s * .0625f; // 16 images/row
2028 float dy = tex.t * .5f ; // 2 images/column
2029 2426
2030 if (tex.name)
2031 {
2032 // this time avoiding texture state changes
2033 // save gobs of state changes.
2034 if (key.texname != tex.name)
2035 {
2036 glEnd (); 2427 glEnd ();
2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2038 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2039 } 2430 }
2040 2431
2041 if (border) 2432 if (border)
2042 { 2433 {
2043 float ox = border * dx; 2434 float ox = border * dx;
2044 2435
2045 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2046 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2047 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2048 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2049 } 2440 }
2050 2441
2051 if (corner) 2442 if (corner)
2052 { 2443 {
2053 float ox = corner * dx; 2444 float ox = corner * dx;
2054 2445
2055 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2057 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2059 }
2060 }
2061 } 2450 }
2062 } 2451 }
2063 } 2452 }
2064 } 2453 }
2065 2454
2066 glEnd (); 2455 glEnd ();
2067 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2068 key.texname = -1; 2457 key.texname = -1;
2069 } 2458 }
2070
2071 hv_clear (smooth);
2072 } 2459 }
2073 2460
2074 if (pl_tex.name) 2461 if (pl_tex.name)
2075 { 2462 {
2076 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2077 int px = pl_x + pdx; 2464 int px = pl_x + sdx;
2078 int py = pl_y + pdy; 2465 int py = pl_y + sdy;
2079 2466
2080 key.texname = tex.name; 2467 key.texname = tex.name;
2081 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2082 2469
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2085 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);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2087 2474
2088 rc_draw (rc); 2475 rc.draw ();
2089 } 2476 }
2090 2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2091 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2092 rc_free (rc);
2093 2482
2094 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2095 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2096 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2097 { 2486 {
2100 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2101 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2102 { 2491 {
2103 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2104 2493
2105 int px = x * T; 2494 int px = x * Tw;
2106 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 }
2107 2502
2108 if (cell->stat_hp) 2503 if (cell->stat_hp)
2109 { 2504 {
2110 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2111 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2112 2507
2113 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2114 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2115 px + width - 1, py); 2510 px + width - 1, py);
2116 2511
2122 } 2517 }
2123 } 2518 }
2124} 2519}
2125 2520
2126void 2521void
2127draw_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)
2128 CODE: 2523 CODE:
2129{ 2524{
2130 static float color[16][3] = { 2525 static float color[16][3] = {
2131 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2132 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2133 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2134 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2135 2530
2136 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2137 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2138 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2139 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2140 2535
2141 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2142 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2143 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2144 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2145 2540
2146 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2147 2542
2148 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2149 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2150 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2151 }; 2546 };
2152 2547
2153 int x, y; 2548 int x, y;
2154 2549
2155 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 */
2156 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2157 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2158 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2159 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2160 2561
2161 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2165 2566
2166 if (m) 2567 if (m)
2167 { 2568 {
2168 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2169 2570
2170 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2171 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2172 2573
2173 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2174 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2175 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2176 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2177 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2178 } 2579 }
2186void 2587void
2187fow_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)
2188 PPCODE: 2589 PPCODE:
2189{ 2590{
2190 int x, y; 2591 int x, y;
2191 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2192 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2193 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2194 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);
2195 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2196 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2197 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2198 2600
2199 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2200 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2201 2603
2202 mx += self->x - 1; 2604 mx += self->x - 1;
2203 my += self->y - 1; 2605 my += self->y - 1;
2204
2205 memset (darkness1, 255, sw1 * sh1);
2206 2606
2207 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2208 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2209 { 2609 {
2210 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2213 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2214 { 2614 {
2215 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2216 2616
2217 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2218 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2219 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2220 } 2620 }
2221 } 2621 }
2222 2622
2223 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2224 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2243 2643
2244 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2245 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2246 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2247 2647
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2250 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2252 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 */
2253 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2256 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2257 } 2657 }
2258 2658
2259 free (darkness1); 2659 free (darkness1);
2260 2660
2261 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2262 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2263 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2264 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2265} 2665}
2266 2666
2267SV * 2667SV *
2330 else 2730 else
2331 *data++ = 0; 2731 *data++ = 0;
2332 } 2732 }
2333 } 2733 }
2334 2734
2335 /* 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 */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 { 2737 {
2338 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 } 2740 }
2341 2741
2342 RETVAL = data_sv; 2742 RETVAL = data_sv;
2343} 2743}
2344 OUTPUT: 2744 OUTPUT:
2345 RETVAL 2745 RETVAL
2346 2746
2347void 2747void
2354 STRLEN len; 2754 STRLEN len;
2355 uint8_t *data, *end; 2755 uint8_t *data, *end;
2356 2756
2357 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2360 end = data + len + 8; 2760 end = data + len + 8;
2361 2761
2362 if (len < 5) 2762 if (len < 5)
2363 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2364 2764
2425} 2825}
2426 2826
2427MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2428 2828
2429DC::RW 2829DC::RW
2430new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2431 CODE: 2831 CODE:
2432{ 2832{
2433 STRLEN datalen; 2833 STRLEN datalen;
2434 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2435 2835
2437} 2837}
2438 OUTPUT: 2838 OUTPUT:
2439 RETVAL 2839 RETVAL
2440 2840
2441DC::RW 2841DC::RW
2442new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2443 CODE: 2843 CODE:
2444 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2445 OUTPUT: 2845 OUTPUT:
2446 RETVAL 2846 RETVAL
2447 2847
2465 if (RETVAL < 0) 2865 if (RETVAL < 0)
2466 { 2866 {
2467 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2468 2868
2469 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)
2470 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2471 2876 }
2877 else
2472 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2473 } 2879 }
2474 2880
2475 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2476 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2477} 2883}
2524void 2930void
2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2526 CODE: 2932 CODE:
2527{ 2933{
2528 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));
2529 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;
2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2531} 2937}
2532 2938
2533void 2939void
2534set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2537 2943
2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2539 2945
2540PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2541 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
2542DC::MixChunk 2960DC::MixChunk
2543new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2544 CODE: 2962 CODE:
2545 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2546 OUTPUT: 2964 OUTPUT:
2547 RETVAL 2965 RETVAL
2548 2966
2578 OUTPUT: 2996 OUTPUT:
2579 RETVAL 2997 RETVAL
2580 2998
2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2582 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
2583int 3013int
2584volume (int volume = -1) 3014volume (int volume = -1)
2585 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2586 CODE: 3016 CODE:
2587 if (items > 0) 3017 if (items > 0)
2598void 3028void
2599halt () 3029halt ()
2600 CODE: 3030 CODE:
2601 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2602 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2603DC::MixMusic 3040DC::MixMusic
2604new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2605 CODE: 3042 CODE:
2606 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2607 OUTPUT: 3044 OUTPUT:
2608 RETVAL 3045 RETVAL
2609 3046
2637 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2638# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2639 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2640 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2641 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2642 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2643 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2644 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2645 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2646 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2658 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2659 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2660 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2661 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2662 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),
2663 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2664 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2665 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2666 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2667 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2735 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2736 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2737 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2738 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2739 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),
2740# undef const_iv 3185# undef const_iv
2741 }; 3186 };
2742 3187
2743 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--)
2744 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2745 3190
2746 texture_av = newAV (); 3191 texture_av = newAV ();
2747 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2748} 3193}
2749 3194
2751disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2752 CODE: 3197 CODE:
2753 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2755 3200
2756char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2757gl_vendor () 3205gl_vendor ()
2758 CODE: 3206 CODE:
2759 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2760 OUTPUT: 3208 OUTPUT:
2761 RETVAL 3209 RETVAL
2762 3210
2763char * 3211const char *
2764gl_version () 3212gl_version ()
2765 CODE: 3213 CODE:
2766 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2767 OUTPUT: 3215 OUTPUT:
2768 RETVAL 3216 RETVAL
2769 3217
2770char * 3218const char *
2771gl_extensions () 3219gl_extensions ()
2772 CODE: 3220 CODE:
2773 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2774 OUTPUT: 3222 OUTPUT:
2775 RETVAL 3223 RETVAL
2776 3224
2777const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2778 3230
2779GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2780 CODE: 3232 CODE:
2781 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2782 OUTPUT: 3234 OUTPUT:
2790 3242
2791int glGetError () 3243int glGetError ()
2792 3244
2793void glFinish () 3245void glFinish ()
2794 3246
3247void glFlush ()
3248
2795void glClear (int mask) 3249void glClear (int mask)
2796 3250
2797void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2798 PROTOTYPE: @ 3252 PROTOTYPE: @
2799 3253
2808void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2809 3263
2810void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2811 CODE: 3265 CODE:
2812 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2813 3269
2814void glDepthMask (int flag) 3270void glDepthMask (int flag)
2815 3271
2816void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2817 3273
2852void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2853 CODE: 3309 CODE:
2854 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2855 3311
2856void 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: @
2857 ALIAS: 3314 ALIAS:
2858 glColor_premultiply = 1 3315 glColor_premultiply = 1
2859 CODE: 3316 CODE:
2860 if (ix) 3317 if (ix)
2861 { 3318 {
2967 3424
2968void glEndList () 3425void glEndList ()
2969 3426
2970void glCallList (int list) 3427void glCallList (int list)
2971 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2973 3435
2974PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
2975 3437
2976void 3438void
2977find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
2978 PPCODE: 3440 PPCODE:
2979{ 3441{
2980 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
2981 XPUSHs (self); 3443 XPUSHs (self);
2982} 3444}
2983 3445
2984BOOT: 3446BOOT:
2985{ 3447{
2993 3455
2994void 3456void
2995draw (SV *self) 3457draw (SV *self)
2996 CODE: 3458 CODE:
2997{ 3459{
2998 HV *hv; 3460 HV *hv;
2999 SV **svp; 3461 SV **svp;
3000 NV x, y, w, h; 3462 NV x, y, w, h;
3001 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3002 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3003 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3004 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