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.210 by root, Tue Jul 24 18:24:03 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
24// microsoft vs. C
25# define sqrtf(x) sqrt(x)
26# define atan2f(x,y) atan2(x,y)
27# define M_PI 3.14159265f
22#endif 28#endif
23 29
24#include <assert.h> 30#include <cassert>
25#include <math.h> 31#include <cmath>
26#include <string.h> 32#include <cstring>
27#include <stdio.h> 33#include <cstdio>
28#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
38
39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 40
30#include <SDL.h> 41#include <SDL.h>
31#include <SDL_thread.h> 42#include <SDL_thread.h>
32#include <SDL_endian.h> 43#include <SDL_endian.h>
33#include <SDL_image.h> 44#include <SDL_image.h>
34#include <SDL_mixer.h> 45#include <SDL_mixer.h>
35#include <SDL_opengl.h> 46#include <SDL_opengl.h>
36 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
37#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
39 57
40#include <glib/gmacros.h> 58#include <glib.h>
41 59
42#include <pango/pango.h> 60#include <pango/pango.h>
61
62#ifndef PANGO_VERSION_CHECK
63# define PANGO_VERSION_CHECK(a,b,c) 0
64#endif
65
66#if !PANGO_VERSION_CHECK (1, 15, 2)
67# define pango_layout_get_line_readonly pango_layout_get_line
68# define pango_layout_get_lines_readonly pango_layout_get_lines
69# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
70# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
71#endif
43 72
44#ifndef _WIN32 73#ifndef _WIN32
45# include <sys/types.h> 74# include <sys/types.h>
46# include <sys/socket.h> 75# include <sys/socket.h>
47# include <netinet/in.h> 76# include <netinet/in.h>
48# include <netinet/tcp.h> 77# include <netinet/tcp.h>
49# include <inttypes.h> 78# include <inttypes.h>
50#endif 79#endif
51 80
81#include "ecb.h"
82
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 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 */
54#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
55 89
56#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
58 92
59#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
60 94
61#if 0 95/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 97
64# define PARACHUTE 0 98#define KMOD_LRAM 0x10000 // our extension
65#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}
66 121
67static AV *texture_av; 122static AV *texture_av;
68 123
69static struct 124static struct
70{ 125{
… …
107 av_push (texture_av, (SV *)(size_t)name); 162 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 163 glDeleteTextures (1, &name);
109} 164}
110 165
111#include "texcache.c" 166#include "texcache.c"
167#include "rendercache.c"
112 168
113#include "pango-font.c" 169#include "pango-font.c"
114#include "pango-fontmap.c" 170#include "pango-fontmap.c"
115#include "pango-render.c" 171#include "pango-render.c"
116 172
173typedef IV DC__Channel;
174typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 175typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 176typedef Mix_Music *DC__MixMusic;
119 177
120typedef PangoFontDescription *CFPlus__Font; 178typedef PangoFontDescription *DC__Font;
121 179
122static int 180static int
123shape_attr_p (PangoLayoutRun *run) 181shape_attr_p (PangoLayoutRun *run)
124{ 182{
125 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
126 184
127 while (attrs) 185 while (attrs)
128 { 186 {
129 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
130 188
131 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
132 return 1; 190 return 1;
133 191
134 attrs = attrs->next; 192 attrs = attrs->next;
135 } 193 }
136 194
137 return 0; 195 return 0;
138} 196}
139 197
140typedef struct cf_layout { 198struct cf_layout {
141 PangoLayout *pl; 199 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
143 int base_height; 201 int base_height;
144 CFPlus__Font font; 202 DC__Font font;
145} *CFPlus__Layout; 203 rc_t rc;
204};
146 205
206typedef cf_layout *DC__Layout;
207
147static CFPlus__Font default_font; 208static DC__Font default_font;
148static PangoContext *opengl_context; 209static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
150 211
151static void 212static void
152substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
153{ 214{
154 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
155#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
157#endif 218#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 220}
160 221
161static void 222static void
162layout_update_font (CFPlus__Layout self) 223layout_update_font (DC__Layout self)
163{ 224{
164 /* 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
165 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
166 */ 227 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
168 229
169 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 232
172 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
173} 234}
174 235
175static void 236static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 238{
178 PangoRectangle rect; 239 PangoRectangle rect;
179 240
180 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
… …
188 249
189 *w = rect.width; 250 *w = rect.width;
190 *h = rect.height; 251 *h = rect.height;
191} 252}
192 253
254/////////////////////////////////////////////////////////////////////////////
255
193typedef uint16_t tileid; 256typedef uint16_t tileid;
194typedef uint16_t faceid; 257typedef uint16_t faceid;
195 258
196typedef struct { 259struct maptex
260{
197 int name; 261 GLuint name;
198 int w, h; 262 int w, h;
199 float s, t; 263 float s, t;
200 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
201 tileid smoothtile; 265 tileid smoothtile;
202 uint8_t smoothlevel; 266 uint8_t smoothlevel;
203} maptex; 267 uint8_t unused; /* set to zero on use */
268};
204 269
205typedef struct { 270struct mapcell
271{
206 uint32_t player; 272 uint32_t player;
207 tileid tile[3]; 273 tileid tile[3];
208 uint16_t darkness; 274 uint16_t darkness;
209 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
210} mapcell; 276};
211 277
212typedef struct { 278struct maprow
279{
213 int32_t c0, c1; 280 int32_t c0, c1;
214 mapcell *col; 281 mapcell *col;
215} maprow; 282};
216 283
217typedef struct map { 284struct mapgrid {
218 int x, y, w, h; 285 int x, y, w, h;
219 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
220 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
222 289
223 int32_t rows; 290 int32_t rows;
224 maprow *row; 291 maprow *row;
225} *CFPlus__Map; 292};
226 293
227static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
228prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
229{ 299{
230 char *p; 300 T *p;
231 301
232 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
233 Zero (p, inc, char); 303 Zero (p, inc, T);
234 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
235 Safefree (ptr); 305 Safefree (ptr);
236 306
237 return p; 307 ptr = p;
238} 308}
239 309
240static char * 310template<typename T>
241append (char *ptr, int sze, int inc)
242{
243 Renew (ptr, sze + inc, char);
244 Zero (ptr + sze, inc, char);
245
246 return ptr;
247}
248
249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
251
252static 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
253need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
254{ 320{
255 while (self->faces <= face) 321 while (self->faces <= face)
256 { 322 {
257 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
258 self->faces *= 2; 324 self->faces *= 2;
259 } 325 }
260} 326}
261 327
262static void 328static void
263need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
264{ 330{
265 while (self->texs <= texid) 331 while (self->texs <= texid)
266 { 332 {
267 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
268 self->texs *= 2; 334 self->texs *= 2;
269 } 335 }
270} 336}
271 337
272static maprow * 338static maprow *
273map_get_row (CFPlus__Map self, int y) 339map_get_row (mapgrid *self, int y)
274{ 340{
275 if (0 > y) 341 if (0 > y)
276 { 342 {
277 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
279 345
280 self->rows += extend; 346 self->rows += extend;
281 self->y += extend; 347 self->y += extend;
282 y += extend; 348 y += extend;
283 } 349 }
284 else if (y >= self->rows) 350 else if (y >= self->rows)
285 { 351 {
286 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
287 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
288 self->rows += extend; 354 self->rows += extend;
289 } 355 }
290 356
291 return self->row + y; 357 return self->row + y;
292} 358}
… …
302 } 368 }
303 369
304 if (row->c0 > x) 370 if (row->c0 > x)
305 { 371 {
306 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
307 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
308 row->c0 -= extend; 374 row->c0 -= extend;
309 } 375 }
310 else if (x >= row->c1) 376 else if (x >= row->c1)
311 { 377 {
312 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
313 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
314 row->c1 += extend; 380 row->c1 += extend;
315 } 381 }
316 382
317 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
318} 384}
319 385
320static mapcell * 386static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
322{ 388{
323 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
324} 390}
325 391
326static void 392static void
327map_clear (CFPlus__Map self) 393map_clear (mapgrid *self)
328{ 394{
329 int r; 395 int r;
330 396
331 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
… …
339 self->oy = 0; 405 self->oy = 0;
340 self->row = 0; 406 self->row = 0;
341 self->rows = 0; 407 self->rows = 0;
342} 408}
343 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
344static void 420static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
346{ 422{
347 int x, y; 423 int x, y;
348 maprow *row; 424 maprow *row;
349 mapcell *cell; 425 mapcell *cell;
350 426
… …
362 if (x >= row->c1) 438 if (x >= row->c1)
363 break; 439 break;
364 440
365 cell = row->col + x - row->c0; 441 cell = row->col + x - row->c0;
366 442
367 cell->darkness = 0; 443 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 444 }
372 } 445 }
373} 446}
374 447
375typedef struct { 448struct smooth_key
449{
376 tileid tile; 450 tileid tile;
377 uint8_t x, y, level; 451 uint8_t x, y, level;
378} 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}
379 471
380static void 472static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
382{ 474{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
384 476
385 if (SvIOK (*sv)) 477 if (it == h.end ())
386 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
387 else 479 else
388 sv_setiv (*sv, bits); 480 it->second |= bits;
389} 481}
390 482
391static void 483static void
392music_finished (void) 484music_finished (void)
393{ 485{
… …
410 ev.code = 1; 502 ev.code = 1;
411 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
412 ev.data2 = 0; 504 ev.data2 = 0;
413 505
414 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;
415} 514}
416 515
417static unsigned int 516static unsigned int
418minpot (unsigned int n) 517minpot (unsigned int n)
419{ 518{
… …
476 return 0; 575 return 0;
477 576
478 return 1; 577 return 1;
479} 578}
480 579
481MODULE = 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
482 639
483PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
484 641
485BOOT: 642BOOT:
486{ 643{
487 HV *stash = gv_stashpv ("CFPlus", 1); 644 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 645 static const struct {
489 const char *name; 646 const char *name;
490 IV iv; 647 IV iv;
491 } *civ, const_iv[] = { 648 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 649# define const_iv(name) { # name, (IV)name }
… …
514 671
515 const_iv (SDL_APPINPUTFOCUS), 672 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 673 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 674 const_iv (SDL_APPACTIVE),
518 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),
519 const_iv (SDLK_KP0), 728 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 729 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 730 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 731 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 732 const_iv (SDLK_KP4),
… …
595 const_iv (KMOD_LMETA), 804 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
599 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)
600# undef const_iv 842# undef const_iv
601 }; 843 };
602 844
603 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--)
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
605 847
606 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
607 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
608} 850}
609 851
… …
621 RETVAL 863 RETVAL
622 864
623NV floor (NV x) 865NV floor (NV x)
624 866
625NV 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
626 882
627void 883void
628pango_init () 884pango_init ()
629 CODE: 885 CODE:
630{ 886{
631 opengl_fontmap = pango_opengl_font_map_new (); 887 opengl_fontmap = pango_opengl_font_map_new ();
632 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);
633 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
634} 895}
635 896
636char *
637SDL_GetError () 897char *SDL_GetError ()
638 898
639int 899void SDL_main_hack (SV *real_main)
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 900 PROTOTYPE: &
641 901
642void 902int SDL_Init (U32 flags)
903
904int SDL_InitSubSystem (U32 flags)
905
906void SDL_QuitSubSystem (U32 flags)
907
643SDL_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
644 919
645void 920void
646SDL_ListModes (int rgb, int alpha) 921SDL_ListModes (int rgb, int alpha)
647 PPCODE: 922 PPCODE:
648{ 923{
… …
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 935 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 936 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 937 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 938
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 939 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 940 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 941
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 942 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 943
672 if (m && m != (SDL_Rect **)-1) 944 if (m && m != (SDL_Rect **)-1)
673 while (*m) 945 while (*m)
674 { 946 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 947 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 948 {
677 AV *av = newAV (); 949 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 950 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 951 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 952 av_push (av, newSViv (rgb));
… …
703 ); 975 );
704 976
705 if (RETVAL) 977 if (RETVAL)
706 { 978 {
707 av_clear (texture_av); 979 av_clear (texture_av);
708
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
710#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);
711#include "glfunc.h" 981#include "glfunc.h"
712#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
713 } 985 }
714} 986}
715 OUTPUT: 987 OUTPUT:
716 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
717 992
718void 993void
719SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
720 995
721char * 996char *
722SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
723 999
724int 1000int
725SDL_GetAppState () 1001SDL_GetAppState ()
726 1002
1003int
1004SDL_GetModState ()
1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
727void 1010void
1011SDL_PumpEvents ()
1012
1013void
728poll_events () 1014peep_events ()
729 PPCODE: 1015 PPCODE:
730{ 1016{
731 SDL_Event ev; 1017 SDL_Event ev;
732 1018
733 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
… …
740 { 1026 {
741 case SDL_KEYDOWN: 1027 case SDL_KEYDOWN:
742 case SDL_KEYUP: 1028 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1029 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1030 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 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);
746 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 */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1033 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 1034 break;
749 1035
750 case SDL_ACTIVEEVENT: 1036 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1037 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
769 x = ev.motion.x; 1055 x = ev.motion.x;
770 y = ev.motion.y; 1056 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1057 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 1058 }
773 1059
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1060 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 1061 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 1062 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 1063 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1064 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1065 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 1066 }
781 break; 1067 break;
782 1068
783 case SDL_MOUSEBUTTONDOWN: 1069 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1070 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1071 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1072
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1073 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1074 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1075 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1076 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1081 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1082 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1083 break;
798 } 1084 }
799 1085
800 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))));
801 } 1087 }
802} 1088}
803 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
804int 1103int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1105 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
809 1108
810void 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}
1124
1125void
811Mix_CloseAudio () 1126Mix_CloseAudio ()
812 1127
813int 1128int
814Mix_AllocateChannels (int numchans = -1) 1129Mix_AllocateChannels (int numchans = -1)
1130
1131const char *
1132Mix_GetError ()
815 1133
816void 1134void
817lowdelay (int fd, int val = 1) 1135lowdelay (int fd, int val = 1)
818 CODE: 1136 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1137 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
845 } 1163 }
846 } 1164 }
847#endif 1165#endif
848} 1166}
849 1167
850void 1168int
851add_font (char *file) 1169add_font (char *file)
852 CODE: 1170 CODE:
853 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)
854 1181
855void 1182void
856load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
857 ALIAS: 1184 ALIAS:
858 load_image_file = 1 1185 load_image_file = 1
… …
861 STRLEN image_len; 1188 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1189 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1190 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1191 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1192 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1193 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1194 : SDL_RWFromConstMem (image, image_len);
868 1195
869 if (!rw) 1196 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1197 croak ("load_image: %s", SDL_GetError ());
871 1198
… …
904 1231
905 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
906 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
907 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
908 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
909 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
910 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)));
911 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
912 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
913 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
914 1241
… …
944void 1271void
945error (char *message) 1272error (char *message)
946 CODE: 1273 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1274 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1275#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1276 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1277#endif
951 1278
952void 1279void
953fatal (char *message) 1280fatal (char *message)
954 CODE: 1281 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1282 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1283#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1284 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1285#endif
959 _exit (1); 1286 _exit (1);
960 1287
961void 1288void
962_exit (int retval = 0) 1289_exit (int retval = 0)
… …
974#if DEBUG 1301#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
976#endif 1303#endif
977} 1304}
978 1305
979MODULE = 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
980 1314
981PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
982 1316
983CFPlus::Font 1317DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
985 CODE: 1319 CODE:
986{ 1320{
987 int count; 1321 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
989 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
991} 1325}
992 OUTPUT: 1326 OUTPUT:
993 RETVAL 1327 RETVAL
994 1328
995void 1329void
996DESTROY (CFPlus::Font self) 1330DESTROY (DC::Font self)
997 CODE: 1331 CODE:
998 pango_font_description_free (self); 1332 pango_font_description_free (self);
999 1333
1000void 1334void
1001make_default (CFPlus::Font self) 1335make_default (DC::Font self)
1002 PROTOTYPE: $ 1336 PROTOTYPE: $
1003 CODE: 1337 CODE:
1004 default_font = self; 1338 default_font = self;
1005 1339
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1340MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1341
1008PROTOTYPES: DISABLE 1342PROTOTYPES: DISABLE
1009 1343
1010void 1344void
1011reset_glyph_cache () 1345glyph_cache_backup ()
1012 PROTOTYPE: 1346 PROTOTYPE:
1013 CODE: 1347 CODE:
1348 tc_backup ();
1349
1350void
1351glyph_cache_restore ()
1352 PROTOTYPE:
1353 CODE:
1014 tc_clear (); 1354 tc_restore ();
1015 1355
1016CFPlus::Layout 1356DC::Layout
1017new (SV *class) 1357new (SV *klass)
1018 CODE: 1358 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1020 1360
1021 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1022 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1023 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
… …
1030 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1031 OUTPUT: 1371 OUTPUT:
1032 RETVAL 1372 RETVAL
1033 1373
1034void 1374void
1035DESTROY (CFPlus::Layout self) 1375DESTROY (DC::Layout self)
1036 CODE: 1376 CODE:
1037 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1038 Safefree (self); 1378 delete self;
1039 1379
1040void 1380void
1041set_text (CFPlus::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1042 CODE: 1382 CODE:
1043{ 1383{
1044 STRLEN textlen; 1384 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1385 char *text = SvPVutf8 (text_, textlen);
1046 1386
1047 pango_layout_set_text (self->pl, text, textlen); 1387 pango_layout_set_text (self->pl, text, textlen);
1048} 1388}
1049 1389
1050void 1390void
1051set_markup (CFPlus::Layout self, SV *text_) 1391set_markup (DC::Layout self, SV *text_)
1052 CODE: 1392 CODE:
1053{ 1393{
1054 STRLEN textlen; 1394 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1395 char *text = SvPVutf8 (text_, textlen);
1056 1396
1057 pango_layout_set_markup (self->pl, text, textlen); 1397 pango_layout_set_markup (self->pl, text, textlen);
1058} 1398}
1059 1399
1060void 1400void
1061set_shapes (CFPlus::Layout self, ...) 1401set_shapes (DC::Layout self, ...)
1062 CODE: 1402 CODE:
1063{ 1403{
1064 PangoAttrList *attrs = 0; 1404 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1405 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1406 const char *pos = text;
… …
1101 if (attrs) 1441 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1442 pango_layout_set_attributes (self->pl, attrs);
1103} 1443}
1104 1444
1105void 1445void
1106get_shapes (CFPlus::Layout self) 1446get_shapes (DC::Layout self)
1107 PPCODE: 1447 PPCODE:
1108{ 1448{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1449 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1450
1111 do 1451 do
1112 { 1452 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1453 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1454
1115 if (run && shape_attr_p (run)) 1455 if (run && shape_attr_p (run))
1116 { 1456 {
1117 PangoRectangle extents; 1457 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1458 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1126 1466
1127 pango_layout_iter_free (iter); 1467 pango_layout_iter_free (iter);
1128} 1468}
1129 1469
1130int 1470int
1131has_wrapped (CFPlus::Layout self) 1471has_wrapped (DC::Layout self)
1132 CODE: 1472 CODE:
1133{ 1473{
1134 int lines = 1; 1474 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1475 const char *text = pango_layout_get_text (self->pl);
1136 1476
… …
1141} 1481}
1142 OUTPUT: 1482 OUTPUT:
1143 RETVAL 1483 RETVAL
1144 1484
1145SV * 1485SV *
1146get_text (CFPlus::Layout self) 1486get_text (DC::Layout self)
1147 CODE: 1487 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1488 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1489 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1490 OUTPUT:
1151 RETVAL 1491 RETVAL
1152 1492
1153void 1493void
1154set_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.)
1155 CODE: 1495 CODE:
1156 self->r = r; 1496 self->r = r;
1157 self->g = g; 1497 self->g = g;
1158 self->b = b; 1498 self->b = b;
1159 self->a = a; 1499 self->a = a;
1160 1500
1161void 1501void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1502set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1503 CODE:
1164 if (self->font != font) 1504 if (self->font != font)
1165 { 1505 {
1166 self->font = font; 1506 self->font = font;
1167 layout_update_font (self); 1507 layout_update_font (self);
1168 } 1508 }
1169 1509
1170void 1510void
1171set_height (CFPlus::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1172 CODE: 1512 CODE:
1173 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1174 { 1514 {
1175 self->base_height = base_height; 1515 self->base_height = base_height;
1176 layout_update_font (self); 1516 layout_update_font (self);
1177 } 1517 }
1178 1518
1179void 1519void
1180set_width (CFPlus::Layout self, int max_width = -1) 1520set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1521 CODE:
1182 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);
1183 1523
1184void 1524void
1185set_indent (CFPlus::Layout self, int indent) 1525set_indent (DC::Layout self, int indent)
1186 CODE: 1526 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1527 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1528
1189void 1529void
1190set_spacing (CFPlus::Layout self, int spacing) 1530set_spacing (DC::Layout self, int spacing)
1191 CODE: 1531 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1532 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1533
1194void 1534void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1535set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1536 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1537 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1538 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1539 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1540 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1541 : PANGO_ELLIPSIZE_NONE
1202 ); 1542 );
1203 1543
1204void 1544void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1545set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1546 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1547 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1548
1209void 1549void
1210size (CFPlus::Layout self) 1550size (DC::Layout self)
1211 PPCODE: 1551 PPCODE:
1212{ 1552{
1213 int w, h; 1553 int w, h;
1214 1554
1215 layout_get_pixel_size (self, &w, &h); 1555 layout_get_pixel_size (self, &w, &h);
… …
1218 PUSHs (sv_2mortal (newSViv (w))); 1558 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1559 PUSHs (sv_2mortal (newSViv (h)));
1220} 1560}
1221 1561
1222int 1562int
1223descent (CFPlus::Layout self) 1563descent (DC::Layout self)
1224 CODE: 1564 CODE:
1225{ 1565{
1226 PangoRectangle rect; 1566 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1567 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1568 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1569 RETVAL = PANGO_DESCENT (rect);
1230} 1570}
1231 OUTPUT: 1571 OUTPUT:
1232 RETVAL 1572 RETVAL
1233 1573
1234int 1574int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1575xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1576 CODE:
1237{ 1577{
1238 int index, trailing; 1578 int index, trailing;
1239 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);
1240 RETVAL = index + trailing; 1580 RETVAL = index + trailing;
1241} 1581}
1242 OUTPUT: 1582 OUTPUT:
1243 RETVAL 1583 RETVAL
1244 1584
1245void 1585void
1246cursor_pos (CFPlus::Layout self, int index) 1586cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1587 PPCODE:
1248{ 1588{
1249 PangoRectangle strong_pos; 1589 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1590 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1591
1252 EXTEND (SP, 3); 1592 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1593 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1594 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1595 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1596}
1257 1597
1258void 1598void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1599index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1600 PPCODE:
1261{ 1601{
1262 int line, x; 1602 int line, x;
1263 1603
1264 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)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1606 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1607 --line;
1608#endif
1267 EXTEND (SP, 2); 1609 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1610 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1612}
1271 1613
1272void 1614void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1615line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1616 PPCODE:
1275{ 1617{
1276 PangoLayoutLine *lp; 1618 PangoLayoutLine *lp;
1277 int index, trailing; 1619 int index, trailing;
1278 1620
1279 if (line < 0) 1621 if (line < 0)
1280 XSRETURN_EMPTY; 1622 XSRETURN_EMPTY;
1281 1623
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1624 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1625 XSRETURN_EMPTY; /* do better */
1284 1626
1285 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);
1286 1628
1287 EXTEND (SP, 2); 1629 EXTEND (SP, 2);
… …
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1635 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1636 }
1295} 1637}
1296 1638
1297void 1639void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1641 CODE:
1642 self->rc.clear ();
1300 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1301 self->pl, 1644 self->pl,
1645 &self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1304 flags 1648 flags
1305 ); 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);
1306 1653
1307MODULE = 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
1308 1674
1309PROTOTYPES: ENABLE 1675PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1676
1313void 1677void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1678pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1679 CODE:
1316{ 1680{
… …
1343 HV *hv = (HV *)SvRV (self); 1707 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1708 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1709 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1710 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1711
1712 if (name <= 0)
1713 XSRETURN_EMPTY;
1714
1348 if (items < 5) 1715 if (items < 5)
1349 { 1716 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1717 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1718 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1719 }
… …
1379 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1381 } 1748 }
1382} 1749}
1383 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
1384IV 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)
1385 CODE: 1873 CODE:
1386{ 1874{
1387 GLint width; 1875 GLint width;
1388 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);
… …
1390 RETVAL = width > 0; 1878 RETVAL = width > 0;
1391} 1879}
1392 OUTPUT: 1880 OUTPUT:
1393 RETVAL 1881 RETVAL
1394 1882
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1884
1397PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1398 1886
1399CFPlus::Map 1887DC::Map
1400new (SV *class) 1888new (SV *klass)
1401 CODE: 1889 CODE:
1402 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1403 RETVAL->x = 0; 1891 RETVAL->x = 0;
1404 RETVAL->y = 0; 1892 RETVAL->y = 0;
1405 RETVAL->w = 0; 1893 RETVAL->w = 0;
1406 RETVAL->h = 0; 1894 RETVAL->h = 0;
1407 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
… …
1412 RETVAL->row = 0; 1900 RETVAL->row = 0;
1413 OUTPUT: 1901 OUTPUT:
1414 RETVAL 1902 RETVAL
1415 1903
1416void 1904void
1417DESTROY (CFPlus::Map self) 1905DESTROY (DC::Map self)
1418 CODE: 1906 CODE:
1419{ 1907{
1420 map_clear (self); 1908 map_clear (self);
1421 Safefree (self->face2tile); 1909 Safefree (self->face2tile);
1422 Safefree (self->tex); 1910 Safefree (self->tex);
1423 Safefree (self); 1911 Safefree (self);
1424} 1912}
1425 1913
1426void 1914void
1427resize (CFPlus::Map self, int map_width, int map_height) 1915resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1916 CODE:
1429 self->w = map_width; 1917 self->w = map_width;
1430 self->h = map_height; 1918 self->h = map_height;
1431 1919
1432void 1920void
1433clear (CFPlus::Map self) 1921clear (DC::Map self)
1434 CODE: 1922 CODE:
1435 map_clear (self); 1923 map_clear (self);
1436 1924
1437void 1925void
1438set_tileid (CFPlus::Map self, int face, int tile) 1926set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1927 CODE:
1440{ 1928{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1929 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1930 need_texid (self, tile);
1443} 1931}
1444 1932
1445void 1933void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1935 CODE:
1448{ 1936{
1449 tileid texid; 1937 tileid texid;
1450 maptex *tex; 1938 maptex *tex;
1451 1939
1452 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1453 return; 1941 return;
1454 1942
1455 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1456 return; 1944 return;
1457 1945
1458 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1459 1947
1460 if (!texid) 1948 if (!texid)
1461 return; 1949 return;
1462 1950
1463 tex = self->tex + texid; 1951 tex = self->tex + texid;
1464 tex->smoothtile = self->face2tile [smooth]; 1952 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1953 tex->smoothlevel = level;
1466} 1954}
1467 1955
1468void 1956void
1469set_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)
1470 CODE: 1958 CODE:
1471{ 1959{
1472 need_texid (self, texid); 1960 need_texid (self, texid);
1473 1961
1474 { 1962 {
… …
1493 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1984}
1497 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
1498int 2006int
1499ox (CFPlus::Map self) 2007ox (DC::Map self)
1500 ALIAS: 2008 ALIAS:
1501 oy = 1 2009 oy = 1
1502 x = 2 2010 x = 2
1503 y = 3 2011 y = 3
1504 w = 4 2012 w = 4
… …
1515 } 2023 }
1516 OUTPUT: 2024 OUTPUT:
1517 RETVAL 2025 RETVAL
1518 2026
1519void 2027void
1520scroll (CFPlus::Map self, int dx, int dy) 2028scroll (DC::Map self, int dx, int dy)
1521 CODE: 2029 CODE:
1522{ 2030{
1523 if (dx > 0) 2031 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 2032 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 2033 else if (dx < 0)
… …
1533 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1534 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1535 2043
1536 while (self->y < 0) 2044 while (self->y < 0)
1537 { 2045 {
1538 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1539 2047
1540 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1542 } 2050 }
1543} 2051}
1544 2052
1545void 2053SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1547 CODE: 2055 CODE:
1548{ 2056{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 2059 mapcell *cell;
1552 int x, y, flags; 2060 int x, y, z, flags;
2061 AV *missing = newAV ();
2062 RETVAL = newRV_noinc ((SV *)missing);
1553 2063
1554 while (data < data_end - 1) 2064 while (data < data_end - 1)
1555 { 2065 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 2066 flags = (data [0] << 8) + data [1]; data += 2;
1557 2067
… …
1570 2080
1571 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1572 2082
1573 if (flags & 8) 2083 if (flags & 8)
1574 { 2084 {
2085 uint8_t ext, cmd;
2086
1575 if (extmap) 2087 do
1576 { 2088 {
1577 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1578 2091
1579 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
1580 { 2095 {
1581 ext = *data++;
1582 cmd = ext & 0x3f;
1583
1584 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health
1587 {
1588 cell->stat_width = 1; 2096 cell->stat_width = 1;
1589 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1590 }
1591 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47)
1594 {
1595 if (*data == 4)
1596 ; // decode player count
1597
1598 data += *data + 1;
1599 }
1600 else if (cmd == 8) // cell flags
1601 cell->flags = *data++;
1602 else if (ext & 0x40) // unknown, multibyte => skip
1603 data += *data + 1;
1604 else
1605 data++;
1606 } 2098 }
1607 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++;
1608 } 2116 }
1609 else 2117 while (ext & 0x80);
1610 cell->darkness = *data++ + 1;
1611 } 2118 }
1612 2119
2120 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2121 if (flags & (4 >> z))
1614 { 2122 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2123 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2124 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
2126
2127 if (cell->tile [z])
2128 {
2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
2131 if (!tex->name)
2132 av_push (missing, newSViv (cell->tile [z]));
2133
2134 if (tex->smoothtile)
2135 {
2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
2138 if (!smooth->name)
2139 av_push (missing, newSViv (tex->smoothtile));
2140 }
2141 }
1618 } 2142 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 2143 }
1634 else 2144 else
1635 cell->darkness = 0; 2145 CELL_CLEAR (cell);
1636 } 2146 }
1637} 2147}
2148 OUTPUT:
2149 RETVAL
1638 2150
1639SV * 2151SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2152mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2153 CODE:
1642{ 2154{
1643 int x1, x; 2155 int x1, x;
1644 int y1, y; 2156 int y1, y;
1645 int z; 2157 int z;
… …
1658 ? self->row + y 2170 ? self->row + y
1659 : 0; 2171 : 0;
1660 2172
1661 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1662 { 2174 {
1663 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1664 2176
1665 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1666 { 2178 {
1667 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1668 2180
… …
1670 { 2182 {
1671 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1672 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1673 int a1 = tex.a; 2185 int a1 = tex.a;
1674 2186
1675 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1676 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1677 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1678 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1679 } 2191 }
1680 } 2192 }
1681 2193
1682 *map++ = (r ) 2194 *map++ = (r )
1683 | (g << 8) 2195 | (g << 8)
1684 | (b << 16) 2196 | (b << 16)
1685 | (a << 24); 2197 | (a << 24);
1686 } 2198 }
1687 } 2199 }
1688 2200
1689 RETVAL = map_sv; 2201 RETVAL = map_sv;
1690} 2202}
1691 OUTPUT: 2203 OUTPUT:
1692 RETVAL 2204 RETVAL
1693 2205
1694void 2206void
1695draw (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)
1696 CODE: 2208 CODE:
1697{ 2209{
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1701 smooth_key skey;
1702 int x, y, z; 2210 int x, y, z;
1703 int last_name;
1704 2211
2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2213 int pl_x, pl_y;
2214 maptex pl_tex;
2215 rc_t rc;
2216 rc_t rc_ov;
2217 rc_key_t key;
2218 rc_t::array_t *arr;
2219
2220 pl_tex.name = 0;
2221
1705 // thats current max. sorry. 2222 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1708 2225
1709 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2226 memset (&key, 0, sizeof (key));
1711 2227 key.r = 255;
1712 glColor4ub (255, 255, 255, 255); 2228 key.g = 255;
1713 2229 key.b = 255;
1714 glEnable (GL_BLEND); 2230 key.a = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2231 key.mode = GL_QUADS;
1716 glEnable (GL_TEXTURE_2D); 2232 key.format = GL_T2F_V3F;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1718
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2233
1723 mx += self->x; 2234 mx += self->x;
1724 my += self->y; 2235 my += self->y;
1725 2236
1726 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
1727 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
1728 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
1729 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1730 2241
1731 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1732 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1733 { 2244 {
1734 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
… …
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2254 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2255 self->tex [cell->tile [2]].smoothlevel));
1745 } 2256 }
1746 } 2257 }
1747 2258
2259 glEnable (GL_BLEND);
2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2262
1748 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
1749 { 2264 {
1750 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;
1751 2269
1752 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
1754 { 2272 {
1755 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
… …
1761 tileid tile = cell->tile [z]; 2279 tileid tile = cell->tile [z];
1762 2280
1763 if (tile) 2281 if (tile)
1764 { 2282 {
1765 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2284 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2285
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2286 if (key.texname != tex.name)
1772 { 2287 {
2288 self->tex [tile].unused = 0;
2289
1773 if (!tex.name) 2290 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2292
2293 key.texname = tex.name;
1776 glEnd (); 2294 arr = &rc.array (key);
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1778 glBegin (GL_QUADS);
1779 } 2295 }
1780 2296
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2297 px = (x + 1) * Th - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2298 py = (y + 1) * Tw - tex.h;
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785 2299
1786 if (cell->flags && z == 2) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1787 { 2301 {
1788 if (cell->flags & 1) 2302 pl_x = px;
2303 pl_y = py;
2304 pl_tex = tex;
1789 { 2305 continue;
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 } 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);
1804 2312
1805 // update smooth hash 2313 // update smooth hash
1806 if (tex.smoothtile) 2314 if (tex.smoothtile)
1807 { 2315 {
1808 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
1809 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
1810 2318
1811 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
1812 2320
1813 // 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
1814 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
1815 2323
1816 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
… …
1824 2332
1825 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1826 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
1827 2335
1828 // full tile 2336 // full tile
1829 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);
1830 2338
1831 // borders 2339 // borders
1832 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);
1833 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);
1834 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);
1835 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);
1836 2344
1837 // corners 2345 // corners
1838 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);
1839 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);
1840 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);
1841 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);
1842 } 2370 }
1843 } 2371 }
1844 } 2372 }
1845 } 2373 }
1846 2374
2375 rc.draw ();
2376 rc.clear ();
2377
1847 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2379 // this is basically counting sort
1849 { 2380 {
1850 int w, b; 2381 int w, b;
1851 2382
1852 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)
1853 { 2388 {
1854 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
1855 if (smask) 2390 IV bits = it->second;
1856 for (b = 0; b < 32; ++b) 2391
1857 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
1858 { 2395 {
1859 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
1860 HE *he; 2404 if (tex.name)
1861
1862 hv_iterinit (smooth);
1863 while ((he = hv_iternext (smooth)))
1864 { 2405 {
1865 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
1866 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
1867 2408 if (key.texname != tex.name)
1868 if (!(bits & 0x1000)
1869 && skey->level == level
1870 && level > smooth_max [skey->x][skey->y])
1871 { 2409 {
1872 maptex tex = self->tex [skey->tile]; 2410 self->tex [skey.tile].unused = 0;
1873 int px = (((int)skey->x) - 1) * T;
1874 int py = (((int)skey->y) - 1) * T;
1875 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column
1879 2411
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name)
1883 {
1884 if (!tex.name)
1885 continue; // smoothing not yet available
1886
1887 glEnd (); 2412 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
1890 } 2415 }
1891 2416
1892 if (border) 2417 if (border)
1893 { 2418 {
1894 float ox = border * dx; 2419 float ox = border * dx;
1895 2420
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1900 } 2425 }
1901 2426
1902 if (corner) 2427 if (corner)
1903 { 2428 {
1904 float ox = corner * dx; 2429 float ox = corner * dx;
1905 2430
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1910 }
1911 } 2435 }
1912 } 2436 }
1913 } 2437 }
1914 } 2438 }
2439
2440 glEnd ();
2441 glDisable (GL_TEXTURE_2D);
2442 key.texname = -1;
1915 } 2443 }
1916
1917 hv_clear (smooth);
1918 } 2444 }
1919 2445
1920 glEnd (); 2446 if (pl_tex.name)
2447 {
2448 maptex tex = pl_tex;
2449 int px = pl_x + sdx;
2450 int py = pl_y + sdy;
1921 2451
1922 glDisable (GL_TEXTURE_2D); 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
1923 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
1924 2467
1925 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
… …
1931 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
1932 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
1933 { 2476 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
1935 2478
1936 int px = x * T; 2479 int px = x * Tw;
1937 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 }
1938 2487
1939 if (cell->stat_hp) 2488 if (cell->stat_hp)
1940 { 2489 {
1941 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1943 2492
1944 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
1945 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
1946 px + width - 1, py); 2495 px + width - 1, py);
1947 2496
… …
1953 } 2502 }
1954 } 2503 }
1955} 2504}
1956 2505
1957void 2506void
1958draw_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)
1959 CODE: 2508 CODE:
1960{ 2509{
1961 static float color[16][3] = { 2510 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
1963 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
1964 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
1965 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
1966 2515
1967 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
1968 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
1969 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
1970 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
1971 2520
1972 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
1973 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
1974 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
1975 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
1976 2525
1977 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
1978 2527
1979 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
1980 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
1981 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
1982 }; 2531 };
1983 2532
1984 int x, y; 2533 int x, y;
1985 2534
1986 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 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
1991 2546
1992 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
… …
1996 2551
1997 if (m) 2552 if (m)
1998 { 2553 {
1999 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2000 2555
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2002 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2003 2558
2004 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2564 }
… …
2013 glDisable (GL_BLEND); 2568 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2569 glDisable (GL_TEXTURE_2D);
2015} 2570}
2016 2571
2017void 2572void
2018fow_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)
2019 PPCODE: 2574 PPCODE:
2020{ 2575{
2021 int x, y; 2576 int x, y;
2022 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2024 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2025 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);
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029 2585
2030 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2032 2588
2033 mx += self->x - 1; 2589 mx += self->x - 1;
2034 my += self->y - 1; 2590 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037 2591
2038 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2040 { 2594 {
2041 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
… …
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2599 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2047 2601
2048 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2605 }
2052 } 2606 }
2053 2607
2054 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
… …
2074 2628
2075 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2078 2632
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2083 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 */
2084 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2088 } 2642 }
2089 2643
2090 free (darkness1); 2644 free (darkness1);
2091 2645
2092 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2093 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2096} 2650}
2097 2651
2098SV * 2652SV *
2099get_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)
2100 CODE: 2654 CODE:
2101{ 2655{
2102 int x, y, x1, y1; 2656 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2657 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2658 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2161 else 2715 else
2162 *data++ = 0; 2716 *data++ = 0;
2163 } 2717 }
2164 } 2718 }
2165 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 {
2166 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2725 }
2726
2168 RETVAL = data_sv; 2727 RETVAL = data_sv;
2169} 2728}
2170 OUTPUT: 2729 OUTPUT:
2171 RETVAL 2730 RETVAL
2172 2731
2173void 2732void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2733set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2734 PPCODE:
2176{ 2735{
2177 int x, y, z; 2736 int x, y, z;
2178 int w, h; 2737 int w, h;
2179 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;
2180 2749
2181 if (*data++ != 0) 2750 if (*data++ != 0)
2182 return; /* version mismatch */ 2751 XSRETURN_EMPTY; /* version mismatch */
2183 2752
2184 w = *data++ << 8; w |= *data++; 2753 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2754 h = *data++ << 8; h |= *data++;
2186 2755
2187 // 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
… …
2199 { 2768 {
2200 maprow *row = map_get_row (self, y); 2769 maprow *row = map_get_row (self, y);
2201 2770
2202 for (x = x0; x < x1; x++) 2771 for (x = x0; x < x1; x++)
2203 { 2772 {
2773 uint8_t flags;
2774
2775 if (data + 7 >= end)
2776 XSRETURN_EMPTY;
2777
2204 uint8_t flags = *data++; 2778 flags = *data++;
2205 2779
2206 if (flags) 2780 if (flags)
2207 { 2781 {
2208 mapcell *cell = row_get_cell (row, x); 2782 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2783 tileid tile[3] = { 0, 0, 0 };
… …
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2786 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2787 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2788
2215 if (cell->darkness == 0) 2789 if (cell->darkness == 0)
2216 { 2790 {
2217 cell->darkness = 0; 2791 /*cell->darkness = 0;*/
2792 EXTEND (SP, 3);
2218 2793
2219 for (z = 0; z <= 2; z++) 2794 for (z = 0; z <= 2; z++)
2220 { 2795 {
2221 tileid t = tile [z]; 2796 tileid t = tile [z];
2222 2797
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2798 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2799 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2800 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2801 need_texid (self, t);
2227 } 2802 }
2228 2803
2229 cell->tile [z] = t; 2804 cell->tile [z] = t;
2230 } 2805 }
… …
2232 } 2807 }
2233 } 2808 }
2234 } 2809 }
2235} 2810}
2236 2811
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2813
2814DC::RW
2815new (SV *klass, SV *data_sv)
2816 CODE:
2817{
2818 STRLEN datalen;
2819 char *data = SvPVbyte (data_sv, datalen);
2820
2821 RETVAL = SDL_RWFromConstMem (data, datalen);
2822}
2823 OUTPUT:
2824 RETVAL
2825
2826DC::RW
2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2828 CODE:
2829 RETVAL = SDL_RWFromFile (path, mode);
2830 OUTPUT:
2831 RETVAL
2832
2833# fails on win32:
2834# dc.xs(2268) : error C2059: syntax error : '('
2835#void
2836#close (DC::RW self)
2837# CODE:
2838# (self->(close)) (self);
2839
2840MODULE = Deliantra::Client PACKAGE = DC::Channel
2238 2841
2239PROTOTYPES: DISABLE 2842PROTOTYPES: DISABLE
2240 2843
2241CFPlus::MixChunk 2844DC::Channel
2242new_from_file (SV *class, char *path) 2845find ()
2243 CODE: 2846 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2847{
2848 RETVAL = Mix_GroupAvailable (-1);
2849
2850 if (RETVAL < 0)
2851 {
2852 RETVAL = Mix_GroupOldest (-1);
2853
2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2860 XSRETURN_UNDEF;
2861 }
2862 else
2863 Mix_HaltChannel (RETVAL);
2864 }
2865
2866 Mix_UnregisterAllEffects (RETVAL);
2867 Mix_Volume (RETVAL, 128);
2868}
2245 OUTPUT: 2869 OUTPUT:
2246 RETVAL 2870 RETVAL
2247 2871
2248void 2872void
2873halt (DC::Channel self)
2874 CODE:
2875 Mix_HaltChannel (self);
2876
2877void
2878expire (DC::Channel self, int ticks = -1)
2879 CODE:
2880 Mix_ExpireChannel (self, ticks);
2881
2882void
2883fade_out (DC::Channel self, int ticks = -1)
2884 CODE:
2885 Mix_FadeOutChannel (self, ticks);
2886
2887int
2888volume (DC::Channel self, int volume)
2889 CODE:
2890 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2891 OUTPUT:
2892 RETVAL
2893
2894void
2895unregister_all_effects (DC::Channel self)
2896 CODE:
2897 Mix_UnregisterAllEffects (self);
2898
2899void
2900set_panning (DC::Channel self, int left, int right)
2901 CODE:
2902 left = CLAMP (left , 0, 255);
2903 right = CLAMP (right, 0, 255);
2904 Mix_SetPanning (self, left, right);
2905
2906void
2907set_distance (DC::Channel self, int distance)
2908 CODE:
2909 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2910
2911void
2912set_position (DC::Channel self, int angle, int distance)
2913 CODE:
2914
2915void
2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2917 CODE:
2918{
2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2922}
2923
2924void
2925set_reverse_stereo (DC::Channel self, int flip)
2926 CODE:
2927 Mix_SetReverseStereo (self, flip);
2928
2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2930
2931PROTOTYPES: DISABLE
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
2945DC::MixChunk
2946new (SV *klass, DC::RW rwops)
2947 CODE:
2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2949 OUTPUT:
2950 RETVAL
2951
2952void
2249DESTROY (CFPlus::MixChunk self) 2953DESTROY (DC::MixChunk self)
2250 CODE: 2954 CODE:
2251 Mix_FreeChunk (self); 2955 Mix_FreeChunk (self);
2252 2956
2253int 2957int
2254volume (CFPlus::MixChunk self, int volume = -1) 2958volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2959 CODE:
2960 if (items > 1)
2961 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2962 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2963 OUTPUT:
2258 RETVAL 2964 RETVAL
2259 2965
2260int 2966DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2967play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2968 CODE:
2969{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2970 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2971
2972 if (RETVAL < 0)
2973 XSRETURN_UNDEF;
2974
2975 if (channel < 0)
2976 {
2977 Mix_UnregisterAllEffects (RETVAL);
2978 Mix_Volume (RETVAL, 128);
2979 }
2980}
2264 OUTPUT: 2981 OUTPUT:
2265 RETVAL 2982 RETVAL
2266 2983
2267MODULE = 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
2268 2997
2269int 2998int
2270volume (int volume = -1) 2999volume (int volume = -1)
2271 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2272 CODE: 3001 CODE:
3002 if (items > 0)
3003 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 3004 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 3005 OUTPUT:
2275 RETVAL 3006 RETVAL
2276 3007
3008void
3009fade_out (int ms)
3010 CODE:
3011 Mix_FadeOutMusic (ms);
3012
3013void
3014halt ()
3015 CODE:
3016 Mix_HaltMusic ();
3017
2277int 3018int
2278fade_out (int ms) 3019playing ()
2279 CODE: 3020 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 3021 RETVAL = Mix_PlayingMusic ();
2281 OUTPUT: 3022 OUTPUT:
2282 RETVAL 3023 RETVAL
2283 3024
2284CFPlus::MixMusic 3025DC::MixMusic
2285new_from_file (SV *class, char *path) 3026new (SV *klass, DC::RW rwops)
2286 CODE: 3027 CODE:
2287 RETVAL = Mix_LoadMUS (path); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2288 OUTPUT: 3029 OUTPUT:
2289 RETVAL 3030 RETVAL
2290 3031
2291void 3032void
2292DESTROY (CFPlus::MixMusic self) 3033DESTROY (DC::MixMusic self)
2293 CODE: 3034 CODE:
2294 Mix_FreeMusic (self); 3035 Mix_FreeMusic (self);
2295 3036
2296int 3037int
2297play (CFPlus::MixMusic self, int loops = -1) 3038play (DC::MixMusic self, int loops = -1)
2298 CODE: 3039 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 3040 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 3041 OUTPUT:
2301 RETVAL 3042 RETVAL
2302 3043
2303int 3044void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3045fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 3046 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3047 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 3048
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3049MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 3050
2312PROTOTYPES: ENABLE 3051PROTOTYPES: ENABLE
2313 3052
2314BOOT: 3053BOOT:
2315{ 3054{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3055 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 3056 static const struct {
2318 const char *name; 3057 const char *name;
2319 IV iv; 3058 IV iv;
2320 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2322 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2323 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2324 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2325 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2326 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2327 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2328 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2329 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
… …
2341 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2342 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2343 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2344 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2345 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),
2346 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2347 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2348 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2349 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2350 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
… …
2356 const_iv (GL_INTENSITY), 3100 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 3101 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 3102 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 3103 const_iv (GL_FLOAT),
2360 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),
2361 const_iv (GL_COMPILE), 3111 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 3112 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 3113 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 3114 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 3115 const_iv (GL_TEXTURE_2D),
… …
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3154 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 3155 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 3156 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 3157 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 3158 const_iv (GL_GENERATE_MIPMAP_HINT),
3159 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 3160 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 3161 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2414 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2415 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),
2416# undef const_iv 3170# undef const_iv
2417 }; 3171 };
2418 3172
2419 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--)
2420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2421 3175
2422 texture_av = newAV (); 3176 texture_av = newAV ();
2423 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2424} 3178}
2425 3179
2426char * 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 *
2427gl_vendor () 3190gl_vendor ()
2428 CODE: 3191 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2430 OUTPUT: 3193 OUTPUT:
2431 RETVAL 3194 RETVAL
2432 3195
2433char * 3196const char *
2434gl_version () 3197gl_version ()
2435 CODE: 3198 CODE:
2436 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2437 OUTPUT: 3200 OUTPUT:
2438 RETVAL 3201 RETVAL
2439 3202
2440char * 3203const char *
2441gl_extensions () 3204gl_extensions ()
2442 CODE: 3205 CODE:
2443 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2444 OUTPUT: 3207 OUTPUT:
2445 RETVAL 3208 RETVAL
2446 3209
2447const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2448 3215
2449GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2450 CODE: 3217 CODE:
2451 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2452 OUTPUT: 3219 OUTPUT:
… …
2460 3227
2461int glGetError () 3228int glGetError ()
2462 3229
2463void glFinish () 3230void glFinish ()
2464 3231
3232void glFlush ()
3233
2465void glClear (int mask) 3234void glClear (int mask)
2466 3235
2467void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2468 PROTOTYPE: @ 3237 PROTOTYPE: @
2469 3238
… …
2478void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2479 3248
2480void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2481 CODE: 3250 CODE:
2482 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2483 3254
2484void glDepthMask (int flag) 3255void glDepthMask (int flag)
2485 3256
2486void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2487 3258
… …
2522void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
2523 CODE: 3294 CODE:
2524 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
2525 3296
2526void 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: @
2527 ALIAS: 3299 ALIAS:
2528 glColor_premultiply = 1 3300 glColor_premultiply = 1
2529 CODE: 3301 CODE:
2530 if (ix) 3302 if (ix)
2531 { 3303 {
… …
2551 3323
2552void glRect (float x1, float y1, float x2, float y2) 3324void glRect (float x1, float y1, float x2, float y2)
2553 CODE: 3325 CODE:
2554 glRectf (x1, y1, x2, y2); 3326 glRectf (x1, y1, x2, y2);
2555 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
2556PROTOTYPES: ENABLE 3337PROTOTYPES: ENABLE
2557 3338
2558void glBegin (int mode) 3339void glBegin (int mode)
2559 3340
2560void glEnd () 3341void glEnd ()
… …
2592void 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)
2593 CODE: 3374 CODE:
2594 if (gl.SeparableFilter2D) 3375 if (gl.SeparableFilter2D)
2595 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3376 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2596 3377
2597void 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)
2598 3379
2599void 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)
2600 3381
2601void glDrawPixels (int width, int height, int format, int type, char *pixels) 3382void glDrawPixels (int width, int height, int format, int type, char *pixels)
2602 3383
… …
2628 3409
2629void glEndList () 3410void glEndList ()
2630 3411
2631void glCallList (int list) 3412void glCallList (int list)
2632 3413
2633MODULE = 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
2634 3420
2635PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
2636 3422
2637void 3423void
2638find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
2639 PPCODE: 3425 PPCODE:
2640{ 3426{
2641 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
2642 XPUSHs (self); 3428 XPUSHs (self);
2643} 3429}
2644 3430
2645BOOT: 3431BOOT:
2646{ 3432{
2647 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3433 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2648 3434
2649 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);
2650 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);
2651 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);
2652 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);
2653} 3439}
2654 3440
2655void 3441void
2656draw (SV *self) 3442draw (SV *self)
2657 CODE: 3443 CODE:
2658{ 3444{
2659 HV *hv; 3445 HV *hv;
2660 SV **svp; 3446 SV **svp;
2661 NV x, y, w, h; 3447 NV x, y, w, h;
2662 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
2663 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
2664 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
2665 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);
2666 SV *hover;
2667 double draw_x, draw_y, draw_w, draw_h; 3452 double draw_x, draw_y;
2668 3453
2669 if (!SvROK (self)) 3454 if (!SvROK (self))
2670 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3455 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2671 3456
2672 hv = (HV *)SvRV (self); 3457 hv = (HV *)SvRV (self);
2673 3458
2674 if (SvTYPE (hv) != SVt_PVHV) 3459 if (SvTYPE (hv) != SVt_PVHV)
2675 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3460 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2676 3461
2677 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.;
2678 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.;
2679 3464
2680 if (!h || !w) 3465 if (!h || !w)
… …
2700 { 3485 {
2701 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3486 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2702 3487
2703 if (svp && SvTRUE (*svp)) 3488 if (svp && SvTRUE (*svp))
2704 { 3489 {
2705 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);
2706 glEnable (GL_BLEND); 3491 glEnable (GL_BLEND);
2707 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3492 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2708 glBegin (GL_QUADS); 3493 glBegin (GL_QUADS);
2709 glVertex2f (0, 0); 3494 glVertex2f (0, 0);
2710 glVertex2f (w, 0); 3495 glVertex2f (w, 0);
… …
2713 glEnd (); 3498 glEnd ();
2714 glDisable (GL_BLEND); 3499 glDisable (GL_BLEND);
2715 } 3500 }
2716 } 3501 }
2717#if 0 3502#if 0
2718 if ($ENV{CFPLUS_DEBUG} & 1) { 3503 // draw borders, for debugging
2719 glPushMatrix; 3504 glPushMatrix ();
2720 glColor 1, 1, 0, 1; 3505 glColor4f (1., 1., 0., 1.);
2721 glTranslate 0.375, 0.375; 3506 glTranslatef (.5, .5, 0.);
2722 glBegin GL_LINE_LOOP; 3507 glBegin (GL_LINE_LOOP);
2723 glVertex 0 , 0; 3508 glVertex2f (0 , 0);
2724 glVertex $self->{w} - 1, 0; 3509 glVertex2f (w - 1, 0);
2725 glVertex $self->{w} - 1, $self->{h} - 1; 3510 glVertex2f (w - 1, h - 1);
2726 glVertex 0 , $self->{h} - 1; 3511 glVertex2f (0 , h - 1);
2727 glEnd; 3512 glEnd ();
2728 glPopMatrix; 3513 glPopMatrix ();
2729 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2730 }
2731#endif 3514#endif
2732 PUSHMARK (SP); 3515 PUSHMARK (SP);
2733 XPUSHs (self); 3516 XPUSHs (self);
2734 PUTBACK; 3517 PUTBACK;
2735 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