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.268 by root, Sun Jul 20 02:57:43 2008 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
65# include <netinet/in.h> 76# include <netinet/in.h>
66# include <netinet/tcp.h> 77# include <netinet/tcp.h>
67# include <inttypes.h> 78# include <inttypes.h>
68#endif 79#endif
69 80
70#if __GNUC__ >= 4 81#include "ecb.h"
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78 82
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
82 89
83#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
85 92
86#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
87 94
88/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
97
98#define KMOD_LRAM 0x10000 // our extension
99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
102
103static char *
104fast_sv_grow (SV *sv, STRLEN need)
105{
106 STRLEN len = SvLEN (sv);
107 STRLEN want = SvCUR (sv) + need;
108
109 if (ecb_expect_false (len < want))
110 {
111 do
112 len *= 2;
113 while (len < want);
114
115 sv_grow (sv, len);
116 }
117
118 SvCUR_set (sv, want);
119 return SvEND (sv) - need;
120}
90 121
91static AV *texture_av; 122static AV *texture_av;
92 123
93static struct 124static struct
94{ 125{
151{ 182{
152 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
153 184
154 while (attrs) 185 while (attrs)
155 { 186 {
156 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 188
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 190 return 1;
160 191
161 attrs = attrs->next; 192 attrs = attrs->next;
162 } 193 }
163 194
164 return 0; 195 return 0;
165} 196}
166 197
167typedef struct cf_layout { 198struct cf_layout {
168 PangoLayout *pl; 199 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
170 int base_height; 201 int base_height;
171 DC__Font font; 202 DC__Font font;
172 rc_t *rc; 203 rc_t rc;
173} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
174 207
175static DC__Font default_font; 208static DC__Font default_font;
176static PangoContext *opengl_context; 209static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
178 211
179static void 212static void
180substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
181{ 214{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 218#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 220}
188 221
189static void 222static void
216 249
217 *w = rect.width; 250 *w = rect.width;
218 *h = rect.height; 251 *h = rect.height;
219} 252}
220 253
254/////////////////////////////////////////////////////////////////////////////
255
221typedef uint16_t tileid; 256typedef uint16_t tileid;
222typedef uint16_t faceid; 257typedef uint16_t faceid;
223 258
224typedef struct { 259struct maptex
260{
225 GLuint name; 261 GLuint name;
226 int w, h; 262 int w, h;
227 float s, t; 263 float s, t;
228 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
229 tileid smoothtile; 265 tileid smoothtile;
230 uint8_t smoothlevel; 266 uint8_t smoothlevel;
231} maptex; 267 uint8_t unused; /* set to zero on use */
268};
232 269
233typedef struct { 270struct mapcell
271{
234 uint32_t player; 272 uint32_t player;
235 tileid tile[3]; 273 tileid tile[3];
236 uint16_t darkness; 274 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 276};
239 277
240typedef struct { 278struct maprow
279{
241 int32_t c0, c1; 280 int32_t c0, c1;
242 mapcell *col; 281 mapcell *col;
243} maprow; 282};
244 283
245typedef struct map { 284struct mapgrid {
246 int x, y, w, h; 285 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
250 289
251 int32_t rows; 290 int32_t rows;
252 maprow *row; 291 maprow *row;
253} *DC__Map; 292};
254 293
255static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
256prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
257{ 299{
258 char *p; 300 T *p;
259 301
260 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
261 Zero (p, inc, char); 303 Zero (p, inc, T);
262 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
263 Safefree (ptr); 305 Safefree (ptr);
264 306
265 return p; 307 ptr = p;
266} 308}
267 309
268static char * 310template<typename T>
269append (char *ptr, int sze, int inc)
270{
271 Renew (ptr, sze + inc, char);
272 Zero (ptr + sze, inc, char);
273
274 return ptr;
275}
276
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
278#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279
280static void 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
281need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
282{ 320{
283 while (self->faces <= face) 321 while (self->faces <= face)
284 { 322 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 324 self->faces *= 2;
287 } 325 }
288} 326}
289 327
290static void 328static void
291need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
292{ 330{
293 while (self->texs <= texid) 331 while (self->texs <= texid)
294 { 332 {
295 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
296 self->texs *= 2; 334 self->texs *= 2;
297 } 335 }
298} 336}
299 337
300static maprow * 338static maprow *
301map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
302{ 340{
303 if (0 > y) 341 if (0 > y)
304 { 342 {
305 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
307 345
308 self->rows += extend; 346 self->rows += extend;
309 self->y += extend; 347 self->y += extend;
310 y += extend; 348 y += extend;
311 } 349 }
312 else if (y >= self->rows) 350 else if (y >= self->rows)
313 { 351 {
314 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
315 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
316 self->rows += extend; 354 self->rows += extend;
317 } 355 }
318 356
319 return self->row + y; 357 return self->row + y;
320} 358}
330 } 368 }
331 369
332 if (row->c0 > x) 370 if (row->c0 > x)
333 { 371 {
334 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
335 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
336 row->c0 -= extend; 374 row->c0 -= extend;
337 } 375 }
338 else if (x >= row->c1) 376 else if (x >= row->c1)
339 { 377 {
340 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
341 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
342 row->c1 += extend; 380 row->c1 += extend;
343 } 381 }
344 382
345 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
346} 384}
347 385
348static mapcell * 386static mapcell *
349map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
350{ 388{
351 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
352} 390}
353 391
354static void 392static void
355map_clear (DC__Map self) 393map_clear (mapgrid *self)
356{ 394{
357 int r; 395 int r;
358 396
359 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
378 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
379 (cell)->player = 0; \ 417 (cell)->player = 0; \
380 } while (0) 418 } while (0)
381 419
382static void 420static void
383map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
384{ 422{
385 int x, y; 423 int x, y;
386 maprow *row; 424 maprow *row;
387 mapcell *cell; 425 mapcell *cell;
388 426
405 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
406 } 444 }
407 } 445 }
408} 446}
409 447
410typedef struct { 448struct smooth_key
449{
411 tileid tile; 450 tileid tile;
412 uint8_t x, y, level; 451 uint8_t x, y, level;
413} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
414 471
415static void 472static void
416smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
417{ 474{
418 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
419 476
420 if (SvIOK (*sv)) 477 if (it == h.end ())
421 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
422 else 479 else
423 sv_setiv (*sv, bits); 480 it->second |= bits;
424} 481}
425 482
426static void 483static void
427music_finished (void) 484music_finished (void)
428{ 485{
445 ev.code = 1; 502 ev.code = 1;
446 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
447 ev.data2 = 0; 504 ev.data2 = 0;
448 505
449 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
450} 514}
451 515
452static unsigned int 516static unsigned int
453minpot (unsigned int n) 517minpot (unsigned int n)
454{ 518{
464 n |= n >> 16; 528 n |= n >> 16;
465 529
466 return n + 1; 530 return n + 1;
467} 531}
468 532
469static unsigned int
470popcount (unsigned int n)
471{
472 n -= (n >> 1) & 0x55555555U;
473 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
474 n = ((n >> 4) + n) & 0x0f0f0f0fU;
475 n *= 0x01010101U;
476
477 return n >> 24;
478}
479
480/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
481#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
482#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
483 536
484/******************************************************************************/ 537/******************************************************************************/
521 if (!svp || !SvTRUE (*svp)) 574 if (!svp || !SvTRUE (*svp))
522 return 0; 575 return 0;
523 576
524 return 1; 577 return 1;
525} 578}
579
580/******************************************************************************/
581
582/* process keyboard modifiers */
583static int
584mod_munge (int mod)
585{
586 mod &= MOD_MASK;
587
588 if (mod & (KMOD_META | KMOD_ALT))
589 mod |= KMOD_LRAM;
590
591 return mod;
592}
593
594static void
595deliantra_main (SV *real_main)
596{
597 dSP;
598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
601}
602
603#ifdef __MACOSX__
604 static SV *real_main;
605
606 /* to due surprising braindamage on the side of SDL design, we
607 * do some mind-boggling hack here: SDL requires a custom main()
608 * on OS X, so... we provide one and call the original main(), which,
609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
610 * and which calls our main (== SDL_main) back.
611 */
612 extern C_LINKAGE int
613 main (int argc, char *argv[])
614 {
615 deliantra_main (real_main);
616 }
617
618 #undef main
619
620 extern C_LINKAGE int main (int argc, char *argv[]);
621
622 static void
623 SDL_main_hack (SV *real_main_)
624 {
625 real_main = real_main_;
626
627 char *argv[] = { "deliantra client", 0 };
628 (main) (1, argv);
629 }
630#else
631 static void
632 SDL_main_hack (SV *real_main)
633 {
634 deliantra_main (real_main);
635 }
636#endif
526 637
527MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
528 639
529PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
530 641
559 const_iv (SDL_USEREVENT), 670 const_iv (SDL_USEREVENT),
560 671
561 const_iv (SDL_APPINPUTFOCUS), 672 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 673 const_iv (SDL_APPMOUSEFOCUS),
563 const_iv (SDL_APPACTIVE), 674 const_iv (SDL_APPACTIVE),
675
676
677 const_iv (SDLK_UNKNOWN),
678 const_iv (SDLK_FIRST),
679 const_iv (SDLK_BACKSPACE),
680 const_iv (SDLK_TAB),
681 const_iv (SDLK_CLEAR),
682 const_iv (SDLK_RETURN),
683 const_iv (SDLK_PAUSE),
684 const_iv (SDLK_ESCAPE),
685 const_iv (SDLK_SPACE),
686 const_iv (SDLK_EXCLAIM),
687 const_iv (SDLK_QUOTEDBL),
688 const_iv (SDLK_HASH),
689 const_iv (SDLK_DOLLAR),
690 const_iv (SDLK_AMPERSAND),
691 const_iv (SDLK_QUOTE),
692 const_iv (SDLK_LEFTPAREN),
693 const_iv (SDLK_RIGHTPAREN),
694 const_iv (SDLK_ASTERISK),
695 const_iv (SDLK_PLUS),
696 const_iv (SDLK_COMMA),
697 const_iv (SDLK_MINUS),
698 const_iv (SDLK_PERIOD),
699 const_iv (SDLK_SLASH),
700 const_iv (SDLK_0),
701 const_iv (SDLK_1),
702 const_iv (SDLK_2),
703 const_iv (SDLK_3),
704 const_iv (SDLK_4),
705 const_iv (SDLK_5),
706 const_iv (SDLK_6),
707 const_iv (SDLK_7),
708 const_iv (SDLK_8),
709 const_iv (SDLK_9),
710 const_iv (SDLK_COLON),
711 const_iv (SDLK_SEMICOLON),
712 const_iv (SDLK_LESS),
713 const_iv (SDLK_EQUALS),
714 const_iv (SDLK_GREATER),
715 const_iv (SDLK_QUESTION),
716 const_iv (SDLK_AT),
717
718 const_iv (SDLK_LEFTBRACKET),
719 const_iv (SDLK_BACKSLASH),
720 const_iv (SDLK_RIGHTBRACKET),
721 const_iv (SDLK_CARET),
722 const_iv (SDLK_UNDERSCORE),
723 const_iv (SDLK_BACKQUOTE),
724 const_iv (SDLK_DELETE),
564 725
565 const_iv (SDLK_FIRST), 726 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 727 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 728 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 729 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 808 const_iv (KMOD_MODE),
648 809
810 const_iv (KMOD_LRAM),
811
649 const_iv (MIX_DEFAULT_FORMAT), 812 const_iv (MIX_DEFAULT_FORMAT),
650 813
651 const_iv (SDL_INIT_TIMER), 814 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 815 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 816 const_iv (SDL_INIT_VIDEO),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 834 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO), 835 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 836 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES), 837 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL), 838 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL) 839 const_iv (SDL_GL_SWAP_CONTROL),
840
841 const_iv (FOW_DARKNESS)
677# undef const_iv 842# undef const_iv
678 }; 843 };
679 844
680 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 845 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
682 847
683 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
684 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
685} 850}
686 851
701 866
702NV ceil (NV x) 867NV ceil (NV x)
703 868
704IV minpot (UV n) 869IV minpot (UV n)
705 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
706IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
707 888
708void 889void
709pango_init () 890pango_init ()
710 CODE: 891 CODE:
711{ 892{
719#endif 900#endif
720} 901}
721 902
722char *SDL_GetError () 903char *SDL_GetError ()
723 904
905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
907
724int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
725 909
726int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
727 911
728void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
729 913
730void SDL_Quit () 914void SDL_Quit ()
731 915
732int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
733 918
734int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
735 CODE: 920 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
737 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
738 OUTPUT: 923 OUTPUT:
739 RETVAL 924 RETVAL
740 925
741void 926void
796 ); 981 );
797 982
798 if (RETVAL) 983 if (RETVAL)
799 { 984 {
800 av_clear (texture_av); 985 av_clear (texture_av);
801
802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
803#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
804#include "glfunc.h" 987#include "glfunc.h"
805#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
806 } 991 }
807} 992}
808 OUTPUT: 993 OUTPUT:
809 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
810 998
811void 999void
812SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
813 1001
814char * 1002char *
815SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
816 1005
817int 1006int
818SDL_GetAppState () 1007SDL_GetAppState ()
819 1008
820int 1009int
821SDL_GetModState () 1010SDL_GetModState ()
822 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
823void 1016void
1017SDL_PumpEvents ()
1018
1019void
824poll_events () 1020peep_events ()
825 PPCODE: 1021 PPCODE:
826{ 1022{
827 SDL_Event ev; 1023 SDL_Event ev;
828 1024
829 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
836 { 1032 {
837 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
838 case SDL_KEYUP: 1034 case SDL_KEYUP:
839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
841 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1037 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
842 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1038 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
844 break; 1040 break;
845 1041
846 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
865 x = ev.motion.x; 1061 x = ev.motion.x;
866 y = ev.motion.y; 1062 y = ev.motion.y;
867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
868 } 1064 }
869 1065
870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
871 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
872 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
873 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
874 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
875 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
895 1091
896 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
897 } 1093 }
898} 1094}
899 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
900int 1109int
901Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
902 POSTCALL: 1111 POSTCALL:
903 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
904 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
905 1114
906void 1115void
907Mix_QuerySpec () 1116Mix_QuerySpec ()
966add_font (char *file) 1175add_font (char *file)
967 CODE: 1176 CODE:
968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT: 1178 OUTPUT:
970 RETVAL 1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
971 1187
972void 1188void
973load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
974 ALIAS: 1190 ALIAS:
975 load_image_file = 1 1191 load_image_file = 1
1021 1237
1022 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1023 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1024 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1025 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1026 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1027 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1028 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1029 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1030 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1031 1247
1091#if DEBUG 1307#if DEBUG
1092 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
1093#endif 1309#endif
1094} 1310}
1095 1311
1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1096MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1097 1320
1098PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1099 1322
1100DC::Font 1323DC::Font
1101new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1102 CODE: 1325 CODE:
1103{ 1326{
1104 int count; 1327 int count;
1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1106 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1135 PROTOTYPE: 1358 PROTOTYPE:
1136 CODE: 1359 CODE:
1137 tc_restore (); 1360 tc_restore ();
1138 1361
1139DC::Layout 1362DC::Layout
1140new (SV *class) 1363new (SV *klass)
1141 CODE: 1364 CODE:
1142 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1143 1366
1144 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1145 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1146 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1147 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1148 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1149 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1150 RETVAL->font = 0; 1373 RETVAL->font = 0;
1151 RETVAL->rc = rc_alloc ();
1152 1374
1153 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1154 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1155 OUTPUT: 1377 OUTPUT:
1156 RETVAL 1378 RETVAL
1157 1379
1158void 1380void
1159DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1160 CODE: 1382 CODE:
1161 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1162 rc_free (self->rc);
1163 Safefree (self); 1384 delete self;
1164 1385
1165void 1386void
1166set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1167 CODE: 1388 CODE:
1168{ 1389{
1294 1515
1295void 1516void
1296set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1297 CODE: 1518 CODE:
1298 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1299 { 1520 {
1300 self->base_height = base_height; 1521 self->base_height = base_height;
1301 layout_update_font (self); 1522 layout_update_font (self);
1302 } 1523 }
1303 1524
1304void 1525void
1422} 1643}
1423 1644
1424void 1645void
1425render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1426 CODE: 1647 CODE:
1427 rc_clear (self->rc); 1648 self->rc.clear ();
1428 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1429 self->pl, 1650 self->pl,
1430 self->rc, 1651 &self->rc,
1431 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1432 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1433 flags 1654 flags
1434 ); 1655 );
1435 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1446 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1447 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1448 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1449 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1450 1671
1451 rc_draw (self->rc); 1672 self->rc.draw ();
1452 1673
1453 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1454 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1455 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1456} 1677}
1531 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1532 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1533 } 1754 }
1534} 1755}
1535 1756
1757void
1758draw_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)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1536IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1537 CODE: 1879 CODE:
1538{ 1880{
1539 GLint width; 1881 GLint width;
1540 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1547MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1548 1890
1549PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1550 1892
1551DC::Map 1893DC::Map
1552new (SV *class) 1894new (SV *klass)
1553 CODE: 1895 CODE:
1554 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1555 RETVAL->x = 0; 1897 RETVAL->x = 0;
1556 RETVAL->y = 0; 1898 RETVAL->y = 0;
1557 RETVAL->w = 0; 1899 RETVAL->w = 0;
1558 RETVAL->h = 0; 1900 RETVAL->h = 0;
1559 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1596 1938
1597void 1939void
1598set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1599 CODE: 1941 CODE:
1600{ 1942{
1601 tileid texid; 1943 tileid texid;
1602 maptex *tex; 1944 maptex *tex;
1603 1945
1604 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1605 return; 1947 return;
1606 1948
1607 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1608 return; 1950 return;
1609 1951
1610 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1611 1953
1612 if (!texid) 1954 if (!texid)
1613 return; 1955 return;
1614 1956
1615 tex = self->tex + texid; 1957 tex = self->tex + texid;
1644 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1986 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1645 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1646 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1648} 1990}
1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
1649 2011
1650int 2012int
1651ox (DC::Map self) 2013ox (DC::Map self)
1652 ALIAS: 2014 ALIAS:
1653 oy = 1 2015 oy = 1
1685 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1686 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1687 2049
1688 while (self->y < 0) 2050 while (self->y < 0)
1689 { 2051 {
1690 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1691 2053
1692 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1693 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1694 } 2056 }
1695} 2057}
1696 2058
1697SV * 2059SV *
1698map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1699 CODE: 2061 CODE:
1700{ 2062{
1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1702 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1703 mapcell *cell; 2065 mapcell *cell;
1724 2086
1725 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1726 2088
1727 if (flags & 8) 2089 if (flags & 8)
1728 { 2090 {
2091 uint8_t ext, cmd;
2092
1729 if (extmap) 2093 do
1730 { 2094 {
1731 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1732 2097
1733 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1734 { 2101 {
1735 ext = *data++;
1736 cmd = ext & 0x7f;
1737
1738 if (cmd < 4)
1739 cell->darkness = 255 - ext * 64 + 1;
1740 else if (cmd == 5) // health
1741 {
1742 cell->stat_width = 1; 2102 cell->stat_width = 1;
1743 cell->stat_hp = *data++; 2103 cell->stat_hp = *data++;
1744 }
1745 else if (cmd == 6) // monster width
1746 cell->stat_width = *data++ + 1;
1747 else if (cmd == 0x47)
1748 {
1749 if (*data == 1) cell->player = data [1];
1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1753
1754 data += *data + 1;
1755 }
1756 else if (cmd == 8) // cell flags
1757 cell->flags = *data++;
1758 else if (ext & 0x40) // unknown, multibyte => skip
1759 data += *data + 1;
1760 else
1761 data++;
1762 } 2104 }
1763 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1764 } 2122 }
1765 else 2123 while (ext & 0x80);
1766 cell->darkness = *data++ + 1;
1767 } 2124 }
1768 2125
1769 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1770 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1771 { 2128 {
1774 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1775 2132
1776 if (cell->tile [z]) 2133 if (cell->tile [z])
1777 { 2134 {
1778 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1779 if (!tex->name) 2137 if (!tex->name)
1780 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1781 2139
1782 if (tex->smoothtile) 2140 if (tex->smoothtile)
1783 { 2141 {
1784 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1785 if (!smooth->name) 2144 if (!smooth->name)
1786 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1787 } 2146 }
1788 } 2147 }
1789 } 2148 }
1817 ? self->row + y 2176 ? self->row + y
1818 : 0; 2177 : 0;
1819 2178
1820 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1821 { 2180 {
1822 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1823 2182
1824 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1825 { 2184 {
1826 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1827 2186
1829 { 2188 {
1830 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1831 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1832 int a1 = tex.a; 2191 int a1 = tex.a;
1833 2192
1834 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1835 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1836 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1837 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1838 } 2197 }
1839 } 2198 }
1840 2199
1841 *map++ = (r ) 2200 *map++ = (r )
1842 | (g << 8) 2201 | (g << 8)
1843 | (b << 16) 2202 | (b << 16)
1844 | (a << 24); 2203 | (a << 24);
1845 } 2204 }
1846 } 2205 }
1847 2206
1848 RETVAL = map_sv; 2207 RETVAL = map_sv;
1849} 2208}
1850 OUTPUT: 2209 OUTPUT:
1851 RETVAL 2210 RETVAL
1852 2211
1853void 2212void
1854draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2213draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1855 CODE: 2214 CODE:
1856{ 2215{
1857 int x, y, z; 2216 int x, y, z;
1858 2217
1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1860 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1861 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1862 smooth_key skey;
1863 int pl_x, pl_y; 2219 int pl_x, pl_y;
1864 maptex pl_tex; 2220 maptex pl_tex;
1865 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1866 rc_key_t key; 2223 rc_key_t key;
1867 rc_array_t *arr; 2224 rc_t::array_t *arr;
1868 2225
1869 pl_tex.name = 0; 2226 pl_tex.name = 0;
1870 2227
1871 // thats current max. sorry. 2228 // that's current max. sorry.
1872 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1873 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1874
1875 // clear key, in case of extra padding
1876 memset (&skey, 0, sizeof (skey));
1877 2231
1878 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1879 key.r = 255; 2233 key.r = 255;
1880 key.g = 255; 2234 key.g = 255;
1881 key.b = 255; 2235 key.b = 255;
1882 key.a = 255; 2236 key.a = 255;
1883 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1884 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
1885 key.texname = -1;
1886 2239
1887 mx += self->x; 2240 mx += self->x;
1888 my += self->y; 2241 my += self->y;
1889 2242
1890 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1891 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1892 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1893 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1894 2247
1895 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1896 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1897 { 2250 {
1898 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
1913 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1914 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1915 2268
1916 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1917 { 2270 {
1918 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
1919 2275
1920 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1921 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1922 { 2278 {
1923 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
1929 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
1930 2286
1931 if (tile) 2287 if (tile)
1932 { 2288 {
1933 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1934 int px = (x + 1) * T - tex.w; 2290 int px, py;
1935 int py = (y + 1) * T - tex.h;
1936 2291
1937 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
1938 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1939 if (!tex.name) 2296 if (!tex.name)
1940 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1941 2298
1942 key.texname = tex.name; 2299 key.texname = tex.name;
1943 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
1944 } 2301 }
1945 2302
2303 px = (x + 1) * Th - tex.w;
2304 py = (y + 1) * Tw - tex.h;
2305
1946 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1947 { 2307 {
1948 pl_x = px; 2308 pl_x = px;
1949 pl_y = py; 2309 pl_y = py;
1950 pl_tex = tex; 2310 pl_tex = tex;
1951 continue; 2311 continue;
1952 } 2312 }
1953 2313
1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
1955 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1956 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1957 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1958
1959 if (expect_false (cell->flags) && expect_false (z == 2))
1960 {
1961 // overlays such as the speech bubble, probably more to come
1962 if (cell->flags & 1)
1963 {
1964 maptex tex = self->tex [1];
1965 int px = x * T + T * 2 / 32;
1966 int py = y * T - T * 6 / 32;
1967
1968 if (tex.name)
1969 {
1970 if (key.texname != tex.name)
1971 {
1972 key.texname = tex.name;
1973 arr = rc_array (rc, &key);
1974 }
1975
1976 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1977 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1978 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1979 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1980 }
1981 }
1982 }
1983 2318
1984 // update smooth hash 2319 // update smooth hash
1985 if (tex.smoothtile) 2320 if (tex.smoothtile)
1986 { 2321 {
1987 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
1988 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
1989 2324
1990 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
1991 2326
1992 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
1993 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
1994 2329
1995 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
2003 2338
2004 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2005 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
2006 2341
2007 // full tile 2342 // full tile
2008 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2009 2344
2010 // borders 2345 // borders
2011 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2012 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2013 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2014 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2015 2350
2016 // corners 2351 // corners
2017 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2018 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2019 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2020 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2021 } 2376 }
2022 } 2377 }
2023 } 2378 }
2024 } 2379 }
2025 2380
2026 rc_draw (rc); 2381 rc.draw ();
2027 rc_clear (rc); 2382 rc.clear ();
2028 2383
2029 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2030 // this is basically counting sort 2385 // this is basically counting sort
2031 { 2386 {
2032 int w, b; 2387 int w, b;
2033 2388
2034 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2035 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2036 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2037 { 2394 {
2038 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2039 if (smask) 2396 IV bits = it->second;
2040 for (b = 0; b < 32; ++b) 2397
2041 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2042 { 2401 {
2043 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2044 HE *he; 2410 if (tex.name)
2045
2046 hv_iterinit (smooth);
2047 while ((he = hv_iternext (smooth)))
2048 { 2411 {
2049 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2050 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2051 2414 if (key.texname != tex.name)
2052 if (!(bits & 0x1000)
2053 && skey->level == level
2054 && level > smooth_max [skey->x][skey->y])
2055 { 2415 {
2056 maptex tex = self->tex [skey->tile]; 2416 self->tex [skey.tile].unused = 0;
2057 int px = (((int)skey->x) - 1) * T;
2058 int py = (((int)skey->y) - 1) * T;
2059 int border = bits & 15;
2060 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2061 float dx = tex.s * .0625f; // 16 images/row
2062 float dy = tex.t * .5f ; // 2 images/column
2063 2417
2064 if (tex.name)
2065 {
2066 // this time avoiding texture state changes
2067 // save gobs of state changes.
2068 if (key.texname != tex.name)
2069 {
2070 glEnd (); 2418 glEnd ();
2071 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2072 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2073 } 2421 }
2074 2422
2075 if (border) 2423 if (border)
2076 { 2424 {
2077 float ox = border * dx; 2425 float ox = border * dx;
2078 2426
2079 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2083 } 2431 }
2084 2432
2085 if (corner) 2433 if (corner)
2086 { 2434 {
2087 float ox = corner * dx; 2435 float ox = corner * dx;
2088 2436
2089 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2090 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2091 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2092 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2093 }
2094 }
2095 } 2441 }
2096 } 2442 }
2097 } 2443 }
2098 } 2444 }
2099 2445
2100 glEnd (); 2446 glEnd ();
2101 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2102 key.texname = -1; 2448 key.texname = -1;
2103 } 2449 }
2104
2105 hv_clear (smooth);
2106 } 2450 }
2107 2451
2108 if (pl_tex.name) 2452 if (pl_tex.name)
2109 { 2453 {
2110 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2111 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2112 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2113 2457
2114 key.texname = tex.name; 2458 key.texname = tex.name;
2115 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2116 2460
2117 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2118 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2119 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2120 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2121 2465
2122 rc_draw (rc); 2466 rc.draw ();
2123 } 2467 }
2124 2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
2125 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2126 rc_free (rc);
2127 2473
2128 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2129 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2130 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2131 { 2477 {
2134 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2135 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2136 { 2482 {
2137 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2138 2484
2139 int px = x * T; 2485 int px = x * Tw;
2140 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2141 2493
2142 if (cell->stat_hp) 2494 if (cell->stat_hp)
2143 { 2495 {
2144 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2145 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2146 2498
2147 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2148 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2149 px + width - 1, py); 2501 px + width - 1, py);
2150 2502
2156 } 2508 }
2157 } 2509 }
2158} 2510}
2159 2511
2160void 2512void
2161draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2162 CODE: 2514 CODE:
2163{ 2515{
2164 static float color[16][3] = { 2516 static float color[16][3] = {
2165 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2166 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2167 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2168 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2169 2521
2170 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2171 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2172 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2173 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2174 2526
2175 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2176 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2177 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2178 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2179 2531
2180 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2181 2533
2182 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2183 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2184 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2185 }; 2537 };
2186 2538
2187 int x, y; 2539 int x, y;
2188 2540
2189 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2190 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2191 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2194 2552
2195 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2199 2557
2200 if (m) 2558 if (m)
2201 { 2559 {
2202 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2203 2561
2204 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2205 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2206 2564
2207 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2208 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2209 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2210 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2211 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2212 } 2570 }
2220void 2578void
2221fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2222 PPCODE: 2580 PPCODE:
2223{ 2581{
2224 int x, y; 2582 int x, y;
2225 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2226 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2227 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2228 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2229 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2230 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2231 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2232 2591
2233 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2234 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2235 2594
2236 mx += self->x - 1; 2595 mx += self->x - 1;
2237 my += self->y - 1; 2596 my += self->y - 1;
2238
2239 memset (darkness1, 255, sw1 * sh1);
2240 2597
2241 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2242 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2243 { 2600 {
2244 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2247 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2248 { 2605 {
2249 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2250 2607
2251 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2252 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2253 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2254 } 2611 }
2255 } 2612 }
2256 2613
2257 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2258 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2277 2634
2278 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2279 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2280 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2281 2638
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2283 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2286 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2289 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2291 } 2648 }
2292 2649
2293 free (darkness1); 2650 free (darkness1);
2294 2651
2295 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2296 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2297 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2298 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2299} 2656}
2300 2657
2301SV * 2658SV *
2364 else 2721 else
2365 *data++ = 0; 2722 *data++ = 0;
2366 } 2723 }
2367 } 2724 }
2368 2725
2369 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 { 2728 {
2372 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 } 2731 }
2375 2732
2376 RETVAL = data_sv; 2733 RETVAL = data_sv;
2377} 2734}
2378 OUTPUT: 2735 OUTPUT:
2379 RETVAL 2736 RETVAL
2380 2737
2381void 2738void
2388 STRLEN len; 2745 STRLEN len;
2389 uint8_t *data, *end; 2746 uint8_t *data, *end;
2390 2747
2391 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2394 end = data + len + 8; 2751 end = data + len + 8;
2395 2752
2396 if (len < 5) 2753 if (len < 5)
2397 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2398 2755
2459} 2816}
2460 2817
2461MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2462 2819
2463DC::RW 2820DC::RW
2464new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2465 CODE: 2822 CODE:
2466{ 2823{
2467 STRLEN datalen; 2824 STRLEN datalen;
2468 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2469 2826
2471} 2828}
2472 OUTPUT: 2829 OUTPUT:
2473 RETVAL 2830 RETVAL
2474 2831
2475DC::RW 2832DC::RW
2476new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2477 CODE: 2834 CODE:
2478 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2479 OUTPUT: 2836 OUTPUT:
2480 RETVAL 2837 RETVAL
2481 2838
2499 if (RETVAL < 0) 2856 if (RETVAL < 0)
2500 { 2857 {
2501 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2502 2859
2503 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2504 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2505 2867 }
2868 else
2506 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2507 } 2870 }
2508 2871
2509 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2510 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2511} 2874}
2558void 2921void
2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2560 CODE: 2923 CODE:
2561{ 2924{
2562 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2563 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2565} 2928}
2566 2929
2567void 2930void
2568set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2571 2934
2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2573 2936
2574PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2575 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2576DC::MixChunk 2951DC::MixChunk
2577new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2578 CODE: 2953 CODE:
2579 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2580 OUTPUT: 2955 OUTPUT:
2581 RETVAL 2956 RETVAL
2582 2957
2612 OUTPUT: 2987 OUTPUT:
2613 RETVAL 2988 RETVAL
2614 2989
2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2616 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2617int 3004int
2618volume (int volume = -1) 3005volume (int volume = -1)
2619 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2620 CODE: 3007 CODE:
2621 if (items > 0) 3008 if (items > 0)
2632void 3019void
2633halt () 3020halt ()
2634 CODE: 3021 CODE:
2635 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2636 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2637DC::MixMusic 3031DC::MixMusic
2638new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2639 CODE: 3033 CODE:
2640 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2641 OUTPUT: 3035 OUTPUT:
2642 RETVAL 3036 RETVAL
2643 3037
2671 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2672# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2673 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2674 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2675 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2676 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2677 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2678 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2679 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2680 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2692 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2693 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2694 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2695 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2696 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2697 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2698 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2699 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2700 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2701 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2769 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2770 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2771 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2772 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2773 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2774# undef const_iv 3176# undef const_iv
2775 }; 3177 };
2776 3178
2777 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2778 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2779 3181
2780 texture_av = newAV (); 3182 texture_av = newAV ();
2781 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2782} 3184}
2783 3185
2785disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2786 CODE: 3188 CODE:
2787 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2788 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2789 3191
2790char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2791gl_vendor () 3196gl_vendor ()
2792 CODE: 3197 CODE:
2793 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2794 OUTPUT: 3199 OUTPUT:
2795 RETVAL 3200 RETVAL
2796 3201
2797char * 3202const char *
2798gl_version () 3203gl_version ()
2799 CODE: 3204 CODE:
2800 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2801 OUTPUT: 3206 OUTPUT:
2802 RETVAL 3207 RETVAL
2803 3208
2804char * 3209const char *
2805gl_extensions () 3210gl_extensions ()
2806 CODE: 3211 CODE:
2807 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2808 OUTPUT: 3213 OUTPUT:
2809 RETVAL 3214 RETVAL
2810 3215
2811const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2812 3221
2813GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2814 CODE: 3223 CODE:
2815 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2816 OUTPUT: 3225 OUTPUT:
2824 3233
2825int glGetError () 3234int glGetError ()
2826 3235
2827void glFinish () 3236void glFinish ()
2828 3237
3238void glFlush ()
3239
2829void glClear (int mask) 3240void glClear (int mask)
2830 3241
2831void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2832 PROTOTYPE: @ 3243 PROTOTYPE: @
2833 3244
2842void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2843 3254
2844void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2845 CODE: 3256 CODE:
2846 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2847 3260
2848void glDepthMask (int flag) 3261void glDepthMask (int flag)
2849 3262
2850void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2851 3264
2886void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2887 CODE: 3300 CODE:
2888 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2889 3302
2890void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2891 ALIAS: 3305 ALIAS:
2892 glColor_premultiply = 1 3306 glColor_premultiply = 1
2893 CODE: 3307 CODE:
2894 if (ix) 3308 if (ix)
2895 { 3309 {
3001 3415
3002void glEndList () 3416void glEndList ()
3003 3417
3004void glCallList (int list) 3418void glCallList (int list)
3005 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3007 3426
3008PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3009 3428
3010void 3429void
3011find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3012 PPCODE: 3431 PPCODE:
3013{ 3432{
3014 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3015 XPUSHs (self); 3434 XPUSHs (self);
3016} 3435}
3017 3436
3018BOOT: 3437BOOT:
3019{ 3438{
3027 3446
3028void 3447void
3029draw (SV *self) 3448draw (SV *self)
3030 CODE: 3449 CODE:
3031{ 3450{
3032 HV *hv; 3451 HV *hv;
3033 SV **svp; 3452 SV **svp;
3034 NV x, y, w, h; 3453 NV x, y, w, h;
3035 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3036 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3037 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3038 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines