ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.334 by root, Mon Nov 19 01:37:28 2018 UTC

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

Diff Legend

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