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

Diff Legend

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