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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines