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

Diff Legend

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