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.203 by root, Thu Jul 19 13:45:16 2007 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 2018 UTC

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

Diff Legend

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