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.207 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

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

Diff Legend

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