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.201 by root, Tue Jul 17 17:39:06 2007 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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
24// microsoft vs. C
25# define sqrtf(x) sqrt(x)
26# define atan2f(x,y) atan2(x,y)
27# define M_PI 3.14159265f
22#endif 28#endif
23 29
24#include <assert.h> 30#include <cassert>
25#include <math.h> 31#include <cmath>
26#include <string.h> 32#include <cstring>
27#include <stdio.h> 33#include <cstdio>
28#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
38
39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 40
30#include <SDL.h> 41#include <SDL.h>
42#include <SDL_thread.h>
31#include <SDL_endian.h> 43#include <SDL_endian.h>
32#include <SDL_image.h> 44#include <SDL_image.h>
33#include <SDL_mixer.h> 45#include <SDL_mixer.h>
34#include <SDL_opengl.h> 46#include <SDL_opengl.h>
35 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
36#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
38 57
39#include <glib/gmacros.h> 58#include <glib.h>
40 59
41#include <pango/pango.h> 60#include <pango/pango.h>
61
62#ifndef PANGO_VERSION_CHECK
63# define PANGO_VERSION_CHECK(a,b,c) 0
64#endif
65
66#if !PANGO_VERSION_CHECK (1, 15, 2)
67# define pango_layout_get_line_readonly pango_layout_get_line
68# define pango_layout_get_lines_readonly pango_layout_get_lines
69# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
70# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
71#endif
42 72
43#ifndef _WIN32 73#ifndef _WIN32
44# include <sys/types.h> 74# include <sys/types.h>
45# include <sys/socket.h> 75# include <sys/socket.h>
46# include <netinet/in.h> 76# include <netinet/in.h>
47# include <netinet/tcp.h> 77# include <netinet/tcp.h>
48# include <inttypes.h> 78# include <inttypes.h>
49#endif 79#endif
50 80
81#if __GNUC__ >= 4
82# define expect(expr,value) __builtin_expect ((expr),(value))
83#else
84# define expect(expr,value) (expr)
85#endif
86
87#define expect_false(expr) expect ((expr) != 0, 0)
88#define expect_true(expr) expect ((expr) != 0, 1)
89
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
53#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
54 96
55#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
57 99
58#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
59 101
60#if 0 102/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else 104
63# define PARACHUTE 0 105#define KMOD_LRAM 0x10000 // our extension
64#endif 106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
65 128
66static AV *texture_av; 129static AV *texture_av;
67 130
68static struct 131static struct
69{ 132{
… …
106 av_push (texture_av, (SV *)(size_t)name); 169 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 170 glDeleteTextures (1, &name);
108} 171}
109 172
110#include "texcache.c" 173#include "texcache.c"
174#include "rendercache.c"
111 175
112#include "pango-font.c" 176#include "pango-font.c"
113#include "pango-fontmap.c" 177#include "pango-fontmap.c"
114#include "pango-render.c" 178#include "pango-render.c"
115 179
180typedef IV DC__Channel;
181typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 182typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 183typedef Mix_Music *DC__MixMusic;
118 184
119typedef PangoFontDescription *CFPlus__Font; 185typedef PangoFontDescription *DC__Font;
120 186
121static int 187static int
122shape_attr_p (PangoLayoutRun *run) 188shape_attr_p (PangoLayoutRun *run)
123{ 189{
124 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
125 191
126 while (attrs) 192 while (attrs)
127 { 193 {
128 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
129 195
130 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
131 return 1; 197 return 1;
132 198
133 attrs = attrs->next; 199 attrs = attrs->next;
134 } 200 }
135 201
136 return 0; 202 return 0;
137} 203}
138 204
139typedef struct cf_layout { 205struct cf_layout {
140 PangoLayout *pl; 206 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
142 int base_height; 208 int base_height;
143 CFPlus__Font font; 209 DC__Font font;
144} *CFPlus__Layout; 210 rc_t *rc;
211};
145 212
213typedef cf_layout *DC__Layout;
214
146static CFPlus__Font default_font; 215static DC__Font default_font;
147static PangoContext *opengl_context; 216static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
149 218
150static void 219static void
151substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
152{ 221{
153 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
154#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
156#endif 225#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 227}
159 228
160static void 229static void
161layout_update_font (CFPlus__Layout self) 230layout_update_font (DC__Layout self)
162{ 231{
163 /* use a random scale factor to account for unknown descenders, 0.8 works 232 /* use a random scale factor to account for unknown descenders, 0.8 works
164 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
165 */ 234 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
167 236
168 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 239
171 pango_layout_set_font_description (self->pl, font); 240 pango_layout_set_font_description (self->pl, font);
172} 241}
173 242
174static void 243static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 244layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 245{
177 PangoRectangle rect; 246 PangoRectangle rect;
178 247
179 // get_pixel_* wrongly rounds down 248 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 249 pango_layout_get_extents (self->pl, 0, &rect);
… …
190} 259}
191 260
192typedef uint16_t tileid; 261typedef uint16_t tileid;
193typedef uint16_t faceid; 262typedef uint16_t faceid;
194 263
195typedef struct { 264struct maptex
265{
196 int name; 266 GLuint name;
197 int w, h; 267 int w, h;
198 float s, t; 268 float s, t;
199 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
200 tileid smoothtile; 270 tileid smoothtile;
201 uint8_t smoothlevel; 271 uint8_t smoothlevel;
202} maptex; 272 uint8_t unused; /* set to zero on use */
273};
203 274
204typedef struct { 275struct mapcell
276{
205 uint32_t player; 277 uint32_t player;
206 tileid tile[3]; 278 tileid tile[3];
207 uint16_t darkness; 279 uint16_t darkness;
208 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
209} mapcell; 281};
210 282
211typedef struct { 283struct maprow
284{
212 int32_t c0, c1; 285 int32_t c0, c1;
213 mapcell *col; 286 mapcell *col;
214} maprow; 287};
215 288
216typedef struct map { 289struct mapgrid {
217 int x, y, w, h; 290 int x, y, w, h;
218 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
219 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
221 294
222 int32_t rows; 295 int32_t rows;
223 maprow *row; 296 maprow *row;
224} *CFPlus__Map; 297};
298
299typedef mapgrid *DC__Map;
225 300
226static char * 301static char *
227prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
228{ 303{
229 char *p; 304 char *p;
… …
247 322
248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
250 325
251static void 326static void
252need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
253{ 328{
254 while (self->faces <= face) 329 while (self->faces <= face)
255 { 330 {
256 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2; 332 self->faces *= 2;
258 } 333 }
259} 334}
260 335
261static void 336static void
262need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
263{ 338{
264 while (self->texs <= texid) 339 while (self->texs <= texid)
265 { 340 {
266 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2; 342 self->texs *= 2;
268 } 343 }
269} 344}
270 345
271static maprow * 346static maprow *
272map_get_row (CFPlus__Map self, int y) 347map_get_row (mapgrid *self, int y)
273{ 348{
274 if (0 > y) 349 if (0 > y)
275 { 350 {
276 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
… …
315 390
316 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
317} 392}
318 393
319static mapcell * 394static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
321{ 396{
322 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
323} 398}
324 399
325static void 400static void
326map_clear (CFPlus__Map self) 401map_clear (mapgrid *self)
327{ 402{
328 int r; 403 int r;
329 404
330 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
… …
338 self->oy = 0; 413 self->oy = 0;
339 self->row = 0; 414 self->row = 0;
340 self->rows = 0; 415 self->rows = 0;
341} 416}
342 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
343static void 428static void
344map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
345{ 430{
346 int x, y; 431 int x, y;
347 maprow *row; 432 maprow *row;
348 mapcell *cell; 433 mapcell *cell;
349 434
… …
361 if (x >= row->c1) 446 if (x >= row->c1)
362 break; 447 break;
363 448
364 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
365 450
366 cell->darkness = 0; 451 CELL_CLEAR (cell);
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
370 } 452 }
371 } 453 }
372} 454}
373 455
374typedef struct { 456struct smooth_key
457{
375 tileid tile; 458 tileid tile;
376 uint8_t x, y, level; 459 uint8_t x, y, level;
377} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
378 479
379static void 480static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
381{ 482{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
383 484
384 if (SvIOK (*sv)) 485 if (it == h.end ())
385 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
386 else 487 else
387 sv_setiv (*sv, bits); 488 it->second |= bits;
388} 489}
389 490
390static void 491static void
391music_finished (void) 492music_finished (void)
392{ 493{
… …
409 ev.code = 1; 510 ev.code = 1;
410 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
411 ev.data2 = 0; 512 ev.data2 = 0;
412 513
413 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
414} 522}
415 523
416static unsigned int 524static unsigned int
417minpot (unsigned int n) 525minpot (unsigned int n)
418{ 526{
… …
428 n |= n >> 16; 536 n |= n >> 16;
429 537
430 return n + 1; 538 return n + 1;
431} 539}
432 540
541static unsigned int
542popcount (unsigned int n)
543{
544 n -= (n >> 1) & 0x55555555U;
545 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
546 n = ((n >> 4) + n) & 0x0f0f0f0fU;
547 n *= 0x01010101U;
548
549 return n >> 24;
550}
551
433/* SDL should provide this, really. */ 552/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 553#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 554#define SDLK_MODIFIER_MAX 314
436 555
437MODULE = CFPlus PACKAGE = CFPlus 556/******************************************************************************/
557
558static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
559static GV *hover_gv;
560
561static int
562within_widget (SV *widget, NV x, NV y)
563{
564 HV *self;
565 SV **svp;
566 NV wx, ww, wy, wh;
567
568 if (!SvROK (widget))
569 return 0;
570
571 self = (HV *)SvRV (widget);
572
573 if (SvTYPE (self) != SVt_PVHV)
574 return 0;
575
576 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
577 if (y < wy)
578 return 0;
579
580 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
581 if (y >= wy + wh)
582 return 0;
583
584 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
585 if (x < wx)
586 return 0;
587
588 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
589 if (x >= wx + ww)
590 return 0;
591
592 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
593 if (!svp || !SvTRUE (*svp))
594 return 0;
595
596 return 1;
597}
598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
656
657MODULE = Deliantra::Client PACKAGE = DC
438 658
439PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
440 660
441BOOT: 661BOOT:
442{ 662{
443 HV *stash = gv_stashpv ("CFPlus", 1); 663 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 664 static const struct {
445 const char *name; 665 const char *name;
446 IV iv; 666 IV iv;
447 } *civ, const_iv[] = { 667 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 668# define const_iv(name) { # name, (IV)name }
… …
470 690
471 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
474 694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
744
745 const_iv (SDLK_FIRST),
746 const_iv (SDLK_LAST),
475 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 749 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 750 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 751 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 823 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
555 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
828
829 const_iv (KMOD_LRAM),
830
831 const_iv (MIX_DEFAULT_FORMAT),
832
833 const_iv (SDL_INIT_TIMER),
834 const_iv (SDL_INIT_AUDIO),
835 const_iv (SDL_INIT_VIDEO),
836 const_iv (SDL_INIT_CDROM),
837 const_iv (SDL_INIT_JOYSTICK),
838 const_iv (SDL_INIT_EVERYTHING),
839 const_iv (SDL_INIT_NOPARACHUTE),
840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
556# undef const_iv 861# undef const_iv
557 }; 862 };
558 863
559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
561 866
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
564} 869}
565 870
… …
577 RETVAL 882 RETVAL
578 883
579NV floor (NV x) 884NV floor (NV x)
580 885
581NV ceil (NV x) 886NV ceil (NV x)
887
888IV minpot (UV n)
889
890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
582 897
583void 898void
584pango_init () 899pango_init ()
585 CODE: 900 CODE:
586{ 901{
587 opengl_fontmap = pango_opengl_font_map_new (); 902 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 903 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 904 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
905 /*pango_context_set_font_description (opengl_context, default_font);*/
906#if PANGO_VERSION_CHECK (1, 15, 2)
907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
909#endif
590} 910}
591 911
592char *
593SDL_GetError () 912char *SDL_GetError ()
594 913
595int 914void SDL_main_hack (SV *real_main)
596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
597 916
598void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
599SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
600 934
601void 935void
602SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
603 PPCODE: 937 PPCODE:
604{ 938{
… …
616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
619 953
620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
621#if SDL_VERSION_ATLEAST(1,2,10)
622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
624#endif
625 956
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 958
628 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
629 while (*m) 960 while (*m)
630 { 961 {
631 if ((*m)->w >= 640 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
632 { 963 {
633 AV *av = newAV (); 964 AV *av = newAV ();
634 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
635 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
… …
659 ); 990 );
660 991
661 if (RETVAL) 992 if (RETVAL)
662 { 993 {
663 av_clear (texture_av); 994 av_clear (texture_av);
664
665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
666#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
667#include "glfunc.h" 996#include "glfunc.h"
668#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
669 } 1000 }
670} 1001}
671 OUTPUT: 1002 OUTPUT:
672 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
673 1007
674void 1008void
675SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
676 1010
677char * 1011char *
678SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
679 1014
680int 1015int
681SDL_GetAppState () 1016SDL_GetAppState ()
682 1017
1018int
1019SDL_GetModState ()
1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
683void 1025void
1026SDL_PumpEvents ()
1027
1028void
684poll_events () 1029peep_events ()
685 PPCODE: 1030 PPCODE:
686{ 1031{
687 SDL_Event ev; 1032 SDL_Event ev;
688 1033
689 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
… …
696 { 1041 {
697 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
698 case SDL_KEYUP: 1043 case SDL_KEYUP:
699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
701 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
702 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
704 break; 1049 break;
705 1050
706 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
725 x = ev.motion.x; 1070 x = ev.motion.x;
726 y = ev.motion.y; 1071 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 } 1073 }
729 1074
730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
731 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
732 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
733 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
734 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
735 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 } 1081 }
737 break; 1082 break;
738 1083
739 case SDL_MOUSEBUTTONDOWN: 1084 case SDL_MOUSEBUTTONDOWN:
740 case SDL_MOUSEBUTTONUP: 1085 case SDL_MOUSEBUTTONUP:
741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1086 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
742 1087
743 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1088 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
744 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1089 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
745 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1090 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
746 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1091 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
751 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1096 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
752 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1097 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
753 break; 1098 break;
754 } 1099 }
755 1100
756 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
757 } 1102 }
758} 1103}
759 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
760int 1118int
761Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
762 POSTCALL: 1120 POSTCALL:
763 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
764 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
765 1123
766void 1124void
1125Mix_QuerySpec ()
1126 PPCODE:
1127{
1128 int freq, channels;
1129 Uint16 format;
1130
1131 if (Mix_QuerySpec (&freq, &format, &channels))
1132 {
1133 EXTEND (SP, 3);
1134 PUSHs (sv_2mortal (newSViv (freq)));
1135 PUSHs (sv_2mortal (newSViv (format)));
1136 PUSHs (sv_2mortal (newSViv (channels)));
1137 }
1138}
1139
1140void
767Mix_CloseAudio () 1141Mix_CloseAudio ()
768 1142
769int 1143int
770Mix_AllocateChannels (int numchans = -1) 1144Mix_AllocateChannels (int numchans = -1)
1145
1146const char *
1147Mix_GetError ()
771 1148
772void 1149void
773lowdelay (int fd, int val = 1) 1150lowdelay (int fd, int val = 1)
774 CODE: 1151 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1152 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
801 } 1178 }
802 } 1179 }
803#endif 1180#endif
804} 1181}
805 1182
806void 1183int
807add_font (char *file) 1184add_font (char *file)
808 CODE: 1185 CODE:
809 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1187 OUTPUT:
1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
810 1196
811void 1197void
812load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
813 ALIAS: 1199 ALIAS:
814 load_image_file = 1 1200 load_image_file = 1
… …
817 STRLEN image_len; 1203 STRLEN image_len;
818 char *image = (char *)SvPVbyte (image_, image_len); 1204 char *image = (char *)SvPVbyte (image_, image_len);
819 SDL_Surface *surface, *surface2; 1205 SDL_Surface *surface, *surface2;
820 SDL_PixelFormat fmt; 1206 SDL_PixelFormat fmt;
821 SDL_RWops *rw = ix 1207 SDL_RWops *rw = ix
822 ? SDL_RWFromFile (image, "r") 1208 ? SDL_RWFromFile (image, "rb")
823 : SDL_RWFromConstMem (image, image_len); 1209 : SDL_RWFromConstMem (image, image_len);
824 1210
825 if (!rw) 1211 if (!rw)
826 croak ("load_image: %s", SDL_GetError ()); 1212 croak ("load_image: %s", SDL_GetError ());
827 1213
… …
860 1246
861 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
862 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
863 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
864 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
865 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
866 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
867 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
868 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
869 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
870 1256
… …
900void 1286void
901error (char *message) 1287error (char *message)
902 CODE: 1288 CODE:
903 fprintf (stderr, "ERROR: %s\n", message); 1289 fprintf (stderr, "ERROR: %s\n", message);
904#ifdef _WIN32 1290#ifdef _WIN32
905 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1291 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
906#endif 1292#endif
907 1293
908void 1294void
909fatal (char *message) 1295fatal (char *message)
910 CODE: 1296 CODE:
911 fprintf (stderr, "FATAL: %s\n", message); 1297 fprintf (stderr, "FATAL: %s\n", message);
912#ifdef _WIN32 1298#ifdef _WIN32
913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1299 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
914#endif 1300#endif
915 _exit (1); 1301 _exit (1);
916 1302
917void 1303void
918_exit (int retval = 0) 1304_exit (int retval = 0)
… …
930#if DEBUG 1316#if DEBUG
931 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
932#endif 1318#endif
933} 1319}
934 1320
935MODULE = CFPlus PACKAGE = CFPlus::Font 1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
936 1327
937CFPlus::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1329
1330PROTOTYPES: DISABLE
1331
1332DC::Font
938new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
939 CODE: 1334 CODE:
940{ 1335{
941 int count; 1336 int count;
942 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
943 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
945} 1340}
946 OUTPUT: 1341 OUTPUT:
947 RETVAL 1342 RETVAL
948 1343
949void 1344void
950DESTROY (CFPlus::Font self) 1345DESTROY (DC::Font self)
951 CODE: 1346 CODE:
952 pango_font_description_free (self); 1347 pango_font_description_free (self);
953 1348
954void 1349void
955make_default (CFPlus::Font self) 1350make_default (DC::Font self)
1351 PROTOTYPE: $
956 CODE: 1352 CODE:
957 default_font = self; 1353 default_font = self;
958 1354
959MODULE = CFPlus PACKAGE = CFPlus::Layout 1355MODULE = Deliantra::Client PACKAGE = DC::Layout
960 1356
1357PROTOTYPES: DISABLE
1358
961void 1359void
962reset_glyph_cache () 1360glyph_cache_backup ()
1361 PROTOTYPE:
963 CODE: 1362 CODE:
1363 tc_backup ();
1364
1365void
1366glyph_cache_restore ()
1367 PROTOTYPE:
1368 CODE:
964 tc_clear (); 1369 tc_restore ();
965 1370
966CFPlus::Layout 1371DC::Layout
967new (SV *class) 1372new (SV *klass)
968 CODE: 1373 CODE:
969 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
970 1375
971 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
972 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
973 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
974 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
975 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
976 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
977 RETVAL->font = 0; 1382 RETVAL->font = 0;
1383 RETVAL->rc = rc_alloc ();
978 1384
979 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1385 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
980 layout_update_font (RETVAL); 1386 layout_update_font (RETVAL);
981 OUTPUT: 1387 OUTPUT:
982 RETVAL 1388 RETVAL
983 1389
984void 1390void
985DESTROY (CFPlus::Layout self) 1391DESTROY (DC::Layout self)
986 CODE: 1392 CODE:
987 g_object_unref (self->pl); 1393 g_object_unref (self->pl);
1394 rc_free (self->rc);
988 Safefree (self); 1395 Safefree (self);
989 1396
990void 1397void
991set_text (CFPlus::Layout self, SV *text_) 1398set_text (DC::Layout self, SV *text_)
992 CODE: 1399 CODE:
993{ 1400{
994 STRLEN textlen; 1401 STRLEN textlen;
995 char *text = SvPVutf8 (text_, textlen); 1402 char *text = SvPVutf8 (text_, textlen);
996 1403
997 pango_layout_set_text (self->pl, text, textlen); 1404 pango_layout_set_text (self->pl, text, textlen);
998} 1405}
999 1406
1000void 1407void
1001set_markup (CFPlus::Layout self, SV *text_) 1408set_markup (DC::Layout self, SV *text_)
1002 CODE: 1409 CODE:
1003{ 1410{
1004 STRLEN textlen; 1411 STRLEN textlen;
1005 char *text = SvPVutf8 (text_, textlen); 1412 char *text = SvPVutf8 (text_, textlen);
1006 1413
1007 pango_layout_set_markup (self->pl, text, textlen); 1414 pango_layout_set_markup (self->pl, text, textlen);
1008} 1415}
1009 1416
1010void 1417void
1011set_shapes (CFPlus::Layout self, ...) 1418set_shapes (DC::Layout self, ...)
1012 CODE: 1419 CODE:
1013{ 1420{
1014 PangoAttrList *attrs = 0; 1421 PangoAttrList *attrs = 0;
1015 const char *text = pango_layout_get_text (self->pl); 1422 const char *text = pango_layout_get_text (self->pl);
1016 const char *pos = text; 1423 const char *pos = text;
… …
1051 if (attrs) 1458 if (attrs)
1052 pango_layout_set_attributes (self->pl, attrs); 1459 pango_layout_set_attributes (self->pl, attrs);
1053} 1460}
1054 1461
1055void 1462void
1056get_shapes (CFPlus::Layout self) 1463get_shapes (DC::Layout self)
1057 PPCODE: 1464 PPCODE:
1058{ 1465{
1059 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1466 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1060 1467
1061 do 1468 do
1062 { 1469 {
1063 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1470 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1064 1471
1065 if (run && shape_attr_p (run)) 1472 if (run && shape_attr_p (run))
1066 { 1473 {
1067 PangoRectangle extents; 1474 PangoRectangle extents;
1068 pango_layout_iter_get_run_extents (iter, 0, &extents); 1475 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1076 1483
1077 pango_layout_iter_free (iter); 1484 pango_layout_iter_free (iter);
1078} 1485}
1079 1486
1080int 1487int
1081has_wrapped (CFPlus::Layout self) 1488has_wrapped (DC::Layout self)
1082 CODE: 1489 CODE:
1083{ 1490{
1084 int lines = 1; 1491 int lines = 1;
1085 const char *text = pango_layout_get_text (self->pl); 1492 const char *text = pango_layout_get_text (self->pl);
1086 1493
… …
1091} 1498}
1092 OUTPUT: 1499 OUTPUT:
1093 RETVAL 1500 RETVAL
1094 1501
1095SV * 1502SV *
1096get_text (CFPlus::Layout self) 1503get_text (DC::Layout self)
1097 CODE: 1504 CODE:
1098 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1505 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1099 sv_utf8_decode (RETVAL); 1506 sv_utf8_decode (RETVAL);
1100 OUTPUT: 1507 OUTPUT:
1101 RETVAL 1508 RETVAL
1102 1509
1103void 1510void
1104set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1511set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1105 CODE: 1512 CODE:
1106 self->r = r; 1513 self->r = r;
1107 self->g = g; 1514 self->g = g;
1108 self->b = b; 1515 self->b = b;
1109 self->a = a; 1516 self->a = a;
1110 1517
1111void 1518void
1112set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1519set_font (DC::Layout self, DC::Font font = 0)
1113 CODE: 1520 CODE:
1114 if (self->font != font) 1521 if (self->font != font)
1115 { 1522 {
1116 self->font = font; 1523 self->font = font;
1117 layout_update_font (self); 1524 layout_update_font (self);
1118 } 1525 }
1119 1526
1120void 1527void
1121set_height (CFPlus::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1122 CODE: 1529 CODE:
1123 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1124 { 1531 {
1125 self->base_height = base_height; 1532 self->base_height = base_height;
1126 layout_update_font (self); 1533 layout_update_font (self);
1127 } 1534 }
1128 1535
1129void 1536void
1130set_width (CFPlus::Layout self, int max_width = -1) 1537set_width (DC::Layout self, int max_width = -1)
1131 CODE: 1538 CODE:
1132 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1539 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1133 1540
1134void 1541void
1135set_indent (CFPlus::Layout self, int indent) 1542set_indent (DC::Layout self, int indent)
1136 CODE: 1543 CODE:
1137 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1544 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1138 1545
1139void 1546void
1140set_spacing (CFPlus::Layout self, int spacing) 1547set_spacing (DC::Layout self, int spacing)
1141 CODE: 1548 CODE:
1142 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1549 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1143 1550
1144void 1551void
1145set_ellipsise (CFPlus::Layout self, int ellipsise) 1552set_ellipsise (DC::Layout self, int ellipsise)
1146 CODE: 1553 CODE:
1147 pango_layout_set_ellipsize (self->pl, 1554 pango_layout_set_ellipsize (self->pl,
1148 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1555 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1149 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1556 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1150 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1557 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1151 : PANGO_ELLIPSIZE_NONE 1558 : PANGO_ELLIPSIZE_NONE
1152 ); 1559 );
1153 1560
1154void 1561void
1155set_single_paragraph_mode (CFPlus::Layout self, int spm) 1562set_single_paragraph_mode (DC::Layout self, int spm)
1156 CODE: 1563 CODE:
1157 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1564 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1158 1565
1159void 1566void
1160size (CFPlus::Layout self) 1567size (DC::Layout self)
1161 PPCODE: 1568 PPCODE:
1162{ 1569{
1163 int w, h; 1570 int w, h;
1164 1571
1165 layout_get_pixel_size (self, &w, &h); 1572 layout_get_pixel_size (self, &w, &h);
… …
1168 PUSHs (sv_2mortal (newSViv (w))); 1575 PUSHs (sv_2mortal (newSViv (w)));
1169 PUSHs (sv_2mortal (newSViv (h))); 1576 PUSHs (sv_2mortal (newSViv (h)));
1170} 1577}
1171 1578
1172int 1579int
1173descent (CFPlus::Layout self) 1580descent (DC::Layout self)
1174 CODE: 1581 CODE:
1175{ 1582{
1176 PangoRectangle rect; 1583 PangoRectangle rect;
1177 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1584 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1178 pango_layout_line_get_pixel_extents (line, 0, &rect); 1585 pango_layout_line_get_pixel_extents (line, 0, &rect);
1179 RETVAL = PANGO_DESCENT (rect); 1586 RETVAL = PANGO_DESCENT (rect);
1180} 1587}
1181 OUTPUT: 1588 OUTPUT:
1182 RETVAL 1589 RETVAL
1183 1590
1184int 1591int
1185xy_to_index (CFPlus::Layout self, int x, int y) 1592xy_to_index (DC::Layout self, int x, int y)
1186 CODE: 1593 CODE:
1187{ 1594{
1188 int index, trailing; 1595 int index, trailing;
1189 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1596 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1190 RETVAL = index + trailing; 1597 RETVAL = index + trailing;
1191} 1598}
1192 OUTPUT: 1599 OUTPUT:
1193 RETVAL 1600 RETVAL
1194 1601
1195void 1602void
1196cursor_pos (CFPlus::Layout self, int index) 1603cursor_pos (DC::Layout self, int index)
1197 PPCODE: 1604 PPCODE:
1198{ 1605{
1199 PangoRectangle strong_pos; 1606 PangoRectangle pos;
1200 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1607 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1201 1608
1202 EXTEND (SP, 3); 1609 EXTEND (SP, 3);
1203 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1612 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1206} 1613}
1207 1614
1208void 1615void
1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1616index_to_line_x (DC::Layout self, int index, int trailing = 0)
1210 PPCODE: 1617 PPCODE:
1211{ 1618{
1212 int line, x; 1619 int line, x;
1213 1620
1214 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1621 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1622#if !PANGO_VERSION_CHECK (1, 17, 3)
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1623 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1216 1624 --line;
1625#endif
1217 EXTEND (SP, 2); 1626 EXTEND (SP, 2);
1218 PUSHs (sv_2mortal (newSViv (line - 1))); 1627 PUSHs (sv_2mortal (newSViv (line)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1628 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220} 1629}
1221 1630
1222void 1631void
1223line_x_to_index (CFPlus::Layout self, int line, int x) 1632line_x_to_index (DC::Layout self, int line, int x)
1224 PPCODE: 1633 PPCODE:
1225{ 1634{
1226 PangoLayoutLine *lp; 1635 PangoLayoutLine *lp;
1227 int index, trailing; 1636 int index, trailing;
1228 1637
1229 if (line < 0) 1638 if (line < 0)
1230 XSRETURN_EMPTY; 1639 XSRETURN_EMPTY;
1231 1640
1232 if (!(lp = pango_layout_get_line (self->pl, line))) 1641 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */ 1642 XSRETURN_EMPTY; /* do better */
1234 1643
1235 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1644 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1236 1645
1237 EXTEND (SP, 2); 1646 EXTEND (SP, 2);
… …
1243 PUSHs (sv_2mortal (newSViv (trailing))); 1652 PUSHs (sv_2mortal (newSViv (trailing)));
1244 } 1653 }
1245} 1654}
1246 1655
1247void 1656void
1248render (CFPlus::Layout self, float x, float y, int flags = 0) 1657render (DC::Layout self, float x, float y, int flags = 0)
1249 PPCODE: 1658 CODE:
1659 rc_clear (self->rc);
1250 pango_opengl_render_layout_subpixel ( 1660 pango_opengl_render_layout_subpixel (
1251 self->pl, 1661 self->pl,
1662 self->rc,
1252 x * PANGO_SCALE, y * PANGO_SCALE, 1663 x * PANGO_SCALE, y * PANGO_SCALE,
1253 self->r, self->g, self->b, self->a, 1664 self->r, self->g, self->b, self->a,
1254 flags 1665 flags
1255 ); 1666 );
1667 // we assume that context_change actually clears/frees stuff
1668 // and does not do any recomputation...
1669 pango_layout_context_changed (self->pl);
1256 1670
1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1258
1259int minpot (int n)
1260
1261void 1671void
1262pad2pot (SV *data_, SV *w_, SV *h_) 1672draw (DC::Layout self)
1263 CODE: 1673 CODE:
1264{ 1674{
1265 int ow = SvIV (w_); 1675 glEnable (GL_TEXTURE_2D);
1266 int oh = SvIV (h_); 1676 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1677 glEnable (GL_BLEND);
1678 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1679 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1680 glEnable (GL_ALPHA_TEST);
1681 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1267 1682
1268 if (ow && oh) 1683 rc_draw (self->rc);
1684
1685 glDisable (GL_ALPHA_TEST);
1686 glDisable (GL_BLEND);
1687 glDisable (GL_TEXTURE_2D);
1688}
1689
1690MODULE = Deliantra::Client PACKAGE = DC::Texture
1691
1692PROTOTYPES: ENABLE
1693
1694void
1695pad (SV *data_, int ow, int oh, int nw, int nh)
1696 CODE:
1697{
1698 if ((nw != ow || nh != oh) && SvOK (data_))
1269 { 1699 {
1270 int nw = minpot (ow);
1271 int nh = minpot (oh);
1272
1273 if (nw != ow || nh != oh)
1274 {
1275 if (SvOK (data_))
1276 {
1277 STRLEN datalen; 1700 STRLEN datalen;
1278 char *data = SvPVbyte (data_, datalen); 1701 char *data = SvPVbyte (data_, datalen);
1279 int bpp = datalen / (ow * oh); 1702 int bpp = datalen / (ow * oh);
1280 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1703 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1281 1704
1282 SvPOK_only (result_); 1705 SvPOK_only (result_);
1283 SvCUR_set (result_, nw * nh * bpp); 1706 SvCUR_set (result_, nw * nh * bpp);
1284 1707
1285 memset (SvPVX (result_), 0, nw * nh * bpp); 1708 memset (SvPVX (result_), 0, nw * nh * bpp);
1286 while (oh--) 1709 while (oh--)
1287 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1710 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1288 1711
1289 sv_setsv (data_, result_); 1712 sv_setsv (data_, result_);
1290 }
1291
1292 sv_setiv (w_, nw);
1293 sv_setiv (h_, nh);
1294 }
1295 } 1713 }
1296} 1714}
1297 1715
1298void 1716void
1299draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1717draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1305{ 1723{
1306 HV *hv = (HV *)SvRV (self); 1724 HV *hv = (HV *)SvRV (self);
1307 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1725 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1308 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1726 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1309 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1727 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1728
1729 if (name <= 0)
1730 XSRETURN_EMPTY;
1310 1731
1311 if (items < 5) 1732 if (items < 5)
1312 { 1733 {
1313 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1734 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1314 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1735 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1342 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1344 } 1765 }
1345} 1766}
1346 1767
1768void
1769draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1347IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1348 CODE: 1890 CODE:
1349{ 1891{
1350 GLint width; 1892 GLint width;
1351 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1353 RETVAL = width > 0; 1895 RETVAL = width > 0;
1354} 1896}
1355 OUTPUT: 1897 OUTPUT:
1356 RETVAL 1898 RETVAL
1357 1899
1358MODULE = CFPlus PACKAGE = CFPlus::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1359 1901
1360CFPlus::Map 1902PROTOTYPES: DISABLE
1903
1904DC::Map
1361new (SV *class) 1905new (SV *klass)
1362 CODE: 1906 CODE:
1363 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1364 RETVAL->x = 0; 1908 RETVAL->x = 0;
1365 RETVAL->y = 0; 1909 RETVAL->y = 0;
1366 RETVAL->w = 0; 1910 RETVAL->w = 0;
1367 RETVAL->h = 0; 1911 RETVAL->h = 0;
1368 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
… …
1373 RETVAL->row = 0; 1917 RETVAL->row = 0;
1374 OUTPUT: 1918 OUTPUT:
1375 RETVAL 1919 RETVAL
1376 1920
1377void 1921void
1378DESTROY (CFPlus::Map self) 1922DESTROY (DC::Map self)
1379 CODE: 1923 CODE:
1380{ 1924{
1381 map_clear (self); 1925 map_clear (self);
1382 Safefree (self->face2tile); 1926 Safefree (self->face2tile);
1383 Safefree (self->tex); 1927 Safefree (self->tex);
1384 Safefree (self); 1928 Safefree (self);
1385} 1929}
1386 1930
1387void 1931void
1388resize (CFPlus::Map self, int map_width, int map_height) 1932resize (DC::Map self, int map_width, int map_height)
1389 CODE: 1933 CODE:
1390 self->w = map_width; 1934 self->w = map_width;
1391 self->h = map_height; 1935 self->h = map_height;
1392 1936
1393void 1937void
1394clear (CFPlus::Map self) 1938clear (DC::Map self)
1395 CODE: 1939 CODE:
1396 map_clear (self); 1940 map_clear (self);
1397 1941
1398void 1942void
1399set_tileid (CFPlus::Map self, int face, int tile) 1943set_tileid (DC::Map self, int face, int tile)
1400 CODE: 1944 CODE:
1401{ 1945{
1402 need_facenum (self, face); self->face2tile [face] = tile; 1946 need_facenum (self, face); self->face2tile [face] = tile;
1403 need_texid (self, tile); 1947 need_texid (self, tile);
1404} 1948}
1405 1949
1406void 1950void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1408 CODE: 1952 CODE:
1409{ 1953{
1410 tileid texid; 1954 tileid texid;
1411 maptex *tex; 1955 maptex *tex;
1412 1956
1413 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1414 return; 1958 return;
1415 1959
1416 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1417 return; 1961 return;
1418 1962
1419 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1420 1964
1421 if (!texid) 1965 if (!texid)
1422 return; 1966 return;
1423 1967
1424 tex = self->tex + texid; 1968 tex = self->tex + texid;
1425 tex->smoothtile = self->face2tile [smooth]; 1969 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level; 1970 tex->smoothlevel = level;
1427} 1971}
1428 1972
1429void 1973void
1430set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1974set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1431 CODE: 1975 CODE:
1432{ 1976{
1433 need_texid (self, texid); 1977 need_texid (self, texid);
1434 1978
1435 { 1979 {
… …
1454 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1455 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1456 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1457} 2001}
1458 2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
2022
1459int 2023int
1460ox (CFPlus::Map self) 2024ox (DC::Map self)
1461 ALIAS: 2025 ALIAS:
1462 oy = 1 2026 oy = 1
1463 x = 2 2027 x = 2
1464 y = 3 2028 y = 3
1465 w = 4 2029 w = 4
… …
1476 } 2040 }
1477 OUTPUT: 2041 OUTPUT:
1478 RETVAL 2042 RETVAL
1479 2043
1480void 2044void
1481scroll (CFPlus::Map self, int dx, int dy) 2045scroll (DC::Map self, int dx, int dy)
1482 CODE: 2046 CODE:
1483{ 2047{
1484 if (dx > 0) 2048 if (dx > 0)
1485 map_blank (self, self->x, self->y, dx, self->h); 2049 map_blank (self, self->x, self->y, dx, self->h);
1486 else if (dx < 0) 2050 else if (dx < 0)
… …
1501 self->rows += MAP_EXTEND_Y; 2065 self->rows += MAP_EXTEND_Y;
1502 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1503 } 2067 }
1504} 2068}
1505 2069
1506void 2070SV *
1507map1a_update (CFPlus::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1508 CODE: 2072 CODE:
1509{ 2073{
1510 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1511 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1512 mapcell *cell; 2076 mapcell *cell;
1513 int x, y, flags; 2077 int x, y, z, flags;
2078 AV *missing = newAV ();
2079 RETVAL = newRV_noinc ((SV *)missing);
1514 2080
1515 while (data < data_end - 1) 2081 while (data < data_end - 1)
1516 { 2082 {
1517 flags = (data [0] << 8) + data [1]; data += 2; 2083 flags = (data [0] << 8) + data [1]; data += 2;
1518 2084
… …
1531 2097
1532 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1533 2099
1534 if (flags & 8) 2100 if (flags & 8)
1535 { 2101 {
2102 uint8_t ext, cmd;
2103
1536 if (extmap) 2104 do
1537 { 2105 {
1538 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1539 2108
1540 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1541 { 2112 {
1542 ext = *data++;
1543 cmd = ext & 0x3f;
1544
1545 if (cmd < 4)
1546 cell->darkness = 255 - ext * 64 + 1;
1547 else if (cmd == 5) // health
1548 {
1549 cell->stat_width = 1; 2113 cell->stat_width = 1;
1550 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1551 }
1552 else if (cmd == 6) // monster width
1553 cell->stat_width = *data++ + 1;
1554 else if (cmd == 0x47)
1555 {
1556 if (*data == 4)
1557 ; // decode player count
1558
1559 data += *data + 1;
1560 }
1561 else if (cmd == 8) // cell flags
1562 cell->flags = *data++;
1563 else if (ext & 0x40) // unknown, multibyte => skip
1564 data += *data + 1;
1565 else
1566 data++;
1567 } 2115 }
1568 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1569 } 2133 }
1570 else 2134 while (ext & 0x80);
1571 cell->darkness = *data++ + 1;
1572 } 2135 }
1573 2136
2137 for (z = 0; z <= 2; ++z)
1574 if (flags & 4) 2138 if (flags & (4 >> z))
1575 { 2139 {
1576 faceid face = (data [0] << 8) + data [1]; data += 2; 2140 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face); 2141 need_facenum (self, face);
1578 cell->tile [0] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
2143
2144 if (cell->tile [z])
2145 {
2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
2148 if (!tex->name)
2149 av_push (missing, newSViv (cell->tile [z]));
2150
2151 if (tex->smoothtile)
2152 {
2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
2155 if (!smooth->name)
2156 av_push (missing, newSViv (tex->smoothtile));
2157 }
2158 }
1579 } 2159 }
1580
1581 if (flags & 2)
1582 {
1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1586 }
1587
1588 if (flags & 1)
1589 {
1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1593 }
1594 } 2160 }
1595 else 2161 else
1596 cell->darkness = 0; 2162 CELL_CLEAR (cell);
1597 } 2163 }
1598} 2164}
2165 OUTPUT:
2166 RETVAL
1599 2167
1600SV * 2168SV *
1601mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2169mapmap (DC::Map self, int x0, int y0, int w, int h)
1602 CODE: 2170 CODE:
1603{ 2171{
1604 int x1, x; 2172 int x1, x;
1605 int y1, y; 2173 int y1, y;
1606 int z; 2174 int z;
… …
1619 ? self->row + y 2187 ? self->row + y
1620 : 0; 2188 : 0;
1621 2189
1622 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1623 { 2191 {
1624 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1625 2193
1626 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1627 { 2195 {
1628 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1629 2197
… …
1631 { 2199 {
1632 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1633 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1634 int a1 = tex.a; 2202 int a1 = tex.a;
1635 2203
1636 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1637 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1638 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1639 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1640 } 2208 }
1641 } 2209 }
1642 2210
1643 *map++ = (r ) 2211 *map++ = (r )
1644 | (g << 8) 2212 | (g << 8)
1645 | (b << 16) 2213 | (b << 16)
1646 | (a << 24); 2214 | (a << 24);
1647 } 2215 }
1648 } 2216 }
1649 2217
1650 RETVAL = map_sv; 2218 RETVAL = map_sv;
1651} 2219}
1652 OUTPUT: 2220 OUTPUT:
1653 RETVAL 2221 RETVAL
1654 2222
1655void 2223void
1656draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1657 CODE: 2225 CODE:
1658{ 2226{
1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1661 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1662 smooth_key skey;
1663 int x, y, z; 2227 int x, y, z;
1664 int last_name;
1665 2228
2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2230 int pl_x, pl_y;
2231 maptex pl_tex;
2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
2234 rc_key_t key;
2235 rc_array_t *arr;
2236
2237 pl_tex.name = 0;
2238
1666 // thats current max. sorry. 2239 // that's current max. sorry.
1667 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1669 2242
1670 // clear key, in case of extra padding
1671 memset (&skey, 0, sizeof (skey)); 2243 memset (&key, 0, sizeof (key));
1672 2244 key.r = 255;
1673 glColor4ub (255, 255, 255, 255); 2245 key.g = 255;
1674 2246 key.b = 255;
1675 glEnable (GL_BLEND); 2247 key.a = 255;
1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2248 key.mode = GL_QUADS;
1677 glEnable (GL_TEXTURE_2D); 2249 key.format = GL_T2F_V3F;
1678 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1679
1680 glBegin (GL_QUADS);
1681
1682 last_name = 0;
1683 2250
1684 mx += self->x; 2251 mx += self->x;
1685 my += self->y; 2252 my += self->y;
1686 2253
1687 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1688 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1689 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1690 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1691 2258
1692 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1693 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1694 { 2261 {
1695 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
… …
1704 MAX (self->tex [cell->tile [1]].smoothlevel, 2271 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel)); 2272 self->tex [cell->tile [2]].smoothlevel));
1706 } 2273 }
1707 } 2274 }
1708 2275
2276 glEnable (GL_BLEND);
2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2279
1709 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1710 { 2281 {
1711 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2285 key.texname = -1;
1712 2286
1713 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
1714 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
1715 { 2289 {
1716 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
… …
1722 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
1723 2297
1724 if (tile) 2298 if (tile)
1725 { 2299 {
1726 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w; 2301 int px, py;
1728 int py = (y + 1) * T - tex.h;
1729 2302
1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name) 2303 if (key.texname != tex.name)
1733 { 2304 {
2305 self->tex [tile].unused = 0;
2306
1734 if (!tex.name) 2307 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1736 2309
1737 glEnd (); 2310 key.texname = tex.name;
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2311 arr = rc_array (rc, &key);
1739 glBegin (GL_QUADS);
1740 } 2312 }
1741 2313
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2314 px = (x + 1) * Th - tex.w;
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2315 py = (y + 1) * Tw - tex.h;
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746 2316
1747 if (cell->flags && z == 2) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
1748 { 2318 {
1749 if (cell->flags & 1) 2319 pl_x = px;
2320 pl_y = py;
2321 pl_tex = tex;
1750 { 2322 continue;
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 } 2323 }
2324
2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2326 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2327 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2328 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1765 2329
1766 // update smooth hash 2330 // update smooth hash
1767 if (tex.smoothtile) 2331 if (tex.smoothtile)
1768 { 2332 {
1769 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
1770 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
1771 2335
1772 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
1773 2337
1774 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
1775 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
1776 2340
1777 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
… …
1785 2349
1786 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1787 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
1788 2352
1789 // full tile 2353 // full tile
1790 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1791 2355
1792 // borders 2356 // borders
1793 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1794 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1795 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1796 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1797 2361
1798 // corners 2362 // corners
1799 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1800 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1801 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2367 }
2368 }
2369
2370 if (expect_false (z == 2) && expect_false (cell->flags))
2371 {
2372 // overlays such as the speech bubble, probably more to come
2373 if (cell->flags & 1)
2374 {
2375 rc_key_t key_ov = key;
2376 maptex tex = self->tex [TEXID_SPEECH];
2377 rc_array_t *arr;
2378 int px = x * Tw + Tw * 2 / 32;
2379 int py = y * Th - Th * 6 / 32;
2380
2381 key_ov.texname = tex.name;
2382 arr = rc_array (rc_ov, &key_ov);
2383
2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2386 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1803 } 2388 }
1804 } 2389 }
1805 } 2390 }
1806 } 2391 }
1807 2392
2393 rc_draw (rc);
2394 rc_clear (rc);
2395
1808 // go through all smoothlevels, lowest to highest, then draw. 2396 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort 2397 // this is basically counting sort
1810 { 2398 {
1811 int w, b; 2399 int w, b;
1812 2400
1813 for (w = 0; w < 256 / 32; ++w) 2401 glEnable (GL_TEXTURE_2D);
2402 glBegin (GL_QUADS);
2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1814 { 2406 {
1815 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
1816 if (smask) 2408 IV bits = it->second;
1817 for (b = 0; b < 32; ++b) 2409
1818 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
1819 { 2413 {
1820 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
1821 HE *he; 2422 if (tex.name)
1822
1823 hv_iterinit (smooth);
1824 while ((he = hv_iternext (smooth)))
1825 { 2423 {
1826 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
1827 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
1828 2426 if (key.texname != tex.name)
1829 if (!(bits & 0x1000)
1830 && skey->level == level
1831 && level > smooth_max [skey->x][skey->y])
1832 { 2427 {
1833 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
1834 int px = (((int)skey->x) - 1) * T;
1835 int py = (((int)skey->y) - 1) * T;
1836 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column
1840 2429
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name)
1844 {
1845 if (!tex.name)
1846 continue; // smoothing not yet available
1847
1848 glEnd (); 2430 glEnd ();
1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1850 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
1851 } 2433 }
1852 2434
1853 if (border) 2435 if (border)
1854 { 2436 {
1855 float ox = border * dx; 2437 float ox = border * dx;
1856 2438
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1861 } 2443 }
1862 2444
1863 if (corner) 2445 if (corner)
1864 { 2446 {
1865 float ox = corner * dx; 2447 float ox = corner * dx;
1866 2448
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1871 }
1872 } 2453 }
1873 } 2454 }
1874 } 2455 }
1875 } 2456 }
2457
2458 glEnd ();
2459 glDisable (GL_TEXTURE_2D);
2460 key.texname = -1;
1876 } 2461 }
1877
1878 hv_clear (smooth);
1879 } 2462 }
1880 2463
1881 glEnd (); 2464 if (pl_tex.name)
2465 {
2466 maptex tex = pl_tex;
2467 int px = pl_x + sdx;
2468 int py = pl_y + sdy;
1882 2469
1883 glDisable (GL_TEXTURE_2D); 2470 key.texname = tex.name;
2471 arr = rc_array (rc, &key);
2472
2473 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2474 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2475 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2476 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2477
2478 rc_draw (rc);
2479 }
2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
1884 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2485 rc_free (rc);
2486 rc_free (rc_ov);
1885 2487
1886 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
1887 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
1888 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
1889 { 2491 {
… …
1892 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
1893 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
1894 { 2496 {
1895 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
1896 2498
1897 int px = x * T; 2499 int px = x * Tw;
1898 int py = y * T; 2500 int py = y * Th;
2501
2502 if (expect_false (cell->player == player))
2503 {
2504 px += sdx;
2505 py += sdy;
2506 }
1899 2507
1900 if (cell->stat_hp) 2508 if (cell->stat_hp)
1901 { 2509 {
1902 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1904 2512
1905 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
1906 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
1907 px + width - 1, py); 2515 px + width - 1, py);
1908 2516
… …
1914 } 2522 }
1915 } 2523 }
1916} 2524}
1917 2525
1918void 2526void
1919draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2527draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1920 CODE: 2528 CODE:
1921{ 2529{
1922 static float color[16][3] = { 2530 static float color[16][3] = {
1923 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
1924 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
1925 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
1926 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
1927 2535
1928 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
1929 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
1930 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
1931 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
1932 2540
1933 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
1934 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
1935 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
1936 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
1937 2545
1938 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
1939 2547
1940 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
1941 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
1942 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
1943 }; 2551 };
1944 2552
1945 int x, y; 2553 int x, y;
1946 2554
1947 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2556 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2558 * and takes the colour from god knows where instead of using
2559 * Cp. MODULATE results in the same colour, but slightly different
2560 * alpha, but atcually gives us the correct colour with nvidia.
2561 */
1948 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1949 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
1950 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1951 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
1952 2566
1953 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
… …
1957 2571
1958 if (m) 2572 if (m)
1959 { 2573 {
1960 float *c = color [m & 15]; 2574 float *c = color [m & 15];
1961 2575
1962 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
1963 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
1964 2578
1965 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
1966 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1967 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1968 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1969 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1970 } 2584 }
… …
1974 glDisable (GL_BLEND); 2588 glDisable (GL_BLEND);
1975 glDisable (GL_TEXTURE_2D); 2589 glDisable (GL_TEXTURE_2D);
1976} 2590}
1977 2591
1978void 2592void
1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2593fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1980 PPCODE: 2594 PPCODE:
1981{ 2595{
1982 int x, y; 2596 int x, y;
1983 int sw4 = (sw + 3) & ~3; 2597 int sw1 = sw + 2;
2598 int sh1 = sh + 2;
2599 int sh3 = sh * 3;
2600 int sw3 = sw * 3;
1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2601 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2602 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1986 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1987 memset (darkness, 255, sw4 * sh); 2604 memset (darkness1, 0, sw1*sh1);
2605
1988 SvPOK_only (darkness_sv); 2606 SvPOK_only (darkness3_sv);
1989 SvCUR_set (darkness_sv, sw4 * sh); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
1990 2608
1991 mx += self->x; 2609 mx += self->x - 1;
1992 my += self->y; 2610 my += self->y - 1;
1993 2611
1994 for (y = 0; y < sh; y++) 2612 for (y = 0; y < sh1; y++)
1995 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
1996 { 2614 {
1997 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
1998 2616
1999 for (x = 0; x < sw; x++) 2617 for (x = 0; x < sw1; x++)
2000 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2001 { 2619 {
2002 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2003 2621
2004 darkness[y * sw4 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2005 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2006 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2007 } 2625 }
2008 } 2626 }
2009 2627
2010 if (smoothing)
2011 {
2012 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2013 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2014
2015 SvPOK_only (darkness2_sv);
2016 SvCUR_set (darkness2_sv, sw4 * sh);
2017
2018 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2019 for (x = 0; x < sw4; ++x) 2629 for (x = 0; x < sw; ++x)
2020 { 2630 {
2021 float *f = (float *)matrix; 2631 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2022 int dx, dy; 2632 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2023 float sum = 0.f; 2633 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2634 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2635 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2636 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2637 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2638 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2639 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2024 2640
2025 for (dy = -1; dy <= 1; ++dy) 2641 uint8_t r11 = (d11 + d21 + d12) / 3;
2026 for (dx = -1; dx <= 1; ++dx) 2642 uint8_t r21 = d21;
2027 { 2643 uint8_t r31 = (d21 + d31 + d32) / 3;
2028 unsigned int x2 = x + dx;
2029 unsigned int y2 = y + dy;
2030 2644
2031 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2645 uint8_t r12 = d12;
2032 } 2646 uint8_t r22 = d22;
2647 uint8_t r32 = d32;
2033 2648
2034 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2035 } 2650 uint8_t r23 = d23;
2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2036 2652
2037 darkness_sv = darkness2_sv; 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2657 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2038 } 2662 }
2663
2664 free (darkness1);
2039 2665
2040 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2041 PUSHs (sv_2mortal (newSViv (sw4))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2042 PUSHs (sv_2mortal (newSViv (sh))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2043 PUSHs (darkness_sv); 2669 PUSHs (darkness3_sv);
2044} 2670}
2045 2671
2046SV * 2672SV *
2047get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2673get_rect (DC::Map self, int x0, int y0, int w, int h)
2048 CODE: 2674 CODE:
2049{ 2675{
2050 int x, y, x1, y1; 2676 int x, y, x1, y1;
2051 SV *data_sv = newSV (w * h * 7 + 5); 2677 SV *data_sv = newSV (w * h * 7 + 5);
2052 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2109 else 2735 else
2110 *data++ = 0; 2736 *data++ = 0;
2111 } 2737 }
2112 } 2738 }
2113 2739
2740 /* if size is w*h + 5 then no data has been found */
2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2742 {
2114 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2115 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2745 }
2746
2116 RETVAL = data_sv; 2747 RETVAL = data_sv;
2117} 2748}
2118 OUTPUT: 2749 OUTPUT:
2119 RETVAL 2750 RETVAL
2120 2751
2121void 2752void
2122set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2753set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2123 PPCODE: 2754 PPCODE:
2124{ 2755{
2125 int x, y, z; 2756 int x, y, z;
2126 int w, h; 2757 int w, h;
2127 int x1, y1; 2758 int x1, y1;
2759 STRLEN len;
2760 uint8_t *data, *end;
2761
2762 len = SvLEN (data_sv);
2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2765 end = data + len + 8;
2766
2767 if (len < 5)
2768 XSRETURN_EMPTY;
2128 2769
2129 if (*data++ != 0) 2770 if (*data++ != 0)
2130 return; /* version mismatch */ 2771 XSRETURN_EMPTY; /* version mismatch */
2131 2772
2132 w = *data++ << 8; w |= *data++; 2773 w = *data++ << 8; w |= *data++;
2133 h = *data++ << 8; h |= *data++; 2774 h = *data++ << 8; h |= *data++;
2134 2775
2135 // we need to do this 'cause we don't keep an absolute coord system for rows 2776 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2147 { 2788 {
2148 maprow *row = map_get_row (self, y); 2789 maprow *row = map_get_row (self, y);
2149 2790
2150 for (x = x0; x < x1; x++) 2791 for (x = x0; x < x1; x++)
2151 { 2792 {
2793 uint8_t flags;
2794
2795 if (data + 7 >= end)
2796 XSRETURN_EMPTY;
2797
2152 uint8_t flags = *data++; 2798 flags = *data++;
2153 2799
2154 if (flags) 2800 if (flags)
2155 { 2801 {
2156 mapcell *cell = row_get_cell (row, x); 2802 mapcell *cell = row_get_cell (row, x);
2157 tileid tile[3] = { 0, 0, 0 }; 2803 tileid tile[3] = { 0, 0, 0 };
… …
2160 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2806 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2161 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2807 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2162 2808
2163 if (cell->darkness == 0) 2809 if (cell->darkness == 0)
2164 { 2810 {
2165 cell->darkness = 0; 2811 /*cell->darkness = 0;*/
2812 EXTEND (SP, 3);
2166 2813
2167 for (z = 0; z <= 2; z++) 2814 for (z = 0; z <= 2; z++)
2168 { 2815 {
2169 tileid t = tile [z]; 2816 tileid t = tile [z];
2170 2817
2171 if (t >= self->texs || (t && !self->tex [t].name)) 2818 if (t >= self->texs || (t && !self->tex [t].name))
2172 { 2819 {
2173 XPUSHs (sv_2mortal (newSViv (t))); 2820 PUSHs (sv_2mortal (newSViv (t)));
2174 need_texid (self, t); 2821 need_texid (self, t);
2175 } 2822 }
2176 2823
2177 cell->tile [z] = t; 2824 cell->tile [z] = t;
2178 } 2825 }
… …
2180 } 2827 }
2181 } 2828 }
2182 } 2829 }
2183} 2830}
2184 2831
2185MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2186 2833
2187CFPlus::MixChunk 2834DC::RW
2188new_from_file (SV *class, char *path) 2835new (SV *klass, SV *data_sv)
2189 CODE: 2836 CODE:
2190 RETVAL = Mix_LoadWAV (path); 2837{
2838 STRLEN datalen;
2839 char *data = SvPVbyte (data_sv, datalen);
2840
2841 RETVAL = SDL_RWFromConstMem (data, datalen);
2842}
2191 OUTPUT: 2843 OUTPUT:
2192 RETVAL 2844 RETVAL
2193 2845
2846DC::RW
2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2848 CODE:
2849 RETVAL = SDL_RWFromFile (path, mode);
2850 OUTPUT:
2851 RETVAL
2852
2853# fails on win32:
2854# dc.xs(2268) : error C2059: syntax error : '('
2194void 2855#void
2856#close (DC::RW self)
2857# CODE:
2858# (self->(close)) (self);
2859
2860MODULE = Deliantra::Client PACKAGE = DC::Channel
2861
2862PROTOTYPES: DISABLE
2863
2864DC::Channel
2865find ()
2866 CODE:
2867{
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2871 {
2872 RETVAL = Mix_GroupOldest (-1);
2873
2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2880 XSRETURN_UNDEF;
2881 }
2882 else
2883 Mix_HaltChannel (RETVAL);
2884 }
2885
2886 Mix_UnregisterAllEffects (RETVAL);
2887 Mix_Volume (RETVAL, 128);
2888}
2889 OUTPUT:
2890 RETVAL
2891
2892void
2893halt (DC::Channel self)
2894 CODE:
2895 Mix_HaltChannel (self);
2896
2897void
2898expire (DC::Channel self, int ticks = -1)
2899 CODE:
2900 Mix_ExpireChannel (self, ticks);
2901
2902void
2903fade_out (DC::Channel self, int ticks = -1)
2904 CODE:
2905 Mix_FadeOutChannel (self, ticks);
2906
2907int
2908volume (DC::Channel self, int volume)
2909 CODE:
2910 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2911 OUTPUT:
2912 RETVAL
2913
2914void
2915unregister_all_effects (DC::Channel self)
2916 CODE:
2917 Mix_UnregisterAllEffects (self);
2918
2919void
2920set_panning (DC::Channel self, int left, int right)
2921 CODE:
2922 left = CLAMP (left , 0, 255);
2923 right = CLAMP (right, 0, 255);
2924 Mix_SetPanning (self, left, right);
2925
2926void
2927set_distance (DC::Channel self, int distance)
2928 CODE:
2929 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2930
2931void
2932set_position (DC::Channel self, int angle, int distance)
2933 CODE:
2934
2935void
2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2937 CODE:
2938{
2939 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2942}
2943
2944void
2945set_reverse_stereo (DC::Channel self, int flip)
2946 CODE:
2947 Mix_SetReverseStereo (self, flip);
2948
2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2950
2951PROTOTYPES: DISABLE
2952
2953void
2954decoders ()
2955 PPCODE:
2956#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2957 int i, num = Mix_GetNumChunkDecoders ();
2958 EXTEND (SP, num);
2959 for (i = 0; i < num; ++i)
2960 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2961#else
2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2963#endif
2964
2965DC::MixChunk
2966new (SV *klass, DC::RW rwops)
2967 CODE:
2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2969 OUTPUT:
2970 RETVAL
2971
2972void
2195DESTROY (CFPlus::MixChunk self) 2973DESTROY (DC::MixChunk self)
2196 CODE: 2974 CODE:
2197 Mix_FreeChunk (self); 2975 Mix_FreeChunk (self);
2198 2976
2199int 2977int
2200volume (CFPlus::MixChunk self, int volume = -1) 2978volume (DC::MixChunk self, int volume = -1)
2201 CODE: 2979 CODE:
2980 if (items > 1)
2981 volume = CLAMP (volume, 0, 128);
2202 RETVAL = Mix_VolumeChunk (self, volume); 2982 RETVAL = Mix_VolumeChunk (self, volume);
2203 OUTPUT: 2983 OUTPUT:
2204 RETVAL 2984 RETVAL
2205 2985
2206int 2986DC::Channel
2207play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2987play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2208 CODE: 2988 CODE:
2989{
2209 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2990 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2991
2992 if (RETVAL < 0)
2993 XSRETURN_UNDEF;
2994
2995 if (channel < 0)
2996 {
2997 Mix_UnregisterAllEffects (RETVAL);
2998 Mix_Volume (RETVAL, 128);
2999 }
3000}
2210 OUTPUT: 3001 OUTPUT:
2211 RETVAL 3002 RETVAL
2212 3003
2213MODULE = CFPlus PACKAGE = CFPlus::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
3005
3006void
3007decoders ()
3008 PPCODE:
3009#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3010 int i, num = Mix_GetNumMusicDecoders ();
3011 EXTEND (SP, num);
3012 for (i = 0; i < num; ++i)
3013 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3014#else
3015 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3016#endif
2214 3017
2215int 3018int
2216volume (int volume = -1) 3019volume (int volume = -1)
3020 PROTOTYPE: ;$
2217 CODE: 3021 CODE:
3022 if (items > 0)
3023 volume = CLAMP (volume, 0, 128);
2218 RETVAL = Mix_VolumeMusic (volume); 3024 RETVAL = Mix_VolumeMusic (volume);
2219 OUTPUT: 3025 OUTPUT:
2220 RETVAL 3026 RETVAL
2221 3027
3028void
3029fade_out (int ms)
3030 CODE:
3031 Mix_FadeOutMusic (ms);
3032
3033void
3034halt ()
3035 CODE:
3036 Mix_HaltMusic ();
3037
2222int 3038int
2223fade_out (int ms) 3039playing ()
2224 CODE: 3040 CODE:
2225 RETVAL = Mix_FadeOutMusic (ms); 3041 RETVAL = Mix_PlayingMusic ();
2226 OUTPUT: 3042 OUTPUT:
2227 RETVAL 3043 RETVAL
2228 3044
2229CFPlus::MixMusic 3045DC::MixMusic
2230new_from_file (SV *class, char *path) 3046new (SV *klass, DC::RW rwops)
2231 CODE: 3047 CODE:
2232 RETVAL = Mix_LoadMUS (path); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2233 OUTPUT: 3049 OUTPUT:
2234 RETVAL 3050 RETVAL
2235 3051
2236void 3052void
2237DESTROY (CFPlus::MixMusic self) 3053DESTROY (DC::MixMusic self)
2238 CODE: 3054 CODE:
2239 Mix_FreeMusic (self); 3055 Mix_FreeMusic (self);
2240 3056
2241int 3057int
2242play (CFPlus::MixMusic self, int loops = -1) 3058play (DC::MixMusic self, int loops = -1)
2243 CODE: 3059 CODE:
2244 RETVAL = Mix_PlayMusic (self, loops); 3060 RETVAL = Mix_PlayMusic (self, loops);
2245 OUTPUT: 3061 OUTPUT:
2246 RETVAL 3062 RETVAL
2247 3063
2248int 3064void
2249fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3065fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2250 CODE: 3066 CODE:
2251 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3067 Mix_FadeInMusicPos (self, loops, ms, position);
2252 OUTPUT:
2253 RETVAL
2254 3068
2255MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3069MODULE = Deliantra::Client PACKAGE = DC::OpenGL
3070
3071PROTOTYPES: ENABLE
2256 3072
2257BOOT: 3073BOOT:
2258{ 3074{
2259 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3075 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2260 static const struct { 3076 static const struct {
2261 const char *name; 3077 const char *name;
2262 IV iv; 3078 IV iv;
2263 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2264# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2265 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2266 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2267 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2268 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2269 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2270 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2271 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2272 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
… …
2276 const_iv (GL_ALPHA_TEST), 3093 const_iv (GL_ALPHA_TEST),
2277 const_iv (GL_NORMALIZE), 3094 const_iv (GL_NORMALIZE),
2278 const_iv (GL_RESCALE_NORMAL), 3095 const_iv (GL_RESCALE_NORMAL),
2279 const_iv (GL_FRONT), 3096 const_iv (GL_FRONT),
2280 const_iv (GL_BACK), 3097 const_iv (GL_BACK),
3098 const_iv (GL_AUX0),
2281 const_iv (GL_AND), 3099 const_iv (GL_AND),
2282 const_iv (GL_ONE), 3100 const_iv (GL_ONE),
2283 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2284 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2285 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2286 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2287 const_iv (GL_ONE_MINUS_DST_ALPHA), 3105 const_iv (GL_ONE_MINUS_DST_ALPHA),
3106 const_iv (GL_SRC_COLOR),
3107 const_iv (GL_DST_COLOR),
3108 const_iv (GL_ONE_MINUS_SRC_COLOR),
3109 const_iv (GL_ONE_MINUS_DST_COLOR),
2288 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2289 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2290 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2291 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2292 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
… …
2298 const_iv (GL_INTENSITY), 3120 const_iv (GL_INTENSITY),
2299 const_iv (GL_LUMINANCE), 3121 const_iv (GL_LUMINANCE),
2300 const_iv (GL_LUMINANCE_ALPHA), 3122 const_iv (GL_LUMINANCE_ALPHA),
2301 const_iv (GL_FLOAT), 3123 const_iv (GL_FLOAT),
2302 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3124 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3125 const_iv (GL_COMPRESSED_ALPHA_ARB),
3126 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3127 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3128 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3129 const_iv (GL_COMPRESSED_RGB_ARB),
3130 const_iv (GL_COMPRESSED_RGBA_ARB),
2303 const_iv (GL_COMPILE), 3131 const_iv (GL_COMPILE),
2304 const_iv (GL_PROXY_TEXTURE_1D), 3132 const_iv (GL_PROXY_TEXTURE_1D),
2305 const_iv (GL_PROXY_TEXTURE_2D), 3133 const_iv (GL_PROXY_TEXTURE_2D),
2306 const_iv (GL_TEXTURE_1D), 3134 const_iv (GL_TEXTURE_1D),
2307 const_iv (GL_TEXTURE_2D), 3135 const_iv (GL_TEXTURE_2D),
… …
2331 const_iv (GL_COLOR_LOGIC_OP), 3159 const_iv (GL_COLOR_LOGIC_OP),
2332 const_iv (GL_SEPARABLE_2D), 3160 const_iv (GL_SEPARABLE_2D),
2333 const_iv (GL_CONVOLUTION_2D), 3161 const_iv (GL_CONVOLUTION_2D),
2334 const_iv (GL_CONVOLUTION_BORDER_MODE), 3162 const_iv (GL_CONVOLUTION_BORDER_MODE),
2335 const_iv (GL_CONSTANT_BORDER), 3163 const_iv (GL_CONSTANT_BORDER),
3164 const_iv (GL_POINTS),
2336 const_iv (GL_LINES), 3165 const_iv (GL_LINES),
2337 const_iv (GL_LINE_STRIP), 3166 const_iv (GL_LINE_STRIP),
2338 const_iv (GL_LINE_LOOP), 3167 const_iv (GL_LINE_LOOP),
2339 const_iv (GL_QUADS), 3168 const_iv (GL_QUADS),
2340 const_iv (GL_QUAD_STRIP), 3169 const_iv (GL_QUAD_STRIP),
2341 const_iv (GL_TRIANGLES), 3170 const_iv (GL_TRIANGLES),
2342 const_iv (GL_TRIANGLE_STRIP), 3171 const_iv (GL_TRIANGLE_STRIP),
2343 const_iv (GL_TRIANGLE_FAN), 3172 const_iv (GL_TRIANGLE_FAN),
3173 const_iv (GL_POLYGON),
2344 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3174 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3175 const_iv (GL_POINT_SMOOTH_HINT),
3176 const_iv (GL_LINE_SMOOTH_HINT),
3177 const_iv (GL_POLYGON_SMOOTH_HINT),
3178 const_iv (GL_GENERATE_MIPMAP_HINT),
3179 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2345 const_iv (GL_FASTEST), 3180 const_iv (GL_FASTEST),
3181 const_iv (GL_DONT_CARE),
3182 const_iv (GL_NICEST),
2346 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2347 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2348 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2349 const_iv (GL_T2F_N3F_V3F), 3186 const_iv (GL_T2F_N3F_V3F),
3187 const_iv (GL_FUNC_ADD),
3188 const_iv (GL_FUNC_SUBTRACT),
3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2350# undef const_iv 3190# undef const_iv
2351 }; 3191 };
2352 3192
2353 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3193 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2354 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2355 3195
2356 texture_av = newAV (); 3196 texture_av = newAV ();
2357 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2358} 3198}
2359 3199
2360char * 3200void
3201disable_GL_EXT_blend_func_separate ()
3202 CODE:
3203 gl.BlendFuncSeparate = 0;
3204 gl.BlendFuncSeparateEXT = 0;
3205
3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2361gl_vendor () 3210gl_vendor ()
2362 CODE: 3211 CODE:
2363 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2364 OUTPUT: 3213 OUTPUT:
2365 RETVAL 3214 RETVAL
2366 3215
2367char * 3216const char *
2368gl_version () 3217gl_version ()
2369 CODE: 3218 CODE:
2370 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2371 OUTPUT: 3220 OUTPUT:
2372 RETVAL 3221 RETVAL
2373 3222
2374char * 3223const char *
2375gl_extensions () 3224gl_extensions ()
2376 CODE: 3225 CODE:
2377 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2378 OUTPUT: 3227 OUTPUT:
2379 RETVAL 3228 RETVAL
2380 3229
2381const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2382 3235
2383GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2384 CODE: 3237 CODE:
2385 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2386 OUTPUT: 3239 OUTPUT:
… …
2394 3247
2395int glGetError () 3248int glGetError ()
2396 3249
2397void glFinish () 3250void glFinish ()
2398 3251
3252void glFlush ()
3253
2399void glClear (int mask) 3254void glClear (int mask)
2400 3255
2401void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2402 PROTOTYPE: @ 3257 PROTOTYPE: @
2403 3258
… …
2413 3268
2414void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2415 CODE: 3270 CODE:
2416 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
2417 3272
3273# void glBlendEquation (int se)
3274
2418void glDepthMask (int flag) 3275void glDepthMask (int flag)
2419 3276
2420void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2421 3278
2422void glColorMask (int red, int green, int blue, int alpha) 3279void glColorMask (int red, int green, int blue, int alpha)
… …
2436# near_ and far_ are due to microsofts buggy "c" compiler 3293# near_ and far_ are due to microsofts buggy "c" compiler
2437void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3294void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2438 3295
2439# near_ and far_ are due to microsofts buggy "c" compiler 3296# near_ and far_ are due to microsofts buggy "c" compiler
2440void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3297void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3298
3299PROTOTYPES: DISABLE
2441 3300
2442void glViewport (int x, int y, int width, int height) 3301void glViewport (int x, int y, int width, int height)
2443 3302
2444void glScissor (int x, int y, int width, int height) 3303void glScissor (int x, int y, int width, int height)
2445 3304
… …
2453 3312
2454void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
2455 CODE: 3314 CODE:
2456 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
2457 3316
2458void glBegin (int mode)
2459
2460void glEnd ()
2461
2462void glColor (float r, float g, float b, float a = 1.0) 3317void glColor (float r, float g, float b, float a = 1.0)
2463 PROTOTYPE: @ 3318 PROTOTYPE: @
2464 ALIAS: 3319 ALIAS:
2465 glColor_premultiply = 1 3320 glColor_premultiply = 1
2466 CODE: 3321 CODE:
2467 if (ix) 3322 if (ix)
2468 { 3323 {
… …
2471 b *= a; 3326 b *= a;
2472 } 3327 }
2473 // microsoft visual "c" rounds instead of truncating... 3328 // microsoft visual "c" rounds instead of truncating...
2474 glColor4f (r, g, b, a); 3329 glColor4f (r, g, b, a);
2475 3330
2476void glInterleavedArrays (int format, int stride, char *data)
2477
2478void glDrawElements (int mode, int count, int type, char *indices)
2479
2480# 1.2 void glDrawRangeElements (int mode, int start, int end
2481
2482void glRasterPos (float x, float y, float z = 0.) 3331void glRasterPos (float x, float y, float z = 0.)
2483 CODE: 3332 CODE:
2484 glRasterPos3f (0, 0, z); 3333 glRasterPos3f (0, 0, z);
2485 glBitmap (0, 0, 0, 0, x, y, 0); 3334 glBitmap (0, 0, 0, 0, x, y, 0);
2486 3335
… …
2490 3339
2491void glTexCoord (float s, float t) 3340void glTexCoord (float s, float t)
2492 CODE: 3341 CODE:
2493 glTexCoord2f (s, t); 3342 glTexCoord2f (s, t);
2494 3343
3344void glRect (float x1, float y1, float x2, float y2)
3345 CODE:
3346 glRectf (x1, y1, x2, y2);
3347
3348void glRect_lineloop (float x1, float y1, float x2, float y2)
3349 CODE:
3350 glBegin (GL_LINE_LOOP);
3351 glVertex2f (x1, y1);
3352 glVertex2f (x2, y1);
3353 glVertex2f (x2, y2);
3354 glVertex2f (x1, y2);
3355 glEnd ();
3356
3357PROTOTYPES: ENABLE
3358
3359void glBegin (int mode)
3360
3361void glEnd ()
3362
3363void glPointSize (GLfloat size)
3364
3365void glLineWidth (GLfloat width)
3366
3367void glInterleavedArrays (int format, int stride, char *data)
3368
3369void glDrawElements (int mode, int count, int type, char *indices)
3370
3371# 1.2 void glDrawRangeElements (int mode, int start, int end
3372
2495void glTexEnv (int target, int pname, float param) 3373void glTexEnv (int target, int pname, float param)
2496 CODE: 3374 CODE:
2497 glTexEnvf (target, pname, param); 3375 glTexEnvf (target, pname, param);
2498 3376
2499void glTexParameter (int target, int pname, float param) 3377void glTexParameter (int target, int pname, float param)
… …
2515void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3393void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2516 CODE: 3394 CODE:
2517 if (gl.SeparableFilter2D) 3395 if (gl.SeparableFilter2D)
2518 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3396 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2519 3397
2520void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3398void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2521 3399
2522void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3400void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2523 3401
2524void glDrawPixels (int width, int height, int format, int type, char *pixels) 3402void glDrawPixels (int width, int height, int format, int type, char *pixels)
2525 3403
… …
2551 3429
2552void glEndList () 3430void glEndList ()
2553 3431
2554void glCallList (int list) 3432void glCallList (int list)
2555 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3440
3441PROTOTYPES: DISABLE
3442
3443void
3444find_widget (SV *self, NV x, NV y)
3445 PPCODE:
3446{
3447 if (within_widget (self, x, y))
3448 XPUSHs (self);
3449}
3450
3451BOOT:
3452{
3453 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3454
3455 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3456 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3457 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3458 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3459}
3460
3461void
3462draw (SV *self)
3463 CODE:
3464{
3465 HV *hv;
3466 SV **svp;
3467 NV x, y, w, h;
3468 SV *draw_x_sv = GvSV (draw_x_gv);
3469 SV *draw_y_sv = GvSV (draw_y_gv);
3470 SV *draw_w_sv = GvSV (draw_w_gv);
3471 SV *draw_h_sv = GvSV (draw_h_gv);
3472 double draw_x, draw_y;
3473
3474 if (!SvROK (self))
3475 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3476
3477 hv = (HV *)SvRV (self);
3478
3479 if (SvTYPE (hv) != SVt_PVHV)
3480 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3481
3482 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3483 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3484
3485 if (!h || !w)
3486 XSRETURN_EMPTY;
3487
3488 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3489 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3490
3491 draw_x = SvNV (draw_x_sv) + x;
3492 draw_y = SvNV (draw_y_sv) + y;
3493
3494 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3495 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3496 XSRETURN_EMPTY;
3497
3498 sv_setnv (draw_x_sv, draw_x);
3499 sv_setnv (draw_y_sv, draw_y);
3500
3501 glPushMatrix ();
3502 glTranslated (x, y, 0);
3503
3504 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3505 {
3506 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3507
3508 if (svp && SvTRUE (*svp))
3509 {
3510 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3511 glEnable (GL_BLEND);
3512 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3513 glBegin (GL_QUADS);
3514 glVertex2f (0, 0);
3515 glVertex2f (w, 0);
3516 glVertex2f (w, h);
3517 glVertex2f (0, h);
3518 glEnd ();
3519 glDisable (GL_BLEND);
3520 }
3521 }
3522#if 0
3523 // draw borders, for debugging
3524 glPushMatrix ();
3525 glColor4f (1., 1., 0., 1.);
3526 glTranslatef (.5, .5, 0.);
3527 glBegin (GL_LINE_LOOP);
3528 glVertex2f (0 , 0);
3529 glVertex2f (w - 1, 0);
3530 glVertex2f (w - 1, h - 1);
3531 glVertex2f (0 , h - 1);
3532 glEnd ();
3533 glPopMatrix ();
3534#endif
3535 PUSHMARK (SP);
3536 XPUSHs (self);
3537 PUTBACK;
3538 call_method ("_draw", G_VOID | G_DISCARD);
3539 SPAGAIN;
3540
3541 glPopMatrix ();
3542
3543 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3544 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3545}
3546

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines