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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines