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

Diff Legend

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