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