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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 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
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
626 888
627void 889void
628pango_init () 890pango_init ()
629 CODE: 891 CODE:
630{ 892{
631 opengl_fontmap = pango_opengl_font_map_new (); 893 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 894 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); 895 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
896 /*pango_context_set_font_description (opengl_context, default_font);*/
897#if PANGO_VERSION_CHECK (1, 15, 2)
898 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
899 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
900#endif
634} 901}
635 902
636char *
637SDL_GetError () 903char *SDL_GetError ()
638 904
639int 905void SDL_main_hack (SV *real_main)
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 906 PROTOTYPE: &
641 907
642void 908int SDL_Init (U32 flags)
909
910int SDL_InitSubSystem (U32 flags)
911
912void SDL_QuitSubSystem (U32 flags)
913
643SDL_Quit () 914void SDL_Quit ()
915
916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
918
919int SDL_GL_GetAttribute (int attr)
920 CODE:
921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
922 XSRETURN_UNDEF;
923 OUTPUT:
924 RETVAL
644 925
645void 926void
646SDL_ListModes (int rgb, int alpha) 927SDL_ListModes (int rgb, int alpha)
647 PPCODE: 928 PPCODE:
648{ 929{
… …
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 941 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 944
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 945 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); 946 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 947
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 948 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 949
672 if (m && m != (SDL_Rect **)-1) 950 if (m && m != (SDL_Rect **)-1)
673 while (*m) 951 while (*m)
674 { 952 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 953 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 954 {
677 AV *av = newAV (); 955 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 956 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 957 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 958 av_push (av, newSViv (rgb));
… …
703 ); 981 );
704 982
705 if (RETVAL) 983 if (RETVAL)
706 { 984 {
707 av_clear (texture_av); 985 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); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 987#include "glfunc.h"
712#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
713 } 991 }
714} 992}
715 OUTPUT: 993 OUTPUT:
716 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
717 998
718void 999void
719SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
720 1001
721char * 1002char *
722SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
723 1005
724int 1006int
725SDL_GetAppState () 1007SDL_GetAppState ()
726 1008
1009int
1010SDL_GetModState ()
1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
727void 1016void
1017SDL_PumpEvents ()
1018
1019void
728poll_events () 1020peep_events ()
729 PPCODE: 1021 PPCODE:
730{ 1022{
731 SDL_Event ev; 1023 SDL_Event ev;
732 1024
733 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
… …
740 { 1032 {
741 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
742 case SDL_KEYUP: 1034 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1037 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 */ 1038 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); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 1040 break;
749 1041
750 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
769 x = ev.motion.x; 1061 x = ev.motion.x;
770 y = ev.motion.y; 1062 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 1064 }
773 1065
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 1072 }
781 break; 1073 break;
782 1074
783 case SDL_MOUSEBUTTONDOWN: 1075 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1076 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1077 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1078
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1079 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1080 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1081 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1082 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1087 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1088 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1089 break;
798 } 1090 }
799 1091
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1093 }
802} 1094}
803 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
804int 1109int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1111 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
809 1114
810void 1115void
1116Mix_QuerySpec ()
1117 PPCODE:
1118{
1119 int freq, channels;
1120 Uint16 format;
1121
1122 if (Mix_QuerySpec (&freq, &format, &channels))
1123 {
1124 EXTEND (SP, 3);
1125 PUSHs (sv_2mortal (newSViv (freq)));
1126 PUSHs (sv_2mortal (newSViv (format)));
1127 PUSHs (sv_2mortal (newSViv (channels)));
1128 }
1129}
1130
1131void
811Mix_CloseAudio () 1132Mix_CloseAudio ()
812 1133
813int 1134int
814Mix_AllocateChannels (int numchans = -1) 1135Mix_AllocateChannels (int numchans = -1)
1136
1137const char *
1138Mix_GetError ()
815 1139
816void 1140void
817lowdelay (int fd, int val = 1) 1141lowdelay (int fd, int val = 1)
818 CODE: 1142 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1143 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
845 } 1169 }
846 } 1170 }
847#endif 1171#endif
848} 1172}
849 1173
850void 1174int
851add_font (char *file) 1175add_font (char *file)
852 CODE: 1176 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1178 OUTPUT:
1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
854 1187
855void 1188void
856load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
857 ALIAS: 1190 ALIAS:
858 load_image_file = 1 1191 load_image_file = 1
… …
861 STRLEN image_len; 1194 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1195 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1196 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1197 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1198 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1199 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1200 : SDL_RWFromConstMem (image, image_len);
868 1201
869 if (!rw) 1202 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1203 croak ("load_image: %s", SDL_GetError ());
871 1204
… …
904 1237
905 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
906 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
907 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
908 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
909 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 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))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
911 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
912 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
913 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
914 1247
… …
944void 1277void
945error (char *message) 1278error (char *message)
946 CODE: 1279 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1280 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1281#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1282 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1283#endif
951 1284
952void 1285void
953fatal (char *message) 1286fatal (char *message)
954 CODE: 1287 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1288 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1289#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1290 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1291#endif
959 _exit (1); 1292 _exit (1);
960 1293
961void 1294void
962_exit (int retval = 0) 1295_exit (int retval = 0)
… …
974#if DEBUG 1307#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
976#endif 1309#endif
977} 1310}
978 1311
979MODULE = CFPlus PACKAGE = CFPlus::Font 1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1319MODULE = Deliantra::Client PACKAGE = DC::Font
980 1320
981PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
982 1322
983CFPlus::Font 1323DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
985 CODE: 1325 CODE:
986{ 1326{
987 int count; 1327 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
989 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
991} 1331}
992 OUTPUT: 1332 OUTPUT:
993 RETVAL 1333 RETVAL
994 1334
995void 1335void
996DESTROY (CFPlus::Font self) 1336DESTROY (DC::Font self)
997 CODE: 1337 CODE:
998 pango_font_description_free (self); 1338 pango_font_description_free (self);
999 1339
1000void 1340void
1001make_default (CFPlus::Font self) 1341make_default (DC::Font self)
1002 PROTOTYPE: $ 1342 PROTOTYPE: $
1003 CODE: 1343 CODE:
1004 default_font = self; 1344 default_font = self;
1005 1345
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1346MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1347
1008PROTOTYPES: DISABLE 1348PROTOTYPES: DISABLE
1009 1349
1010void 1350void
1011reset_glyph_cache () 1351glyph_cache_backup ()
1012 PROTOTYPE: 1352 PROTOTYPE:
1013 CODE: 1353 CODE:
1354 tc_backup ();
1355
1356void
1357glyph_cache_restore ()
1358 PROTOTYPE:
1359 CODE:
1014 tc_clear (); 1360 tc_restore ();
1015 1361
1016CFPlus::Layout 1362DC::Layout
1017new (SV *class) 1363new (SV *klass)
1018 CODE: 1364 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1020 1366
1021 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1022 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1023 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
… …
1030 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1031 OUTPUT: 1377 OUTPUT:
1032 RETVAL 1378 RETVAL
1033 1379
1034void 1380void
1035DESTROY (CFPlus::Layout self) 1381DESTROY (DC::Layout self)
1036 CODE: 1382 CODE:
1037 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1038 Safefree (self); 1384 delete self;
1039 1385
1040void 1386void
1041set_text (CFPlus::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1042 CODE: 1388 CODE:
1043{ 1389{
1044 STRLEN textlen; 1390 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1391 char *text = SvPVutf8 (text_, textlen);
1046 1392
1047 pango_layout_set_text (self->pl, text, textlen); 1393 pango_layout_set_text (self->pl, text, textlen);
1048} 1394}
1049 1395
1050void 1396void
1051set_markup (CFPlus::Layout self, SV *text_) 1397set_markup (DC::Layout self, SV *text_)
1052 CODE: 1398 CODE:
1053{ 1399{
1054 STRLEN textlen; 1400 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1401 char *text = SvPVutf8 (text_, textlen);
1056 1402
1057 pango_layout_set_markup (self->pl, text, textlen); 1403 pango_layout_set_markup (self->pl, text, textlen);
1058} 1404}
1059 1405
1060void 1406void
1061set_shapes (CFPlus::Layout self, ...) 1407set_shapes (DC::Layout self, ...)
1062 CODE: 1408 CODE:
1063{ 1409{
1064 PangoAttrList *attrs = 0; 1410 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1411 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1412 const char *pos = text;
… …
1101 if (attrs) 1447 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1448 pango_layout_set_attributes (self->pl, attrs);
1103} 1449}
1104 1450
1105void 1451void
1106get_shapes (CFPlus::Layout self) 1452get_shapes (DC::Layout self)
1107 PPCODE: 1453 PPCODE:
1108{ 1454{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1455 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1456
1111 do 1457 do
1112 { 1458 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1459 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1460
1115 if (run && shape_attr_p (run)) 1461 if (run && shape_attr_p (run))
1116 { 1462 {
1117 PangoRectangle extents; 1463 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1464 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1126 1472
1127 pango_layout_iter_free (iter); 1473 pango_layout_iter_free (iter);
1128} 1474}
1129 1475
1130int 1476int
1131has_wrapped (CFPlus::Layout self) 1477has_wrapped (DC::Layout self)
1132 CODE: 1478 CODE:
1133{ 1479{
1134 int lines = 1; 1480 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1481 const char *text = pango_layout_get_text (self->pl);
1136 1482
… …
1141} 1487}
1142 OUTPUT: 1488 OUTPUT:
1143 RETVAL 1489 RETVAL
1144 1490
1145SV * 1491SV *
1146get_text (CFPlus::Layout self) 1492get_text (DC::Layout self)
1147 CODE: 1493 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1494 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1495 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1496 OUTPUT:
1151 RETVAL 1497 RETVAL
1152 1498
1153void 1499void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1500set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1501 CODE:
1156 self->r = r; 1502 self->r = r;
1157 self->g = g; 1503 self->g = g;
1158 self->b = b; 1504 self->b = b;
1159 self->a = a; 1505 self->a = a;
1160 1506
1161void 1507void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1508set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1509 CODE:
1164 if (self->font != font) 1510 if (self->font != font)
1165 { 1511 {
1166 self->font = font; 1512 self->font = font;
1167 layout_update_font (self); 1513 layout_update_font (self);
1168 } 1514 }
1169 1515
1170void 1516void
1171set_height (CFPlus::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1172 CODE: 1518 CODE:
1173 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1174 { 1520 {
1175 self->base_height = base_height; 1521 self->base_height = base_height;
1176 layout_update_font (self); 1522 layout_update_font (self);
1177 } 1523 }
1178 1524
1179void 1525void
1180set_width (CFPlus::Layout self, int max_width = -1) 1526set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1527 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1528 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1529
1184void 1530void
1185set_indent (CFPlus::Layout self, int indent) 1531set_indent (DC::Layout self, int indent)
1186 CODE: 1532 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1533 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1534
1189void 1535void
1190set_spacing (CFPlus::Layout self, int spacing) 1536set_spacing (DC::Layout self, int spacing)
1191 CODE: 1537 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1538 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1539
1194void 1540void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1541set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1542 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1543 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1544 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1545 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1546 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1547 : PANGO_ELLIPSIZE_NONE
1202 ); 1548 );
1203 1549
1204void 1550void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1551set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1552 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1553 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1554
1209void 1555void
1210size (CFPlus::Layout self) 1556size (DC::Layout self)
1211 PPCODE: 1557 PPCODE:
1212{ 1558{
1213 int w, h; 1559 int w, h;
1214 1560
1215 layout_get_pixel_size (self, &w, &h); 1561 layout_get_pixel_size (self, &w, &h);
… …
1218 PUSHs (sv_2mortal (newSViv (w))); 1564 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1565 PUSHs (sv_2mortal (newSViv (h)));
1220} 1566}
1221 1567
1222int 1568int
1223descent (CFPlus::Layout self) 1569descent (DC::Layout self)
1224 CODE: 1570 CODE:
1225{ 1571{
1226 PangoRectangle rect; 1572 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1573 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1574 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1575 RETVAL = PANGO_DESCENT (rect);
1230} 1576}
1231 OUTPUT: 1577 OUTPUT:
1232 RETVAL 1578 RETVAL
1233 1579
1234int 1580int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1581xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1582 CODE:
1237{ 1583{
1238 int index, trailing; 1584 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1585 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1586 RETVAL = index + trailing;
1241} 1587}
1242 OUTPUT: 1588 OUTPUT:
1243 RETVAL 1589 RETVAL
1244 1590
1245void 1591void
1246cursor_pos (CFPlus::Layout self, int index) 1592cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1593 PPCODE:
1248{ 1594{
1249 PangoRectangle strong_pos; 1595 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1596 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1597
1252 EXTEND (SP, 3); 1598 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1599 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1600 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1601 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1602}
1257 1603
1258void 1604void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1605index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1606 PPCODE:
1261{ 1607{
1262 int line, x; 1608 int line, x;
1263 1609
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1610 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1611#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1612 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1613 --line;
1614#endif
1267 EXTEND (SP, 2); 1615 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1616 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1617 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1618}
1271 1619
1272void 1620void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1621line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1622 PPCODE:
1275{ 1623{
1276 PangoLayoutLine *lp; 1624 PangoLayoutLine *lp;
1277 int index, trailing; 1625 int index, trailing;
1278 1626
1279 if (line < 0) 1627 if (line < 0)
1280 XSRETURN_EMPTY; 1628 XSRETURN_EMPTY;
1281 1629
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1630 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1631 XSRETURN_EMPTY; /* do better */
1284 1632
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1633 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1634
1287 EXTEND (SP, 2); 1635 EXTEND (SP, 2);
… …
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1641 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1642 }
1295} 1643}
1296 1644
1297void 1645void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1647 CODE:
1648 self->rc.clear ();
1300 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1301 self->pl, 1650 self->pl,
1651 &self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1304 flags 1654 flags
1305 ); 1655 );
1656 // we assume that context_change actually clears/frees stuff
1657 // and does not do any recomputation...
1658 pango_layout_context_changed (self->pl);
1306 1659
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1660void
1661draw (DC::Layout self)
1662 CODE:
1663{
1664 glEnable (GL_TEXTURE_2D);
1665 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1666 glEnable (GL_BLEND);
1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1669 glEnable (GL_ALPHA_TEST);
1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1671
1672 self->rc.draw ();
1673
1674 glDisable (GL_ALPHA_TEST);
1675 glDisable (GL_BLEND);
1676 glDisable (GL_TEXTURE_2D);
1677}
1678
1679MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1680
1309PROTOTYPES: ENABLE 1681PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1682
1313void 1683void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1684pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1685 CODE:
1316{ 1686{
… …
1343 HV *hv = (HV *)SvRV (self); 1713 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1714 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1715 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1716 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1717
1718 if (name <= 0)
1719 XSRETURN_EMPTY;
1720
1348 if (items < 5) 1721 if (items < 5)
1349 { 1722 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1723 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1724 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1725 }
… …
1379 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1381 } 1754 }
1382} 1755}
1383 1756
1757void
1758draw_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)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE: 1879 CODE:
1386{ 1880{
1387 GLint width; 1881 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1390 RETVAL = width > 0; 1884 RETVAL = width > 0;
1391} 1885}
1392 OUTPUT: 1886 OUTPUT:
1393 RETVAL 1887 RETVAL
1394 1888
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1890
1397PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1398 1892
1399CFPlus::Map 1893DC::Map
1400new (SV *class) 1894new (SV *klass)
1401 CODE: 1895 CODE:
1402 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1403 RETVAL->x = 0; 1897 RETVAL->x = 0;
1404 RETVAL->y = 0; 1898 RETVAL->y = 0;
1405 RETVAL->w = 0; 1899 RETVAL->w = 0;
1406 RETVAL->h = 0; 1900 RETVAL->h = 0;
1407 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
… …
1412 RETVAL->row = 0; 1906 RETVAL->row = 0;
1413 OUTPUT: 1907 OUTPUT:
1414 RETVAL 1908 RETVAL
1415 1909
1416void 1910void
1417DESTROY (CFPlus::Map self) 1911DESTROY (DC::Map self)
1418 CODE: 1912 CODE:
1419{ 1913{
1420 map_clear (self); 1914 map_clear (self);
1421 Safefree (self->face2tile); 1915 Safefree (self->face2tile);
1422 Safefree (self->tex); 1916 Safefree (self->tex);
1423 Safefree (self); 1917 Safefree (self);
1424} 1918}
1425 1919
1426void 1920void
1427resize (CFPlus::Map self, int map_width, int map_height) 1921resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1922 CODE:
1429 self->w = map_width; 1923 self->w = map_width;
1430 self->h = map_height; 1924 self->h = map_height;
1431 1925
1432void 1926void
1433clear (CFPlus::Map self) 1927clear (DC::Map self)
1434 CODE: 1928 CODE:
1435 map_clear (self); 1929 map_clear (self);
1436 1930
1437void 1931void
1438set_tileid (CFPlus::Map self, int face, int tile) 1932set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1933 CODE:
1440{ 1934{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1935 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1936 need_texid (self, tile);
1443} 1937}
1444 1938
1445void 1939void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1941 CODE:
1448{ 1942{
1449 tileid texid; 1943 tileid texid;
1450 maptex *tex; 1944 maptex *tex;
1451 1945
1452 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1453 return; 1947 return;
1454 1948
1455 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1456 return; 1950 return;
1457 1951
1458 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1459 1953
1460 if (!texid) 1954 if (!texid)
1461 return; 1955 return;
1462 1956
1463 tex = self->tex + texid; 1957 tex = self->tex + texid;
1464 tex->smoothtile = self->face2tile [smooth]; 1958 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1959 tex->smoothlevel = level;
1466} 1960}
1467 1961
1468void 1962void
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) 1963set_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: 1964 CODE:
1471{ 1965{
1472 need_texid (self, texid); 1966 need_texid (self, texid);
1473 1967
1474 { 1968 {
… …
1493 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1990}
1497 1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
2011
1498int 2012int
1499ox (CFPlus::Map self) 2013ox (DC::Map self)
1500 ALIAS: 2014 ALIAS:
1501 oy = 1 2015 oy = 1
1502 x = 2 2016 x = 2
1503 y = 3 2017 y = 3
1504 w = 4 2018 w = 4
… …
1515 } 2029 }
1516 OUTPUT: 2030 OUTPUT:
1517 RETVAL 2031 RETVAL
1518 2032
1519void 2033void
1520scroll (CFPlus::Map self, int dx, int dy) 2034scroll (DC::Map self, int dx, int dy)
1521 CODE: 2035 CODE:
1522{ 2036{
1523 if (dx > 0) 2037 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 2038 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 2039 else if (dx < 0)
… …
1533 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1534 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1535 2049
1536 while (self->y < 0) 2050 while (self->y < 0)
1537 { 2051 {
1538 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1539 2053
1540 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1542 } 2056 }
1543} 2057}
1544 2058
1545void 2059SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1547 CODE: 2061 CODE:
1548{ 2062{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 2065 mapcell *cell;
1552 int x, y, flags; 2066 int x, y, z, flags;
2067 AV *missing = newAV ();
2068 RETVAL = newRV_noinc ((SV *)missing);
1553 2069
1554 while (data < data_end - 1) 2070 while (data < data_end - 1)
1555 { 2071 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 2072 flags = (data [0] << 8) + data [1]; data += 2;
1557 2073
… …
1570 2086
1571 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1572 2088
1573 if (flags & 8) 2089 if (flags & 8)
1574 { 2090 {
2091 uint8_t ext, cmd;
2092
1575 if (extmap) 2093 do
1576 { 2094 {
1577 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1578 2097
1579 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1580 { 2101 {
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; 2102 cell->stat_width = 1;
1589 cell->stat_hp = *data++; 2103 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 } 2104 }
1607 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1608 } 2122 }
1609 else 2123 while (ext & 0x80);
1610 cell->darkness = *data++ + 1;
1611 } 2124 }
1612 2125
2126 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2127 if (flags & (4 >> z))
1614 { 2128 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2129 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2130 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
2132
2133 if (cell->tile [z])
2134 {
2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
2137 if (!tex->name)
2138 av_push (missing, newSViv (cell->tile [z]));
2139
2140 if (tex->smoothtile)
2141 {
2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
2144 if (!smooth->name)
2145 av_push (missing, newSViv (tex->smoothtile));
2146 }
2147 }
1618 } 2148 }
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 } 2149 }
1634 else 2150 else
1635 cell->darkness = 0; 2151 CELL_CLEAR (cell);
1636 } 2152 }
1637} 2153}
2154 OUTPUT:
2155 RETVAL
1638 2156
1639SV * 2157SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2158mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2159 CODE:
1642{ 2160{
1643 int x1, x; 2161 int x1, x;
1644 int y1, y; 2162 int y1, y;
1645 int z; 2163 int z;
… …
1658 ? self->row + y 2176 ? self->row + y
1659 : 0; 2177 : 0;
1660 2178
1661 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1662 { 2180 {
1663 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1664 2182
1665 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1666 { 2184 {
1667 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1668 2186
… …
1670 { 2188 {
1671 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1672 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1673 int a1 = tex.a; 2191 int a1 = tex.a;
1674 2192
1675 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1676 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1677 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1678 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1679 } 2197 }
1680 } 2198 }
1681 2199
1682 *map++ = (r ) 2200 *map++ = (r )
1683 | (g << 8) 2201 | (g << 8)
1684 | (b << 16) 2202 | (b << 16)
1685 | (a << 24); 2203 | (a << 24);
1686 } 2204 }
1687 } 2205 }
1688 2206
1689 RETVAL = map_sv; 2207 RETVAL = map_sv;
1690} 2208}
1691 OUTPUT: 2209 OUTPUT:
1692 RETVAL 2210 RETVAL
1693 2211
1694void 2212void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2213draw (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: 2214 CODE:
1697{ 2215{
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; 2216 int x, y, z;
1703 int last_name;
1704 2217
2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2219 int pl_x, pl_y;
2220 maptex pl_tex;
2221 rc_t rc;
2222 rc_t rc_ov;
2223 rc_key_t key;
2224 rc_t::array_t *arr;
2225
2226 pl_tex.name = 0;
2227
1705 // thats current max. sorry. 2228 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1708 2231
1709 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2232 memset (&key, 0, sizeof (key));
1711 2233 key.r = 255;
1712 glColor4ub (255, 255, 255, 255); 2234 key.g = 255;
1713 2235 key.b = 255;
1714 glEnable (GL_BLEND); 2236 key.a = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2237 key.mode = GL_QUADS;
1716 glEnable (GL_TEXTURE_2D); 2238 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 2239
1723 mx += self->x; 2240 mx += self->x;
1724 my += self->y; 2241 my += self->y;
1725 2242
1726 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1727 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1728 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1729 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1730 2247
1731 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1732 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1733 { 2250 {
1734 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
… …
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2260 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2261 self->tex [cell->tile [2]].smoothlevel));
1745 } 2262 }
1746 } 2263 }
1747 2264
2265 glEnable (GL_BLEND);
2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2268
1748 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1749 { 2270 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
1751 2275
1752 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1754 { 2278 {
1755 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
… …
1761 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
1762 2286
1763 if (tile) 2287 if (tile)
1764 { 2288 {
1765 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2290 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2291
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2292 if (key.texname != tex.name)
1772 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1773 if (!tex.name) 2296 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2298
2299 key.texname = tex.name;
1776 glEnd (); 2300 arr = &rc.array (key);
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1778 glBegin (GL_QUADS);
1779 } 2301 }
1780 2302
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2303 px = (x + 1) * Th - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2304 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 2305
1786 if (cell->flags && z == 2) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1787 { 2307 {
1788 if (cell->flags & 1) 2308 pl_x = px;
2309 pl_y = py;
2310 pl_tex = tex;
1789 { 2311 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 } 2312 }
2313
2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1804 2318
1805 // update smooth hash 2319 // update smooth hash
1806 if (tex.smoothtile) 2320 if (tex.smoothtile)
1807 { 2321 {
1808 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
1809 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
1810 2324
1811 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
1812 2326
1813 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
1814 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
1815 2329
1816 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
… …
1824 2338
1825 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1826 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
1827 2341
1828 // full tile 2342 // full tile
1829 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1830 2344
1831 // borders 2345 // borders
1832 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 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); 2347 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); 2348 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); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1836 2350
1837 // corners 2351 // corners
1838 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 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); 2353 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); 2354 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); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1842 } 2376 }
1843 } 2377 }
1844 } 2378 }
1845 } 2379 }
1846 2380
2381 rc.draw ();
2382 rc.clear ();
2383
1847 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2385 // this is basically counting sort
1849 { 2386 {
1850 int w, b; 2387 int w, b;
1851 2388
1852 for (w = 0; w < 256 / 32; ++w) 2389 glEnable (GL_TEXTURE_2D);
2390 glBegin (GL_QUADS);
2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1853 { 2394 {
1854 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
1855 if (smask) 2396 IV bits = it->second;
1856 for (b = 0; b < 32; ++b) 2397
1857 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
1858 { 2401 {
1859 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
1860 HE *he; 2410 if (tex.name)
1861
1862 hv_iterinit (smooth);
1863 while ((he = hv_iternext (smooth)))
1864 { 2411 {
1865 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
1866 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
1867 2414 if (key.texname != tex.name)
1868 if (!(bits & 0x1000)
1869 && skey->level == level
1870 && level > smooth_max [skey->x][skey->y])
1871 { 2415 {
1872 maptex tex = self->tex [skey->tile]; 2416 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 2417
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 (); 2418 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
1890 } 2421 }
1891 2422
1892 if (border) 2423 if (border)
1893 { 2424 {
1894 float ox = border * dx; 2425 float ox = border * dx;
1895 2426
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1900 } 2431 }
1901 2432
1902 if (corner) 2433 if (corner)
1903 { 2434 {
1904 float ox = corner * dx; 2435 float ox = corner * dx;
1905 2436
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1910 }
1911 } 2441 }
1912 } 2442 }
1913 } 2443 }
1914 } 2444 }
2445
2446 glEnd ();
2447 glDisable (GL_TEXTURE_2D);
2448 key.texname = -1;
1915 } 2449 }
1916
1917 hv_clear (smooth);
1918 } 2450 }
1919 2451
1920 glEnd (); 2452 if (pl_tex.name)
2453 {
2454 maptex tex = pl_tex;
2455 int px = pl_x + sdx;
2456 int py = pl_y + sdy;
1921 2457
1922 glDisable (GL_TEXTURE_2D); 2458 key.texname = tex.name;
2459 rc_t::array_t &arr = rc.array (key);
2460
2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2465
2466 rc.draw ();
2467 }
2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
1923 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
1924 2473
1925 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
… …
1931 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
1932 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
1933 { 2482 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
1935 2484
1936 int px = x * T; 2485 int px = x * Tw;
1937 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
1938 2493
1939 if (cell->stat_hp) 2494 if (cell->stat_hp)
1940 { 2495 {
1941 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1943 2498
1944 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
1945 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
1946 px + width - 1, py); 2501 px + width - 1, py);
1947 2502
… …
1953 } 2508 }
1954 } 2509 }
1955} 2510}
1956 2511
1957void 2512void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1959 CODE: 2514 CODE:
1960{ 2515{
1961 static float color[16][3] = { 2516 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
1963 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
1964 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
1965 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
1966 2521
1967 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
1968 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
1969 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
1970 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
1971 2526
1972 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
1973 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
1974 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
1975 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
1976 2531
1977 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
1978 2533
1979 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
1980 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
1981 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
1982 }; 2537 };
1983 2538
1984 int x, y; 2539 int x, y;
1985 2540
1986 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
1991 2552
1992 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
… …
1996 2557
1997 if (m) 2558 if (m)
1998 { 2559 {
1999 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2000 2561
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2002 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2003 2564
2004 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2570 }
… …
2013 glDisable (GL_BLEND); 2574 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2575 glDisable (GL_TEXTURE_2D);
2015} 2576}
2016 2577
2017void 2578void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2580 PPCODE:
2020{ 2581{
2021 int x, y; 2582 int x, y;
2022 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2024 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2025 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029 2591
2030 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2032 2594
2033 mx += self->x - 1; 2595 mx += self->x - 1;
2034 my += self->y - 1; 2596 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037 2597
2038 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2040 { 2600 {
2041 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
… …
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2605 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2047 2607
2048 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2611 }
2052 } 2612 }
2053 2613
2054 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
… …
2074 2634
2075 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2078 2638
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2083 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 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); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2088 } 2648 }
2089 2649
2090 free (darkness1); 2650 free (darkness1);
2091 2651
2092 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2093 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2096} 2656}
2097 2657
2098SV * 2658SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2659get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2660 CODE:
2101{ 2661{
2102 int x, y, x1, y1; 2662 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2663 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2664 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2161 else 2721 else
2162 *data++ = 0; 2722 *data++ = 0;
2163 } 2723 }
2164 } 2724 }
2165 2725
2726 /* if size is w*h + 5 then no data has been found */
2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2728 {
2166 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2731 }
2732
2168 RETVAL = data_sv; 2733 RETVAL = data_sv;
2169} 2734}
2170 OUTPUT: 2735 OUTPUT:
2171 RETVAL 2736 RETVAL
2172 2737
2173void 2738void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2739set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2740 PPCODE:
2176{ 2741{
2177 int x, y, z; 2742 int x, y, z;
2178 int w, h; 2743 int w, h;
2179 int x1, y1; 2744 int x1, y1;
2745 STRLEN len;
2746 uint8_t *data, *end;
2747
2748 len = SvLEN (data_sv);
2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2751 end = data + len + 8;
2752
2753 if (len < 5)
2754 XSRETURN_EMPTY;
2180 2755
2181 if (*data++ != 0) 2756 if (*data++ != 0)
2182 return; /* version mismatch */ 2757 XSRETURN_EMPTY; /* version mismatch */
2183 2758
2184 w = *data++ << 8; w |= *data++; 2759 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2760 h = *data++ << 8; h |= *data++;
2186 2761
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2762 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2199 { 2774 {
2200 maprow *row = map_get_row (self, y); 2775 maprow *row = map_get_row (self, y);
2201 2776
2202 for (x = x0; x < x1; x++) 2777 for (x = x0; x < x1; x++)
2203 { 2778 {
2779 uint8_t flags;
2780
2781 if (data + 7 >= end)
2782 XSRETURN_EMPTY;
2783
2204 uint8_t flags = *data++; 2784 flags = *data++;
2205 2785
2206 if (flags) 2786 if (flags)
2207 { 2787 {
2208 mapcell *cell = row_get_cell (row, x); 2788 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2789 tileid tile[3] = { 0, 0, 0 };
… …
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2792 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2793 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2794
2215 if (cell->darkness == 0) 2795 if (cell->darkness == 0)
2216 { 2796 {
2217 cell->darkness = 0; 2797 /*cell->darkness = 0;*/
2798 EXTEND (SP, 3);
2218 2799
2219 for (z = 0; z <= 2; z++) 2800 for (z = 0; z <= 2; z++)
2220 { 2801 {
2221 tileid t = tile [z]; 2802 tileid t = tile [z];
2222 2803
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2804 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2805 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2806 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2807 need_texid (self, t);
2227 } 2808 }
2228 2809
2229 cell->tile [z] = t; 2810 cell->tile [z] = t;
2230 } 2811 }
… …
2232 } 2813 }
2233 } 2814 }
2234 } 2815 }
2235} 2816}
2236 2817
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2819
2820DC::RW
2821new (SV *klass, SV *data_sv)
2822 CODE:
2823{
2824 STRLEN datalen;
2825 char *data = SvPVbyte (data_sv, datalen);
2826
2827 RETVAL = SDL_RWFromConstMem (data, datalen);
2828}
2829 OUTPUT:
2830 RETVAL
2831
2832DC::RW
2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2834 CODE:
2835 RETVAL = SDL_RWFromFile (path, mode);
2836 OUTPUT:
2837 RETVAL
2838
2839# fails on win32:
2840# dc.xs(2268) : error C2059: syntax error : '('
2841#void
2842#close (DC::RW self)
2843# CODE:
2844# (self->(close)) (self);
2845
2846MODULE = Deliantra::Client PACKAGE = DC::Channel
2238 2847
2239PROTOTYPES: DISABLE 2848PROTOTYPES: DISABLE
2240 2849
2241CFPlus::MixChunk 2850DC::Channel
2242new_from_file (SV *class, char *path) 2851find ()
2243 CODE: 2852 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2853{
2854 RETVAL = Mix_GroupAvailable (-1);
2855
2856 if (RETVAL < 0)
2857 {
2858 RETVAL = Mix_GroupOldest (-1);
2859
2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2866 XSRETURN_UNDEF;
2867 }
2868 else
2869 Mix_HaltChannel (RETVAL);
2870 }
2871
2872 Mix_UnregisterAllEffects (RETVAL);
2873 Mix_Volume (RETVAL, 128);
2874}
2245 OUTPUT: 2875 OUTPUT:
2246 RETVAL 2876 RETVAL
2247 2877
2248void 2878void
2879halt (DC::Channel self)
2880 CODE:
2881 Mix_HaltChannel (self);
2882
2883void
2884expire (DC::Channel self, int ticks = -1)
2885 CODE:
2886 Mix_ExpireChannel (self, ticks);
2887
2888void
2889fade_out (DC::Channel self, int ticks = -1)
2890 CODE:
2891 Mix_FadeOutChannel (self, ticks);
2892
2893int
2894volume (DC::Channel self, int volume)
2895 CODE:
2896 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2897 OUTPUT:
2898 RETVAL
2899
2900void
2901unregister_all_effects (DC::Channel self)
2902 CODE:
2903 Mix_UnregisterAllEffects (self);
2904
2905void
2906set_panning (DC::Channel self, int left, int right)
2907 CODE:
2908 left = CLAMP (left , 0, 255);
2909 right = CLAMP (right, 0, 255);
2910 Mix_SetPanning (self, left, right);
2911
2912void
2913set_distance (DC::Channel self, int distance)
2914 CODE:
2915 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2916
2917void
2918set_position (DC::Channel self, int angle, int distance)
2919 CODE:
2920
2921void
2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2923 CODE:
2924{
2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2928}
2929
2930void
2931set_reverse_stereo (DC::Channel self, int flip)
2932 CODE:
2933 Mix_SetReverseStereo (self, flip);
2934
2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2936
2937PROTOTYPES: DISABLE
2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2951DC::MixChunk
2952new (SV *klass, DC::RW rwops)
2953 CODE:
2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2955 OUTPUT:
2956 RETVAL
2957
2958void
2249DESTROY (CFPlus::MixChunk self) 2959DESTROY (DC::MixChunk self)
2250 CODE: 2960 CODE:
2251 Mix_FreeChunk (self); 2961 Mix_FreeChunk (self);
2252 2962
2253int 2963int
2254volume (CFPlus::MixChunk self, int volume = -1) 2964volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2965 CODE:
2966 if (items > 1)
2967 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2968 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2969 OUTPUT:
2258 RETVAL 2970 RETVAL
2259 2971
2260int 2972DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2973play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2974 CODE:
2975{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2976 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2977
2978 if (RETVAL < 0)
2979 XSRETURN_UNDEF;
2980
2981 if (channel < 0)
2982 {
2983 Mix_UnregisterAllEffects (RETVAL);
2984 Mix_Volume (RETVAL, 128);
2985 }
2986}
2264 OUTPUT: 2987 OUTPUT:
2265 RETVAL 2988 RETVAL
2266 2989
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
2268 3003
2269int 3004int
2270volume (int volume = -1) 3005volume (int volume = -1)
2271 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2272 CODE: 3007 CODE:
3008 if (items > 0)
3009 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 3010 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 3011 OUTPUT:
2275 RETVAL 3012 RETVAL
2276 3013
3014void
3015fade_out (int ms)
3016 CODE:
3017 Mix_FadeOutMusic (ms);
3018
3019void
3020halt ()
3021 CODE:
3022 Mix_HaltMusic ();
3023
2277int 3024int
2278fade_out (int ms) 3025playing ()
2279 CODE: 3026 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 3027 RETVAL = Mix_PlayingMusic ();
2281 OUTPUT: 3028 OUTPUT:
2282 RETVAL 3029 RETVAL
2283 3030
2284CFPlus::MixMusic 3031DC::MixMusic
2285new_from_file (SV *class, char *path) 3032new (SV *klass, DC::RW rwops)
2286 CODE: 3033 CODE:
2287 RETVAL = Mix_LoadMUS (path); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2288 OUTPUT: 3035 OUTPUT:
2289 RETVAL 3036 RETVAL
2290 3037
2291void 3038void
2292DESTROY (CFPlus::MixMusic self) 3039DESTROY (DC::MixMusic self)
2293 CODE: 3040 CODE:
2294 Mix_FreeMusic (self); 3041 Mix_FreeMusic (self);
2295 3042
2296int 3043int
2297play (CFPlus::MixMusic self, int loops = -1) 3044play (DC::MixMusic self, int loops = -1)
2298 CODE: 3045 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 3046 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 3047 OUTPUT:
2301 RETVAL 3048 RETVAL
2302 3049
2303int 3050void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3051fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 3052 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3053 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 3054
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3055MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 3056
2312PROTOTYPES: ENABLE 3057PROTOTYPES: ENABLE
2313 3058
2314BOOT: 3059BOOT:
2315{ 3060{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3061 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 3062 static const struct {
2318 const char *name; 3063 const char *name;
2319 IV iv; 3064 IV iv;
2320 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2322 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2323 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2324 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2325 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2326 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2327 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2328 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2329 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
… …
2341 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2342 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2343 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2344 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2345 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2346 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2347 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2348 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2349 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2350 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
… …
2356 const_iv (GL_INTENSITY), 3106 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 3107 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 3108 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 3109 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3110 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3111 const_iv (GL_COMPRESSED_ALPHA_ARB),
3112 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3113 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3114 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3115 const_iv (GL_COMPRESSED_RGB_ARB),
3116 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 3117 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 3118 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 3119 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 3120 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 3121 const_iv (GL_TEXTURE_2D),
… …
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3160 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 3161 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 3162 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 3163 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 3164 const_iv (GL_GENERATE_MIPMAP_HINT),
3165 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 3166 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 3167 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2414 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2415 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2416# undef const_iv 3176# undef const_iv
2417 }; 3177 };
2418 3178
2419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2421 3181
2422 texture_av = newAV (); 3182 texture_av = newAV ();
2423 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2424} 3184}
2425 3185
2426char * 3186void
3187disable_GL_EXT_blend_func_separate ()
3188 CODE:
3189 gl.BlendFuncSeparate = 0;
3190 gl.BlendFuncSeparateEXT = 0;
3191
3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2427gl_vendor () 3196gl_vendor ()
2428 CODE: 3197 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2430 OUTPUT: 3199 OUTPUT:
2431 RETVAL 3200 RETVAL
2432 3201
2433char * 3202const char *
2434gl_version () 3203gl_version ()
2435 CODE: 3204 CODE:
2436 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2437 OUTPUT: 3206 OUTPUT:
2438 RETVAL 3207 RETVAL
2439 3208
2440char * 3209const char *
2441gl_extensions () 3210gl_extensions ()
2442 CODE: 3211 CODE:
2443 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2444 OUTPUT: 3213 OUTPUT:
2445 RETVAL 3214 RETVAL
2446 3215
2447const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2448 3221
2449GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2450 CODE: 3223 CODE:
2451 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2452 OUTPUT: 3225 OUTPUT:
… …
2460 3233
2461int glGetError () 3234int glGetError ()
2462 3235
2463void glFinish () 3236void glFinish ()
2464 3237
3238void glFlush ()
3239
2465void glClear (int mask) 3240void glClear (int mask)
2466 3241
2467void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2468 PROTOTYPE: @ 3243 PROTOTYPE: @
2469 3244
… …
2478void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2479 3254
2480void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2481 CODE: 3256 CODE:
2482 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2483 3260
2484void glDepthMask (int flag) 3261void glDepthMask (int flag)
2485 3262
2486void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2487 3264
… …
2522void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2523 CODE: 3300 CODE:
2524 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2525 3302
2526void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2527 ALIAS: 3305 ALIAS:
2528 glColor_premultiply = 1 3306 glColor_premultiply = 1
2529 CODE: 3307 CODE:
2530 if (ix) 3308 if (ix)
2531 { 3309 {
… …
2547 3325
2548void glTexCoord (float s, float t) 3326void glTexCoord (float s, float t)
2549 CODE: 3327 CODE:
2550 glTexCoord2f (s, t); 3328 glTexCoord2f (s, t);
2551 3329
3330void glRect (float x1, float y1, float x2, float y2)
3331 CODE:
3332 glRectf (x1, y1, x2, y2);
3333
3334void glRect_lineloop (float x1, float y1, float x2, float y2)
3335 CODE:
3336 glBegin (GL_LINE_LOOP);
3337 glVertex2f (x1, y1);
3338 glVertex2f (x2, y1);
3339 glVertex2f (x2, y2);
3340 glVertex2f (x1, y2);
3341 glEnd ();
3342
2552PROTOTYPES: ENABLE 3343PROTOTYPES: ENABLE
2553 3344
2554void glBegin (int mode) 3345void glBegin (int mode)
2555 3346
2556void glEnd () 3347void glEnd ()
… …
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3379void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 3380 CODE:
2590 if (gl.SeparableFilter2D) 3381 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3382 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 3383
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3384void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 3385
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3386void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 3387
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 3388void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 3389
… …
2624 3415
2625void glEndList () 3416void glEndList ()
2626 3417
2627void glCallList (int list) 3418void glCallList (int list)
2628 3419
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 3426
2631PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
2632 3428
2633void 3429void
2634find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
2635 PPCODE: 3431 PPCODE:
2636{ 3432{
2637 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
2638 XPUSHs (self); 3434 XPUSHs (self);
2639} 3435}
2640 3436
2641BOOT: 3437BOOT:
2642{ 3438{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3439 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 3440
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3441 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3442 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3443 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3444 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 3445}
2650 3446
2651void 3447void
2652draw (SV *self) 3448draw (SV *self)
2653 CODE: 3449 CODE:
2654{ 3450{
2655 HV *hv; 3451 HV *hv;
2656 SV **svp; 3452 SV **svp;
2657 NV x, y, w, h; 3453 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3458 double draw_x, draw_y;
2664 3459
2665 if (!SvROK (self)) 3460 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3461 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3462
2668 hv = (HV *)SvRV (self); 3463 hv = (HV *)SvRV (self);
2669 3464
2670 if (SvTYPE (hv) != SVt_PVHV) 3465 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3466 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3467
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3468 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3469 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3470
2676 if (!h || !w) 3471 if (!h || !w)
… …
2696 { 3491 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3492 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3493
2699 if (svp && SvTRUE (*svp)) 3494 if (svp && SvTRUE (*svp))
2700 { 3495 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3496 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3497 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3498 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3499 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3500 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3501 glVertex2f (w, 0);
… …
2709 glEnd (); 3504 glEnd ();
2710 glDisable (GL_BLEND); 3505 glDisable (GL_BLEND);
2711 } 3506 }
2712 } 3507 }
2713#if 0 3508#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3509 // draw borders, for debugging
2715 glPushMatrix; 3510 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3511 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3512 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3513 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3514 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3515 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3516 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3517 glVertex2f (0 , h - 1);
2723 glEnd; 3518 glEnd ();
2724 glPopMatrix; 3519 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3520#endif
2728 PUSHMARK (SP); 3521 PUSHMARK (SP);
2729 XPUSHs (self); 3522 XPUSHs (self);
2730 PUTBACK; 3523 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3524 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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