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

Diff Legend

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