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

Diff Legend

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