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

Diff Legend

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