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.253 by root, Fri Dec 28 20:59:14 2007 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#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 61#ifndef PANGO_VERSION_CHECK
62# define PANGO_VERSION_CHECK(a,b,c) 0
63#endif
64
65#if !PANGO_VERSION_CHECK (1, 15, 2)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 66# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 67# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 68# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 69# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 70#endif
57 71
58#ifndef _WIN32 72#ifndef _WIN32
59# include <sys/types.h> 73# include <sys/types.h>
60# include <sys/socket.h> 74# include <sys/socket.h>
61# include <netinet/in.h> 75# include <netinet/in.h>
62# include <netinet/tcp.h> 76# include <netinet/tcp.h>
63# include <inttypes.h> 77# include <inttypes.h>
64#endif 78#endif
65 79
80#if __GNUC__ >= 4
81# define expect(expr,value) __builtin_expect ((expr),(value))
82#else
83# define expect(expr,value) (expr)
84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
88
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 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 */
68#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
69 95
70#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
72 98
73#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
74 100
75/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77 103
78#if 0 104#define KMOD_LRAM 0x10000 // our extension
79# define PARACHUTE SDL_INIT_NOPARACHUTE 105
80#else 106#define TEXID_SPEECH 1
81# define PARACHUTE 0 107#define TEXID_NOFACE 2
82#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}
83 127
84static AV *texture_av; 128static AV *texture_av;
85 129
86static struct 130static struct
87{ 131{
144{ 188{
145 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
146 190
147 while (attrs) 191 while (attrs)
148 { 192 {
149 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
150 194
151 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
152 return 1; 196 return 1;
153 197
154 attrs = attrs->next; 198 attrs = attrs->next;
155 } 199 }
156 200
157 return 0; 201 return 0;
158} 202}
159 203
160typedef struct cf_layout { 204struct cf_layout {
161 PangoLayout *pl; 205 PangoLayout *pl;
162 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
163 int base_height; 207 int base_height;
164 DC__Font font; 208 DC__Font font;
165 rc_t *rc; 209 rc_t *rc;
166} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
167 213
168static DC__Font default_font; 214static DC__Font default_font;
169static PangoContext *opengl_context; 215static PangoContext *opengl_context;
170static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
171 217
172static void 218static void
173substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
174{ 220{
175 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
176#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
177 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
178#endif 224#endif
179 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
180} 226}
181 227
182static void 228static void
183layout_update_font (DC__Layout self) 229layout_update_font (DC__Layout self)
184{ 230{
185 /* use a random scale factor to account for unknown descenders, 0.8 works 231 /* use a random scale factor to account for unknown descenders, 0.8 works
186 * reasonably well with bitstream vera 232 * reasonably well with dejavu/bistream fonts
187 */ 233 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 234 PangoFontDescription *font = self->font ? self->font : default_font;
189 235
190 pango_font_description_set_absolute_size (font, 236 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 237 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
212} 258}
213 259
214typedef uint16_t tileid; 260typedef uint16_t tileid;
215typedef uint16_t faceid; 261typedef uint16_t faceid;
216 262
217typedef struct { 263struct maptex
264{
218 GLuint name; 265 GLuint name;
219 int w, h; 266 int w, h;
220 float s, t; 267 float s, t;
221 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
222 tileid smoothtile; 269 tileid smoothtile;
223 uint8_t smoothlevel; 270 uint8_t smoothlevel;
224} maptex; 271 uint8_t unused; /* set to zero on use */
272};
225 273
226typedef struct { 274struct mapcell
275{
227 uint32_t player; 276 uint32_t player;
228 tileid tile[3]; 277 tileid tile[3];
229 uint16_t darkness; 278 uint16_t darkness;
230 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
231} mapcell; 280};
232 281
233typedef struct { 282struct maprow
283{
234 int32_t c0, c1; 284 int32_t c0, c1;
235 mapcell *col; 285 mapcell *col;
236} maprow; 286};
237 287
238typedef struct map { 288struct mapgrid {
239 int x, y, w, h; 289 int x, y, w, h;
240 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
241 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
242 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
243 293
244 int32_t rows; 294 int32_t rows;
245 maprow *row; 295 maprow *row;
246} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
247 299
248static char * 300static char *
249prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
250{ 302{
251 char *p; 303 char *p;
269 321
270#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))
271#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))
272 324
273static void 325static void
274need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
275{ 327{
276 while (self->faces <= face) 328 while (self->faces <= face)
277 { 329 {
278 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
279 self->faces *= 2; 331 self->faces *= 2;
280 } 332 }
281} 333}
282 334
283static void 335static void
284need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
285{ 337{
286 while (self->texs <= texid) 338 while (self->texs <= texid)
287 { 339 {
288 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
289 self->texs *= 2; 341 self->texs *= 2;
290 } 342 }
291} 343}
292 344
293static maprow * 345static maprow *
294map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
295{ 347{
296 if (0 > y) 348 if (0 > y)
297 { 349 {
298 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
299 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
337 389
338 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
339} 391}
340 392
341static mapcell * 393static mapcell *
342map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
343{ 395{
344 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
345} 397}
346 398
347static void 399static void
348map_clear (DC__Map self) 400map_clear (mapgrid *self)
349{ 401{
350 int r; 402 int r;
351 403
352 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
353 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
360 self->oy = 0; 412 self->oy = 0;
361 self->row = 0; 413 self->row = 0;
362 self->rows = 0; 414 self->rows = 0;
363} 415}
364 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
365static void 427static void
366map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
367{ 429{
368 int x, y; 430 int x, y;
369 maprow *row; 431 maprow *row;
370 mapcell *cell; 432 mapcell *cell;
371 433
383 if (x >= row->c1) 445 if (x >= row->c1)
384 break; 446 break;
385 447
386 cell = row->col + x - row->c0; 448 cell = row->col + x - row->c0;
387 449
388 cell->darkness = 0; 450 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 451 }
393 } 452 }
394} 453}
395 454
396typedef struct { 455struct smooth_key
456{
397 tileid tile; 457 tileid tile;
398 uint8_t x, y, level; 458 uint8_t x, y, level;
399} 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}
400 478
401static void 479static void
402smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
403{ 481{
404 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
405 483
406 if (SvIOK (*sv)) 484 if (it == h.end ())
407 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
408 else 486 else
409 sv_setiv (*sv, bits); 487 it->second |= bits;
410} 488}
411 489
412static void 490static void
413music_finished (void) 491music_finished (void)
414{ 492{
431 ev.code = 1; 509 ev.code = 1;
432 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
433 ev.data2 = 0; 511 ev.data2 = 0;
434 512
435 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;
436} 521}
437 522
438static unsigned int 523static unsigned int
439minpot (unsigned int n) 524minpot (unsigned int n)
440{ 525{
507 if (!svp || !SvTRUE (*svp)) 592 if (!svp || !SvTRUE (*svp))
508 return 0; 593 return 0;
509 594
510 return 1; 595 return 1;
511} 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
512 655
513MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
514 657
515PROTOTYPES: ENABLE 658PROTOTYPES: ENABLE
516 659
545 const_iv (SDL_USEREVENT), 688 const_iv (SDL_USEREVENT),
546 689
547 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
548 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
549 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),
550 743
551 const_iv (SDLK_FIRST), 744 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST), 745 const_iv (SDLK_LAST),
553 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
554 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
630 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
631 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 826 const_iv (KMOD_MODE),
634 827
828 const_iv (KMOD_LRAM),
829
635 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)
636# undef const_iv 860# undef const_iv
637 }; 861 };
638 862
639 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--)
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
641 865
642 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
643 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
644} 868}
645 869
661NV ceil (NV x) 885NV ceil (NV x)
662 886
663IV minpot (UV n) 887IV minpot (UV n)
664 888
665IV 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
666 896
667void 897void
668pango_init () 898pango_init ()
669 CODE: 899 CODE:
670{ 900{
671 opengl_fontmap = pango_opengl_font_map_new (); 901 opengl_fontmap = pango_opengl_font_map_new ();
672 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 902 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 903 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 904 /*pango_context_set_font_description (opengl_context, default_font);*/
905#if PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 906 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 907 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 908#endif
678} 909}
679 910
680char *
681SDL_GetError () 911char *SDL_GetError ()
682 912
683int 913void SDL_main_hack (SV *real_main)
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 914 PROTOTYPE: &
685 915
686void 916int SDL_Init (U32 flags)
917
918int SDL_InitSubSystem (U32 flags)
919
920void SDL_QuitSubSystem (U32 flags)
921
687SDL_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
688 933
689void 934void
690SDL_ListModes (int rgb, int alpha) 935SDL_ListModes (int rgb, int alpha)
691 PPCODE: 936 PPCODE:
692{ 937{
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 952
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 953 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 954 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 955
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 956 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 957
716 if (m && m != (SDL_Rect **)-1) 958 if (m && m != (SDL_Rect **)-1)
717 while (*m) 959 while (*m)
718 { 960 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 961 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 962 {
721 AV *av = newAV (); 963 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 964 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 965 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 966 av_push (av, newSViv (rgb));
747 ); 989 );
748 990
749 if (RETVAL) 991 if (RETVAL)
750 { 992 {
751 av_clear (texture_av); 993 av_clear (texture_av);
752
753 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
754#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);
755#include "glfunc.h" 995#include "glfunc.h"
756#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
757 } 999 }
758} 1000}
759 OUTPUT: 1001 OUTPUT:
760 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
761 1006
762void 1007void
763SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
764 1009
765char * 1010char *
766SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
767 1013
768int 1014int
769SDL_GetAppState () 1015SDL_GetAppState ()
770 1016
1017int
1018SDL_GetModState ()
1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
771void 1024void
1025SDL_PumpEvents ()
1026
1027void
772poll_events () 1028peep_events ()
773 PPCODE: 1029 PPCODE:
774{ 1030{
775 SDL_Event ev; 1031 SDL_Event ev;
776 1032
777 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
784 { 1040 {
785 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
786 case SDL_KEYUP: 1042 case SDL_KEYUP:
787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789 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);
790 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 */
791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792 break; 1048 break;
793 1049
794 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
813 x = ev.motion.x; 1069 x = ev.motion.x;
814 y = ev.motion.y; 1070 y = ev.motion.y;
815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816 } 1072 }
817 1073
818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819 hv_store (hv, "state", 5, newSViv (state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
820 hv_store (hv, "x", 1, newSViv (x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
821 hv_store (hv, "y", 1, newSViv (y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
822 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
843 1099
844 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))));
845 } 1101 }
846} 1102}
847 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
848int 1117int
849Mix_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)
850 POSTCALL: 1119 POSTCALL:
851 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
852 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
853 1122
854void 1123void
855Mix_QuerySpec () 1124Mix_QuerySpec ()
908 } 1177 }
909 } 1178 }
910#endif 1179#endif
911} 1180}
912 1181
913void 1182int
914add_font (char *file) 1183add_font (char *file)
915 CODE: 1184 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1186 OUTPUT:
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)
917 1195
918void 1196void
919load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
920 ALIAS: 1198 ALIAS:
921 load_image_file = 1 1199 load_image_file = 1
967 1245
968 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
969 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
970 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
971 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
972 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
973 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)));
974 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
975 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
976 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
977 1255
1037#if DEBUG 1315#if DEBUG
1038 VALGRIND_DO_LEAK_CHECK; 1316 VALGRIND_DO_LEAK_CHECK;
1039#endif 1317#endif
1040} 1318}
1041 1319
1320int
1321SvREFCNT (SV *sv)
1322 CODE:
1323 RETVAL = SvREFCNT (sv);
1324 OUTPUT:
1325 RETVAL
1326
1042MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1043 1328
1044PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1045 1330
1046DC::Font 1331DC::Font
1047new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1048 CODE: 1333 CODE:
1049{ 1334{
1050 int count; 1335 int count;
1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1052 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1081 PROTOTYPE: 1366 PROTOTYPE:
1082 CODE: 1367 CODE:
1083 tc_restore (); 1368 tc_restore ();
1084 1369
1085DC::Layout 1370DC::Layout
1086new (SV *class) 1371new (SV *klass)
1087 CODE: 1372 CODE:
1088 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1089 1374
1090 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1091 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1240 1525
1241void 1526void
1242set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1243 CODE: 1528 CODE:
1244 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1245 { 1530 {
1246 self->base_height = base_height; 1531 self->base_height = base_height;
1247 layout_update_font (self); 1532 layout_update_font (self);
1248 } 1533 }
1249 1534
1250void 1535void
1331 PPCODE: 1616 PPCODE:
1332{ 1617{
1333 int line, x; 1618 int line, x;
1334 1619
1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1620 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1621#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1622 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1623 --line;
1339#endif 1624#endif
1340 EXTEND (SP, 2); 1625 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1626 PUSHs (sv_2mortal (newSViv (line)));
1477 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1478 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1479 } 1764 }
1480} 1765}
1481 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
1482IV 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)
1483 CODE: 1889 CODE:
1484{ 1890{
1485 GLint width; 1891 GLint width;
1486 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);
1493MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1494 1900
1495PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1496 1902
1497DC::Map 1903DC::Map
1498new (SV *class) 1904new (SV *klass)
1499 CODE: 1905 CODE:
1500 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1501 RETVAL->x = 0; 1907 RETVAL->x = 0;
1502 RETVAL->y = 0; 1908 RETVAL->y = 0;
1503 RETVAL->w = 0; 1909 RETVAL->w = 0;
1504 RETVAL->h = 0; 1910 RETVAL->h = 0;
1505 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1542 1948
1543void 1949void
1544set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1545 CODE: 1951 CODE:
1546{ 1952{
1547 tileid texid; 1953 tileid texid;
1548 maptex *tex; 1954 maptex *tex;
1549 1955
1550 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1551 return; 1957 return;
1552 1958
1553 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1554 return; 1960 return;
1555 1961
1556 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1557 1963
1558 if (!texid) 1964 if (!texid)
1559 return; 1965 return;
1560 1966
1561 tex = self->tex + texid; 1967 tex = self->tex + texid;
1590 //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);
1591 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1592 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594} 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 }
1595 2021
1596int 2022int
1597ox (DC::Map self) 2023ox (DC::Map self)
1598 ALIAS: 2024 ALIAS:
1599 oy = 1 2025 oy = 1
1639 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1640 } 2066 }
1641} 2067}
1642 2068
1643SV * 2069SV *
1644map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1645 CODE: 2071 CODE:
1646{ 2072{
1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1648 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1649 mapcell *cell; 2075 mapcell *cell;
1670 2096
1671 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1672 2098
1673 if (flags & 8) 2099 if (flags & 8)
1674 { 2100 {
2101 uint8_t ext, cmd;
2102
1675 if (extmap) 2103 do
1676 { 2104 {
1677 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1678 2107
1679 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
1680 { 2111 {
1681 ext = *data++;
1682 cmd = ext & 0x3f;
1683
1684 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health
1687 {
1688 cell->stat_width = 1; 2112 cell->stat_width = 1;
1689 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1690 }
1691 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47)
1694 {
1695 if (*data == 4)
1696 ; // decode player count
1697
1698 data += *data + 1;
1699 }
1700 else if (cmd == 8) // cell flags
1701 cell->flags = *data++;
1702 else if (ext & 0x40) // unknown, multibyte => skip
1703 data += *data + 1;
1704 else
1705 data++;
1706 } 2114 }
1707 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++;
1708 } 2132 }
1709 else 2133 while (ext & 0x80);
1710 cell->darkness = *data++ + 1;
1711 } 2134 }
1712 2135
1713 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1714 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1715 { 2138 {
1718 cell->tile [z] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
1719 2142
1720 if (cell->tile [z]) 2143 if (cell->tile [z])
1721 { 2144 {
1722 maptex *tex = self->tex + cell->tile [z]; 2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
1723 if (!tex->name) 2147 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z])); 2148 av_push (missing, newSViv (cell->tile [z]));
1725 2149
1726 if (tex->smoothtile) 2150 if (tex->smoothtile)
1727 { 2151 {
1728 maptex *smooth = self->tex + tex->smoothtile; 2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
1729 if (!smooth->name) 2154 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile)); 2155 av_push (missing, newSViv (tex->smoothtile));
1731 } 2156 }
1732 } 2157 }
1733 } 2158 }
1734 } 2159 }
1735 else 2160 else
1736 cell->darkness = 0; 2161 CELL_CLEAR (cell);
1737 } 2162 }
1738} 2163}
1739 OUTPUT: 2164 OUTPUT:
1740 RETVAL 2165 RETVAL
1741 2166
1761 ? self->row + y 2186 ? self->row + y
1762 : 0; 2187 : 0;
1763 2188
1764 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1765 { 2190 {
1766 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1767 2192
1768 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1769 { 2194 {
1770 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1771 2196
1773 { 2198 {
1774 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1775 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1776 int a1 = tex.a; 2201 int a1 = tex.a;
1777 2202
1778 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1779 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1780 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1781 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1782 } 2207 }
1783 } 2208 }
1784 2209
1785 *map++ = (r ) 2210 *map++ = (r )
1786 | (g << 8) 2211 | (g << 8)
1787 | (b << 16) 2212 | (b << 16)
1788 | (a << 24); 2213 | (a << 24);
1789 } 2214 }
1790 } 2215 }
1791 2216
1792 RETVAL = map_sv; 2217 RETVAL = map_sv;
1793} 2218}
1794 OUTPUT: 2219 OUTPUT:
1795 RETVAL 2220 RETVAL
1796 2221
1797void 2222void
1798draw (DC::Map self, int mx, int my, int sw, int sh, int T) 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)
1799 CODE: 2224 CODE:
1800{ 2225{
1801 int x, y, z; 2226 int x, y, z;
1802 2227
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 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
1805 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)
1806 smooth_key skey; 2230 smooth_key skey;
1807 2231 int pl_x, pl_y;
2232 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
1809 rc_key_t key; 2235 rc_key_t key;
1810 rc_array_t *arr; 2236 rc_array_t *arr;
1811 2237
2238 pl_tex.name = 0;
2239
1812 // thats current max. sorry. 2240 // that's current max. sorry.
1813 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1815 2243
1816 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1817 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
1821 key.g = 255; 2249 key.g = 255;
1822 key.b = 255; 2250 key.b = 255;
1823 key.a = 255; 2251 key.a = 255;
1824 key.mode = GL_QUADS; 2252 key.mode = GL_QUADS;
1825 key.format = GL_T2F_V3F; 2253 key.format = GL_T2F_V3F;
1826 key.texname = -1;
1827 2254
1828 mx += self->x; 2255 mx += self->x;
1829 my += self->y; 2256 my += self->y;
1830 2257
1831 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
1854 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 2283
1857 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1858 { 2285 {
2286 smooth_hash smooth;
1859 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1860 2289
1861 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1863 { 2292 {
1864 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
1874 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1875 int px, py; 2304 int px, py;
1876 2305
1877 if (key.texname != tex.name) 2306 if (key.texname != tex.name)
1878 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1879 if (!tex.name) 2310 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1881 2312
1882 key.texname = tex.name; 2313 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
1884 } 2315 }
1885 2316
1886 px = (x + 1) * T - tex.w; 2317 px = (x + 1) * Th - tex.w;
1887 py = (y + 1) * T - tex.h; 2318 py = (y + 1) * Tw - tex.h;
2319
2320 if (expect_false (cell->player == player) && expect_false (z == 2))
2321 {
2322 pl_x = px;
2323 pl_y = py;
2324 pl_tex = tex;
2325 continue;
2326 }
1888 2327
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 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);
1891 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);
1892 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);
1893
1894 if (cell->flags && z == 2)
1895 {
1896 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1)
1898 {
1899 maptex tex = self->tex [1];
1900 int px = x * T + T * 2 / 32;
1901 int py = y * T - T * 6 / 32;
1902
1903 if (tex.name)
1904 {
1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1915 }
1916 }
1917 }
1918 2332
1919 // update smooth hash 2333 // update smooth hash
1920 if (tex.smoothtile) 2334 if (tex.smoothtile)
1921 { 2335 {
1922 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
1938 2352
1939 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1940 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
1941 2355
1942 // full tile 2356 // full tile
1943 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);
1944 2358
1945 // borders 2359 // borders
1946 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);
1947 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);
1948 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);
1949 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);
1950 2364
1951 // corners 2365 // corners
1952 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);
1953 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);
1954 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);
1955 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);
1956 } 2391 }
1957 } 2392 }
1958 } 2393 }
1959 } 2394 }
1960 2395
1976 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
1977 { 2412 {
1978 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
1979 HE *he; 2414 HE *he;
1980 2415
1981 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1982 while ((he = hv_iternext (smooth)))
1983 { 2417 {
1984 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
1985 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
1986 2420
1987 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
1988 && skey->level == level 2422 && skey.level == level
1989 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
1990 { 2424 {
1991 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
1992 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
1993 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
1994 int border = bits & 15; 2428 int border = bits & 15;
1995 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1996 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
1997 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
1998 2432
2000 { 2434 {
2001 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2002 // save gobs of state changes. 2436 // save gobs of state changes.
2003 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2004 { 2438 {
2439 self->tex [skey.tile].unused = 0;
2440
2005 glEnd (); 2441 glEnd ();
2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2008 } 2444 }
2009 2445
2010 if (border) 2446 if (border)
2011 { 2447 {
2012 float ox = border * dx; 2448 float ox = border * dx;
2013 2449
2014 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2015 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2016 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2017 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2018 } 2454 }
2019 2455
2020 if (corner) 2456 if (corner)
2021 { 2457 {
2022 float ox = corner * dx; 2458 float ox = corner * dx;
2023 2459
2024 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2028 } 2464 }
2029 } 2465 }
2030 } 2466 }
2031 } 2467 }
2032 } 2468 }
2034 2470
2035 glEnd (); 2471 glEnd ();
2036 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1; 2473 key.texname = -1;
2038 } 2474 }
2039
2040 hv_clear (smooth);
2041 } 2475 }
2476
2477 if (pl_tex.name)
2478 {
2479 maptex tex = pl_tex;
2480 int px = pl_x + sdx;
2481 int py = pl_y + sdy;
2482
2483 key.texname = tex.name;
2484 arr = rc_array (rc, &key);
2485
2486 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2487 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2488 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2490
2491 rc_draw (rc);
2492 }
2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
2042 2496
2043 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2044 rc_free (rc); 2498 rc_free (rc);
2499 rc_free (rc_ov);
2045 2500
2046 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
2048 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
2049 { 2504 {
2052 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2053 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2054 { 2509 {
2055 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2056 2511
2057 int px = x * T; 2512 int px = x * Tw;
2058 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 }
2059 2520
2060 if (cell->stat_hp) 2521 if (cell->stat_hp)
2061 { 2522 {
2062 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2063 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2064 2525
2065 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2066 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2067 px + width - 1, py); 2528 px + width - 1, py);
2068 2529
2074 } 2535 }
2075 } 2536 }
2076} 2537}
2077 2538
2078void 2539void
2079draw_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)
2080 CODE: 2541 CODE:
2081{ 2542{
2082 static float color[16][3] = { 2543 static float color[16][3] = {
2083 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
2084 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
2085 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
2086 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
2087 2548
2088 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2089 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2090 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2091 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2092 2553
2093 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2094 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2095 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2096 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2097 2558
2098 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2099 2560
2100 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2101 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2102 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2103 }; 2564 };
2104 2565
2105 int x, y; 2566 int x, y;
2106 2567
2107 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 */
2108 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2109 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2110 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2111 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
2112 2579
2113 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
2117 2584
2118 if (m) 2585 if (m)
2119 { 2586 {
2120 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2121 2588
2122 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2123 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2124 2591
2125 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
2126 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2127 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2128 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2129 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2130 } 2597 }
2138void 2605void
2139fow_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)
2140 PPCODE: 2607 PPCODE:
2141{ 2608{
2142 int x, y; 2609 int x, y;
2143 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2144 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2145 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2146 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);
2147 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2148 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2149 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2150 2618
2151 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2153 2621
2154 mx += self->x - 1; 2622 mx += self->x - 1;
2155 my += self->y - 1; 2623 my += self->y - 1;
2156
2157 memset (darkness1, 255, sw1 * sh1);
2158 2624
2159 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2161 { 2627 {
2162 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
2165 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2166 { 2632 {
2167 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2168 2634
2169 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2170 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2171 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2172 } 2638 }
2173 } 2639 }
2174 2640
2175 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2176 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
2195 2661
2196 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2197 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2198 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2199 2665
2200 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2201 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2202 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2203 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2204 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 */
2205 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2206 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2207 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2208 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2209 } 2675 }
2210 2676
2211 free (darkness1); 2677 free (darkness1);
2212 2678
2213 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2214 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2215 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2216 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2217} 2683}
2218 2684
2219SV * 2685SV *
2282 else 2748 else
2283 *data++ = 0; 2749 *data++ = 0;
2284 } 2750 }
2285 } 2751 }
2286 2752
2753 /* if size is w*h + 5 then no data has been found */
2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2755 {
2287 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2758 }
2759
2289 RETVAL = data_sv; 2760 RETVAL = data_sv;
2290} 2761}
2291 OUTPUT: 2762 OUTPUT:
2292 RETVAL 2763 RETVAL
2293 2764
2294void 2765void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2766set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2767 PPCODE:
2297{ 2768{
2298 int x, y, z; 2769 int x, y, z;
2299 int w, h; 2770 int w, h;
2300 int x1, y1; 2771 int x1, y1;
2772 STRLEN len;
2773 uint8_t *data, *end;
2774
2775 len = SvLEN (data_sv);
2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2778 end = data + len + 8;
2779
2780 if (len < 5)
2781 XSRETURN_EMPTY;
2301 2782
2302 if (*data++ != 0) 2783 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2784 XSRETURN_EMPTY; /* version mismatch */
2304 2785
2305 w = *data++ << 8; w |= *data++; 2786 w = *data++ << 8; w |= *data++;
2320 { 2801 {
2321 maprow *row = map_get_row (self, y); 2802 maprow *row = map_get_row (self, y);
2322 2803
2323 for (x = x0; x < x1; x++) 2804 for (x = x0; x < x1; x++)
2324 { 2805 {
2806 uint8_t flags;
2807
2808 if (data + 7 >= end)
2809 XSRETURN_EMPTY;
2810
2325 uint8_t flags = *data++; 2811 flags = *data++;
2326 2812
2327 if (flags) 2813 if (flags)
2328 { 2814 {
2329 mapcell *cell = row_get_cell (row, x); 2815 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2816 tileid tile[3] = { 0, 0, 0 };
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2819 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2820 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2821
2336 if (cell->darkness == 0) 2822 if (cell->darkness == 0)
2337 { 2823 {
2338 cell->darkness = 0; 2824 /*cell->darkness = 0;*/
2825 EXTEND (SP, 3);
2339 2826
2340 for (z = 0; z <= 2; z++) 2827 for (z = 0; z <= 2; z++)
2341 { 2828 {
2342 tileid t = tile [z]; 2829 tileid t = tile [z];
2343 2830
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2831 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2832 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2833 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2834 need_texid (self, t);
2348 } 2835 }
2349 2836
2350 cell->tile [z] = t; 2837 cell->tile [z] = t;
2351 } 2838 }
2356} 2843}
2357 2844
2358MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2359 2846
2360DC::RW 2847DC::RW
2361new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2362 CODE: 2849 CODE:
2363{ 2850{
2364 STRLEN datalen; 2851 STRLEN datalen;
2365 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2366 2853
2368} 2855}
2369 OUTPUT: 2856 OUTPUT:
2370 RETVAL 2857 RETVAL
2371 2858
2372DC::RW 2859DC::RW
2373new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2374 CODE: 2861 CODE:
2375 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2376 OUTPUT: 2863 OUTPUT:
2377 RETVAL 2864 RETVAL
2378 2865
2396 if (RETVAL < 0) 2883 if (RETVAL < 0)
2397 { 2884 {
2398 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2399 2886
2400 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)
2401 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2402 2894 }
2895 else
2403 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2404 } 2897 }
2405 2898
2406 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2407 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2408} 2901}
2455void 2948void
2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457 CODE: 2950 CODE:
2458{ 2951{
2459 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));
2460 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;
2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462} 2955}
2463 2956
2464void 2957void
2465set_reverse_stereo (DC::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2468 2961
2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2470 2963
2471PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2472 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
2473DC::MixChunk 2978DC::MixChunk
2474new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2475 CODE: 2980 CODE:
2476 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2477 OUTPUT: 2982 OUTPUT:
2478 RETVAL 2983 RETVAL
2479 2984
2509 OUTPUT: 3014 OUTPUT:
2510 RETVAL 3015 RETVAL
2511 3016
2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2513 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
2514int 3031int
2515volume (int volume = -1) 3032volume (int volume = -1)
2516 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2517 CODE: 3034 CODE:
2518 if (items > 0) 3035 if (items > 0)
2529void 3046void
2530halt () 3047halt ()
2531 CODE: 3048 CODE:
2532 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2533 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2534DC::MixMusic 3058DC::MixMusic
2535new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2536 CODE: 3060 CODE:
2537 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2538 OUTPUT: 3062 OUTPUT:
2539 RETVAL 3063 RETVAL
2540 3064
2568 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2569# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
2570 const_iv (GL_VENDOR), 3094 const_iv (GL_VENDOR),
2571 const_iv (GL_VERSION), 3095 const_iv (GL_VERSION),
2572 const_iv (GL_EXTENSIONS), 3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2573 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2574 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2575 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2576 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2577 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
2589 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2590 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2591 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2592 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2593 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),
2594 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2595 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2596 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2597 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2598 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
2666 const_iv (GL_NICEST), 3195 const_iv (GL_NICEST),
2667 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2668 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2669 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2670 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),
2671# undef const_iv 3203# undef const_iv
2672 }; 3204 };
2673 3205
2674 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--)
2675 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2676 3208
2677 texture_av = newAV (); 3209 texture_av = newAV ();
2678 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
2679} 3211}
2680 3212
2682disable_GL_EXT_blend_func_separate () 3214disable_GL_EXT_blend_func_separate ()
2683 CODE: 3215 CODE:
2684 gl.BlendFuncSeparate = 0; 3216 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
2686 3218
2687char * 3219void
3220apple_nvidia_bug (int enable)
3221
3222const char *
2688gl_vendor () 3223gl_vendor ()
2689 CODE: 3224 CODE:
2690 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2691 OUTPUT: 3226 OUTPUT:
2692 RETVAL 3227 RETVAL
2693 3228
2694char * 3229const char *
2695gl_version () 3230gl_version ()
2696 CODE: 3231 CODE:
2697 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2698 OUTPUT: 3233 OUTPUT:
2699 RETVAL 3234 RETVAL
2700 3235
2701char * 3236const char *
2702gl_extensions () 3237gl_extensions ()
2703 CODE: 3238 CODE:
2704 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2705 OUTPUT: 3240 OUTPUT:
2706 RETVAL 3241 RETVAL
2707 3242
2708const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
2709 3248
2710GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
2711 CODE: 3250 CODE:
2712 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
2713 OUTPUT: 3252 OUTPUT:
2721 3260
2722int glGetError () 3261int glGetError ()
2723 3262
2724void glFinish () 3263void glFinish ()
2725 3264
3265void glFlush ()
3266
2726void glClear (int mask) 3267void glClear (int mask)
2727 3268
2728void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2729 PROTOTYPE: @ 3270 PROTOTYPE: @
2730 3271
2739void glBlendFunc (int sfactor, int dfactor) 3280void glBlendFunc (int sfactor, int dfactor)
2740 3281
2741void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2742 CODE: 3283 CODE:
2743 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
3285
3286# void glBlendEquation (int se)
2744 3287
2745void glDepthMask (int flag) 3288void glDepthMask (int flag)
2746 3289
2747void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2748 3291
2783void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2784 CODE: 3327 CODE:
2785 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2786 3329
2787void 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: @
2788 ALIAS: 3332 ALIAS:
2789 glColor_premultiply = 1 3333 glColor_premultiply = 1
2790 CODE: 3334 CODE:
2791 if (ix) 3335 if (ix)
2792 { 3336 {
2898 3442
2899void glEndList () 3443void glEndList ()
2900 3444
2901void glCallList (int list) 3445void glCallList (int list)
2902 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2904 3453
2905PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
2906 3455
2907void 3456void
2908find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
2909 PPCODE: 3458 PPCODE:
2910{ 3459{
2911 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
2912 XPUSHs (self); 3461 XPUSHs (self);
2913} 3462}
2914 3463
2915BOOT: 3464BOOT:
2916{ 3465{
2924 3473
2925void 3474void
2926draw (SV *self) 3475draw (SV *self)
2927 CODE: 3476 CODE:
2928{ 3477{
2929 HV *hv; 3478 HV *hv;
2930 SV **svp; 3479 SV **svp;
2931 NV x, y, w, h; 3480 NV x, y, w, h;
2932 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
2933 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
2934 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
2935 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