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.224 by root, Sat Aug 11 11:21:46 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
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
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
50 72
51#ifndef _WIN32 73#ifndef _WIN32
52# include <sys/types.h> 74# include <sys/types.h>
53# include <sys/socket.h> 75# include <sys/socket.h>
54# include <netinet/in.h> 76# include <netinet/in.h>
55# include <netinet/tcp.h> 77# include <netinet/tcp.h>
56# include <inttypes.h> 78# include <inttypes.h>
57#endif 79#endif
58 80
81#include "ecb.h"
82#include "salloc.h"
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 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 */
61#define FOW_DARKNESS 32 88#define FOW_DARKNESS 50
89#define DARKNESS_ADJUST(n) (n)
62 90
63#define MAP_EXTEND_X 32 91#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 92#define MAP_EXTEND_Y 512
65 93
66#define MIN_FONT_HEIGHT 10 94#define MIN_FONT_HEIGHT 10
67 95
68#if 0 96/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 97#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 98
71# define PARACHUTE 0 99#define KMOD_LRAM 0x10000 // our extension
72#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}
73 146
74static AV *texture_av; 147static AV *texture_av;
75 148
76static struct 149static struct
77{ 150{
120 193
121#include "pango-font.c" 194#include "pango-font.c"
122#include "pango-fontmap.c" 195#include "pango-fontmap.c"
123#include "pango-render.c" 196#include "pango-render.c"
124 197
125typedef IV CFPlus__Channel; 198typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 199typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 200typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 201typedef Mix_Music *DC__MixMusic;
129 202
130typedef PangoFontDescription *CFPlus__Font; 203typedef PangoFontDescription *DC__Font;
131 204
132static int 205static int
133shape_attr_p (PangoLayoutRun *run) 206shape_attr_p (PangoLayoutRun *run)
134{ 207{
135 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
136 209
137 while (attrs) 210 while (attrs)
138 { 211 {
139 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 213
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 215 return 1;
143 216
144 attrs = attrs->next; 217 attrs = attrs->next;
145 } 218 }
146 219
147 return 0; 220 return 0;
148} 221}
149 222
150typedef struct cf_layout { 223struct cf_layout {
151 PangoLayout *pl; 224 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
153 int base_height; 226 int base_height;
154 CFPlus__Font font; 227 DC__Font font;
155} *CFPlus__Layout; 228 rc_t rc;
229};
156 230
231typedef cf_layout *DC__Layout;
232
157static CFPlus__Font default_font; 233static DC__Font default_font;
158static PangoContext *opengl_context; 234static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
160 236
161static void 237static void
162substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
163{ 239{
164 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
165#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
166 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
167#endif 243#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 245}
170 246
171static void 247static void
172layout_update_font (CFPlus__Layout self) 248layout_update_font (DC__Layout self)
173{ 249{
174 /* 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
175 * reasonably well with bitstream vera 251 * reasonably well with dejavu/bistream fonts
176 */ 252 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 253 PangoFontDescription *font = self->font ? self->font : default_font;
178 254
179 pango_font_description_set_absolute_size (font, 255 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 256 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 257
182 pango_layout_set_font_description (self->pl, font); 258 pango_layout_set_font_description (self->pl, font);
183} 259}
184 260
185static void 261static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 262layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 263{
188 PangoRectangle rect; 264 PangoRectangle rect;
189 265
190 // get_pixel_* wrongly rounds down 266 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 267 pango_layout_get_extents (self->pl, 0, &rect);
198 274
199 *w = rect.width; 275 *w = rect.width;
200 *h = rect.height; 276 *h = rect.height;
201} 277}
202 278
279/////////////////////////////////////////////////////////////////////////////
280
203typedef uint16_t tileid; 281typedef uint16_t tileid;
204typedef uint16_t faceid; 282typedef uint16_t faceid;
205 283
206typedef struct { 284struct maptex
285{
207 int name; 286 GLuint name;
208 int w, h; 287 int w, h;
209 float s, t; 288 float s, t;
210 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
211 tileid smoothtile; 290 tileid smoothtile;
212 uint8_t smoothlevel; 291 uint8_t smoothlevel;
213} maptex; 292 uint8_t unused; /* set to zero on use */
293};
214 294
215typedef struct { 295struct mapcell
296{
216 uint32_t player; 297 uint32_t player;
217 tileid tile[3]; 298 tileid tile[3];
218 uint16_t darkness; 299 uint16_t darkness;
219 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
220} mapcell; 301};
221 302
222typedef struct { 303struct maprow
304{
223 int32_t c0, c1; 305 int32_t c0, c1;
224 mapcell *col; 306 mapcell *col;
225} maprow; 307};
226 308
227typedef struct map { 309struct mapgrid {
228 int x, y, w, h; 310 int x, y, w, h;
229 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
230 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
232 314
233 int32_t rows; 315 int32_t rows;
234 maprow *row; 316 maprow *row;
235} *CFPlus__Map; 317};
236 318
237static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
238prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
239{ 324{
240 char *p; 325 T *p;
241 326
242 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
243 Zero (p, inc, char); 328 Zero (p, inc, T);
244 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
245 Safefree (ptr); 330 Safefree (ptr);
246 331
247 return p; 332 ptr = p;
248} 333}
249 334
250static char * 335template<typename T>
336ecb_cold static void
251append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
252{ 338{
253 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
254 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
255
256 return ptr;
257} 341}
258
259#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
260#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
261 342
262static void 343static void
263need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
264{ 345{
265 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
266 { 347 return;
348
349 size_t newsize = minpot (face + 1);
267 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
268 self->faces *= 2; 351 self->faces = newsize;
269 }
270} 352}
271 353
272static void 354static void
273need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
274{ 356{
275 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
276 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
277 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
278 self->texs *= 2; 362 self->texs = newsize;
279 }
280} 363}
281 364
282static maprow * 365static maprow *
283map_get_row (CFPlus__Map self, int y) 366map_get_row (mapgrid *self, int y)
284{ 367{
285 if (0 > y) 368 if (0 > y)
286 { 369 {
287 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
289 372
290 self->rows += extend; 373 self->rows += extend;
291 self->y += extend; 374 self->y += extend;
292 y += extend; 375 y += extend;
293 } 376 }
294 else if (y >= self->rows) 377 else if (y >= self->rows)
295 { 378 {
296 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
297 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
298 self->rows += extend; 381 self->rows += extend;
299 } 382 }
300 383
301 return self->row + y; 384 return self->row + y;
302} 385}
312 } 395 }
313 396
314 if (row->c0 > x) 397 if (row->c0 > x)
315 { 398 {
316 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
317 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
318 row->c0 -= extend; 401 row->c0 -= extend;
319 } 402 }
320 else if (x >= row->c1) 403 else if (x >= row->c1)
321 { 404 {
322 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
323 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
324 row->c1 += extend; 407 row->c1 += extend;
325 } 408 }
326 409
327 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
328} 411}
329 412
330static mapcell * 413static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
332{ 415{
333 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
334} 417}
335 418
336static void 419static void
337map_clear (CFPlus__Map self) 420map_clear (mapgrid *self)
338{ 421{
339 int r; 422 int r;
340 423
341 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
349 self->oy = 0; 432 self->oy = 0;
350 self->row = 0; 433 self->row = 0;
351 self->rows = 0; 434 self->rows = 0;
352} 435}
353 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
354static void 447static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
356{ 449{
357 int x, y; 450 int x, y;
358 maprow *row; 451 maprow *row;
359 mapcell *cell; 452 mapcell *cell;
360 453
372 if (x >= row->c1) 465 if (x >= row->c1)
373 break; 466 break;
374 467
375 cell = row->col + x - row->c0; 468 cell = row->col + x - row->c0;
376 469
377 cell->darkness = 0; 470 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 471 }
382 } 472 }
383} 473}
384 474
385typedef struct { 475struct smooth_key
476{
386 tileid tile; 477 tileid tile;
387 uint8_t x, y, level; 478 uint8_t x, y, level;
388} 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}
389 498
390static void 499static void
391smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
392{ 501{
393 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
394 503
395 if (SvIOK (*sv)) 504 if (it == h.end ())
396 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
397 else 506 else
398 sv_setiv (*sv, bits); 507 it->second |= bits;
399} 508}
400 509
401static void 510static void
402music_finished (void) 511music_finished (void)
403{ 512{
422 ev.data2 = 0; 531 ev.data2 = 0;
423 532
424 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
425} 534}
426 535
427static unsigned int
428minpot (unsigned int n)
429{
430 if (!n)
431 return 0;
432
433 --n;
434
435 n |= n >> 1;
436 n |= n >> 2;
437 n |= n >> 4;
438 n |= n >> 8;
439 n |= n >> 16;
440
441 return n + 1;
442}
443
444/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
447 539
448/******************************************************************************/ 540/******************************************************************************/
486 return 0; 578 return 0;
487 579
488 return 1; 580 return 1;
489} 581}
490 582
491MODULE = CFPlus PACKAGE = CFPlus 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
492 642
493PROTOTYPES: ENABLE 643PROTOTYPES: ENABLE
494 644
495BOOT: 645BOOT:
496{ 646{
497 HV *stash = gv_stashpv ("CFPlus", 1); 647 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 648 static const struct {
499 const char *name; 649 const char *name;
500 IV iv; 650 IV iv;
501 } *civ, const_iv[] = { 651 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 652# define const_iv(name) { # name, (IV)name }
524 674
525 const_iv (SDL_APPINPUTFOCUS), 675 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 676 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 677 const_iv (SDL_APPACTIVE),
528 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),
529 const_iv (SDLK_KP0), 731 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 732 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 733 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 734 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 735 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 807 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 808 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 809 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 810 const_iv (KMOD_CAPS),
609 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)
610# undef const_iv 845# undef const_iv
611 }; 846 };
612 847
613 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--)
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
615 850
616 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
617 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
618} 853}
619 854
631 RETVAL 866 RETVAL
632 867
633NV floor (NV x) 868NV floor (NV x)
634 869
635NV 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
636 891
637void 892void
638pango_init () 893pango_init ()
639 CODE: 894 CODE:
640{ 895{
641 opengl_fontmap = pango_opengl_font_map_new (); 896 opengl_fontmap = pango_opengl_font_map_new ();
642 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);
643 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
644} 904}
645 905
646char *
647SDL_GetError () 906char *SDL_GetError ()
648 907
649int 908void SDL_main_hack (SV *real_main)
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 909 PROTOTYPE: &
651 910
652void 911int SDL_Init (U32 flags)
912
913int SDL_InitSubSystem (U32 flags)
914
915void SDL_QuitSubSystem (U32 flags)
916
653SDL_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
654 928
655void 929void
656SDL_ListModes (int rgb, int alpha) 930SDL_ListModes (int rgb, int alpha)
657 PPCODE: 931 PPCODE:
658{ 932{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 944 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 945 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 946 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 947
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 948 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675#if SDL_VERSION_ATLEAST(1,2,10)
676 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 949 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 950
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 951 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 952
682 if (m && m != (SDL_Rect **)-1) 953 if (m && m != (SDL_Rect **)-1)
683 while (*m) 954 while (*m)
684 { 955 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 956 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 957 {
687 AV *av = newAV (); 958 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 959 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 960 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 961 av_push (av, newSViv (rgb));
713 ); 984 );
714 985
715 if (RETVAL) 986 if (RETVAL)
716 { 987 {
717 av_clear (texture_av); 988 av_clear (texture_av);
718
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
720#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);
721#include "glfunc.h" 990#include "glfunc.h"
722#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
723 } 994 }
724} 995}
725 OUTPUT: 996 OUTPUT:
726 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
727 1001
728void 1002void
729SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
730 1004
731char * 1005char *
732SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
733 1008
734int 1009int
735SDL_GetAppState () 1010SDL_GetAppState ()
736 1011
1012int
1013SDL_GetModState ()
1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
737void 1019void
1020SDL_PumpEvents ()
1021
1022void
738poll_events () 1023peep_events ()
739 PPCODE: 1024 PPCODE:
740{ 1025{
741 SDL_Event ev; 1026 SDL_Event ev;
742 1027
743 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
750 { 1035 {
751 case SDL_KEYDOWN: 1036 case SDL_KEYDOWN:
752 case SDL_KEYUP: 1037 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1038 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1039 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 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);
756 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 */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1042 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 1043 break;
759 1044
760 case SDL_ACTIVEEVENT: 1045 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1046 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 1064 x = ev.motion.x;
780 y = ev.motion.y; 1065 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1066 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 1067 }
783 1068
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1069 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 1070 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 1071 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 1072 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1073 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1074 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 1075 }
791 break; 1076 break;
792 1077
793 case SDL_MOUSEBUTTONDOWN: 1078 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 1079 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1080 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 1081
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1082 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1083 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1084 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1085 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1090 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1091 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1092 break;
808 } 1093 }
809 1094
810 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))));
811 } 1096 }
812} 1097}
813 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
814int 1112int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1113Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 1114 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
1117
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}
819 1133
820void 1134void
821Mix_CloseAudio () 1135Mix_CloseAudio ()
822 1136
823int 1137int
858 } 1172 }
859 } 1173 }
860#endif 1174#endif
861} 1175}
862 1176
863void 1177int
864add_font (char *file) 1178add_font (char *file)
865 CODE: 1179 CODE:
866 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)
867 1190
868void 1191void
869load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
870 ALIAS: 1193 ALIAS:
871 load_image_file = 1 1194 load_image_file = 1
917 1240
918 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
919 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
920 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
921 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
922 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
923 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)));
924 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
925 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
926 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
927 1250
957void 1280void
958error (char *message) 1281error (char *message)
959 CODE: 1282 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1283 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1284#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1285 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1286#endif
964 1287
965void 1288void
966fatal (char *message) 1289fatal (char *message)
967 CODE: 1290 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1291 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1292#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1293 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1294#endif
972 _exit (1); 1295 _exit (1);
973 1296
974void 1297void
975_exit (int retval = 0) 1298_exit (int retval = 0)
987#if DEBUG 1310#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1311 VALGRIND_DO_LEAK_CHECK;
989#endif 1312#endif
990} 1313}
991 1314
992MODULE = CFPlus PACKAGE = CFPlus::Font 1315int
1316SvREFCNT (SV *sv)
1317 CODE:
1318 RETVAL = SvREFCNT (sv);
1319 OUTPUT:
1320 RETVAL
1321
1322MODULE = Deliantra::Client PACKAGE = DC::Font
993 1323
994PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
995 1325
996CFPlus::Font 1326DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
998 CODE: 1328 CODE:
999{ 1329{
1000 int count; 1330 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1002 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1004} 1334}
1005 OUTPUT: 1335 OUTPUT:
1006 RETVAL 1336 RETVAL
1007 1337
1008void 1338void
1009DESTROY (CFPlus::Font self) 1339DESTROY (DC::Font self)
1010 CODE: 1340 CODE:
1011 pango_font_description_free (self); 1341 pango_font_description_free (self);
1012 1342
1013void 1343void
1014make_default (CFPlus::Font self) 1344make_default (DC::Font self)
1015 PROTOTYPE: $ 1345 PROTOTYPE: $
1016 CODE: 1346 CODE:
1017 default_font = self; 1347 default_font = self;
1018 1348
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1349MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1350
1021PROTOTYPES: DISABLE 1351PROTOTYPES: DISABLE
1022 1352
1023void 1353void
1024reset_glyph_cache () 1354glyph_cache_backup ()
1025 PROTOTYPE: 1355 PROTOTYPE:
1026 CODE: 1356 CODE:
1357 tc_backup ();
1358
1359void
1360glyph_cache_restore ()
1361 PROTOTYPE:
1362 CODE:
1027 tc_clear (); 1363 tc_restore ();
1028 1364
1029CFPlus::Layout 1365DC::Layout
1030new (SV *class) 1366new (SV *klass)
1031 CODE: 1367 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1033 1369
1034 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1036 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1043 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1044 OUTPUT: 1380 OUTPUT:
1045 RETVAL 1381 RETVAL
1046 1382
1047void 1383void
1048DESTROY (CFPlus::Layout self) 1384DESTROY (DC::Layout self)
1049 CODE: 1385 CODE:
1050 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1051 Safefree (self); 1387 delete self;
1052 1388
1053void 1389void
1054set_text (CFPlus::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1055 CODE: 1391 CODE:
1056{ 1392{
1057 STRLEN textlen; 1393 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1394 char *text = SvPVutf8 (text_, textlen);
1059 1395
1060 pango_layout_set_text (self->pl, text, textlen); 1396 pango_layout_set_text (self->pl, text, textlen);
1061} 1397}
1062 1398
1063void 1399void
1064set_markup (CFPlus::Layout self, SV *text_) 1400set_markup (DC::Layout self, SV *text_)
1065 CODE: 1401 CODE:
1066{ 1402{
1067 STRLEN textlen; 1403 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1404 char *text = SvPVutf8 (text_, textlen);
1069 1405
1070 pango_layout_set_markup (self->pl, text, textlen); 1406 pango_layout_set_markup (self->pl, text, textlen);
1071} 1407}
1072 1408
1073void 1409void
1074set_shapes (CFPlus::Layout self, ...) 1410set_shapes (DC::Layout self, ...)
1075 CODE: 1411 CODE:
1076{ 1412{
1077 PangoAttrList *attrs = 0; 1413 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1414 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1415 const char *pos = text;
1114 if (attrs) 1450 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1451 pango_layout_set_attributes (self->pl, attrs);
1116} 1452}
1117 1453
1118void 1454void
1119get_shapes (CFPlus::Layout self) 1455get_shapes (DC::Layout self)
1120 PPCODE: 1456 PPCODE:
1121{ 1457{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1458 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1459
1124 do 1460 do
1125 { 1461 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1462 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1463
1128 if (run && shape_attr_p (run)) 1464 if (run && shape_attr_p (run))
1129 { 1465 {
1130 PangoRectangle extents; 1466 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1467 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1475
1140 pango_layout_iter_free (iter); 1476 pango_layout_iter_free (iter);
1141} 1477}
1142 1478
1143int 1479int
1144has_wrapped (CFPlus::Layout self) 1480has_wrapped (DC::Layout self)
1145 CODE: 1481 CODE:
1146{ 1482{
1147 int lines = 1; 1483 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1484 const char *text = pango_layout_get_text (self->pl);
1149 1485
1154} 1490}
1155 OUTPUT: 1491 OUTPUT:
1156 RETVAL 1492 RETVAL
1157 1493
1158SV * 1494SV *
1159get_text (CFPlus::Layout self) 1495get_text (DC::Layout self)
1160 CODE: 1496 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1497 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1498 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1499 OUTPUT:
1164 RETVAL 1500 RETVAL
1165 1501
1166void 1502void
1167set_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.)
1168 CODE: 1504 CODE:
1169 self->r = r; 1505 self->r = r;
1170 self->g = g; 1506 self->g = g;
1171 self->b = b; 1507 self->b = b;
1172 self->a = a; 1508 self->a = a;
1173 1509
1174void 1510void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1511set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1512 CODE:
1177 if (self->font != font) 1513 if (self->font != font)
1178 { 1514 {
1179 self->font = font; 1515 self->font = font;
1180 layout_update_font (self); 1516 layout_update_font (self);
1181 } 1517 }
1182 1518
1183void 1519void
1184set_height (CFPlus::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1185 CODE: 1521 CODE:
1186 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1187 { 1523 {
1188 self->base_height = base_height; 1524 self->base_height = base_height;
1189 layout_update_font (self); 1525 layout_update_font (self);
1190 } 1526 }
1191 1527
1192void 1528void
1193set_width (CFPlus::Layout self, int max_width = -1) 1529set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1530 CODE:
1195 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);
1196 1532
1197void 1533void
1198set_indent (CFPlus::Layout self, int indent) 1534set_indent (DC::Layout self, int indent)
1199 CODE: 1535 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1536 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1537
1202void 1538void
1203set_spacing (CFPlus::Layout self, int spacing) 1539set_spacing (DC::Layout self, int spacing)
1204 CODE: 1540 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1541 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1542
1207void 1543void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1544set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1545 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1546 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1547 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1548 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1549 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1550 : PANGO_ELLIPSIZE_NONE
1215 ); 1551 );
1216 1552
1217void 1553void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1554set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1555 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1556 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1557
1222void 1558void
1223size (CFPlus::Layout self) 1559size (DC::Layout self)
1224 PPCODE: 1560 PPCODE:
1225{ 1561{
1226 int w, h; 1562 int w, h;
1227 1563
1228 layout_get_pixel_size (self, &w, &h); 1564 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1567 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1568 PUSHs (sv_2mortal (newSViv (h)));
1233} 1569}
1234 1570
1235int 1571int
1236descent (CFPlus::Layout self) 1572descent (DC::Layout self)
1237 CODE: 1573 CODE:
1238{ 1574{
1239 PangoRectangle rect; 1575 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1576 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1577 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1578 RETVAL = PANGO_DESCENT (rect);
1243} 1579}
1244 OUTPUT: 1580 OUTPUT:
1245 RETVAL 1581 RETVAL
1246 1582
1247int 1583int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1584xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1585 CODE:
1250{ 1586{
1251 int index, trailing; 1587 int index, trailing;
1252 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);
1253 RETVAL = index + trailing; 1589 RETVAL = index + trailing;
1254} 1590}
1255 OUTPUT: 1591 OUTPUT:
1256 RETVAL 1592 RETVAL
1257 1593
1258void 1594void
1259cursor_pos (CFPlus::Layout self, int index) 1595cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1596 PPCODE:
1261{ 1597{
1262 PangoRectangle strong_pos; 1598 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1599 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1600
1265 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1602 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1603 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1604 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1605}
1270 1606
1271void 1607void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1608index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1609 PPCODE:
1274{ 1610{
1275 int line, x; 1611 int line, x;
1276 1612
1277 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)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1615 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1616 --line;
1617#endif
1280 EXTEND (SP, 2); 1618 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1619 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1620 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1621}
1284 1622
1285void 1623void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1624line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1625 PPCODE:
1288{ 1626{
1289 PangoLayoutLine *lp; 1627 PangoLayoutLine *lp;
1290 int index, trailing; 1628 int index, trailing;
1291 1629
1292 if (line < 0) 1630 if (line < 0)
1293 XSRETURN_EMPTY; 1631 XSRETURN_EMPTY;
1294 1632
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1633 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1634 XSRETURN_EMPTY; /* do better */
1297 1635
1298 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);
1299 1637
1300 EXTEND (SP, 2); 1638 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1644 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1645 }
1308} 1646}
1309 1647
1310void 1648void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1650 CODE:
1651 self->rc.clear ();
1313 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1314 self->pl, 1653 self->pl,
1654 &self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1317 flags 1657 flags
1318 ); 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);
1319 1662
1320MODULE = 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);
1674
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
1321 1683
1322PROTOTYPES: ENABLE 1684PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1685
1326void 1686void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1687pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1688 CODE:
1329{ 1689{
1395 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1397 } 1757 }
1398} 1758}
1399 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
1400IV 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)
1401 CODE: 1882 CODE:
1402{ 1883{
1403 GLint width; 1884 GLint width;
1404 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);
1406 RETVAL = width > 0; 1887 RETVAL = width > 0;
1407} 1888}
1408 OUTPUT: 1889 OUTPUT:
1409 RETVAL 1890 RETVAL
1410 1891
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1893
1413PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1414 1895
1415CFPlus::Map 1896DC::Map
1416new (SV *class) 1897new (SV *klass)
1417 CODE: 1898 CODE:
1418 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1419 RETVAL->x = 0; 1900 RETVAL->x = 0;
1420 RETVAL->y = 0; 1901 RETVAL->y = 0;
1421 RETVAL->w = 0; 1902 RETVAL->w = 0;
1422 RETVAL->h = 0; 1903 RETVAL->h = 0;
1423 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1428 RETVAL->row = 0; 1909 RETVAL->row = 0;
1429 OUTPUT: 1910 OUTPUT:
1430 RETVAL 1911 RETVAL
1431 1912
1432void 1913void
1433DESTROY (CFPlus::Map self) 1914DESTROY (DC::Map self)
1434 CODE: 1915 CODE:
1435{ 1916{
1436 map_clear (self); 1917 map_clear (self);
1437 Safefree (self->face2tile); 1918 Safefree (self->face2tile);
1438 Safefree (self->tex); 1919 Safefree (self->tex);
1439 Safefree (self); 1920 Safefree (self);
1440} 1921}
1441 1922
1442void 1923void
1443resize (CFPlus::Map self, int map_width, int map_height) 1924resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1925 CODE:
1445 self->w = map_width; 1926 self->w = map_width;
1446 self->h = map_height; 1927 self->h = map_height;
1447 1928
1448void 1929void
1449clear (CFPlus::Map self) 1930clear (DC::Map self)
1450 CODE: 1931 CODE:
1451 map_clear (self); 1932 map_clear (self);
1452 1933
1453void 1934void
1454set_tileid (CFPlus::Map self, int face, int tile) 1935set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1936 CODE:
1456{ 1937{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1938 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1939 need_texid (self, tile);
1459} 1940}
1460 1941
1461void 1942void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1944 CODE:
1464{ 1945{
1465 tileid texid; 1946 tileid texid;
1466 maptex *tex; 1947 maptex *tex;
1467 1948
1468 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1469 return; 1950 return;
1470 1951
1471 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1472 return; 1953 return;
1473 1954
1474 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1475 1956
1476 if (!texid) 1957 if (!texid)
1477 return; 1958 return;
1478 1959
1479 tex = self->tex + texid; 1960 tex = self->tex + texid;
1480 tex->smoothtile = self->face2tile [smooth]; 1961 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1962 tex->smoothlevel = level;
1482} 1963}
1483 1964
1484void 1965void
1485set_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)
1486 CODE: 1967 CODE:
1487{ 1968{
1488 need_texid (self, texid); 1969 need_texid (self, texid);
1489 1970
1490 { 1971 {
1509 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1993}
1513 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
1514int 2015int
1515ox (CFPlus::Map self) 2016ox (DC::Map self)
1516 ALIAS: 2017 ALIAS:
1517 oy = 1 2018 oy = 1
1518 x = 2 2019 x = 2
1519 y = 3 2020 y = 3
1520 w = 4 2021 w = 4
1531 } 2032 }
1532 OUTPUT: 2033 OUTPUT:
1533 RETVAL 2034 RETVAL
1534 2035
1535void 2036void
1536scroll (CFPlus::Map self, int dx, int dy) 2037scroll (DC::Map self, int dx, int dy)
1537 CODE: 2038 CODE:
1538{ 2039{
1539 if (dx > 0) 2040 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 2041 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 2042 else if (dx < 0)
1549 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1550 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1551 2052
1552 while (self->y < 0) 2053 while (self->y < 0)
1553 { 2054 {
1554 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1555 2056
1556 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1557 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1558 } 2059 }
1559} 2060}
1560 2061
1561SV * 2062SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1563 CODE: 2064 CODE:
1564{ 2065{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 2068 mapcell *cell;
1588 2089
1589 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1590 2091
1591 if (flags & 8) 2092 if (flags & 8)
1592 { 2093 {
2094 uint8_t ext, cmd;
2095
1593 if (extmap) 2096 do
1594 { 2097 {
1595 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1596 2100
1597 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
1598 { 2104 {
1599 ext = *data++;
1600 cmd = ext & 0x3f;
1601
1602 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health
1605 {
1606 cell->stat_width = 1; 2105 cell->stat_width = 1;
1607 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1608 }
1609 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47)
1612 {
1613 if (*data == 4)
1614 ; // decode player count
1615
1616 data += *data + 1;
1617 }
1618 else if (cmd == 8) // cell flags
1619 cell->flags = *data++;
1620 else if (ext & 0x40) // unknown, multibyte => skip
1621 data += *data + 1;
1622 else
1623 data++;
1624 } 2107 }
1625 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++;
1626 } 2125 }
1627 else 2126 while (ext & 0x80);
1628 cell->darkness = *data++ + 1;
1629 } 2127 }
1630 2128
1631 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1632 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1633 { 2131 {
1636 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1637 2135
1638 if (cell->tile [z]) 2136 if (cell->tile [z])
1639 { 2137 {
1640 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1641 if (!tex->name) 2140 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1643 2142
1644 if (tex->smoothtile) 2143 if (tex->smoothtile)
1645 { 2144 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1647 if (!smooth->name) 2147 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1649 } 2149 }
1650 } 2150 }
1651 } 2151 }
1652 } 2152 }
1653 else 2153 else
1654 cell->darkness = 0; 2154 CELL_CLEAR (cell);
1655 } 2155 }
1656} 2156}
1657 OUTPUT: 2157 OUTPUT:
1658 RETVAL 2158 RETVAL
1659 2159
1660SV * 2160SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2161mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2162 CODE:
1663{ 2163{
1664 int x1, x; 2164 int x1, x;
1665 int y1, y; 2165 int y1, y;
1666 int z; 2166 int z;
1679 ? self->row + y 2179 ? self->row + y
1680 : 0; 2180 : 0;
1681 2181
1682 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1683 { 2183 {
1684 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1685 2185
1686 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1687 { 2187 {
1688 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1689 2189
1691 { 2191 {
1692 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1693 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1694 int a1 = tex.a; 2194 int a1 = tex.a;
1695 2195
1696 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1697 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1698 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1699 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1700 } 2200 }
1701 } 2201 }
1702 2202
1703 *map++ = (r ) 2203 *map++ = (r )
1704 | (g << 8) 2204 | (g << 8)
1705 | (b << 16) 2205 | (b << 16)
1706 | (a << 24); 2206 | (a << 24);
1707 } 2207 }
1708 } 2208 }
1709 2209
1710 RETVAL = map_sv; 2210 RETVAL = map_sv;
1711} 2211}
1712 OUTPUT: 2212 OUTPUT:
1713 RETVAL 2213 RETVAL
1714 2214
1715void 2215void
1716draw (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)
1717 CODE: 2217 CODE:
1718{ 2218{
1719 int x, y, z; 2219 int x, y, z;
1720 2220
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2221 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1724 smooth_key skey; 2222 int pl_x, pl_y;
1725 2223 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
1727 rc_key_t key; 2226 rc_key_t key;
1728 rc_array_t *arr; 2227 rc_t::array_t *arr;
1729 2228
2229 pl_tex.name = 0;
2230
1730 // thats current max. sorry. 2231 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
1733
1734 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey));
1736 2234
1737 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
1738 key.r = 255; 2236 key.r = 255;
1739 key.g = 255; 2237 key.g = 255;
1740 key.b = 255; 2238 key.b = 255;
1741 key.a = 255; 2239 key.a = 255;
1742 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2242
1746 mx += self->x; 2243 mx += self->x;
1747 my += self->y; 2244 my += self->y;
1748 2245
1749 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
1750 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
1751 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
1752 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1753 2250
1754 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
1755 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
1756 { 2253 {
1757 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
1772 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2271
1775 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
1776 { 2273 {
1777 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;
1778 2278
1779 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
1781 { 2281 {
1782 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
1790 if (tile) 2290 if (tile)
1791 { 2291 {
1792 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
1793 int px, py; 2293 int px, py;
1794 2294
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
1798 { 2296 {
2297 self->tex [tile].unused = 0;
2298
1799 if (!tex.name) 2299 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2301
1802 key.texname = tex.name; 2302 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
1804 } 2304 }
1805 2305
1806 px = (x + 1) * T - tex.w; 2306 px = (x + 1) * Th - tex.w;
1807 py = (y + 1) * T - tex.h; 2307 py = (y + 1) * Tw - tex.h;
1808 2308
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813
1814 if (cell->flags && z == 2)
1815 { 2310 {
1816 // overlays such as the speech bubble, probably more to come 2311 pl_x = px;
1817 if (cell->flags & 1) 2312 pl_y = py;
2313 pl_tex = tex;
1818 { 2314 continue;
1819 maptex tex = self->tex [1];
1820 int px = x * T + T * 2 / 32;
1821 int py = y * T - T * 6 / 32;
1822
1823 if (tex.name)
1824 {
1825 if (key.texname != tex.name)
1826 {
1827 key.texname = tex.name;
1828 arr = rc_array (rc, &key);
1829 }
1830
1831 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1832 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1833 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1834 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1835 }
1836 }
1837 } 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);
1838 2321
1839 // update smooth hash 2322 // update smooth hash
1840 if (tex.smoothtile) 2323 if (tex.smoothtile)
1841 { 2324 {
1842 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
1843 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
1844 2327
1845 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
1846 2329
1847 // 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
1848 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
1849 2332
1850 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
1858 2341
1859 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1860 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
1861 2344
1862 // full tile 2345 // full tile
1863 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);
1864 2347
1865 // borders 2348 // borders
1866 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);
1867 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);
1868 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);
1869 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);
1870 2353
1871 // corners 2354 // corners
1872 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);
1873 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);
1874 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);
1875 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);
1876 } 2379 }
1877 } 2380 }
1878 } 2381 }
1879 } 2382 }
1880 2383
1881 rc_draw (rc); 2384 rc.draw ();
1882 rc_clear (rc); 2385 rc.clear ();
1883 2386
1884 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 2388 // this is basically counting sort
1886 { 2389 {
1887 int w, b; 2390 int w, b;
1888 2391
1889 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)
1890 { 2397 {
1891 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
1892 if (smask) 2399 IV bits = it->second;
1893 for (b = 0; b < 32; ++b) 2400
1894 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
1895 { 2404 {
1896 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
1897 HE *he; 2413 if (tex.name)
1898
1899 hv_iterinit (smooth);
1900 while ((he = hv_iternext (smooth)))
1901 { 2414 {
1902 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
1903 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
1904 2417 if (key.texname != tex.name)
1905 if (!(bits & 0x1000)
1906 && skey->level == level
1907 && level > smooth_max [skey->x][skey->y])
1908 { 2418 {
1909 maptex tex = self->tex [skey->tile]; 2419 self->tex [skey.tile].unused = 0;
1910 int px = (((int)skey->x) - 1) * T;
1911 int py = (((int)skey->y) - 1) * T;
1912 int border = bits & 15;
1913 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1914 float dx = tex.s * .0625f; // 16 images/row
1915 float dy = tex.t * .5f ; // 2 images/column
1916 2420
1917 if (tex.name)
1918 { 2421 glEnd ();
1919 // this time avoiding texture state changes
1920 // save gobs of state changes.
1921 if (key.texname != tex.name) 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1922 { 2423 glBegin (GL_QUADS);
1923 key.texname = tex.name;
1924 arr = rc_array (rc, &key);
1925 }
1926
1927 if (border)
1928 {
1929 float ox = border * dx;
1930
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0);
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);
1935 }
1936
1937 if (corner)
1938 {
1939 float ox = corner * dx;
1940
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0);
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);
1945 }
1946 } 2424 }
2425
2426 if (border)
2427 {
2428 float ox = border * dx;
2429
2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2434 }
2435
2436 if (corner)
2437 {
2438 float ox = corner * dx;
2439
2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1947 } 2444 }
1948 } 2445 }
1949 } 2446 }
1950 } 2447 }
2448
2449 glEnd ();
2450 glDisable (GL_TEXTURE_2D);
2451 key.texname = -1;
1951 } 2452 }
1952
1953 hv_clear (smooth);
1954 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2453 }
1957 2454
2455 if (pl_tex.name)
2456 {
2457 maptex tex = pl_tex;
2458 int px = pl_x + sdx;
2459 int py = pl_y + sdy;
2460
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
1958 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
1959 rc_free (rc);
1960 2476
1961 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
1962 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
1963 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
1964 { 2480 {
1967 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
1968 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
1969 { 2485 {
1970 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
1971 2487
1972 int px = x * T; 2488 int px = x * Tw;
1973 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 }
1974 2496
1975 if (cell->stat_hp) 2497 if (cell->stat_hp)
1976 { 2498 {
1977 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
1978 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1979 2501
1980 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
1981 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
1982 px + width - 1, py); 2504 px + width - 1, py);
1983 2505
1989 } 2511 }
1990 } 2512 }
1991} 2513}
1992 2514
1993void 2515void
1994draw_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)
1995 CODE: 2517 CODE:
1996{ 2518{
1997 static float color[16][3] = { 2519 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
1999 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2000 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2001 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2002 2524
2003 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2004 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2005 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2006 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2007 2529
2008 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2009 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2010 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2011 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2012 2534
2013 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2014 2536
2015 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2016 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2017 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2018 }; 2540 };
2019 2541
2020 int x, y; 2542 int x, y;
2021 2543
2022 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 */
2023 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2024 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2025 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2026 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2027 2555
2028 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
2032 2560
2033 if (m) 2561 if (m)
2034 { 2562 {
2035 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2036 2564
2037 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2038 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2039 2567
2040 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2041 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2042 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2043 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2044 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2045 } 2573 }
2049 glDisable (GL_BLEND); 2577 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2578 glDisable (GL_TEXTURE_2D);
2051} 2579}
2052 2580
2053void 2581void
2054fow_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)
2055 PPCODE: 2583 PPCODE:
2056{ 2584{
2057 int x, y; 2585 int x, y;
2058 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2060 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2061 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);
2062 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2063 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2064 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2065 2594
2066 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2067 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2068 2597
2069 mx += self->x - 1; 2598 mx += self->x - 1;
2070 my += self->y - 1; 2599 my += self->y - 1;
2071
2072 memset (darkness1, 255, sw1 * sh1);
2073 2600
2074 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2075 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2076 { 2603 {
2077 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2080 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2081 { 2608 {
2082 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2083 2610
2084 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2085 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2086 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2087 } 2614 }
2088 } 2615 }
2089 2616
2090 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2091 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2110 2637
2111 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2112 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2113 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2114 2641
2115 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2116 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2117 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2118 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2119 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 */
2120 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2121 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2122 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2123 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2124 } 2651 }
2125 2652
2126 free (darkness1); 2653 free (darkness1);
2127 2654
2128 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2129 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2132} 2659}
2133 2660
2134SV * 2661SV *
2135get_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)
2136 CODE: 2663 CODE:
2137{ 2664{
2138 int x, y, x1, y1; 2665 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2666 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2667 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2724 else
2198 *data++ = 0; 2725 *data++ = 0;
2199 } 2726 }
2200 } 2727 }
2201 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 {
2202 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2734 }
2735
2204 RETVAL = data_sv; 2736 RETVAL = data_sv;
2205} 2737}
2206 OUTPUT: 2738 OUTPUT:
2207 RETVAL 2739 RETVAL
2208 2740
2209void 2741void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2742set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2743 PPCODE:
2212{ 2744{
2213 int x, y, z; 2745 int x, y, z;
2214 int w, h; 2746 int w, h;
2215 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;
2216 2758
2217 if (*data++ != 0) 2759 if (*data++ != 0)
2218 return; /* version mismatch */ 2760 XSRETURN_EMPTY; /* version mismatch */
2219 2761
2220 w = *data++ << 8; w |= *data++; 2762 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2763 h = *data++ << 8; h |= *data++;
2222 2764
2223 // 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
2235 { 2777 {
2236 maprow *row = map_get_row (self, y); 2778 maprow *row = map_get_row (self, y);
2237 2779
2238 for (x = x0; x < x1; x++) 2780 for (x = x0; x < x1; x++)
2239 { 2781 {
2782 uint8_t flags;
2783
2784 if (data + 7 >= end)
2785 XSRETURN_EMPTY;
2786
2240 uint8_t flags = *data++; 2787 flags = *data++;
2241 2788
2242 if (flags) 2789 if (flags)
2243 { 2790 {
2244 mapcell *cell = row_get_cell (row, x); 2791 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2792 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2795 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2796 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2797
2251 if (cell->darkness == 0) 2798 if (cell->darkness == 0)
2252 { 2799 {
2253 cell->darkness = 0; 2800 /*cell->darkness = 0;*/
2801 EXTEND (SP, 3);
2254 2802
2255 for (z = 0; z <= 2; z++) 2803 for (z = 0; z <= 2; z++)
2256 { 2804 {
2257 tileid t = tile [z]; 2805 tileid t = tile [z];
2258 2806
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2807 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2808 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2809 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2810 need_texid (self, t);
2263 } 2811 }
2264 2812
2265 cell->tile [z] = t; 2813 cell->tile [z] = t;
2266 } 2814 }
2268 } 2816 }
2269 } 2817 }
2270 } 2818 }
2271} 2819}
2272 2820
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2822
2275CFPlus::RW 2823DC::RW
2276new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2277 CODE: 2825 CODE:
2278{ 2826{
2279 STRLEN datalen; 2827 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2281 2829
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2830 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2831}
2284 OUTPUT: 2832 OUTPUT:
2285 RETVAL 2833 RETVAL
2286 2834
2287CFPlus::RW 2835DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2289 CODE: 2837 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2839 OUTPUT:
2292 RETVAL 2840 RETVAL
2293 2841
2294# fails on win32: 2842# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2843# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2844#void
2297#close (CFPlus::RW self) 2845#close (DC::RW self)
2298# CODE: 2846# CODE:
2299# (self->(close)) (self); 2847# (self->(close)) (self);
2300 2848
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2849MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2850
2303PROTOTYPES: DISABLE 2851PROTOTYPES: DISABLE
2304 2852
2305CFPlus::Channel 2853DC::Channel
2306find () 2854find ()
2307 CODE: 2855 CODE:
2308{ 2856{
2309 RETVAL = Mix_GroupAvailable (-1); 2857 RETVAL = Mix_GroupAvailable (-1);
2310 2858
2311 if (RETVAL < 0) 2859 if (RETVAL < 0)
2312 { 2860 {
2313 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2314 2862
2315 if (RETVAL < 0) 2863 if (RETVAL < 0)
2864 {
2865 // happens sometimes, maybe it just stopped playing(?)
2866 RETVAL = Mix_GroupAvailable (-1);
2867
2868 if (RETVAL < 0)
2316 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2317 2870 }
2871 else
2318 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2319 } 2873 }
2320 2874
2321 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2322 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2323} 2877}
2324 OUTPUT: 2878 OUTPUT:
2325 RETVAL 2879 RETVAL
2326 2880
2327void 2881void
2328halt (CFPlus::Channel self) 2882halt (DC::Channel self)
2329 CODE: 2883 CODE:
2330 Mix_HaltChannel (self); 2884 Mix_HaltChannel (self);
2331 2885
2332void 2886void
2333expire (CFPlus::Channel self, int ticks = -1) 2887expire (DC::Channel self, int ticks = -1)
2334 CODE: 2888 CODE:
2335 Mix_ExpireChannel (self, ticks); 2889 Mix_ExpireChannel (self, ticks);
2336 2890
2337void 2891void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2892fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2893 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2894 Mix_FadeOutChannel (self, ticks);
2341 2895
2342int 2896int
2343volume (CFPlus::Channel self, int volume) 2897volume (DC::Channel self, int volume)
2344 CODE: 2898 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2899 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2900 OUTPUT:
2347 RETVAL 2901 RETVAL
2348 2902
2349void 2903void
2350unregister_all_effects (CFPlus::Channel self) 2904unregister_all_effects (DC::Channel self)
2351 CODE: 2905 CODE:
2352 Mix_UnregisterAllEffects (self); 2906 Mix_UnregisterAllEffects (self);
2353 2907
2354void 2908void
2355set_panning (CFPlus::Channel self, int left, int right) 2909set_panning (DC::Channel self, int left, int right)
2356 CODE: 2910 CODE:
2357 left = CLAMP (left , 0, 255); 2911 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2912 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2913 Mix_SetPanning (self, left, right);
2360 2914
2361void 2915void
2362set_distance (CFPlus::Channel self, int distance) 2916set_distance (DC::Channel self, int distance)
2363 CODE: 2917 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2918 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2919
2366void 2920void
2367set_position (CFPlus::Channel self, int angle, int distance) 2921set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2922 CODE:
2369 2923
2370void 2924void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2926 CODE:
2373{ 2927{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2928 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2929 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2931}
2378 2932
2379void 2933void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2935 CODE:
2382 Mix_SetReverseStereo (self, flip); 2936 Mix_SetReverseStereo (self, flip);
2383 2937
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2939
2386PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2387 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
2388CFPlus::MixChunk 2954DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2955new (SV *klass, DC::RW rwops)
2390 CODE: 2956 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2958 OUTPUT:
2393 RETVAL 2959 RETVAL
2394 2960
2395void 2961void
2396DESTROY (CFPlus::MixChunk self) 2962DESTROY (DC::MixChunk self)
2397 CODE: 2963 CODE:
2398 Mix_FreeChunk (self); 2964 Mix_FreeChunk (self);
2399 2965
2400int 2966int
2401volume (CFPlus::MixChunk self, int volume = -1) 2967volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2968 CODE:
2403 if (items > 1) 2969 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2970 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2971 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2972 OUTPUT:
2407 RETVAL 2973 RETVAL
2408 2974
2409CFPlus::Channel 2975DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2976play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2977 CODE:
2412{ 2978{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2979 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2980
2415 if (RETVAL < 0) 2981 if (RETVAL < 0)
2422 } 2988 }
2423} 2989}
2424 OUTPUT: 2990 OUTPUT:
2425 RETVAL 2991 RETVAL
2426 2992
2427MODULE = 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
2428 3006
2429int 3007int
2430volume (int volume = -1) 3008volume (int volume = -1)
2431 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2432 CODE: 3010 CODE:
2444void 3022void
2445halt () 3023halt ()
2446 CODE: 3024 CODE:
2447 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2448 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2449CFPlus::MixMusic 3034DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 3035new (SV *klass, DC::RW rwops)
2451 CODE: 3036 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 3038 OUTPUT:
2454 RETVAL 3039 RETVAL
2455 3040
2456void 3041void
2457DESTROY (CFPlus::MixMusic self) 3042DESTROY (DC::MixMusic self)
2458 CODE: 3043 CODE:
2459 Mix_FreeMusic (self); 3044 Mix_FreeMusic (self);
2460 3045
2461int 3046int
2462play (CFPlus::MixMusic self, int loops = -1) 3047play (DC::MixMusic self, int loops = -1)
2463 CODE: 3048 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 3049 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 3050 OUTPUT:
2466 RETVAL 3051 RETVAL
2467 3052
2468void 3053void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3054fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 3055 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 3056 Mix_FadeInMusicPos (self, loops, ms, position);
2472 3057
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3058MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 3059
2475PROTOTYPES: ENABLE 3060PROTOTYPES: ENABLE
2476 3061
2477BOOT: 3062BOOT:
2478{ 3063{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3064 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 3065 static const struct {
2481 const char *name; 3066 const char *name;
2482 IV iv; 3067 IV iv;
2483 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2485 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2486 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2487 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2488 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2489 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2490 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2491 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2492 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
2504 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2505 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2506 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2507 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2508 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),
2509 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2510 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2511 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2512 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2513 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
2519 const_iv (GL_INTENSITY), 3109 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 3110 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 3111 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 3112 const_iv (GL_FLOAT),
2523 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),
2524 const_iv (GL_COMPILE), 3120 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 3121 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 3122 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 3123 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 3124 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3163 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 3164 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 3165 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 3166 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 3167 const_iv (GL_GENERATE_MIPMAP_HINT),
3168 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 3169 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 3170 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2577 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2578 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),
2579# undef const_iv 3179# undef const_iv
2580 }; 3180 };
2581 3181
2582 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--)
2583 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2584 3184
2585 texture_av = newAV (); 3185 texture_av = newAV ();
2586 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2587} 3187}
2588 3188
2589char * 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 *
2590gl_vendor () 3199gl_vendor ()
2591 CODE: 3200 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2593 OUTPUT: 3202 OUTPUT:
2594 RETVAL 3203 RETVAL
2595 3204
2596char * 3205const char *
2597gl_version () 3206gl_version ()
2598 CODE: 3207 CODE:
2599 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2600 OUTPUT: 3209 OUTPUT:
2601 RETVAL 3210 RETVAL
2602 3211
2603char * 3212const char *
2604gl_extensions () 3213gl_extensions ()
2605 CODE: 3214 CODE:
2606 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2607 OUTPUT: 3216 OUTPUT:
2608 RETVAL 3217 RETVAL
2609 3218
2610const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2611 3224
2612GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2613 CODE: 3226 CODE:
2614 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2615 OUTPUT: 3228 OUTPUT:
2623 3236
2624int glGetError () 3237int glGetError ()
2625 3238
2626void glFinish () 3239void glFinish ()
2627 3240
3241void glFlush ()
3242
2628void glClear (int mask) 3243void glClear (int mask)
2629 3244
2630void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2631 PROTOTYPE: @ 3246 PROTOTYPE: @
2632 3247
2641void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2642 3257
2643void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2644 CODE: 3259 CODE:
2645 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
2646 3263
2647void glDepthMask (int flag) 3264void glDepthMask (int flag)
2648 3265
2649void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
2650 3267
2685void glRotate (float angle, float x, float y, float z) 3302void glRotate (float angle, float x, float y, float z)
2686 CODE: 3303 CODE:
2687 glRotatef (angle, x, y, z); 3304 glRotatef (angle, x, y, z);
2688 3305
2689void glColor (float r, float g, float b, float a = 1.0) 3306void glColor (float r, float g, float b, float a = 1.0)
3307 PROTOTYPE: @
2690 ALIAS: 3308 ALIAS:
2691 glColor_premultiply = 1 3309 glColor_premultiply = 1
2692 CODE: 3310 CODE:
2693 if (ix) 3311 if (ix)
2694 { 3312 {
2714 3332
2715void glRect (float x1, float y1, float x2, float y2) 3333void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 3334 CODE:
2717 glRectf (x1, y1, x2, y2); 3335 glRectf (x1, y1, x2, y2);
2718 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
2719PROTOTYPES: ENABLE 3346PROTOTYPES: ENABLE
2720 3347
2721void glBegin (int mode) 3348void glBegin (int mode)
2722 3349
2723void glEnd () 3350void glEnd ()
2755void 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)
2756 CODE: 3383 CODE:
2757 if (gl.SeparableFilter2D) 3384 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3385 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 3386
2760void 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)
2761 3388
2762void 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)
2763 3390
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 3391void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 3392
2791 3418
2792void glEndList () 3419void glEndList ()
2793 3420
2794void glCallList (int list) 3421void glCallList (int list)
2795 3422
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 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
2797 3429
2798PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
2799 3431
2800void 3432void
2801find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
2802 PPCODE: 3434 PPCODE:
2803{ 3435{
2804 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
2805 XPUSHs (self); 3437 XPUSHs (self);
2806} 3438}
2807 3439
2808BOOT: 3440BOOT:
2809{ 3441{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3442 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 3443
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3444 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3445 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3446 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3447 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 3448}
2817 3449
2818void 3450void
2819draw (SV *self) 3451draw (SV *self)
2820 CODE: 3452 CODE:
2821{ 3453{
2822 HV *hv; 3454 HV *hv;
2823 SV **svp; 3455 SV **svp;
2824 NV x, y, w, h; 3456 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3460 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3461 double draw_x, draw_y;
2831 3462
2832 if (!SvROK (self)) 3463 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3464 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3465
2835 hv = (HV *)SvRV (self); 3466 hv = (HV *)SvRV (self);
2836 3467
2837 if (SvTYPE (hv) != SVt_PVHV) 3468 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3469 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3470
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3471 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3472 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 3473
2843 if (!h || !w) 3474 if (!h || !w)
2863 { 3494 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3495 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3496
2866 if (svp && SvTRUE (*svp)) 3497 if (svp && SvTRUE (*svp))
2867 { 3498 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3499 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 3500 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3501 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3502 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3503 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3504 glVertex2f (w, 0);
2876 glEnd (); 3507 glEnd ();
2877 glDisable (GL_BLEND); 3508 glDisable (GL_BLEND);
2878 } 3509 }
2879 } 3510 }
2880#if 0 3511#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3512 // draw borders, for debugging
2882 glPushMatrix; 3513 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3514 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3515 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3516 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3517 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3518 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3519 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3520 glVertex2f (0 , h - 1);
2890 glEnd; 3521 glEnd ();
2891 glPopMatrix; 3522 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3523#endif
2895 PUSHMARK (SP); 3524 PUSHMARK (SP);
2896 XPUSHs (self); 3525 XPUSHs (self);
2897 PUTBACK; 3526 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 3527 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines