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.196 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 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
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
582 888
583void 889void
584pango_init () 890pango_init ()
585 CODE: 891 CODE:
586{ 892{
587 opengl_fontmap = pango_opengl_font_map_new (); 893 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 894 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); 895 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
896 /*pango_context_set_font_description (opengl_context, default_font);*/
897#if PANGO_VERSION_CHECK (1, 15, 2)
898 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
899 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
900#endif
590} 901}
591 902
592int 903char *SDL_GetError ()
593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
594 904
595void 905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
907
908int SDL_Init (U32 flags)
909
910int SDL_InitSubSystem (U32 flags)
911
912void SDL_QuitSubSystem (U32 flags)
913
596SDL_Quit () 914void SDL_Quit ()
597 915
916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
918
919int SDL_GL_GetAttribute (int attr)
920 CODE:
921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
922 XSRETURN_UNDEF;
923 OUTPUT:
924 RETVAL
925
598void 926void
599SDL_ListModes () 927SDL_ListModes (int rgb, int alpha)
600 PPCODE: 928 PPCODE:
601{ 929{
602 SDL_Rect **m; 930 SDL_Rect **m;
603 931
604 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 932 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 933 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 934 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 935 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
608 936
609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 937 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 938 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
611 939
612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 940 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 941 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 942 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 943 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
616 944
617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 945 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); 946 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 947
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 948 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 949
628 if (m && m != (SDL_Rect **)-1) 950 if (m && m != (SDL_Rect **)-1)
629 while (*m) 951 while (*m)
630 { 952 {
953 if ((*m)->w >= 400 && (*m)->h >= 300)
954 {
631 AV *av = newAV (); 955 AV *av = newAV ();
632 av_push (av, newSViv ((*m)->w)); 956 av_push (av, newSViv ((*m)->w));
633 av_push (av, newSViv ((*m)->h)); 957 av_push (av, newSViv ((*m)->h));
958 av_push (av, newSViv (rgb));
959 av_push (av, newSViv (alpha));
634 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 960 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
961 }
635 962
636 ++m; 963 ++m;
637 } 964 }
638} 965}
639 966
640char *
641SDL_GetError ()
642
643int 967int
644SDL_SetVideoMode (int w, int h, int fullscreen) 968SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
645 CODE: 969 CODE:
970{
971 SDL_EnableUNICODE (1);
972 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
973
974 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
975 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
976 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
977 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
978
646 RETVAL = !!SDL_SetVideoMode ( 979 RETVAL = !!SDL_SetVideoMode (
647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 980 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
648 ); 981 );
982
649 if (RETVAL) 983 if (RETVAL)
650 { 984 {
651 av_clear (texture_av); 985 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); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
655# include "glfunc.h" 987#include "glfunc.h"
656# undef GL_FUNC 988#undef GL_FUNC
657 989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
658 } 991 }
992}
659 OUTPUT: 993 OUTPUT:
660 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
661 998
662void 999void
663SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
664 1001
665char * 1002char *
666SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
667 1005
1006int
1007SDL_GetAppState ()
1008
1009int
1010SDL_GetModState ()
1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
668void 1016void
669SDL_PollEvent () 1017SDL_PumpEvents ()
1018
1019void
1020peep_events ()
670 PPCODE: 1021 PPCODE:
671{ 1022{
672 SDL_Event ev; 1023 SDL_Event ev;
673 1024
674 while (SDL_PollEvent (&ev)) 1025 SDL_PumpEvents ();
1026 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
675 { 1027 {
676 HV *hv = newHV (); 1028 HV *hv = newHV ();
677 hv_store (hv, "type", 4, newSViv (ev.type), 0); 1029 hv_store (hv, "type", 4, newSViv (ev.type), 0);
678 1030
679 switch (ev.type) 1031 switch (ev.type)
680 { 1032 {
681 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
682 case SDL_KEYUP: 1034 case SDL_KEYUP:
683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
685 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1037 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 */ 1038 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); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
688 break; 1040 break;
689 1041
690 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
709 x = ev.motion.x; 1061 x = ev.motion.x;
710 y = ev.motion.y; 1062 y = ev.motion.y;
711 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
712 } 1064 }
713 1065
714 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
715 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
716 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
717 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
718 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
719 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
720 } 1072 }
721 break; 1073 break;
722 1074
723 case SDL_MOUSEBUTTONDOWN: 1075 case SDL_MOUSEBUTTONDOWN:
724 case SDL_MOUSEBUTTONUP: 1076 case SDL_MOUSEBUTTONUP:
725 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1077 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
726 1078
727 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1079 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
728 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1080 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
729 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1081 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
730 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1082 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
735 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1087 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
736 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1088 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
737 break; 1089 break;
738 } 1090 }
739 1091
740 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
741 } 1093 }
742} 1094}
743 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
744int 1109int
745Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
746 POSTCALL: 1111 POSTCALL:
747 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
748 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
749 1114
750void 1115void
1116Mix_QuerySpec ()
1117 PPCODE:
1118{
1119 int freq, channels;
1120 Uint16 format;
1121
1122 if (Mix_QuerySpec (&freq, &format, &channels))
1123 {
1124 EXTEND (SP, 3);
1125 PUSHs (sv_2mortal (newSViv (freq)));
1126 PUSHs (sv_2mortal (newSViv (format)));
1127 PUSHs (sv_2mortal (newSViv (channels)));
1128 }
1129}
1130
1131void
751Mix_CloseAudio () 1132Mix_CloseAudio ()
752 1133
753int 1134int
754Mix_AllocateChannels (int numchans = -1) 1135Mix_AllocateChannels (int numchans = -1)
1136
1137const char *
1138Mix_GetError ()
755 1139
756void 1140void
757lowdelay (int fd, int val = 1) 1141lowdelay (int fd, int val = 1)
758 CODE: 1142 CODE:
759 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1143 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
785 } 1169 }
786 } 1170 }
787#endif 1171#endif
788} 1172}
789 1173
790void 1174int
791add_font (char *file) 1175add_font (char *file)
792 CODE: 1176 CODE:
793 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1178 OUTPUT:
1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
794 1187
795void 1188void
796load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
797 ALIAS: 1190 ALIAS:
798 load_image_file = 1 1191 load_image_file = 1
… …
801 STRLEN image_len; 1194 STRLEN image_len;
802 char *image = (char *)SvPVbyte (image_, image_len); 1195 char *image = (char *)SvPVbyte (image_, image_len);
803 SDL_Surface *surface, *surface2; 1196 SDL_Surface *surface, *surface2;
804 SDL_PixelFormat fmt; 1197 SDL_PixelFormat fmt;
805 SDL_RWops *rw = ix 1198 SDL_RWops *rw = ix
806 ? SDL_RWFromFile (image, "r") 1199 ? SDL_RWFromFile (image, "rb")
807 : SDL_RWFromConstMem (image, image_len); 1200 : SDL_RWFromConstMem (image, image_len);
808 1201
809 if (!rw) 1202 if (!rw)
810 croak ("load_image: %s", SDL_GetError ()); 1203 croak ("load_image: %s", SDL_GetError ());
811 1204
… …
844 1237
845 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
846 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
847 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
848 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
849 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
850 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
851 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
852 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
853 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
854 1247
… …
884void 1277void
885error (char *message) 1278error (char *message)
886 CODE: 1279 CODE:
887 fprintf (stderr, "ERROR: %s\n", message); 1280 fprintf (stderr, "ERROR: %s\n", message);
888#ifdef _WIN32 1281#ifdef _WIN32
889 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1282 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
890#endif 1283#endif
891 1284
892void 1285void
893fatal (char *message) 1286fatal (char *message)
894 CODE: 1287 CODE:
895 fprintf (stderr, "FATAL: %s\n", message); 1288 fprintf (stderr, "FATAL: %s\n", message);
896#ifdef _WIN32 1289#ifdef _WIN32
897 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1290 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
898#endif 1291#endif
899 _exit (1); 1292 _exit (1);
900 1293
901void 1294void
902_exit (int retval = 0) 1295_exit (int retval = 0)
… …
914#if DEBUG 1307#if DEBUG
915 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
916#endif 1309#endif
917} 1310}
918 1311
919MODULE = CFPlus PACKAGE = CFPlus::Font 1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
920 1318
921CFPlus::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1320
1321PROTOTYPES: DISABLE
1322
1323DC::Font
922new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
923 CODE: 1325 CODE:
924{ 1326{
925 int count; 1327 int count;
926 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
927 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
929} 1331}
930 OUTPUT: 1332 OUTPUT:
931 RETVAL 1333 RETVAL
932 1334
933void 1335void
934DESTROY (CFPlus::Font self) 1336DESTROY (DC::Font self)
935 CODE: 1337 CODE:
936 pango_font_description_free (self); 1338 pango_font_description_free (self);
937 1339
938void 1340void
939make_default (CFPlus::Font self) 1341make_default (DC::Font self)
1342 PROTOTYPE: $
940 CODE: 1343 CODE:
941 default_font = self; 1344 default_font = self;
942 1345
943MODULE = CFPlus PACKAGE = CFPlus::Layout 1346MODULE = Deliantra::Client PACKAGE = DC::Layout
944 1347
1348PROTOTYPES: DISABLE
1349
945void 1350void
946reset_glyph_cache () 1351glyph_cache_backup ()
1352 PROTOTYPE:
947 CODE: 1353 CODE:
1354 tc_backup ();
1355
1356void
1357glyph_cache_restore ()
1358 PROTOTYPE:
1359 CODE:
948 tc_clear (); 1360 tc_restore ();
949 1361
950CFPlus::Layout 1362DC::Layout
951new (SV *class) 1363new (SV *klass)
952 CODE: 1364 CODE:
953 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
954 1366
955 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
956 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
957 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
958 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
… …
964 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
965 OUTPUT: 1377 OUTPUT:
966 RETVAL 1378 RETVAL
967 1379
968void 1380void
969DESTROY (CFPlus::Layout self) 1381DESTROY (DC::Layout self)
970 CODE: 1382 CODE:
971 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
972 Safefree (self); 1384 delete self;
973 1385
974void 1386void
975set_text (CFPlus::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
976 CODE: 1388 CODE:
977{ 1389{
978 STRLEN textlen; 1390 STRLEN textlen;
979 char *text = SvPVutf8 (text_, textlen); 1391 char *text = SvPVutf8 (text_, textlen);
980 1392
981 pango_layout_set_text (self->pl, text, textlen); 1393 pango_layout_set_text (self->pl, text, textlen);
982} 1394}
983 1395
984void 1396void
985set_markup (CFPlus::Layout self, SV *text_) 1397set_markup (DC::Layout self, SV *text_)
986 CODE: 1398 CODE:
987{ 1399{
988 STRLEN textlen; 1400 STRLEN textlen;
989 char *text = SvPVutf8 (text_, textlen); 1401 char *text = SvPVutf8 (text_, textlen);
990 1402
991 pango_layout_set_markup (self->pl, text, textlen); 1403 pango_layout_set_markup (self->pl, text, textlen);
992} 1404}
993 1405
994void 1406void
995set_shapes (CFPlus::Layout self, ...) 1407set_shapes (DC::Layout self, ...)
996 CODE: 1408 CODE:
997{ 1409{
998 PangoAttrList *attrs = 0; 1410 PangoAttrList *attrs = 0;
999 const char *text = pango_layout_get_text (self->pl); 1411 const char *text = pango_layout_get_text (self->pl);
1000 const char *pos = text; 1412 const char *pos = text;
… …
1035 if (attrs) 1447 if (attrs)
1036 pango_layout_set_attributes (self->pl, attrs); 1448 pango_layout_set_attributes (self->pl, attrs);
1037} 1449}
1038 1450
1039void 1451void
1040get_shapes (CFPlus::Layout self) 1452get_shapes (DC::Layout self)
1041 PPCODE: 1453 PPCODE:
1042{ 1454{
1043 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1455 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1044 1456
1045 do 1457 do
1046 { 1458 {
1047 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1459 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1048 1460
1049 if (run && shape_attr_p (run)) 1461 if (run && shape_attr_p (run))
1050 { 1462 {
1051 PangoRectangle extents; 1463 PangoRectangle extents;
1052 pango_layout_iter_get_run_extents (iter, 0, &extents); 1464 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1060 1472
1061 pango_layout_iter_free (iter); 1473 pango_layout_iter_free (iter);
1062} 1474}
1063 1475
1064int 1476int
1065has_wrapped (CFPlus::Layout self) 1477has_wrapped (DC::Layout self)
1066 CODE: 1478 CODE:
1067{ 1479{
1068 int lines = 1; 1480 int lines = 1;
1069 const char *text = pango_layout_get_text (self->pl); 1481 const char *text = pango_layout_get_text (self->pl);
1070 1482
… …
1075} 1487}
1076 OUTPUT: 1488 OUTPUT:
1077 RETVAL 1489 RETVAL
1078 1490
1079SV * 1491SV *
1080get_text (CFPlus::Layout self) 1492get_text (DC::Layout self)
1081 CODE: 1493 CODE:
1082 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1494 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1083 sv_utf8_decode (RETVAL); 1495 sv_utf8_decode (RETVAL);
1084 OUTPUT: 1496 OUTPUT:
1085 RETVAL 1497 RETVAL
1086 1498
1087void 1499void
1088set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1500set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1089 CODE: 1501 CODE:
1090 self->r = r; 1502 self->r = r;
1091 self->g = g; 1503 self->g = g;
1092 self->b = b; 1504 self->b = b;
1093 self->a = a; 1505 self->a = a;
1094 1506
1095void 1507void
1096set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1508set_font (DC::Layout self, DC::Font font = 0)
1097 CODE: 1509 CODE:
1098 if (self->font != font) 1510 if (self->font != font)
1099 { 1511 {
1100 self->font = font; 1512 self->font = font;
1101 layout_update_font (self); 1513 layout_update_font (self);
1102 } 1514 }
1103 1515
1104void 1516void
1105set_height (CFPlus::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1106 CODE: 1518 CODE:
1107 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1108 { 1520 {
1109 self->base_height = base_height; 1521 self->base_height = base_height;
1110 layout_update_font (self); 1522 layout_update_font (self);
1111 } 1523 }
1112 1524
1113void 1525void
1114set_width (CFPlus::Layout self, int max_width = -1) 1526set_width (DC::Layout self, int max_width = -1)
1115 CODE: 1527 CODE:
1116 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1528 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1117 1529
1118void 1530void
1119set_indent (CFPlus::Layout self, int indent) 1531set_indent (DC::Layout self, int indent)
1120 CODE: 1532 CODE:
1121 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1533 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1122 1534
1123void 1535void
1124set_spacing (CFPlus::Layout self, int spacing) 1536set_spacing (DC::Layout self, int spacing)
1125 CODE: 1537 CODE:
1126 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1538 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1127 1539
1128void 1540void
1129set_ellipsise (CFPlus::Layout self, int ellipsise) 1541set_ellipsise (DC::Layout self, int ellipsise)
1130 CODE: 1542 CODE:
1131 pango_layout_set_ellipsize (self->pl, 1543 pango_layout_set_ellipsize (self->pl,
1132 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1544 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1133 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1545 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1134 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1546 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1135 : PANGO_ELLIPSIZE_NONE 1547 : PANGO_ELLIPSIZE_NONE
1136 ); 1548 );
1137 1549
1138void 1550void
1139set_single_paragraph_mode (CFPlus::Layout self, int spm) 1551set_single_paragraph_mode (DC::Layout self, int spm)
1140 CODE: 1552 CODE:
1141 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1553 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1142 1554
1143void 1555void
1144size (CFPlus::Layout self) 1556size (DC::Layout self)
1145 PPCODE: 1557 PPCODE:
1146{ 1558{
1147 int w, h; 1559 int w, h;
1148 1560
1149 layout_get_pixel_size (self, &w, &h); 1561 layout_get_pixel_size (self, &w, &h);
… …
1152 PUSHs (sv_2mortal (newSViv (w))); 1564 PUSHs (sv_2mortal (newSViv (w)));
1153 PUSHs (sv_2mortal (newSViv (h))); 1565 PUSHs (sv_2mortal (newSViv (h)));
1154} 1566}
1155 1567
1156int 1568int
1157descent (CFPlus::Layout self) 1569descent (DC::Layout self)
1158 CODE: 1570 CODE:
1159{ 1571{
1160 PangoRectangle rect; 1572 PangoRectangle rect;
1161 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1573 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1162 pango_layout_line_get_pixel_extents (line, 0, &rect); 1574 pango_layout_line_get_pixel_extents (line, 0, &rect);
1163 RETVAL = PANGO_DESCENT (rect); 1575 RETVAL = PANGO_DESCENT (rect);
1164} 1576}
1165 OUTPUT: 1577 OUTPUT:
1166 RETVAL 1578 RETVAL
1167 1579
1168int 1580int
1169xy_to_index (CFPlus::Layout self, int x, int y) 1581xy_to_index (DC::Layout self, int x, int y)
1170 CODE: 1582 CODE:
1171{ 1583{
1172 int index, trailing; 1584 int index, trailing;
1173 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1585 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1174 RETVAL = index + trailing; 1586 RETVAL = index + trailing;
1175} 1587}
1176 OUTPUT: 1588 OUTPUT:
1177 RETVAL 1589 RETVAL
1178 1590
1179void 1591void
1180cursor_pos (CFPlus::Layout self, int index) 1592cursor_pos (DC::Layout self, int index)
1181 PPCODE: 1593 PPCODE:
1182{ 1594{
1183 PangoRectangle strong_pos; 1595 PangoRectangle pos;
1184 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1596 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1185 1597
1186 EXTEND (SP, 3); 1598 EXTEND (SP, 3);
1187 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1599 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1188 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1600 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1189 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1601 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1190} 1602}
1191 1603
1192void 1604void
1193index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1605index_to_line_x (DC::Layout self, int index, int trailing = 0)
1194 PPCODE: 1606 PPCODE:
1195{ 1607{
1196 int line, x; 1608 int line, x;
1197 1609
1198 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1610 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1611#if !PANGO_VERSION_CHECK (1, 17, 3)
1199 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1612 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1200 1613 --line;
1614#endif
1201 EXTEND (SP, 2); 1615 EXTEND (SP, 2);
1202 PUSHs (sv_2mortal (newSViv (line - 1))); 1616 PUSHs (sv_2mortal (newSViv (line)));
1203 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1617 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1204} 1618}
1205 1619
1206void 1620void
1207line_x_to_index (CFPlus::Layout self, int line, int x) 1621line_x_to_index (DC::Layout self, int line, int x)
1208 PPCODE: 1622 PPCODE:
1209{ 1623{
1210 PangoLayoutLine *lp; 1624 PangoLayoutLine *lp;
1211 int index, trailing; 1625 int index, trailing;
1212 1626
1213 if (line < 0) 1627 if (line < 0)
1214 XSRETURN_EMPTY; 1628 XSRETURN_EMPTY;
1215 1629
1216 if (!(lp = pango_layout_get_line (self->pl, line))) 1630 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1217 XSRETURN_EMPTY; /* do better */ 1631 XSRETURN_EMPTY; /* do better */
1218 1632
1219 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1633 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1220 1634
1221 EXTEND (SP, 2); 1635 EXTEND (SP, 2);
… …
1227 PUSHs (sv_2mortal (newSViv (trailing))); 1641 PUSHs (sv_2mortal (newSViv (trailing)));
1228 } 1642 }
1229} 1643}
1230 1644
1231void 1645void
1232render (CFPlus::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1233 PPCODE: 1647 CODE:
1648 self->rc.clear ();
1234 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1235 self->pl, 1650 self->pl,
1651 &self->rc,
1236 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1237 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1238 flags 1654 flags
1239 ); 1655 );
1656 // we assume that context_change actually clears/frees stuff
1657 // and does not do any recomputation...
1658 pango_layout_context_changed (self->pl);
1240 1659
1241MODULE = CFPlus PACKAGE = CFPlus::Texture
1242
1243void 1660void
1244pad2pot (SV *data_, SV *w_, SV *h_) 1661draw (DC::Layout self)
1245 CODE: 1662 CODE:
1246{ 1663{
1247 int ow = SvIV (w_); 1664 glEnable (GL_TEXTURE_2D);
1248 int oh = SvIV (h_); 1665 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1666 glEnable (GL_BLEND);
1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1669 glEnable (GL_ALPHA_TEST);
1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1249 1671
1250 if (ow && oh) 1672 self->rc.draw ();
1673
1674 glDisable (GL_ALPHA_TEST);
1675 glDisable (GL_BLEND);
1676 glDisable (GL_TEXTURE_2D);
1677}
1678
1679MODULE = Deliantra::Client PACKAGE = DC::Texture
1680
1681PROTOTYPES: ENABLE
1682
1683void
1684pad (SV *data_, int ow, int oh, int nw, int nh)
1685 CODE:
1686{
1687 if ((nw != ow || nh != oh) && SvOK (data_))
1251 { 1688 {
1252 int nw = minpot (ow);
1253 int nh = minpot (oh);
1254
1255 if (nw != ow || nh != oh)
1256 {
1257 if (SvOK (data_))
1258 {
1259 STRLEN datalen; 1689 STRLEN datalen;
1260 char *data = SvPVbyte (data_, datalen); 1690 char *data = SvPVbyte (data_, datalen);
1261 int bpp = datalen / (ow * oh); 1691 int bpp = datalen / (ow * oh);
1262 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1692 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1263 1693
1264 SvPOK_only (result_); 1694 SvPOK_only (result_);
1265 SvCUR_set (result_, nw * nh * bpp); 1695 SvCUR_set (result_, nw * nh * bpp);
1266 1696
1267 memset (SvPVX (result_), 0, nw * nh * bpp); 1697 memset (SvPVX (result_), 0, nw * nh * bpp);
1268 while (oh--) 1698 while (oh--)
1269 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1699 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1270 1700
1271 sv_setsv (data_, result_); 1701 sv_setsv (data_, result_);
1272 }
1273
1274 sv_setiv (w_, nw);
1275 sv_setiv (h_, nh);
1276 }
1277 } 1702 }
1278} 1703}
1279 1704
1280void 1705void
1281draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1706draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1287{ 1712{
1288 HV *hv = (HV *)SvRV (self); 1713 HV *hv = (HV *)SvRV (self);
1289 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1714 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1290 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1715 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1291 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1716 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1717
1718 if (name <= 0)
1719 XSRETURN_EMPTY;
1292 1720
1293 if (items < 5) 1721 if (items < 5)
1294 { 1722 {
1295 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1723 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1296 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1724 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1324 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1325 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1326 } 1754 }
1327} 1755}
1328 1756
1329MODULE = CFPlus PACKAGE = CFPlus::Map 1757void
1758draw_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)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1330 1766
1331CFPlus::Map 1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1879 CODE:
1880{
1881 GLint width;
1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1883 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1884 RETVAL = width > 0;
1885}
1886 OUTPUT:
1887 RETVAL
1888
1889MODULE = Deliantra::Client PACKAGE = DC::Map
1890
1891PROTOTYPES: DISABLE
1892
1893DC::Map
1332new (SV *class) 1894new (SV *klass)
1333 CODE: 1895 CODE:
1334 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1335 RETVAL->x = 0; 1897 RETVAL->x = 0;
1336 RETVAL->y = 0; 1898 RETVAL->y = 0;
1337 RETVAL->w = 0; 1899 RETVAL->w = 0;
1338 RETVAL->h = 0; 1900 RETVAL->h = 0;
1339 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
… …
1344 RETVAL->row = 0; 1906 RETVAL->row = 0;
1345 OUTPUT: 1907 OUTPUT:
1346 RETVAL 1908 RETVAL
1347 1909
1348void 1910void
1349DESTROY (CFPlus::Map self) 1911DESTROY (DC::Map self)
1350 CODE: 1912 CODE:
1351{ 1913{
1352 map_clear (self); 1914 map_clear (self);
1353 Safefree (self->face2tile); 1915 Safefree (self->face2tile);
1354 Safefree (self->tex); 1916 Safefree (self->tex);
1355 Safefree (self); 1917 Safefree (self);
1356} 1918}
1357 1919
1358void 1920void
1359resize (CFPlus::Map self, int map_width, int map_height) 1921resize (DC::Map self, int map_width, int map_height)
1360 CODE: 1922 CODE:
1361 self->w = map_width; 1923 self->w = map_width;
1362 self->h = map_height; 1924 self->h = map_height;
1363 1925
1364void 1926void
1365clear (CFPlus::Map self) 1927clear (DC::Map self)
1366 CODE: 1928 CODE:
1367 map_clear (self); 1929 map_clear (self);
1368 1930
1369void 1931void
1370set_tileid (CFPlus::Map self, int face, int tile) 1932set_tileid (DC::Map self, int face, int tile)
1371 CODE: 1933 CODE:
1372{ 1934{
1373 need_facenum (self, face); self->face2tile [face] = tile; 1935 need_facenum (self, face); self->face2tile [face] = tile;
1374 need_texid (self, tile); 1936 need_texid (self, tile);
1375} 1937}
1376 1938
1377void 1939void
1378set_smooth (CFPlus::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1379 CODE: 1941 CODE:
1380{ 1942{
1381 tileid texid; 1943 tileid texid;
1382 maptex *tex; 1944 maptex *tex;
1383 1945
1384 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1385 return; 1947 return;
1386 1948
1387 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1388 return; 1950 return;
1389 1951
1390 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1391 1953
1392 if (!texid) 1954 if (!texid)
1393 return; 1955 return;
1394 1956
1395 tex = self->tex + texid; 1957 tex = self->tex + texid;
1396 tex->smoothtile = self->face2tile [smooth]; 1958 tex->smoothtile = self->face2tile [smooth];
1397 tex->smoothlevel = level; 1959 tex->smoothlevel = level;
1398} 1960}
1399 1961
1400void 1962void
1401set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1963set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1402 CODE: 1964 CODE:
1403{ 1965{
1404 need_texid (self, texid); 1966 need_texid (self, texid);
1405 1967
1406 { 1968 {
… …
1425 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1426 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1427 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1428} 1990}
1429 1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
2011
1430int 2012int
1431ox (CFPlus::Map self) 2013ox (DC::Map self)
1432 ALIAS: 2014 ALIAS:
1433 oy = 1 2015 oy = 1
1434 x = 2 2016 x = 2
1435 y = 3 2017 y = 3
1436 w = 4 2018 w = 4
… …
1447 } 2029 }
1448 OUTPUT: 2030 OUTPUT:
1449 RETVAL 2031 RETVAL
1450 2032
1451void 2033void
1452scroll (CFPlus::Map self, int dx, int dy) 2034scroll (DC::Map self, int dx, int dy)
1453 CODE: 2035 CODE:
1454{ 2036{
1455 if (dx > 0) 2037 if (dx > 0)
1456 map_blank (self, self->x, self->y, dx, self->h); 2038 map_blank (self, self->x, self->y, dx, self->h);
1457 else if (dx < 0) 2039 else if (dx < 0)
… …
1465 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1466 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1467 2049
1468 while (self->y < 0) 2050 while (self->y < 0)
1469 { 2051 {
1470 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1471 2053
1472 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1473 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1474 } 2056 }
1475} 2057}
1476 2058
1477void 2059SV *
1478map1a_update (CFPlus::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1479 CODE: 2061 CODE:
1480{ 2062{
1481 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1482 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1483 mapcell *cell; 2065 mapcell *cell;
1484 int x, y, flags; 2066 int x, y, z, flags;
2067 AV *missing = newAV ();
2068 RETVAL = newRV_noinc ((SV *)missing);
1485 2069
1486 while (data < data_end - 1) 2070 while (data < data_end - 1)
1487 { 2071 {
1488 flags = (data [0] << 8) + data [1]; data += 2; 2072 flags = (data [0] << 8) + data [1]; data += 2;
1489 2073
… …
1502 2086
1503 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1504 2088
1505 if (flags & 8) 2089 if (flags & 8)
1506 { 2090 {
2091 uint8_t ext, cmd;
2092
1507 if (extmap) 2093 do
1508 { 2094 {
1509 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1510 2097
1511 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1512 { 2101 {
1513 ext = *data++;
1514 cmd = ext & 0x3f;
1515
1516 if (cmd < 4)
1517 cell->darkness = 255 - ext * 64 + 1;
1518 else if (cmd == 5) // health
1519 {
1520 cell->stat_width = 1; 2102 cell->stat_width = 1;
1521 cell->stat_hp = *data++; 2103 cell->stat_hp = *data++;
1522 }
1523 else if (cmd == 6) // monster width
1524 cell->stat_width = *data++ + 1;
1525 else if (cmd == 0x47)
1526 {
1527 if (*data == 4)
1528 ; // decode player count
1529
1530 data += *data + 1;
1531 }
1532 else if (cmd == 8) // cell flags
1533 cell->flags = *data++;
1534 else if (ext & 0x40) // unknown, multibyte => skip
1535 data += *data + 1;
1536 else
1537 data++;
1538 } 2104 }
1539 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1540 } 2122 }
1541 else 2123 while (ext & 0x80);
1542 cell->darkness = *data++ + 1;
1543 } 2124 }
1544 2125
2126 for (z = 0; z <= 2; ++z)
1545 if (flags & 4) 2127 if (flags & (4 >> z))
1546 { 2128 {
1547 faceid face = (data [0] << 8) + data [1]; data += 2; 2129 faceid face = (data [0] << 8) + data [1]; data += 2;
1548 need_facenum (self, face); 2130 need_facenum (self, face);
1549 cell->tile [0] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
2132
2133 if (cell->tile [z])
2134 {
2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
2137 if (!tex->name)
2138 av_push (missing, newSViv (cell->tile [z]));
2139
2140 if (tex->smoothtile)
2141 {
2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
2144 if (!smooth->name)
2145 av_push (missing, newSViv (tex->smoothtile));
2146 }
2147 }
1550 } 2148 }
1551
1552 if (flags & 2)
1553 {
1554 faceid face = (data [0] << 8) + data [1]; data += 2;
1555 need_facenum (self, face);
1556 cell->tile [1] = self->face2tile [face];
1557 }
1558
1559 if (flags & 1)
1560 {
1561 faceid face = (data [0] << 8) + data [1]; data += 2;
1562 need_facenum (self, face);
1563 cell->tile [2] = self->face2tile [face];
1564 }
1565 } 2149 }
1566 else 2150 else
1567 cell->darkness = 0; 2151 CELL_CLEAR (cell);
1568 } 2152 }
1569} 2153}
2154 OUTPUT:
2155 RETVAL
1570 2156
1571SV * 2157SV *
1572mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2158mapmap (DC::Map self, int x0, int y0, int w, int h)
1573 CODE: 2159 CODE:
1574{ 2160{
1575 int x1, x; 2161 int x1, x;
1576 int y1, y; 2162 int y1, y;
1577 int z; 2163 int z;
… …
1590 ? self->row + y 2176 ? self->row + y
1591 : 0; 2177 : 0;
1592 2178
1593 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1594 { 2180 {
1595 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1596 2182
1597 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1598 { 2184 {
1599 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1600 2186
… …
1602 { 2188 {
1603 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1604 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1605 int a1 = tex.a; 2191 int a1 = tex.a;
1606 2192
1607 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1608 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1609 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1610 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1611 } 2197 }
1612 } 2198 }
1613 2199
1614 *map++ = (r ) 2200 *map++ = (r )
1615 | (g << 8) 2201 | (g << 8)
1616 | (b << 16) 2202 | (b << 16)
1617 | (a << 24); 2203 | (a << 24);
1618 } 2204 }
1619 } 2205 }
1620 2206
1621 RETVAL = map_sv; 2207 RETVAL = map_sv;
1622} 2208}
1623 OUTPUT: 2209 OUTPUT:
1624 RETVAL 2210 RETVAL
1625 2211
1626void 2212void
1627draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2213draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1628 CODE: 2214 CODE:
1629{ 2215{
1630 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1631 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1632 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1633 smooth_key skey;
1634 int x, y, z; 2216 int x, y, z;
1635 int last_name;
1636 2217
2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2219 int pl_x, pl_y;
2220 maptex pl_tex;
2221 rc_t rc;
2222 rc_t rc_ov;
2223 rc_key_t key;
2224 rc_t::array_t *arr;
2225
2226 pl_tex.name = 0;
2227
1637 // thats current max. sorry. 2228 // that's current max. sorry.
1638 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1639 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1640 2231
1641 // clear key, in case of extra padding
1642 memset (&skey, 0, sizeof (skey)); 2232 memset (&key, 0, sizeof (key));
1643 2233 key.r = 255;
1644 glColor4ub (255, 255, 255, 255); 2234 key.g = 255;
1645 2235 key.b = 255;
1646 glEnable (GL_BLEND); 2236 key.a = 255;
1647 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2237 key.mode = GL_QUADS;
1648 glEnable (GL_TEXTURE_2D); 2238 key.format = GL_T2F_V3F;
1649 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1650
1651 glBegin (GL_QUADS);
1652
1653 last_name = 0;
1654 2239
1655 mx += self->x; 2240 mx += self->x;
1656 my += self->y; 2241 my += self->y;
1657 2242
1658 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1659 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1660 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1661 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1662 2247
1663 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1664 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1665 { 2250 {
1666 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
… …
1675 MAX (self->tex [cell->tile [1]].smoothlevel, 2260 MAX (self->tex [cell->tile [1]].smoothlevel,
1676 self->tex [cell->tile [2]].smoothlevel)); 2261 self->tex [cell->tile [2]].smoothlevel));
1677 } 2262 }
1678 } 2263 }
1679 2264
2265 glEnable (GL_BLEND);
2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2268
1680 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1681 { 2270 {
1682 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
1683 2275
1684 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1685 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1686 { 2278 {
1687 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
… …
1693 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
1694 2286
1695 if (tile) 2287 if (tile)
1696 { 2288 {
1697 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1698 int px = (x + 1) * T - tex.w; 2290 int px, py;
1699 int py = (y + 1) * T - tex.h;
1700 2291
1701 // suppressing texture state switches here
1702 // is only moderately effective, but worth the extra effort
1703 if (last_name != tex.name) 2292 if (key.texname != tex.name)
1704 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1705 if (!tex.name) 2296 if (!tex.name)
1706 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1707 2298
2299 key.texname = tex.name;
1708 glEnd (); 2300 arr = &rc.array (key);
1709 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1710 glBegin (GL_QUADS);
1711 } 2301 }
1712 2302
1713 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2303 px = (x + 1) * Th - tex.w;
1714 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2304 py = (y + 1) * Tw - tex.h;
1715 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1716 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1717 2305
1718 if (cell->flags && z == 2) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1719 { 2307 {
1720 if (cell->flags & 1) 2308 pl_x = px;
2309 pl_y = py;
2310 pl_tex = tex;
1721 { 2311 continue;
1722 maptex tex = self->tex [1];
1723 int px = x * T + T * 2 / 32;
1724 int py = y * T - T * 6 / 32;
1725
1726 glEnd ();
1727 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1728 glBegin (GL_QUADS);
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1734 }
1735 } 2312 }
2313
2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1736 2318
1737 // update smooth hash 2319 // update smooth hash
1738 if (tex.smoothtile) 2320 if (tex.smoothtile)
1739 { 2321 {
1740 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
1741 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
1742 2324
1743 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
1744 2326
1745 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
1746 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
1747 2329
1748 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
… …
1756 2338
1757 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1758 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
1759 2341
1760 // full tile 2342 // full tile
1761 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1762 2344
1763 // borders 2345 // borders
1764 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1765 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1766 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1767 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1768 2350
1769 // corners 2351 // corners
1770 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1771 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1772 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1773 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1774 } 2376 }
1775 } 2377 }
1776 } 2378 }
1777 } 2379 }
1778 2380
2381 rc.draw ();
2382 rc.clear ();
2383
1779 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
1780 // this is basically counting sort 2385 // this is basically counting sort
1781 { 2386 {
1782 int w, b; 2387 int w, b;
1783 2388
1784 for (w = 0; w < 256 / 32; ++w) 2389 glEnable (GL_TEXTURE_2D);
2390 glBegin (GL_QUADS);
2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1785 { 2394 {
1786 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
1787 if (smask) 2396 IV bits = it->second;
1788 for (b = 0; b < 32; ++b) 2397
1789 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
1790 { 2401 {
1791 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
1792 HE *he; 2410 if (tex.name)
1793
1794 hv_iterinit (smooth);
1795 while ((he = hv_iternext (smooth)))
1796 { 2411 {
1797 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
1798 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
1799 2414 if (key.texname != tex.name)
1800 if (!(bits & 0x1000)
1801 && skey->level == level
1802 && level > smooth_max [skey->x][skey->y])
1803 { 2415 {
1804 maptex tex = self->tex [skey->tile]; 2416 self->tex [skey.tile].unused = 0;
1805 int px = (((int)skey->x) - 1) * T;
1806 int py = (((int)skey->y) - 1) * T;
1807 int border = bits & 15;
1808 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1809 float dx = tex.s * .0625f; // 16 images/row
1810 float dy = tex.t * .5f ; // 2 images/column
1811 2417
1812 // this time naively avoiding texture state changes
1813 // save gobs of state changes.
1814 if (last_name != tex.name)
1815 {
1816 if (!tex.name)
1817 continue; // smoothing not yet available
1818
1819 glEnd (); 2418 glEnd ();
1820 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1821 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
1822 } 2421 }
1823 2422
1824 if (border) 2423 if (border)
1825 { 2424 {
1826 float ox = border * dx; 2425 float ox = border * dx;
1827 2426
1828 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1829 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1830 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1831 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1832 } 2431 }
1833 2432
1834 if (corner) 2433 if (corner)
1835 { 2434 {
1836 float ox = corner * dx; 2435 float ox = corner * dx;
1837 2436
1838 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1839 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1840 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1841 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1842 }
1843 } 2441 }
1844 } 2442 }
1845 } 2443 }
1846 } 2444 }
2445
2446 glEnd ();
2447 glDisable (GL_TEXTURE_2D);
2448 key.texname = -1;
1847 } 2449 }
1848
1849 hv_clear (smooth);
1850 } 2450 }
1851 2451
1852 glEnd (); 2452 if (pl_tex.name)
2453 {
2454 maptex tex = pl_tex;
2455 int px = pl_x + sdx;
2456 int py = pl_y + sdy;
1853 2457
1854 glDisable (GL_TEXTURE_2D); 2458 key.texname = tex.name;
2459 rc_t::array_t &arr = rc.array (key);
2460
2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2465
2466 rc.draw ();
2467 }
2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
1855 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
1856 2473
1857 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
1858 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
… …
1863 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
1864 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
1865 { 2482 {
1866 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
1867 2484
1868 int px = x * T; 2485 int px = x * Tw;
1869 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
1870 2493
1871 if (cell->stat_hp) 2494 if (cell->stat_hp)
1872 { 2495 {
1873 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
1874 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1875 2498
1876 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
1877 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
1878 px + width - 1, py); 2501 px + width - 1, py);
1879 2502
… …
1885 } 2508 }
1886 } 2509 }
1887} 2510}
1888 2511
1889void 2512void
1890draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1891 CODE: 2514 CODE:
1892{ 2515{
1893 static float color[16][3] = { 2516 static float color[16][3] = {
1894 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
1895 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
1896 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
1897 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
1898 2521
1899 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
1900 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
1901 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
1902 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
1903 2526
1904 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
1905 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
1906 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
1907 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
1908 2531
1909 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
1910 2533
1911 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
1912 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
1913 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
1914 }; 2537 };
1915 2538
1916 int x, y; 2539 int x, y;
1917 2540
1918 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
1919 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1920 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
1921 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1922 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
1923 2552
1924 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
… …
1928 2557
1929 if (m) 2558 if (m)
1930 { 2559 {
1931 float *c = color [m & 15]; 2560 float *c = color [m & 15];
1932 2561
1933 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
1934 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
1935 2564
1936 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
1937 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1938 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1939 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1940 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1941 } 2570 }
… …
1945 glDisable (GL_BLEND); 2574 glDisable (GL_BLEND);
1946 glDisable (GL_TEXTURE_2D); 2575 glDisable (GL_TEXTURE_2D);
1947} 2576}
1948 2577
1949void 2578void
1950fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1951 PPCODE: 2580 PPCODE:
1952{ 2581{
1953 int x, y; 2582 int x, y;
1954 int sw4 = (sw + 3) & ~3; 2583 int sw1 = sw + 2;
2584 int sh1 = sh + 2;
2585 int sh3 = sh * 3;
2586 int sw3 = sw * 3;
1955 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1956 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1957 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1958 memset (darkness, 255, sw4 * sh); 2590 memset (darkness1, 0, sw1*sh1);
2591
1959 SvPOK_only (darkness_sv); 2592 SvPOK_only (darkness3_sv);
1960 SvCUR_set (darkness_sv, sw4 * sh); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
1961 2594
1962 mx += self->x; 2595 mx += self->x - 1;
1963 my += self->y; 2596 my += self->y - 1;
1964 2597
1965 for (y = 0; y < sh; y++) 2598 for (y = 0; y < sh1; y++)
1966 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
1967 { 2600 {
1968 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
1969 2602
1970 for (x = 0; x < sw; x++) 2603 for (x = 0; x < sw1; x++)
1971 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
1972 { 2605 {
1973 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
1974 2607
1975 darkness[y * sw4 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
1976 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1977 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
1978 } 2611 }
1979 } 2612 }
1980 2613
2614 for (y = 0; y < sh; ++y)
2615 for (x = 0; x < sw; ++x)
2616 {
2617 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2618 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2619 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2620 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2621 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2622 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2623 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2624 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2625 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2626
2627 uint8_t r11 = (d11 + d21 + d12) / 3;
2628 uint8_t r21 = d21;
2629 uint8_t r31 = (d21 + d31 + d32) / 3;
2630
2631 uint8_t r12 = d12;
2632 uint8_t r22 = d22;
2633 uint8_t r32 = d32;
2634
2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2636 uint8_t r23 = d23;
2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2638
2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2648 }
2649
2650 free (darkness1);
2651
1981 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
1982 PUSHs (sv_2mortal (newSViv (sw4))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
1983 PUSHs (sv_2mortal (newSViv (sh))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
1984 PUSHs (darkness_sv); 2655 PUSHs (darkness3_sv);
1985} 2656}
1986 2657
1987SV * 2658SV *
1988get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2659get_rect (DC::Map self, int x0, int y0, int w, int h)
1989 CODE: 2660 CODE:
1990{ 2661{
1991 int x, y, x1, y1; 2662 int x, y, x1, y1;
1992 SV *data_sv = newSV (w * h * 7 + 5); 2663 SV *data_sv = newSV (w * h * 7 + 5);
1993 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2664 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2050 else 2721 else
2051 *data++ = 0; 2722 *data++ = 0;
2052 } 2723 }
2053 } 2724 }
2054 2725
2726 /* if size is w*h + 5 then no data has been found */
2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2728 {
2055 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2056 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2731 }
2732
2057 RETVAL = data_sv; 2733 RETVAL = data_sv;
2058} 2734}
2059 OUTPUT: 2735 OUTPUT:
2060 RETVAL 2736 RETVAL
2061 2737
2062void 2738void
2063set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2739set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2064 PPCODE: 2740 PPCODE:
2065{ 2741{
2066 int x, y, z; 2742 int x, y, z;
2067 int w, h; 2743 int w, h;
2068 int x1, y1; 2744 int x1, y1;
2745 STRLEN len;
2746 uint8_t *data, *end;
2747
2748 len = SvLEN (data_sv);
2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2751 end = data + len + 8;
2752
2753 if (len < 5)
2754 XSRETURN_EMPTY;
2069 2755
2070 if (*data++ != 0) 2756 if (*data++ != 0)
2071 return; /* version mismatch */ 2757 XSRETURN_EMPTY; /* version mismatch */
2072 2758
2073 w = *data++ << 8; w |= *data++; 2759 w = *data++ << 8; w |= *data++;
2074 h = *data++ << 8; h |= *data++; 2760 h = *data++ << 8; h |= *data++;
2075 2761
2076 // we need to do this 'cause we don't keep an absolute coord system for rows 2762 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2088 { 2774 {
2089 maprow *row = map_get_row (self, y); 2775 maprow *row = map_get_row (self, y);
2090 2776
2091 for (x = x0; x < x1; x++) 2777 for (x = x0; x < x1; x++)
2092 { 2778 {
2779 uint8_t flags;
2780
2781 if (data + 7 >= end)
2782 XSRETURN_EMPTY;
2783
2093 uint8_t flags = *data++; 2784 flags = *data++;
2094 2785
2095 if (flags) 2786 if (flags)
2096 { 2787 {
2097 mapcell *cell = row_get_cell (row, x); 2788 mapcell *cell = row_get_cell (row, x);
2098 tileid tile[3] = { 0, 0, 0 }; 2789 tileid tile[3] = { 0, 0, 0 };
… …
2101 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2792 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2102 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2793 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2103 2794
2104 if (cell->darkness == 0) 2795 if (cell->darkness == 0)
2105 { 2796 {
2106 cell->darkness = 0; 2797 /*cell->darkness = 0;*/
2798 EXTEND (SP, 3);
2107 2799
2108 for (z = 0; z <= 2; z++) 2800 for (z = 0; z <= 2; z++)
2109 { 2801 {
2110 tileid t = tile [z]; 2802 tileid t = tile [z];
2111 2803
2112 if (t >= self->texs || (t && !self->tex [t].name)) 2804 if (t >= self->texs || (t && !self->tex [t].name))
2113 { 2805 {
2114 XPUSHs (sv_2mortal (newSViv (t))); 2806 PUSHs (sv_2mortal (newSViv (t)));
2115 need_texid (self, t); 2807 need_texid (self, t);
2116 } 2808 }
2117 2809
2118 cell->tile [z] = t; 2810 cell->tile [z] = t;
2119 } 2811 }
… …
2121 } 2813 }
2122 } 2814 }
2123 } 2815 }
2124} 2816}
2125 2817
2126MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2127 2819
2128CFPlus::MixChunk 2820DC::RW
2129new_from_file (SV *class, char *path) 2821new (SV *klass, SV *data_sv)
2130 CODE: 2822 CODE:
2131 RETVAL = Mix_LoadWAV (path); 2823{
2824 STRLEN datalen;
2825 char *data = SvPVbyte (data_sv, datalen);
2826
2827 RETVAL = SDL_RWFromConstMem (data, datalen);
2828}
2132 OUTPUT: 2829 OUTPUT:
2133 RETVAL 2830 RETVAL
2134 2831
2832DC::RW
2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2834 CODE:
2835 RETVAL = SDL_RWFromFile (path, mode);
2836 OUTPUT:
2837 RETVAL
2838
2839# fails on win32:
2840# dc.xs(2268) : error C2059: syntax error : '('
2135void 2841#void
2842#close (DC::RW self)
2843# CODE:
2844# (self->(close)) (self);
2845
2846MODULE = Deliantra::Client PACKAGE = DC::Channel
2847
2848PROTOTYPES: DISABLE
2849
2850DC::Channel
2851find ()
2852 CODE:
2853{
2854 RETVAL = Mix_GroupAvailable (-1);
2855
2856 if (RETVAL < 0)
2857 {
2858 RETVAL = Mix_GroupOldest (-1);
2859
2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2866 XSRETURN_UNDEF;
2867 }
2868 else
2869 Mix_HaltChannel (RETVAL);
2870 }
2871
2872 Mix_UnregisterAllEffects (RETVAL);
2873 Mix_Volume (RETVAL, 128);
2874}
2875 OUTPUT:
2876 RETVAL
2877
2878void
2879halt (DC::Channel self)
2880 CODE:
2881 Mix_HaltChannel (self);
2882
2883void
2884expire (DC::Channel self, int ticks = -1)
2885 CODE:
2886 Mix_ExpireChannel (self, ticks);
2887
2888void
2889fade_out (DC::Channel self, int ticks = -1)
2890 CODE:
2891 Mix_FadeOutChannel (self, ticks);
2892
2893int
2894volume (DC::Channel self, int volume)
2895 CODE:
2896 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2897 OUTPUT:
2898 RETVAL
2899
2900void
2901unregister_all_effects (DC::Channel self)
2902 CODE:
2903 Mix_UnregisterAllEffects (self);
2904
2905void
2906set_panning (DC::Channel self, int left, int right)
2907 CODE:
2908 left = CLAMP (left , 0, 255);
2909 right = CLAMP (right, 0, 255);
2910 Mix_SetPanning (self, left, right);
2911
2912void
2913set_distance (DC::Channel self, int distance)
2914 CODE:
2915 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2916
2917void
2918set_position (DC::Channel self, int angle, int distance)
2919 CODE:
2920
2921void
2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2923 CODE:
2924{
2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2928}
2929
2930void
2931set_reverse_stereo (DC::Channel self, int flip)
2932 CODE:
2933 Mix_SetReverseStereo (self, flip);
2934
2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2936
2937PROTOTYPES: DISABLE
2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2951DC::MixChunk
2952new (SV *klass, DC::RW rwops)
2953 CODE:
2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2955 OUTPUT:
2956 RETVAL
2957
2958void
2136DESTROY (CFPlus::MixChunk self) 2959DESTROY (DC::MixChunk self)
2137 CODE: 2960 CODE:
2138 Mix_FreeChunk (self); 2961 Mix_FreeChunk (self);
2139 2962
2140int 2963int
2141volume (CFPlus::MixChunk self, int volume = -1) 2964volume (DC::MixChunk self, int volume = -1)
2142 CODE: 2965 CODE:
2966 if (items > 1)
2967 volume = CLAMP (volume, 0, 128);
2143 RETVAL = Mix_VolumeChunk (self, volume); 2968 RETVAL = Mix_VolumeChunk (self, volume);
2144 OUTPUT: 2969 OUTPUT:
2145 RETVAL 2970 RETVAL
2146 2971
2147int 2972DC::Channel
2148play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2973play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2149 CODE: 2974 CODE:
2975{
2150 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2976 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2977
2978 if (RETVAL < 0)
2979 XSRETURN_UNDEF;
2980
2981 if (channel < 0)
2982 {
2983 Mix_UnregisterAllEffects (RETVAL);
2984 Mix_Volume (RETVAL, 128);
2985 }
2986}
2151 OUTPUT: 2987 OUTPUT:
2152 RETVAL 2988 RETVAL
2153 2989
2154MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
2155 3003
2156int 3004int
2157volume (int volume = -1) 3005volume (int volume = -1)
3006 PROTOTYPE: ;$
2158 CODE: 3007 CODE:
3008 if (items > 0)
3009 volume = CLAMP (volume, 0, 128);
2159 RETVAL = Mix_VolumeMusic (volume); 3010 RETVAL = Mix_VolumeMusic (volume);
2160 OUTPUT: 3011 OUTPUT:
2161 RETVAL 3012 RETVAL
2162 3013
3014void
3015fade_out (int ms)
3016 CODE:
3017 Mix_FadeOutMusic (ms);
3018
3019void
3020halt ()
3021 CODE:
3022 Mix_HaltMusic ();
3023
2163int 3024int
2164fade_out (int ms) 3025playing ()
2165 CODE: 3026 CODE:
2166 RETVAL = Mix_FadeOutMusic (ms); 3027 RETVAL = Mix_PlayingMusic ();
2167 OUTPUT: 3028 OUTPUT:
2168 RETVAL 3029 RETVAL
2169 3030
2170CFPlus::MixMusic 3031DC::MixMusic
2171new_from_file (SV *class, char *path) 3032new (SV *klass, DC::RW rwops)
2172 CODE: 3033 CODE:
2173 RETVAL = Mix_LoadMUS (path); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2174 OUTPUT: 3035 OUTPUT:
2175 RETVAL 3036 RETVAL
2176 3037
2177void 3038void
2178DESTROY (CFPlus::MixMusic self) 3039DESTROY (DC::MixMusic self)
2179 CODE: 3040 CODE:
2180 Mix_FreeMusic (self); 3041 Mix_FreeMusic (self);
2181 3042
2182int 3043int
2183play (CFPlus::MixMusic self, int loops = -1) 3044play (DC::MixMusic self, int loops = -1)
2184 CODE: 3045 CODE:
2185 RETVAL = Mix_PlayMusic (self, loops); 3046 RETVAL = Mix_PlayMusic (self, loops);
2186 OUTPUT: 3047 OUTPUT:
2187 RETVAL 3048 RETVAL
2188 3049
2189int 3050void
2190fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3051fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2191 CODE: 3052 CODE:
2192 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3053 Mix_FadeInMusicPos (self, loops, ms, position);
2193 OUTPUT:
2194 RETVAL
2195 3054
2196MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3055MODULE = Deliantra::Client PACKAGE = DC::OpenGL
3056
3057PROTOTYPES: ENABLE
2197 3058
2198BOOT: 3059BOOT:
2199{ 3060{
2200 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3061 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2201 static const struct { 3062 static const struct {
2202 const char *name; 3063 const char *name;
2203 IV iv; 3064 IV iv;
2204 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2205# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
3067 const_iv (GL_VENDOR),
3068 const_iv (GL_VERSION),
3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2206 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2207 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2208 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2209 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2210 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
… …
2214 const_iv (GL_ALPHA_TEST), 3079 const_iv (GL_ALPHA_TEST),
2215 const_iv (GL_NORMALIZE), 3080 const_iv (GL_NORMALIZE),
2216 const_iv (GL_RESCALE_NORMAL), 3081 const_iv (GL_RESCALE_NORMAL),
2217 const_iv (GL_FRONT), 3082 const_iv (GL_FRONT),
2218 const_iv (GL_BACK), 3083 const_iv (GL_BACK),
3084 const_iv (GL_AUX0),
2219 const_iv (GL_AND), 3085 const_iv (GL_AND),
2220 const_iv (GL_ONE), 3086 const_iv (GL_ONE),
2221 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2222 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2223 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2224 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2225 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2226 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2227 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2228 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2229 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2230 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
… …
2236 const_iv (GL_INTENSITY), 3106 const_iv (GL_INTENSITY),
2237 const_iv (GL_LUMINANCE), 3107 const_iv (GL_LUMINANCE),
2238 const_iv (GL_LUMINANCE_ALPHA), 3108 const_iv (GL_LUMINANCE_ALPHA),
2239 const_iv (GL_FLOAT), 3109 const_iv (GL_FLOAT),
2240 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3110 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3111 const_iv (GL_COMPRESSED_ALPHA_ARB),
3112 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3113 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3114 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3115 const_iv (GL_COMPRESSED_RGB_ARB),
3116 const_iv (GL_COMPRESSED_RGBA_ARB),
2241 const_iv (GL_COMPILE), 3117 const_iv (GL_COMPILE),
3118 const_iv (GL_PROXY_TEXTURE_1D),
3119 const_iv (GL_PROXY_TEXTURE_2D),
2242 const_iv (GL_TEXTURE_1D), 3120 const_iv (GL_TEXTURE_1D),
2243 const_iv (GL_TEXTURE_2D), 3121 const_iv (GL_TEXTURE_2D),
2244 const_iv (GL_TEXTURE_ENV), 3122 const_iv (GL_TEXTURE_ENV),
2245 const_iv (GL_TEXTURE_MAG_FILTER), 3123 const_iv (GL_TEXTURE_MAG_FILTER),
2246 const_iv (GL_TEXTURE_MIN_FILTER), 3124 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2267 const_iv (GL_COLOR_LOGIC_OP), 3145 const_iv (GL_COLOR_LOGIC_OP),
2268 const_iv (GL_SEPARABLE_2D), 3146 const_iv (GL_SEPARABLE_2D),
2269 const_iv (GL_CONVOLUTION_2D), 3147 const_iv (GL_CONVOLUTION_2D),
2270 const_iv (GL_CONVOLUTION_BORDER_MODE), 3148 const_iv (GL_CONVOLUTION_BORDER_MODE),
2271 const_iv (GL_CONSTANT_BORDER), 3149 const_iv (GL_CONSTANT_BORDER),
3150 const_iv (GL_POINTS),
2272 const_iv (GL_LINES), 3151 const_iv (GL_LINES),
2273 const_iv (GL_LINE_STRIP), 3152 const_iv (GL_LINE_STRIP),
2274 const_iv (GL_LINE_LOOP), 3153 const_iv (GL_LINE_LOOP),
2275 const_iv (GL_QUADS), 3154 const_iv (GL_QUADS),
2276 const_iv (GL_QUAD_STRIP), 3155 const_iv (GL_QUAD_STRIP),
2277 const_iv (GL_TRIANGLES), 3156 const_iv (GL_TRIANGLES),
2278 const_iv (GL_TRIANGLE_STRIP), 3157 const_iv (GL_TRIANGLE_STRIP),
2279 const_iv (GL_TRIANGLE_FAN), 3158 const_iv (GL_TRIANGLE_FAN),
3159 const_iv (GL_POLYGON),
2280 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3160 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3161 const_iv (GL_POINT_SMOOTH_HINT),
3162 const_iv (GL_LINE_SMOOTH_HINT),
3163 const_iv (GL_POLYGON_SMOOTH_HINT),
3164 const_iv (GL_GENERATE_MIPMAP_HINT),
3165 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2281 const_iv (GL_FASTEST), 3166 const_iv (GL_FASTEST),
3167 const_iv (GL_DONT_CARE),
3168 const_iv (GL_NICEST),
2282 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2283 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2284 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2285 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2286# undef const_iv 3176# undef const_iv
2287 }; 3177 };
2288 3178
2289 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2290 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2291 3181
2292 texture_av = newAV (); 3182 texture_av = newAV ();
2293 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2294} 3184}
2295 3185
2296char * 3186void
3187disable_GL_EXT_blend_func_separate ()
3188 CODE:
3189 gl.BlendFuncSeparate = 0;
3190 gl.BlendFuncSeparateEXT = 0;
3191
3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2297gl_vendor () 3196gl_vendor ()
2298 CODE: 3197 CODE:
2299 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2300 OUTPUT: 3199 OUTPUT:
2301 RETVAL 3200 RETVAL
2302 3201
2303char * 3202const char *
2304gl_version () 3203gl_version ()
2305 CODE: 3204 CODE:
2306 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2307 OUTPUT: 3206 OUTPUT:
2308 RETVAL 3207 RETVAL
2309 3208
2310char * 3209const char *
2311gl_extensions () 3210gl_extensions ()
2312 CODE: 3211 CODE:
2313 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2314 OUTPUT: 3213 OUTPUT:
2315 RETVAL 3214 RETVAL
2316 3215
3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
3221
3222GLint glGetInteger (GLenum pname)
3223 CODE:
3224 glGetIntegerv (pname, &RETVAL);
3225 OUTPUT:
3226 RETVAL
3227
3228GLdouble glGetDouble (GLenum pname)
3229 CODE:
3230 glGetDoublev (pname, &RETVAL);
3231 OUTPUT:
3232 RETVAL
3233
2317int glGetError () 3234int glGetError ()
2318 3235
2319void glFinish () 3236void glFinish ()
3237
3238void glFlush ()
2320 3239
2321void glClear (int mask) 3240void glClear (int mask)
2322 3241
2323void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2324 PROTOTYPE: @ 3243 PROTOTYPE: @
… …
2335 3254
2336void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2337 CODE: 3256 CODE:
2338 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
2339 3258
3259# void glBlendEquation (int se)
3260
2340void glDepthMask (int flag) 3261void glDepthMask (int flag)
2341 3262
2342void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2343 3264
2344void glColorMask (int red, int green, int blue, int alpha) 3265void glColorMask (int red, int green, int blue, int alpha)
… …
2358# near_ and far_ are due to microsofts buggy "c" compiler 3279# near_ and far_ are due to microsofts buggy "c" compiler
2359void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3280void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2360 3281
2361# near_ and far_ are due to microsofts buggy "c" compiler 3282# near_ and far_ are due to microsofts buggy "c" compiler
2362void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3283void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3284
3285PROTOTYPES: DISABLE
2363 3286
2364void glViewport (int x, int y, int width, int height) 3287void glViewport (int x, int y, int width, int height)
2365 3288
2366void glScissor (int x, int y, int width, int height) 3289void glScissor (int x, int y, int width, int height)
2367 3290
… …
2375 3298
2376void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2377 CODE: 3300 CODE:
2378 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2379 3302
2380void glBegin (int mode)
2381
2382void glEnd ()
2383
2384void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
2385 PROTOTYPE: @ 3304 PROTOTYPE: @
2386 ALIAS: 3305 ALIAS:
2387 glColor_premultiply = 1 3306 glColor_premultiply = 1
2388 CODE: 3307 CODE:
2389 if (ix) 3308 if (ix)
2390 { 3309 {
… …
2393 b *= a; 3312 b *= a;
2394 } 3313 }
2395 // microsoft visual "c" rounds instead of truncating... 3314 // microsoft visual "c" rounds instead of truncating...
2396 glColor4f (r, g, b, a); 3315 glColor4f (r, g, b, a);
2397 3316
2398void glInterleavedArrays (int format, int stride, char *data)
2399
2400void glDrawElements (int mode, int count, int type, char *indices)
2401
2402# 1.2 void glDrawRangeElements (int mode, int start, int end
2403
2404void glRasterPos (float x, float y, float z = 0.) 3317void glRasterPos (float x, float y, float z = 0.)
2405 CODE: 3318 CODE:
2406 glRasterPos3f (0, 0, z); 3319 glRasterPos3f (0, 0, z);
2407 glBitmap (0, 0, 0, 0, x, y, 0); 3320 glBitmap (0, 0, 0, 0, x, y, 0);
2408 3321
… …
2412 3325
2413void glTexCoord (float s, float t) 3326void glTexCoord (float s, float t)
2414 CODE: 3327 CODE:
2415 glTexCoord2f (s, t); 3328 glTexCoord2f (s, t);
2416 3329
3330void glRect (float x1, float y1, float x2, float y2)
3331 CODE:
3332 glRectf (x1, y1, x2, y2);
3333
3334void glRect_lineloop (float x1, float y1, float x2, float y2)
3335 CODE:
3336 glBegin (GL_LINE_LOOP);
3337 glVertex2f (x1, y1);
3338 glVertex2f (x2, y1);
3339 glVertex2f (x2, y2);
3340 glVertex2f (x1, y2);
3341 glEnd ();
3342
3343PROTOTYPES: ENABLE
3344
3345void glBegin (int mode)
3346
3347void glEnd ()
3348
3349void glPointSize (GLfloat size)
3350
3351void glLineWidth (GLfloat width)
3352
3353void glInterleavedArrays (int format, int stride, char *data)
3354
3355void glDrawElements (int mode, int count, int type, char *indices)
3356
3357# 1.2 void glDrawRangeElements (int mode, int start, int end
3358
2417void glTexEnv (int target, int pname, float param) 3359void glTexEnv (int target, int pname, float param)
2418 CODE: 3360 CODE:
2419 glTexEnvf (target, pname, param); 3361 glTexEnvf (target, pname, param);
2420 3362
2421void glTexParameter (int target, int pname, float param) 3363void glTexParameter (int target, int pname, float param)
… …
2437void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3379void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2438 CODE: 3380 CODE:
2439 if (gl.SeparableFilter2D) 3381 if (gl.SeparableFilter2D)
2440 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3382 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2441 3383
2442void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3384void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2443 3385
2444void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3386void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2445 3387
2446void glDrawPixels (int width, int height, int format, int type, char *pixels) 3388void glDrawPixels (int width, int height, int format, int type, char *pixels)
3389
3390void glPixelZoom (float x, float y)
2447 3391
2448void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3392void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2449 3393
2450int glGenTexture () 3394int glGenTexture ()
2451 CODE: 3395 CODE:
… …
2471 3415
2472void glEndList () 3416void glEndList ()
2473 3417
2474void glCallList (int list) 3418void glCallList (int list)
2475 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3426
3427PROTOTYPES: DISABLE
3428
3429void
3430find_widget (SV *self, NV x, NV y)
3431 PPCODE:
3432{
3433 if (within_widget (self, x, y))
3434 XPUSHs (self);
3435}
3436
3437BOOT:
3438{
3439 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3440
3441 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3442 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3443 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3444 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3445}
3446
3447void
3448draw (SV *self)
3449 CODE:
3450{
3451 HV *hv;
3452 SV **svp;
3453 NV x, y, w, h;
3454 SV *draw_x_sv = GvSV (draw_x_gv);
3455 SV *draw_y_sv = GvSV (draw_y_gv);
3456 SV *draw_w_sv = GvSV (draw_w_gv);
3457 SV *draw_h_sv = GvSV (draw_h_gv);
3458 double draw_x, draw_y;
3459
3460 if (!SvROK (self))
3461 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3462
3463 hv = (HV *)SvRV (self);
3464
3465 if (SvTYPE (hv) != SVt_PVHV)
3466 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3467
3468 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3469 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3470
3471 if (!h || !w)
3472 XSRETURN_EMPTY;
3473
3474 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3475 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3476
3477 draw_x = SvNV (draw_x_sv) + x;
3478 draw_y = SvNV (draw_y_sv) + y;
3479
3480 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3481 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3482 XSRETURN_EMPTY;
3483
3484 sv_setnv (draw_x_sv, draw_x);
3485 sv_setnv (draw_y_sv, draw_y);
3486
3487 glPushMatrix ();
3488 glTranslated (x, y, 0);
3489
3490 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3491 {
3492 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3493
3494 if (svp && SvTRUE (*svp))
3495 {
3496 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3497 glEnable (GL_BLEND);
3498 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3499 glBegin (GL_QUADS);
3500 glVertex2f (0, 0);
3501 glVertex2f (w, 0);
3502 glVertex2f (w, h);
3503 glVertex2f (0, h);
3504 glEnd ();
3505 glDisable (GL_BLEND);
3506 }
3507 }
3508#if 0
3509 // draw borders, for debugging
3510 glPushMatrix ();
3511 glColor4f (1., 1., 0., 1.);
3512 glTranslatef (.5, .5, 0.);
3513 glBegin (GL_LINE_LOOP);
3514 glVertex2f (0 , 0);
3515 glVertex2f (w - 1, 0);
3516 glVertex2f (w - 1, h - 1);
3517 glVertex2f (0 , h - 1);
3518 glEnd ();
3519 glPopMatrix ();
3520#endif
3521 PUSHMARK (SP);
3522 XPUSHs (self);
3523 PUTBACK;
3524 call_method ("_draw", G_VOID | G_DISCARD);
3525 SPAGAIN;
3526
3527 glPopMatrix ();
3528
3529 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3530 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3531}
3532

Diff Legend

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