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.139 by root, Mon Aug 14 03:04:17 2006 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
15#endif 27#endif
16 28
29#include <assert.h>
17#include <math.h> 30#include <math.h>
18#include <string.h> 31#include <string.h>
19#include <stdio.h> 32#include <stdio.h>
20#include <stdlib.h> 33#include <stdlib.h>
21 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
22#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
23#include <SDL_endian.h> 39#include <SDL_endian.h>
24#include <SDL_image.h> 40#include <SDL_image.h>
25#include <SDL_mixer.h> 41#include <SDL_mixer.h>
26#include <SDL_opengl.h> 42#include <SDL_opengl.h>
27 43
… …
29#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
30 46
31#include <glib/gmacros.h> 47#include <glib/gmacros.h>
32 48
33#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
34 61
35#ifndef _WIN32 62#ifndef _WIN32
36# include <sys/types.h> 63# include <sys/types.h>
37# include <sys/socket.h> 64# include <sys/socket.h>
38# include <netinet/in.h> 65# include <netinet/in.h>
39# include <netinet/tcp.h> 66# include <netinet/tcp.h>
40# include <inttypes.h> 67# include <inttypes.h>
68#endif
69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
41#else 72#else
42 typedef unsigned char uint8_t; 73# define expect(expr,value) (expr)
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 74#endif
49 75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 80
52#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
53 82
54#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
56 85
57#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
58 87
88/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90
59#if 0 91#if 1
60# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 93#else
62# define PARACHUTE 0 94# define PARACHUTE 0
63#endif 95#endif
64 96
97static AV *texture_av;
98
65static struct 99static struct
66{ 100{
67#define GL_FUNC(ptr,name) ptr name; 101#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 102#include "glfunc.h"
69#undef GL_FUNC 103#undef GL_FUNC
70} gl; 104} gl;
71 105
106static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 107gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 108{
74 if (gl.BlendFuncSeparate) 109 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 110 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 111 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 112 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 113 else
79 glBlendFunc (sa, da); 114 glBlendFunc (sa, da);
80} 115}
81 116
117static GLuint
118gen_texture ()
119{
120 GLuint name;
121
122 if (AvFILL (texture_av) >= 0)
123 name = (GLuint)(size_t)av_pop (texture_av);
124 else
125 glGenTextures (1, &name);
126
127 return name;
128}
129
130static void
131del_texture (GLuint name)
132{
133 /* make a half-assed attempt at returning the memory used by the texture */
134 /* textures are frequently being reused by cfplus anyway */
135 /*glBindTexture (GL_TEXTURE_2D, name);*/
136 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
137 av_push (texture_av, (SV *)(size_t)name);
138 glDeleteTextures (1, &name);
139}
140
82#include "texcache.c" 141#include "texcache.c"
142#include "rendercache.c"
83 143
84#include "pango-font.c" 144#include "pango-font.c"
85#include "pango-fontmap.c" 145#include "pango-fontmap.c"
86#include "pango-render.c" 146#include "pango-render.c"
87 147
148typedef IV DC__Channel;
149typedef SDL_RWops *DC__RW;
88typedef Mix_Chunk *CFPlus__MixChunk; 150typedef Mix_Chunk *DC__MixChunk;
89typedef Mix_Music *CFPlus__MixMusic; 151typedef Mix_Music *DC__MixMusic;
90 152
91typedef PangoFontDescription *CFPlus__Font; 153typedef PangoFontDescription *DC__Font;
92 154
93static int 155static int
94shape_attr_p (PangoLayoutRun *run) 156shape_attr_p (PangoLayoutRun *run)
95{ 157{
96 GSList *attrs = run->item->analysis.extra_attrs; 158 GSList *attrs = run->item->analysis.extra_attrs;
… …
110 172
111typedef struct cf_layout { 173typedef struct cf_layout {
112 PangoLayout *pl; 174 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode 175 float r, g, b, a; // default color for rgba mode
114 int base_height; 176 int base_height;
115 CFPlus__Font font; 177 DC__Font font;
178 rc_t *rc;
116} *CFPlus__Layout; 179} *DC__Layout;
117 180
118static CFPlus__Font default_font; 181static DC__Font default_font;
119static PangoContext *opengl_context; 182static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap; 183static PangoFontMap *opengl_fontmap;
121 184
122static void 185static void
123substitute_func (FcPattern *pattern, gpointer data) 186substitute_func (FcPattern *pattern, gpointer data)
… …
128#endif 191#endif
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 192 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130} 193}
131 194
132static void 195static void
133layout_update_font (CFPlus__Layout self) 196layout_update_font (DC__Layout self)
134{ 197{
135 /* use a random scale factor to account for unknown descenders, 0.8 works 198 /* use a random scale factor to account for unknown descenders, 0.8 works
136 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
137 */ 200 */
138 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
139 202
140 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
141 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
142 205
143 pango_layout_set_font_description (self->pl, font); 206 pango_layout_set_font_description (self->pl, font);
144} 207}
145 208
146static void 209static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 210layout_get_pixel_size (DC__Layout self, int *w, int *h)
148{ 211{
149 PangoRectangle rect; 212 PangoRectangle rect;
150 213
151 // get_pixel_* wrongly rounds down 214 // get_pixel_* wrongly rounds down
152 pango_layout_get_extents (self->pl, 0, &rect); 215 pango_layout_get_extents (self->pl, 0, &rect);
… …
155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; 218 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
156 219
157 if (!rect.width) rect.width = 1; 220 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1; 221 if (!rect.height) rect.height = 1;
159 222
160 rect.width = (rect.width + 3) & ~3;
161
162 *w = rect.width; 223 *w = rect.width;
163 *h = rect.height; 224 *h = rect.height;
164} 225}
165 226
227typedef uint16_t tileid;
166typedef uint16_t mapface; 228typedef uint16_t faceid;
167 229
168typedef struct { 230typedef struct {
169 GLint name; 231 GLuint name;
170 int w, h; 232 int w, h;
171 float s, t; 233 float s, t;
172 uint8_t r, g, b, a; 234 uint8_t r, g, b, a;
235 tileid smoothtile;
236 uint8_t smoothlevel;
173} maptex; 237} maptex;
174 238
175typedef struct { 239typedef struct {
240 uint32_t player;
241 tileid tile[3];
176 int16_t darkness; 242 uint16_t darkness;
177 mapface face[3]; 243 uint8_t stat_width, stat_hp, flags, smoothmax;
178} mapcell; 244} mapcell;
179 245
180typedef struct { 246typedef struct {
181 int32_t c0, c1; 247 int32_t c0, c1;
182 mapcell *col; 248 mapcell *col;
183} maprow; 249} maprow;
184 250
185typedef struct map { 251typedef struct map {
186 int x, y, w, h; 252 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 253 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 254 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 255 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 256
194 int32_t rows; 257 int32_t rows;
195 maprow *row; 258 maprow *row;
196} *CFPlus__Map; 259} *DC__Map;
197 260
198static char * 261static char *
199prepend (char *ptr, int sze, int inc) 262prepend (char *ptr, int sze, int inc)
200{ 263{
201 char *p; 264 char *p;
… …
218} 281}
219 282
220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 283#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 284#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
222 285
286static void
287need_facenum (struct map *self, faceid face)
288{
289 while (self->faces <= face)
290 {
291 Append (tileid, self->face2tile, self->faces, self->faces);
292 self->faces *= 2;
293 }
294}
295
296static void
297need_texid (struct map *self, int texid)
298{
299 while (self->texs <= texid)
300 {
301 Append (maptex, self->tex, self->texs, self->texs);
302 self->texs *= 2;
303 }
304}
305
223static maprow * 306static maprow *
224map_get_row (CFPlus__Map self, int y) 307map_get_row (DC__Map self, int y)
225{ 308{
226 if (0 > y) 309 if (0 > y)
227 { 310 {
228 int extend = - y + MAP_EXTEND_Y; 311 int extend = - y + MAP_EXTEND_Y;
229 Prepend (maprow, self->row, self->rows, extend); 312 Prepend (maprow, self->row, self->rows, extend);
… …
267 350
268 return row->col + (x - row->c0); 351 return row->col + (x - row->c0);
269} 352}
270 353
271static mapcell * 354static mapcell *
272map_get_cell (CFPlus__Map self, int x, int y) 355map_get_cell (DC__Map self, int x, int y)
273{ 356{
274 return row_get_cell (map_get_row (self, y), x); 357 return row_get_cell (map_get_row (self, y), x);
275} 358}
276 359
277static void 360static void
278map_clear (CFPlus__Map self) 361map_clear (DC__Map self)
279{ 362{
280 int r; 363 int r;
281 364
282 for (r = 0; r < self->rows; r++) 365 for (r = 0; r < self->rows; r++)
283 Safefree (self->row[r].col); 366 Safefree (self->row[r].col);
… …
291 self->row = 0; 374 self->row = 0;
292 self->rows = 0; 375 self->rows = 0;
293} 376}
294 377
295static void 378static void
296map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 379map_blank (DC__Map self, int x0, int y0, int w, int h)
297{ 380{
298 int x, y; 381 int x, y;
299 maprow *row; 382 maprow *row;
383 mapcell *cell;
300 384
301 for (y = y0; y < y0 + h; y++) 385 for (y = y0; y < y0 + h; y++)
302 if (y >= 0) 386 if (y >= 0)
303 { 387 {
304 if (y >= self->rows) 388 if (y >= self->rows)
… …
310 if (x >= row->c0) 394 if (x >= row->c0)
311 { 395 {
312 if (x >= row->c1) 396 if (x >= row->c1)
313 break; 397 break;
314 398
315 row->col[x - row->c0].darkness = -1; 399 cell = row->col + x - row->c0;
400
401 cell->darkness = 0;
402 cell->stat_hp = 0;
403 cell->flags = 0;
404 cell->player = 0;
316 } 405 }
317 } 406 }
407}
408
409typedef struct {
410 tileid tile;
411 uint8_t x, y, level;
412} smooth_key;
413
414static void
415smooth_or_bits (HV *hv, smooth_key *key, IV bits)
416{
417 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
418
419 if (SvIOK (*sv))
420 SvIV_set (*sv, SvIVX (*sv) | bits);
421 else
422 sv_setiv (*sv, bits);
318} 423}
319 424
320static void 425static void
321music_finished (void) 426music_finished (void)
322{ 427{
… …
358 n |= n >> 16; 463 n |= n >> 16;
359 464
360 return n + 1; 465 return n + 1;
361} 466}
362 467
363MODULE = CFPlus PACKAGE = CFPlus 468static unsigned int
469popcount (unsigned int n)
470{
471 n -= (n >> 1) & 0x55555555U;
472 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
473 n = ((n >> 4) + n) & 0x0f0f0f0fU;
474 n *= 0x01010101U;
475
476 return n >> 24;
477}
478
479/* SDL should provide this, really. */
480#define SDLK_MODIFIER_MIN 300
481#define SDLK_MODIFIER_MAX 314
482
483/******************************************************************************/
484
485static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
486static GV *hover_gv;
487
488static int
489within_widget (SV *widget, NV x, NV y)
490{
491 HV *self;
492 SV **svp;
493 NV wx, ww, wy, wh;
494
495 if (!SvROK (widget))
496 return 0;
497
498 self = (HV *)SvRV (widget);
499
500 if (SvTYPE (self) != SVt_PVHV)
501 return 0;
502
503 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
504 if (y < wy)
505 return 0;
506
507 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
508 if (y >= wy + wh)
509 return 0;
510
511 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
512 if (x < wx)
513 return 0;
514
515 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
516 if (x >= wx + ww)
517 return 0;
518
519 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
520 if (!svp || !SvTRUE (*svp))
521 return 0;
522
523 return 1;
524}
525
526MODULE = Deliantra::Client PACKAGE = DC
364 527
365PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
366 529
367BOOT: 530BOOT:
368{ 531{
369 HV *stash = gv_stashpv ("CFPlus", 1); 532 HV *stash = gv_stashpv ("DC", 1);
370 static const struct { 533 static const struct {
371 const char *name; 534 const char *name;
372 IV iv; 535 IV iv;
373 } *civ, const_iv[] = { 536 } *civ, const_iv[] = {
374# define const_iv(name) { # name, (IV)name } 537# define const_iv(name) { # name, (IV)name }
538 const_iv (SDLK_MODIFIER_MIN),
539 const_iv (SDLK_MODIFIER_MAX),
540
375 const_iv (SDL_ACTIVEEVENT), 541 const_iv (SDL_ACTIVEEVENT),
376 const_iv (SDL_KEYDOWN), 542 const_iv (SDL_KEYDOWN),
377 const_iv (SDL_KEYUP), 543 const_iv (SDL_KEYUP),
378 const_iv (SDL_MOUSEMOTION), 544 const_iv (SDL_MOUSEMOTION),
379 const_iv (SDL_MOUSEBUTTONDOWN), 545 const_iv (SDL_MOUSEBUTTONDOWN),
… …
388 const_iv (SDL_EVENT_RESERVEDA), 554 const_iv (SDL_EVENT_RESERVEDA),
389 const_iv (SDL_EVENT_RESERVEDB), 555 const_iv (SDL_EVENT_RESERVEDB),
390 const_iv (SDL_VIDEORESIZE), 556 const_iv (SDL_VIDEORESIZE),
391 const_iv (SDL_VIDEOEXPOSE), 557 const_iv (SDL_VIDEOEXPOSE),
392 const_iv (SDL_USEREVENT), 558 const_iv (SDL_USEREVENT),
559
560 const_iv (SDL_APPINPUTFOCUS),
561 const_iv (SDL_APPMOUSEFOCUS),
562 const_iv (SDL_APPACTIVE),
563
564 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST),
393 const_iv (SDLK_KP0), 566 const_iv (SDLK_KP0),
394 const_iv (SDLK_KP1), 567 const_iv (SDLK_KP1),
395 const_iv (SDLK_KP2), 568 const_iv (SDLK_KP2),
396 const_iv (SDLK_KP3), 569 const_iv (SDLK_KP3),
397 const_iv (SDLK_KP4), 570 const_iv (SDLK_KP4),
… …
452 const_iv (SDLK_BREAK), 625 const_iv (SDLK_BREAK),
453 const_iv (SDLK_MENU), 626 const_iv (SDLK_MENU),
454 const_iv (SDLK_POWER), 627 const_iv (SDLK_POWER),
455 const_iv (SDLK_EURO), 628 const_iv (SDLK_EURO),
456 const_iv (SDLK_UNDO), 629 const_iv (SDLK_UNDO),
630
457 const_iv (KMOD_NONE), 631 const_iv (KMOD_NONE),
632 const_iv (KMOD_SHIFT),
458 const_iv (KMOD_LSHIFT), 633 const_iv (KMOD_LSHIFT),
459 const_iv (KMOD_RSHIFT), 634 const_iv (KMOD_RSHIFT),
635 const_iv (KMOD_CTRL),
460 const_iv (KMOD_LCTRL), 636 const_iv (KMOD_LCTRL),
461 const_iv (KMOD_RCTRL), 637 const_iv (KMOD_RCTRL),
638 const_iv (KMOD_ALT),
462 const_iv (KMOD_LALT), 639 const_iv (KMOD_LALT),
463 const_iv (KMOD_RALT), 640 const_iv (KMOD_RALT),
641 const_iv (KMOD_META),
464 const_iv (KMOD_LMETA), 642 const_iv (KMOD_LMETA),
465 const_iv (KMOD_RMETA), 643 const_iv (KMOD_RMETA),
466 const_iv (KMOD_NUM), 644 const_iv (KMOD_NUM),
467 const_iv (KMOD_CAPS), 645 const_iv (KMOD_CAPS),
468 const_iv (KMOD_MODE), 646 const_iv (KMOD_MODE),
469 const_iv (KMOD_CTRL), 647
470 const_iv (KMOD_SHIFT), 648 const_iv (MIX_DEFAULT_FORMAT),
471 const_iv (KMOD_ALT),
472 const_iv (KMOD_META)
473# undef const_iv 649# undef const_iv
474 }; 650 };
475 651
476 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
477 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
654
655 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
656 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
478} 657}
658
659void
660weaken (SV *rv)
661 PROTOTYPE: $
662 CODE:
663 sv_rvweaken (rv);
479 664
480int 665int
481in_destruct () 666in_destruct ()
482 CODE: 667 CODE:
483 RETVAL = PL_main_cv == Nullcv; 668 RETVAL = PL_main_cv == Nullcv;
… …
485 RETVAL 670 RETVAL
486 671
487NV floor (NV x) 672NV floor (NV x)
488 673
489NV ceil (NV x) 674NV ceil (NV x)
675
676IV minpot (UV n)
677
678IV popcount (UV n)
490 679
491void 680void
492pango_init () 681pango_init ()
493 CODE: 682 CODE:
494{ 683{
495 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
496 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 685 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
497 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
687 /*pango_context_set_font_description (opengl_context, default_font);*/
688#if PANGO_VERSION_CHECK (1, 15, 2)
689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif
498} 692}
693
694char *
695SDL_GetError ()
499 696
500int 697int
501SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
502 699
503void 700void
504SDL_Quit () 701SDL_Quit ()
505 702
506void 703void
507SDL_ListModes () 704SDL_ListModes (int rgb, int alpha)
508 PPCODE: 705 PPCODE:
509{ 706{
510 SDL_Rect **m; 707 SDL_Rect **m;
511 708
512 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 709 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
513 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 710 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
514 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 711 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
515 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 712 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
516 713
517 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 714 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
518 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 715 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
519 716
520 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 717 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
521 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
522 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
524 721
525 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
526#if SDL_VERSION_ATLEAST(1,2,10) 723#if SDL_VERSION_ATLEAST(1,2,10)
527 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 724 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
528 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 725 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
529#endif 726#endif
530 727
531 SDL_EnableUNICODE (1);
532 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
533
534 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
535 729
536 if (m && m != (SDL_Rect **)-1) 730 if (m && m != (SDL_Rect **)-1)
537 while (*m) 731 while (*m)
538 { 732 {
733 if ((*m)->w >= 800 && (*m)->h >= 480)
734 {
539 AV *av = newAV (); 735 AV *av = newAV ();
540 av_push (av, newSViv ((*m)->w)); 736 av_push (av, newSViv ((*m)->w));
541 av_push (av, newSViv ((*m)->h)); 737 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb));
739 av_push (av, newSViv (alpha));
542 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 740 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
741 }
543 742
544 ++m; 743 ++m;
545 } 744 }
546} 745}
547 746
548char *
549SDL_GetError ()
550
551int 747int
552SDL_SetVideoMode (int w, int h, int fullscreen) 748SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
553 CODE: 749 CODE:
750{
751 SDL_EnableUNICODE (1);
752 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
753
754 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
755 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
756 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
757 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
758
554 RETVAL = !!SDL_SetVideoMode ( 759 RETVAL = !!SDL_SetVideoMode (
555 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 760 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
556 ); 761 );
762
557 if (RETVAL) 763 if (RETVAL)
558 { 764 {
559 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 765 av_clear (texture_av);
766
767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
560# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 768#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
561# include "glfunc.h" 769#include "glfunc.h"
562# undef GL_FUNC 770#undef GL_FUNC
563 } 771 }
772}
564 OUTPUT: 773 OUTPUT:
565 RETVAL 774 RETVAL
566 775
567void 776void
568SDL_GL_SwapBuffers () 777SDL_GL_SwapBuffers ()
569 778
570char * 779char *
571SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
572 781
782int
783SDL_GetAppState ()
784
785int
786SDL_GetModState ()
787
573void 788void
574SDL_PollEvent () 789poll_events ()
575 PPCODE: 790 PPCODE:
576{ 791{
577 SDL_Event ev; 792 SDL_Event ev;
578 793
579 while (SDL_PollEvent (&ev)) 794 SDL_PumpEvents ();
795 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
580 { 796 {
581 HV *hv = newHV (); 797 HV *hv = newHV ();
582 hv_store (hv, "type", 4, newSViv (ev.type), 0); 798 hv_store (hv, "type", 4, newSViv (ev.type), 0);
583 799
584 switch (ev.type) 800 switch (ev.type)
585 { 801 {
586 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
587 case SDL_KEYUP: 803 case SDL_KEYUP:
588 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
589 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
590 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
591 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
592 break; 809 break;
593 810
594 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
595 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
596 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 813 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
597 break; 814 break;
598 815
599 case SDL_MOUSEMOTION: 816 case SDL_MOUSEMOTION:
817 {
818 int state = ev.motion.state;
819 int x = ev.motion.x;
820 int y = ev.motion.y;
821 int xrel = ev.motion.xrel;
822 int yrel = ev.motion.yrel;
823
824 /* do simplistic event compression */
825 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
826 && state == ev.motion.state)
827 {
828 xrel += ev.motion.xrel;
829 yrel += ev.motion.yrel;
830 x = ev.motion.x;
831 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 }
834
600 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
601
602 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
603 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
604 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
605 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
606 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
841 }
607 break; 842 break;
608 843
609 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
610 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
611 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
612 847
613 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
614 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
615 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
616 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
621 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 856 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
622 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 857 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
623 break; 858 break;
624 } 859 }
625 860
626 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
627 } 862 }
628} 863}
629 864
630int 865int
631Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
632 POSTCALL: 867 POSTCALL:
633 Mix_HookMusicFinished (music_finished); 868 Mix_HookMusicFinished (music_finished);
634 Mix_ChannelFinished (channel_finished); 869 Mix_ChannelFinished (channel_finished);
635 870
636void 871void
872Mix_QuerySpec ()
873 PPCODE:
874{
875 int freq, channels;
876 Uint16 format;
877
878 if (Mix_QuerySpec (&freq, &format, &channels))
879 {
880 EXTEND (SP, 3);
881 PUSHs (sv_2mortal (newSViv (freq)));
882 PUSHs (sv_2mortal (newSViv (format)));
883 PUSHs (sv_2mortal (newSViv (channels)));
884 }
885}
886
887void
637Mix_CloseAudio () 888Mix_CloseAudio ()
638 889
639int 890int
640Mix_AllocateChannels (int numchans = -1) 891Mix_AllocateChannels (int numchans = -1)
641 892
893const char *
894Mix_GetError ()
895
642void 896void
643lowdelay (int fd, int val = 1) 897lowdelay (int fd, int val = 1)
644 CODE: 898 CODE:
899 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
900
901void
902win32_proxy_info ()
903 PPCODE:
904{
645#ifndef _WIN32 905#ifdef _WIN32
646 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 906 char buffer[2048];
907 DWORD buflen;
908
909 EXTEND (SP, 3);
910
911 buflen = sizeof (buffer);
912 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
913 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
914 {
915 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
916
917 buflen = sizeof (buffer);
918 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
919 {
920 PUSHs (newSVpv (buffer, 0));
921
922 buflen = sizeof (buffer);
923 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
924 PUSHs (newSVpv (buffer, 0));
925 }
926 }
647#endif 927#endif
928}
648 929
649void 930int
650add_font (char *file) 931add_font (char *file)
651 CODE: 932 CODE:
652 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
653 936
654void 937void
655load_image_inline (SV *image_) 938load_image_inline (SV *image_)
656 ALIAS: 939 ALIAS:
657 load_image_file = 1 940 load_image_file = 1
… …
660 STRLEN image_len; 943 STRLEN image_len;
661 char *image = (char *)SvPVbyte (image_, image_len); 944 char *image = (char *)SvPVbyte (image_, image_len);
662 SDL_Surface *surface, *surface2; 945 SDL_Surface *surface, *surface2;
663 SDL_PixelFormat fmt; 946 SDL_PixelFormat fmt;
664 SDL_RWops *rw = ix 947 SDL_RWops *rw = ix
665 ? SDL_RWFromFile (image, "r") 948 ? SDL_RWFromFile (image, "rb")
666 : SDL_RWFromConstMem (image, image_len); 949 : SDL_RWFromConstMem (image, image_len);
667 950
668 if (!rw) 951 if (!rw)
669 croak ("load_image: %s", SDL_GetError ()); 952 croak ("load_image: %s", SDL_GetError ());
670 953
… …
743void 1026void
744error (char *message) 1027error (char *message)
745 CODE: 1028 CODE:
746 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
747#ifdef _WIN32 1030#ifdef _WIN32
748 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
749#endif 1032#endif
750 1033
751void 1034void
752fatal (char *message) 1035fatal (char *message)
753 CODE: 1036 CODE:
754 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
755#ifdef _WIN32 1038#ifdef _WIN32
756 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
757#endif 1040#endif
758 _exit (1); 1041 _exit (1);
759 1042
760void 1043void
761_exit (int retval) 1044_exit (int retval = 0)
762 CODE: 1045 CODE:
1046#ifdef WIN32
1047 ExitThread (retval); // unclean, please beam me up
1048#else
763 _exit (retval); 1049 _exit (retval);
1050#endif
764 1051
765MODULE = CFPlus PACKAGE = CFPlus::Font 1052void
1053debug ()
1054 CODE:
1055{
1056#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK;
1058#endif
1059}
766 1060
767CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
1062
1063PROTOTYPES: DISABLE
1064
1065DC::Font
768new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
769 CODE: 1067 CODE:
770{ 1068{
771 int count; 1069 int count;
772 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
775} 1073}
776 OUTPUT: 1074 OUTPUT:
777 RETVAL 1075 RETVAL
778 1076
779void 1077void
780DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
781 CODE: 1079 CODE:
782 pango_font_description_free (self); 1080 pango_font_description_free (self);
783 1081
784void 1082void
785make_default (CFPlus::Font self) 1083make_default (DC::Font self)
1084 PROTOTYPE: $
786 CODE: 1085 CODE:
787 default_font = self; 1086 default_font = self;
788 1087
789MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
790 1089
1090PROTOTYPES: DISABLE
1091
791void 1092void
792reset_glyph_cache () 1093glyph_cache_backup ()
1094 PROTOTYPE:
793 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
794 tc_clear (); 1102 tc_restore ();
795 1103
796CFPlus::Layout 1104DC::Layout
797new (SV *class) 1105new (SV *class)
798 CODE: 1106 CODE:
799 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
800 1108
801 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
… …
803 RETVAL->g = 1.; 1111 RETVAL->g = 1.;
804 RETVAL->b = 1.; 1112 RETVAL->b = 1.;
805 RETVAL->a = 1.; 1113 RETVAL->a = 1.;
806 RETVAL->base_height = MIN_FONT_HEIGHT; 1114 RETVAL->base_height = MIN_FONT_HEIGHT;
807 RETVAL->font = 0; 1115 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
808 1117
809 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
810 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
811 OUTPUT: 1120 OUTPUT:
812 RETVAL 1121 RETVAL
813 1122
814void 1123void
815DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
816 CODE: 1125 CODE:
817 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1127 rc_free (self->rc);
818 Safefree (self); 1128 Safefree (self);
819 1129
820void 1130void
821set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
822 CODE: 1132 CODE:
823{ 1133{
824 STRLEN textlen; 1134 STRLEN textlen;
825 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
826 1136
827 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
828} 1138}
829 1139
830void 1140void
831set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
832 CODE: 1142 CODE:
833{ 1143{
834 STRLEN textlen; 1144 STRLEN textlen;
835 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
836 1146
837 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
838} 1148}
839 1149
840void 1150void
841set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
842 CODE: 1152 CODE:
843{ 1153{
844 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
845 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
846 const char *pos = text; 1156 const char *pos = text;
… …
881 if (attrs) 1191 if (attrs)
882 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
883} 1193}
884 1194
885void 1195void
886get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
887 PPCODE: 1197 PPCODE:
888{ 1198{
889 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
890 1200
891 do 1201 do
892 { 1202 {
893 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
894 1204
895 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
896 { 1206 {
897 PangoRectangle extents; 1207 PangoRectangle extents;
898 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
906 1216
907 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
908} 1218}
909 1219
910int 1220int
911has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
912 CODE: 1222 CODE:
913{ 1223{
914 int lines = 1; 1224 int lines = 1;
915 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
916 1226
… …
921} 1231}
922 OUTPUT: 1232 OUTPUT:
923 RETVAL 1233 RETVAL
924 1234
925SV * 1235SV *
926get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
927 CODE: 1237 CODE:
928 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
929 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
930 OUTPUT: 1240 OUTPUT:
931 RETVAL 1241 RETVAL
932 1242
933void 1243void
934set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1244set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
935 CODE: 1245 CODE:
936 self->r = r; 1246 self->r = r;
937 self->g = g; 1247 self->g = g;
938 self->b = b; 1248 self->b = b;
939 self->a = a; 1249 self->a = a;
940 1250
941void 1251void
942set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
943 CODE: 1253 CODE:
944 if (self->font != font) 1254 if (self->font != font)
945 { 1255 {
946 self->font = font; 1256 self->font = font;
947 layout_update_font (self); 1257 layout_update_font (self);
948 } 1258 }
949 1259
950void 1260void
951set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
952 CODE: 1262 CODE:
953 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
954 { 1264 {
955 self->base_height = base_height; 1265 self->base_height = base_height;
956 layout_update_font (self); 1266 layout_update_font (self);
957 } 1267 }
958 1268
959void 1269void
960set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
961 CODE: 1271 CODE:
962 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1272 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
963 1273
964void 1274void
965set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
966 CODE: 1276 CODE:
967 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
968 1278
969void 1279void
970set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
971 CODE: 1281 CODE:
972 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
973 1283
974void 1284void
975set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
976 CODE: 1286 CODE:
977 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
978 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
979 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
980 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
981 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
982 ); 1292 );
983 1293
984void 1294void
985set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
986 CODE: 1296 CODE:
987 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
988 1298
989void 1299void
990size (CFPlus::Layout self) 1300size (DC::Layout self)
991 PPCODE: 1301 PPCODE:
992{ 1302{
993 int w, h; 1303 int w, h;
994 1304
995 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
… …
998 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
999 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1000} 1310}
1001 1311
1002int 1312int
1003descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1004 CODE: 1314 CODE:
1005{ 1315{
1006 PangoRectangle rect; 1316 PangoRectangle rect;
1007 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1008 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1009 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1010} 1320}
1011 OUTPUT: 1321 OUTPUT:
1012 RETVAL 1322 RETVAL
1013 1323
1014int 1324int
1015xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1016 CODE: 1326 CODE:
1017{ 1327{
1018 int index, trailing; 1328 int index, trailing;
1019 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1329 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1020 RETVAL = index; 1330 RETVAL = index + trailing;
1021} 1331}
1022 OUTPUT: 1332 OUTPUT:
1023 RETVAL 1333 RETVAL
1024 1334
1025void 1335void
1026cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1027 PPCODE: 1337 PPCODE:
1028{ 1338{
1029 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1030 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1031 1341
1032 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1033 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1034 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1035 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1036} 1346}
1037 1347
1038void 1348void
1039render (CFPlus::Layout self, float x, float y, int flags = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1040 PPCODE: 1350 PPCODE:
1351{
1352 int line, x;
1353
1354 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1355#if !PANGO_VERSION_CHECK (1, 17, 3)
1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1357 --line;
1358#endif
1359 EXTEND (SP, 2);
1360 PUSHs (sv_2mortal (newSViv (line)));
1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1362}
1363
1364void
1365line_x_to_index (DC::Layout self, int line, int x)
1366 PPCODE:
1367{
1368 PangoLayoutLine *lp;
1369 int index, trailing;
1370
1371 if (line < 0)
1372 XSRETURN_EMPTY;
1373
1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1375 XSRETURN_EMPTY; /* do better */
1376
1377 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1378
1379 EXTEND (SP, 2);
1380 if (GIMME_V == G_SCALAR)
1381 PUSHs (sv_2mortal (newSViv (index + trailing)));
1382 else
1383 {
1384 PUSHs (sv_2mortal (newSViv (index)));
1385 PUSHs (sv_2mortal (newSViv (trailing)));
1386 }
1387}
1388
1389void
1390render (DC::Layout self, float x, float y, int flags = 0)
1391 CODE:
1392 rc_clear (self->rc);
1041 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1042 self->pl, 1394 self->pl,
1395 self->rc,
1043 x * PANGO_SCALE, y * PANGO_SCALE, 1396 x * PANGO_SCALE, y * PANGO_SCALE,
1044 self->r, self->g, self->b, self->a, 1397 self->r, self->g, self->b, self->a,
1045 flags 1398 flags
1046 ); 1399 );
1400 // we assume that context_change actually clears/frees stuff
1401 // and does not do any recomputation...
1402 pango_layout_context_changed (self->pl);
1047 1403
1048MODULE = CFPlus PACKAGE = CFPlus::Texture
1049
1050void 1404void
1051pad2pot (SV *data_, SV *w_, SV *h_) 1405draw (DC::Layout self)
1052 CODE: 1406 CODE:
1053{ 1407{
1054 int ow = SvIV (w_); 1408 glEnable (GL_TEXTURE_2D);
1055 int oh = SvIV (h_); 1409 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1410 glEnable (GL_BLEND);
1411 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1412 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1413 glEnable (GL_ALPHA_TEST);
1414 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1056 1415
1057 if (ow && oh) 1416 rc_draw (self->rc);
1417
1418 glDisable (GL_ALPHA_TEST);
1419 glDisable (GL_BLEND);
1420 glDisable (GL_TEXTURE_2D);
1421}
1422
1423MODULE = Deliantra::Client PACKAGE = DC::Texture
1424
1425PROTOTYPES: ENABLE
1426
1427void
1428pad (SV *data_, int ow, int oh, int nw, int nh)
1429 CODE:
1430{
1431 if ((nw != ow || nh != oh) && SvOK (data_))
1058 { 1432 {
1059 int nw = minpot (ow);
1060 int nh = minpot (oh);
1061
1062 if (nw != ow || nh != oh)
1063 {
1064 if (SvOK (data_))
1065 {
1066 STRLEN datalen; 1433 STRLEN datalen;
1067 char *data = SvPVbyte (data_, datalen); 1434 char *data = SvPVbyte (data_, datalen);
1068 int bpp = datalen / (ow * oh); 1435 int bpp = datalen / (ow * oh);
1069 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1436 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1070 1437
1071 SvPOK_only (result_); 1438 SvPOK_only (result_);
1072 SvCUR_set (result_, nw * nh * bpp); 1439 SvCUR_set (result_, nw * nh * bpp);
1073 1440
1074 memset (SvPVX (result_), 0, nw * nh * bpp); 1441 memset (SvPVX (result_), 0, nw * nh * bpp);
1075 while (oh--) 1442 while (oh--)
1076 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1443 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1077 1444
1078 sv_setsv (data_, result_); 1445 sv_setsv (data_, result_);
1079 }
1080
1081 sv_setiv (w_, nw);
1082 sv_setiv (h_, nh);
1083 }
1084 } 1446 }
1085} 1447}
1086 1448
1087void 1449void
1088draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1450draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1094{ 1456{
1095 HV *hv = (HV *)SvRV (self); 1457 HV *hv = (HV *)SvRV (self);
1096 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1458 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1097 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1459 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1098 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1460 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1461
1462 if (name <= 0)
1463 XSRETURN_EMPTY;
1099 1464
1100 if (items < 5) 1465 if (items < 5)
1101 { 1466 {
1102 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1467 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1103 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1468 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1131 glDisable (GL_ALPHA_TEST); 1496 glDisable (GL_ALPHA_TEST);
1132 glDisable (GL_BLEND); 1497 glDisable (GL_BLEND);
1133 } 1498 }
1134} 1499}
1135 1500
1136MODULE = CFPlus PACKAGE = CFPlus::Map 1501IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1502 CODE:
1503{
1504 GLint width;
1505 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1506 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1507 RETVAL = width > 0;
1508}
1509 OUTPUT:
1510 RETVAL
1137 1511
1138CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1139new (SV *class, int map_width, int map_height) 1513
1514PROTOTYPES: DISABLE
1515
1516DC::Map
1517new (SV *class)
1140 CODE: 1518 CODE:
1141 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1142 RETVAL->x = 0; 1520 RETVAL->x = 0;
1143 RETVAL->y = 0; 1521 RETVAL->y = 0;
1144 RETVAL->w = map_width; 1522 RETVAL->w = 0;
1145 RETVAL->h = map_height; 1523 RETVAL->h = 0;
1146 RETVAL->ox = 0; 1524 RETVAL->ox = 0;
1147 RETVAL->oy = 0; 1525 RETVAL->oy = 0;
1148 RETVAL->faces = 8192; 1526 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1149 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1527 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1150 RETVAL->texs = 8192;
1151 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1152 RETVAL->rows = 0; 1528 RETVAL->rows = 0;
1153 RETVAL->row = 0; 1529 RETVAL->row = 0;
1154 OUTPUT: 1530 OUTPUT:
1155 RETVAL 1531 RETVAL
1156 1532
1157void 1533void
1158DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1159 CODE: 1535 CODE:
1160{ 1536{
1161 map_clear (self); 1537 map_clear (self);
1162 Safefree (self->face); 1538 Safefree (self->face2tile);
1163 Safefree (self->tex); 1539 Safefree (self->tex);
1164 Safefree (self); 1540 Safefree (self);
1165} 1541}
1166 1542
1167void 1543void
1544resize (DC::Map self, int map_width, int map_height)
1545 CODE:
1546 self->w = map_width;
1547 self->h = map_height;
1548
1549void
1168clear (CFPlus::Map self) 1550clear (DC::Map self)
1169 CODE: 1551 CODE:
1170 map_clear (self); 1552 map_clear (self);
1171 1553
1172void 1554void
1173set_face (CFPlus::Map self, int face, int texid) 1555set_tileid (DC::Map self, int face, int tile)
1174 CODE: 1556 CODE:
1175{ 1557{
1176 while (self->faces <= face) 1558 need_facenum (self, face); self->face2tile [face] = tile;
1177 { 1559 need_texid (self, tile);
1178 Append (mapface, self->face, self->faces, self->faces);
1179 self->faces *= 2;
1180 }
1181
1182 self->face [face] = texid;
1183} 1560}
1184 1561
1185void 1562void
1563set_smooth (DC::Map self, int face, int smooth, int level)
1564 CODE:
1565{
1566 tileid texid;
1567 maptex *tex;
1568
1569 if (face < 0 || face >= self->faces)
1570 return;
1571
1572 if (smooth < 0 || smooth >= self->faces)
1573 return;
1574
1575 texid = self->face2tile [face];
1576
1577 if (!texid)
1578 return;
1579
1580 tex = self->tex + texid;
1581 tex->smoothtile = self->face2tile [smooth];
1582 tex->smoothlevel = level;
1583}
1584
1585void
1186set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1586set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1187 CODE: 1587 CODE:
1188{ 1588{
1189 while (self->texs <= texid) 1589 need_texid (self, texid);
1190 {
1191 Append (maptex, self->tex, self->texs, self->texs);
1192 self->texs *= 2;
1193 }
1194 1590
1195 { 1591 {
1196 maptex *tex = self->tex + texid; 1592 maptex *tex = self->tex + texid;
1197 1593
1198 tex->name = name; 1594 tex->name = name;
… …
1215 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1216 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1217} 1613}
1218 1614
1219int 1615int
1220ox (CFPlus::Map self) 1616ox (DC::Map self)
1221 ALIAS: 1617 ALIAS:
1222 oy = 1 1618 oy = 1
1223 x = 2 1619 x = 2
1224 y = 3 1620 y = 3
1225 w = 4 1621 w = 4
… …
1236 } 1632 }
1237 OUTPUT: 1633 OUTPUT:
1238 RETVAL 1634 RETVAL
1239 1635
1240void 1636void
1241scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1242 CODE: 1638 CODE:
1243{ 1639{
1244 if (dx > 0) 1640 if (dx > 0)
1245 map_blank (self, self->x, self->y, dx - 1, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1246 else if (dx < 0) 1642 else if (dx < 0)
1247 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1643 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1248 1644
1249 if (dy > 0) 1645 if (dy > 0)
1250 map_blank (self, self->x, self->y, self->w, dy - 1); 1646 map_blank (self, self->x, self->y, self->w, dy);
1251 else if (dy < 0) 1647 else if (dy < 0)
1252 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1648 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1253 1649
1254 self->ox += dx; self->x += dx; 1650 self->ox += dx; self->x += dx;
1255 self->oy += dy; self->y += dy; 1651 self->oy += dy; self->y += dy;
1256 1652
1257 while (self->y < 0) 1653 while (self->y < 0)
… …
1261 self->rows += MAP_EXTEND_Y; 1657 self->rows += MAP_EXTEND_Y;
1262 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1263 } 1659 }
1264} 1660}
1265 1661
1266void 1662SV *
1267map1a_update (CFPlus::Map self, SV *data_) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1268 CODE: 1664 CODE:
1269{ 1665{
1270 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1271 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1272 mapcell *cell; 1668 mapcell *cell;
1273 int x, y, flags; 1669 int x, y, z, flags;
1670 AV *missing = newAV ();
1671 RETVAL = newRV_noinc ((SV *)missing);
1274 1672
1275 while (data < data_end) 1673 while (data < data_end - 1)
1276 { 1674 {
1277 flags = (data [0] << 8) + data [1]; data += 2; 1675 flags = (data [0] << 8) + data [1]; data += 2;
1278 1676
1279 x = self->x + ((flags >> 10) & 63); 1677 x = self->x + ((flags >> 10) & 63);
1280 y = self->y + ((flags >> 4) & 63); 1678 y = self->y + ((flags >> 4) & 63);
1281 1679
1282 cell = map_get_cell (self, x, y); 1680 cell = map_get_cell (self, x, y);
1283 1681
1284 if (flags & 15) 1682 if (flags & 15)
1285 { 1683 {
1286 if (cell->darkness < 0) 1684 if (!cell->darkness)
1287 { 1685 {
1686 memset (cell, 0, sizeof (*cell));
1288 cell->darkness = 0; 1687 cell->darkness = 256;
1289 cell->face [0] = 0;
1290 cell->face [1] = 0;
1291 cell->face [2] = 0;
1292 } 1688 }
1293 1689
1294 cell->darkness = flags & 8 ? *data++ : 255;
1295
1296 //TODO: don't trust server data to be in-range(!) 1690 //TODO: don't trust server data to be in-range(!)
1297 1691
1298 if (flags & 4) 1692 if (flags & 8)
1299 { 1693 {
1300 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1694 if (extmap)
1695 {
1696 uint8_t ext, cmd;
1697
1698 do
1699 {
1700 ext = *data++;
1701 cmd = ext & 0x7f;
1702
1703 if (cmd < 4)
1704 cell->darkness = 255 - ext * 64 + 1;
1705 else if (cmd == 5) // health
1706 {
1707 cell->stat_width = 1;
1708 cell->stat_hp = *data++;
1709 }
1710 else if (cmd == 6) // monster width
1711 cell->stat_width = *data++ + 1;
1712 else if (cmd == 0x47)
1713 {
1714 if (*data == 1) cell->player = data [1];
1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1718
1719 data += *data + 1;
1720 }
1721 else if (cmd == 8) // cell flags
1722 cell->flags = *data++;
1723 else if (ext & 0x40) // unknown, multibyte => skip
1724 data += *data + 1;
1725 else
1726 data++;
1727 }
1728 while (ext & 0x80);
1729 }
1730 else
1731 cell->darkness = *data++ + 1;
1301 } 1732 }
1302 1733
1734 for (z = 0; z <= 2; ++z)
1303 if (flags & 2) 1735 if (flags & (4 >> z))
1304 { 1736 {
1305 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1737 faceid face = (data [0] << 8) + data [1]; data += 2;
1738 need_facenum (self, face);
1739 cell->tile [z] = self->face2tile [face];
1740
1741 if (cell->tile [z])
1742 {
1743 maptex *tex = self->tex + cell->tile [z];
1744 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z]));
1746
1747 if (tex->smoothtile)
1748 {
1749 maptex *smooth = self->tex + tex->smoothtile;
1750 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile));
1752 }
1753 }
1306 } 1754 }
1307
1308 if (flags & 1)
1309 {
1310 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1311 }
1312 } 1755 }
1313 else 1756 else
1314 cell->darkness = -1; 1757 cell->darkness = 0;
1315 } 1758 }
1316} 1759}
1760 OUTPUT:
1761 RETVAL
1317 1762
1318SV * 1763SV *
1319mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1320 CODE: 1765 CODE:
1321{ 1766{
1322 int x1, x; 1767 int x1, x;
1323 int y1, y; 1768 int y1, y;
1324 int z; 1769 int z;
… …
1345 { 1790 {
1346 mapcell *cell = row->col + (x - row->c0); 1791 mapcell *cell = row->col + (x - row->c0);
1347 1792
1348 for (z = 0; z <= 0; z++) 1793 for (z = 0; z <= 0; z++)
1349 { 1794 {
1350 mapface face = cell->face [z];
1351
1352 if (face)
1353 {
1354 maptex tex = self->tex [face]; 1795 maptex tex = self->tex [cell->tile [z]];
1355 int a0 = 255 - tex.a; 1796 int a0 = 255 - tex.a;
1356 int a1 = tex.a; 1797 int a1 = tex.a;
1357 1798
1358 r = (r * a0 + tex.r * a1) / 255; 1799 r = (r * a0 + tex.r * a1) / 255;
1359 g = (g * a0 + tex.g * a1) / 255; 1800 g = (g * a0 + tex.g * a1) / 255;
1360 b = (b * a0 + tex.b * a1) / 255; 1801 b = (b * a0 + tex.b * a1) / 255;
1361 a = (a * a0 + tex.a * a1) / 255; 1802 a = (a * a0 + tex.a * a1) / 255;
1362 }
1363 } 1803 }
1364 } 1804 }
1365 1805
1366 *map++ = (r ) 1806 *map++ = (r )
1367 | (g << 8) 1807 | (g << 8)
… …
1374} 1814}
1375 OUTPUT: 1815 OUTPUT:
1376 RETVAL 1816 RETVAL
1377 1817
1378void 1818void
1379draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1380 CODE: 1820 CODE:
1381{ 1821{
1382 int vx, vy;
1383 int x, y, z; 1822 int x, y, z;
1384 int last_name;
1385 mapface face;
1386 1823
1387 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1388 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1827 smooth_key skey;
1828 int pl_x, pl_y;
1829 maptex pl_tex;
1830 rc_t *rc = rc_alloc ();
1831 rc_key_t key;
1832 rc_array_t *arr;
1389 1833
1390 /* 1834 pl_tex.name = 0;
1391 int vx = self->vx = self->w >= sw
1392 ? self->x + (self->w - sw) / 2
1393 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1394 1835
1395 int vy = self->vy = self->h >= sh 1836 // thats current max. sorry.
1396 ? self->y + (self->h - sh) / 2 1837 if (sw > 255) sw = 255;
1397 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1838 if (sh > 255) sh = 255;
1398 */
1399 1839
1400 glColor4ub (255, 255, 255, 255); 1840 // clear key, in case of extra padding
1841 memset (&skey, 0, sizeof (skey));
1842
1843 memset (&key, 0, sizeof (key));
1844 key.r = 255;
1845 key.g = 255;
1846 key.b = 255;
1847 key.a = 255;
1848 key.mode = GL_QUADS;
1849 key.format = GL_T2F_V3F;
1850 key.texname = -1;
1851
1852 mx += self->x;
1853 my += self->y;
1854
1855 // first pass: determine smooth_max
1856 // rather ugly, if you ask me
1857 // could also be stored inside mapcell and updated on change
1858 memset (smooth_max, 0, sizeof (smooth_max));
1859
1860 for (y = 0; y < sh; y++)
1861 if (0 <= y + my && y + my < self->rows)
1862 {
1863 maprow *row = self->row + (y + my);
1864
1865 for (x = 0; x < sw; x++)
1866 if (row->c0 <= x + mx && x + mx < row->c1)
1867 {
1868 mapcell *cell = row->col + (x + mx - row->c0);
1869
1870 smooth_max[x + 1][y + 1] =
1871 MAX (self->tex [cell->tile [0]].smoothlevel,
1872 MAX (self->tex [cell->tile [1]].smoothlevel,
1873 self->tex [cell->tile [2]].smoothlevel));
1874 }
1875 }
1401 1876
1402 glEnable (GL_BLEND); 1877 glEnable (GL_BLEND);
1403 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1878 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_TEXTURE_2D);
1405 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1406 1880
1407 glBegin (GL_QUADS);
1408
1409 last_name = 0;
1410
1411 for (z = 0; z < 3; z++) 1881 for (z = 0; z <= 2; z++)
1882 {
1883 memset (smooth_level, 0, sizeof (smooth_level));
1884
1412 for (y = 0; y < sh; y++) 1885 for (y = 0; y < sh; y++)
1413 if (0 <= y + vy && y + vy < self->rows) 1886 if (0 <= y + my && y + my < self->rows)
1414 { 1887 {
1415 maprow *row = self->row + (y + vy); 1888 maprow *row = self->row + (y + my);
1416 1889
1417 for (x = 0; x < sw; x++) 1890 for (x = 0; x < sw; x++)
1418 if (row->c0 <= x + vx && x + vx < row->c1) 1891 if (row->c0 <= x + mx && x + mx < row->c1)
1419 { 1892 {
1420 mapcell *cell = row->col + (x + vx - row->c0); 1893 mapcell *cell = row->col + (x + mx - row->c0);
1421
1422 face = cell->face [z]; 1894 tileid tile = cell->tile [z];
1423 1895
1424 if (face) 1896 if (tile)
1897 {
1898 maptex tex = self->tex [tile];
1899 int px = (x + 1) * T - tex.w;
1900 int py = (y + 1) * T - tex.h;
1901
1902 if (key.texname != tex.name)
1903 {
1904 if (!tex.name)
1905 tex = self->tex [2]; /* missing, replace by noface */
1906
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 if (expect_false (cell->player == player) && expect_false (z == 2))
1912 {
1913 pl_x = px;
1914 pl_y = py;
1915 pl_tex = tex;
1916 continue;
1917 }
1918
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1921 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1923
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1927 if (cell->flags & 1)
1928 {
1929 maptex tex = self->tex [1];
1930 int px = x * T + T * 2 / 32;
1931 int py = y * T - T * 6 / 32;
1932
1933 if (tex.name)
1934 {
1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1945 }
1946 }
1947 }
1948
1949 // update smooth hash
1950 if (tex.smoothtile)
1951 {
1952 skey.tile = tex.smoothtile;
1953 skey.level = tex.smoothlevel;
1954
1955 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1956
1957 // add bits to current tile and all neighbours. skey.x|y is
1958 // shifted +1|+1 so we always stay positive.
1959
1960 // bits is ___n cccc CCCC bbbb
1961 // n do not draw borders&corners
1962 // c draw these corners, but...
1963 // C ... not these
1964 // b draw these borders
1965
1966 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1967 // ┃· ·· ·┃ ━━
1968
1969 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1970 // ·· ·· ·┏ ┓·
1971
1972 // full tile
1973 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1974
1975 // borders
1976 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1977 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1978 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1979 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1980
1981 // corners
1982 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1983 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1984 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1985 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1986 }
1987 }
1988 }
1989 }
1990
1991 rc_draw (rc);
1992 rc_clear (rc);
1993
1994 // go through all smoothlevels, lowest to highest, then draw.
1995 // this is basically counting sort
1996 {
1997 int w, b;
1998
1999 glEnable (GL_TEXTURE_2D);
2000 glBegin (GL_QUADS);
2001 for (w = 0; w < 256 / 32; ++w)
2002 {
2003 uint32_t smask = smooth_level [w];
2004 if (smask)
2005 for (b = 0; b < 32; ++b)
2006 if (smask & (((uint32_t)1) << b))
1425 { 2007 {
1426 maptex tex = self->tex [face]; 2008 int level = (w << 5) | b;
2009 HE *he;
1427 2010
1428 int px = (x + 1) * 32 - tex.w; 2011 hv_iterinit (smooth);
1429 int py = (y + 1) * 32 - tex.h; 2012 while ((he = hv_iternext (smooth)))
1430
1431 if (last_name != tex.name)
1432 { 2013 {
2014 smooth_key *skey = (smooth_key *)HeKEY (he);
2015 IV bits = SvIVX (HeVAL (he));
2016
2017 if (!(bits & 0x1000)
2018 && skey->level == level
2019 && level > smooth_max [skey->x][skey->y])
2020 {
2021 maptex tex = self->tex [skey->tile];
2022 int px = (((int)skey->x) - 1) * T;
2023 int py = (((int)skey->y) - 1) * T;
2024 int border = bits & 15;
2025 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2026 float dx = tex.s * .0625f; // 16 images/row
2027 float dy = tex.t * .5f ; // 2 images/column
2028
2029 if (tex.name)
2030 {
2031 // this time avoiding texture state changes
2032 // save gobs of state changes.
2033 if (key.texname != tex.name)
2034 {
1433 glEnd (); 2035 glEnd ();
1434 last_name = tex.name;
1435 glBindTexture (GL_TEXTURE_2D, last_name); 2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1436 glBegin (GL_QUADS); 2037 glBegin (GL_QUADS);
2038 }
2039
2040 if (border)
2041 {
2042 float ox = border * dx;
2043
2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2048 }
2049
2050 if (corner)
2051 {
2052 float ox = corner * dx;
2053
2054 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2058 }
2059 }
2060 }
1437 } 2061 }
1438
1439 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1440 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1441 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1442 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1443 } 2062 }
1444 }
1445 } 2063 }
1446 2064
1447 glEnd (); 2065 glEnd ();
1448
1449 glDisable (GL_TEXTURE_2D); 2066 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1;
2068 }
2069
2070 hv_clear (smooth);
2071 }
2072
2073 if (pl_tex.name)
2074 {
2075 maptex tex = pl_tex;
2076 int px = pl_x + pdx;
2077 int py = pl_y + pdy;
2078
2079 key.texname = tex.name;
2080 arr = rc_array (rc, &key);
2081
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2083 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2084 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086
2087 rc_draw (rc);
2088 }
2089
1450 glDisable (GL_BLEND); 2090 glDisable (GL_BLEND);
1451} 2091 rc_free (rc);
1452 2092
2093 // top layer: overlays such as the health bar
2094 for (y = 0; y < sh; y++)
2095 if (0 <= y + my && y + my < self->rows)
2096 {
2097 maprow *row = self->row + (y + my);
2098
2099 for (x = 0; x < sw; x++)
2100 if (row->c0 <= x + mx && x + mx < row->c1)
2101 {
2102 mapcell *cell = row->col + (x + mx - row->c0);
2103
2104 int px = x * T;
2105 int py = y * T;
2106
2107 if (cell->stat_hp)
2108 {
2109 int width = cell->stat_width * T;
2110 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2111
2112 glColor3ub (0, 0, 0);
2113 glRectf (px + 1, py - thick - 2,
2114 px + width - 1, py);
2115
2116 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
2117 glRectf (px + 2,
2118 py - thick - 1,
2119 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
2120 }
2121 }
2122 }
2123}
2124
1453void 2125void
1454draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2126draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1455 CODE: 2127 CODE:
1456{ 2128{
1457 static float color[16][3] = { 2129 static float color[16][3] = {
1458 { 0.00F, 0.00F, 0.00F }, 2130 { 0.00F, 0.00F, 0.00F },
1459 { 1.00F, 1.00F, 1.00F }, 2131 { 1.00F, 1.00F, 1.00F },
… …
1509 glDisable (GL_BLEND); 2181 glDisable (GL_BLEND);
1510 glDisable (GL_TEXTURE_2D); 2182 glDisable (GL_TEXTURE_2D);
1511} 2183}
1512 2184
1513void 2185void
1514fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2186fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1515 PPCODE: 2187 PPCODE:
1516{ 2188{
1517 int vx, vy;
1518 int x, y; 2189 int x, y;
2190 int sw1 = sw + 2;
2191 int sh1 = sh + 2;
2192 int sh3 = sh * 3;
1519 int sw4 = (sw + 3) & ~3; 2193 int sw34 = (sw * 3 + 3) & ~3;
2194 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1520 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2195 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1521 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2196 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1522 2197
1523 memset (darkness, 255, sw4 * sh);
1524 SvPOK_only (darkness_sv); 2198 SvPOK_only (darkness3_sv);
1525 SvCUR_set (darkness_sv, sw4 * sh); 2199 SvCUR_set (darkness3_sv, sw34 * sh3);
1526 2200
1527 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2201 mx += self->x - 1;
1528 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2202 my += self->y - 1;
1529 2203
2204 memset (darkness1, 255, sw1 * sh1);
2205
1530 for (y = 0; y < sh; y++) 2206 for (y = 0; y < sh1; y++)
1531 if (0 <= y + vy && y + vy < self->rows) 2207 if (0 <= y + my && y + my < self->rows)
1532 { 2208 {
1533 maprow *row = self->row + (y + vy); 2209 maprow *row = self->row + (y + my);
1534 2210
1535 for (x = 0; x < sw; x++) 2211 for (x = 0; x < sw1; x++)
1536 if (row->c0 <= x + vx && x + vx < row->c1) 2212 if (row->c0 <= x + mx && x + mx < row->c1)
1537 { 2213 {
1538 mapcell *cell = row->col + (x + vx - row->c0); 2214 mapcell *cell = row->col + (x + mx - row->c0);
1539 2215
1540 darkness[y * sw4 + x] = cell->darkness < 0 2216 darkness1 [y * sw1 + x] = cell->darkness
2217 ? 255 - (cell->darkness - 1)
1541 ? 255 - FOW_DARKNESS 2218 : 255 - FOW_DARKNESS;
1542 : 255 - cell->darkness;
1543 } 2219 }
1544 } 2220 }
1545 2221
2222 for (y = 0; y < sh; ++y)
2223 for (x = 0; x < sw; ++x)
2224 {
2225 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2226 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2227 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2228 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2229 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2230 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2231 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2232 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2233 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2234
2235 uint8_t r11 = (d11 + d21 + d12) / 3;
2236 uint8_t r21 = d21;
2237 uint8_t r31 = (d21 + d31 + d32) / 3;
2238
2239 uint8_t r12 = d12;
2240 uint8_t r22 = d22;
2241 uint8_t r32 = d32;
2242
2243 uint8_t r13 = (d13 + d23 + d12) / 3;
2244 uint8_t r23 = d23;
2245 uint8_t r33 = (d23 + d33 + d32) / 3;
2246
2247 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2250 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2253 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2256 }
2257
2258 free (darkness1);
2259
1546 EXTEND (SP, 3); 2260 EXTEND (SP, 3);
1547 PUSHs (sv_2mortal (newSViv (sw4))); 2261 PUSHs (sv_2mortal (newSViv (sw34)));
1548 PUSHs (sv_2mortal (newSViv (sh))); 2262 PUSHs (sv_2mortal (newSViv (sh3)));
1549 PUSHs (darkness_sv); 2263 PUSHs (darkness3_sv);
1550} 2264}
1551 2265
1552SV * 2266SV *
1553get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2267get_rect (DC::Map self, int x0, int y0, int w, int h)
1554 CODE: 2268 CODE:
1555{ 2269{
1556 int x, y, x1, y1; 2270 int x, y, x1, y1;
1557 SV *data_sv = newSV (w * h * 7 + 5); 2271 SV *data_sv = newSV (w * h * 7 + 5);
1558 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2272 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1583 if (row && row->c0 <= x && x < row->c1) 2297 if (row && row->c0 <= x && x < row->c1)
1584 { 2298 {
1585 mapcell *cell = row->col + (x - row->c0); 2299 mapcell *cell = row->col + (x - row->c0);
1586 uint8_t flags = 0; 2300 uint8_t flags = 0;
1587 2301
1588 if (cell->face [0]) flags |= 1; 2302 if (cell->tile [0]) flags |= 1;
1589 if (cell->face [1]) flags |= 2; 2303 if (cell->tile [1]) flags |= 2;
1590 if (cell->face [2]) flags |= 4; 2304 if (cell->tile [2]) flags |= 4;
1591 2305
1592 *data++ = flags; 2306 *data++ = flags;
1593 2307
1594 if (flags & 1) 2308 if (flags & 1)
1595 { 2309 {
2310 tileid tile = cell->tile [0];
1596 *data++ = cell->face [0] >> 8; 2311 *data++ = tile >> 8;
1597 *data++ = cell->face [0]; 2312 *data++ = tile;
1598 } 2313 }
1599 2314
1600 if (flags & 2) 2315 if (flags & 2)
1601 { 2316 {
2317 tileid tile = cell->tile [1];
1602 *data++ = cell->face [1] >> 8; 2318 *data++ = tile >> 8;
1603 *data++ = cell->face [1]; 2319 *data++ = tile;
1604 } 2320 }
1605 2321
1606 if (flags & 4) 2322 if (flags & 4)
1607 { 2323 {
2324 tileid tile = cell->tile [2];
1608 *data++ = cell->face [2] >> 8; 2325 *data++ = tile >> 8;
1609 *data++ = cell->face [2]; 2326 *data++ = tile;
1610 } 2327 }
1611 } 2328 }
1612 else 2329 else
1613 *data++ = 0; 2330 *data++ = 0;
1614 } 2331 }
1615 } 2332 }
1616 2333
2334 /* if size is w*h + 5 then no data has been found */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 {
1617 SvPOK_only (data_sv); 2337 SvPOK_only (data_sv);
1618 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 }
2340
1619 RETVAL = data_sv; 2341 RETVAL = data_sv;
1620} 2342}
1621 OUTPUT: 2343 OUTPUT:
1622 RETVAL 2344 RETVAL
1623 2345
1624void 2346void
1625set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2347set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1626 PPCODE: 2348 PPCODE:
1627{ 2349{
1628 int x, y, z; 2350 int x, y, z;
1629 int w, h; 2351 int w, h;
1630 int x1, y1; 2352 int x1, y1;
2353 STRLEN len;
2354 uint8_t *data, *end;
2355
2356 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv);
2359 end = data + len + 8;
2360
2361 if (len < 5)
2362 XSRETURN_EMPTY;
1631 2363
1632 if (*data++ != 0) 2364 if (*data++ != 0)
1633 return; /* version mismatch */ 2365 XSRETURN_EMPTY; /* version mismatch */
1634 2366
1635 w = *data++ << 8; w |= *data++; 2367 w = *data++ << 8; w |= *data++;
1636 h = *data++ << 8; h |= *data++; 2368 h = *data++ << 8; h |= *data++;
1637 2369
1638 // we need to do this 'cause we don't keep an absolute coord system for rows 2370 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
1650 { 2382 {
1651 maprow *row = map_get_row (self, y); 2383 maprow *row = map_get_row (self, y);
1652 2384
1653 for (x = x0; x < x1; x++) 2385 for (x = x0; x < x1; x++)
1654 { 2386 {
2387 uint8_t flags;
2388
2389 if (data + 7 >= end)
2390 XSRETURN_EMPTY;
2391
1655 uint8_t flags = *data++; 2392 flags = *data++;
1656 2393
1657 if (flags) 2394 if (flags)
1658 { 2395 {
1659 mapface face[3] = { 0, 0, 0 };
1660
1661 mapcell *cell = row_get_cell (row, x); 2396 mapcell *cell = row_get_cell (row, x);
2397 tileid tile[3] = { 0, 0, 0 };
1662 2398
1663 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2399 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1664 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2400 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1665 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2401 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1666 2402
1667 if (cell->darkness <= 0) 2403 if (cell->darkness == 0)
1668 { 2404 {
1669 cell->darkness = -1; 2405 /*cell->darkness = 0;*/
2406 EXTEND (SP, 3);
1670 2407
1671 for (z = 0; z <= 2; z++) 2408 for (z = 0; z <= 2; z++)
1672 { 2409 {
1673 cell->face[z] = face[z]; 2410 tileid t = tile [z];
1674 2411
1675 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2412 if (t >= self->texs || (t && !self->tex [t].name))
2413 {
1676 XPUSHs (sv_2mortal (newSViv (face[z]))); 2414 PUSHs (sv_2mortal (newSViv (t)));
2415 need_texid (self, t);
2416 }
2417
2418 cell->tile [z] = t;
1677 } 2419 }
1678 } 2420 }
1679 } 2421 }
1680 } 2422 }
1681 } 2423 }
1682} 2424}
1683 2425
1684MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2426MODULE = Deliantra::Client PACKAGE = DC::RW
1685 2427
1686CFPlus::MixChunk 2428DC::RW
1687new_from_file (SV *class, char *path) 2429new (SV *class, SV *data_sv)
1688 CODE: 2430 CODE:
1689 RETVAL = Mix_LoadWAV (path); 2431{
2432 STRLEN datalen;
2433 char *data = SvPVbyte (data_sv, datalen);
2434
2435 RETVAL = SDL_RWFromConstMem (data, datalen);
2436}
1690 OUTPUT: 2437 OUTPUT:
1691 RETVAL 2438 RETVAL
1692 2439
2440DC::RW
2441new_from_file (SV *class, const char *path, const char *mode = "rb")
2442 CODE:
2443 RETVAL = SDL_RWFromFile (path, mode);
2444 OUTPUT:
2445 RETVAL
2446
2447# fails on win32:
2448# dc.xs(2268) : error C2059: syntax error : '('
1693void 2449#void
2450#close (DC::RW self)
2451# CODE:
2452# (self->(close)) (self);
2453
2454MODULE = Deliantra::Client PACKAGE = DC::Channel
2455
2456PROTOTYPES: DISABLE
2457
2458DC::Channel
2459find ()
2460 CODE:
2461{
2462 RETVAL = Mix_GroupAvailable (-1);
2463
2464 if (RETVAL < 0)
2465 {
2466 RETVAL = Mix_GroupOldest (-1);
2467
2468 if (RETVAL < 0)
2469 XSRETURN_UNDEF;
2470
2471 Mix_HaltChannel (RETVAL);
2472 }
2473
2474 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128);
2476}
2477 OUTPUT:
2478 RETVAL
2479
2480void
2481halt (DC::Channel self)
2482 CODE:
2483 Mix_HaltChannel (self);
2484
2485void
2486expire (DC::Channel self, int ticks = -1)
2487 CODE:
2488 Mix_ExpireChannel (self, ticks);
2489
2490void
2491fade_out (DC::Channel self, int ticks = -1)
2492 CODE:
2493 Mix_FadeOutChannel (self, ticks);
2494
2495int
2496volume (DC::Channel self, int volume)
2497 CODE:
2498 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2499 OUTPUT:
2500 RETVAL
2501
2502void
2503unregister_all_effects (DC::Channel self)
2504 CODE:
2505 Mix_UnregisterAllEffects (self);
2506
2507void
2508set_panning (DC::Channel self, int left, int right)
2509 CODE:
2510 left = CLAMP (left , 0, 255);
2511 right = CLAMP (right, 0, 255);
2512 Mix_SetPanning (self, left, right);
2513
2514void
2515set_distance (DC::Channel self, int distance)
2516 CODE:
2517 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2518
2519void
2520set_position (DC::Channel self, int angle, int distance)
2521 CODE:
2522
2523void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE:
2526{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530}
2531
2532void
2533set_reverse_stereo (DC::Channel self, int flip)
2534 CODE:
2535 Mix_SetReverseStereo (self, flip);
2536
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538
2539PROTOTYPES: DISABLE
2540
2541DC::MixChunk
2542new (SV *class, DC::RW rwops)
2543 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2545 OUTPUT:
2546 RETVAL
2547
2548void
1694DESTROY (CFPlus::MixChunk self) 2549DESTROY (DC::MixChunk self)
1695 CODE: 2550 CODE:
1696 Mix_FreeChunk (self); 2551 Mix_FreeChunk (self);
1697 2552
1698int 2553int
1699volume (CFPlus::MixChunk self, int volume = -1) 2554volume (DC::MixChunk self, int volume = -1)
1700 CODE: 2555 CODE:
2556 if (items > 1)
2557 volume = CLAMP (volume, 0, 128);
1701 RETVAL = Mix_VolumeChunk (self, volume); 2558 RETVAL = Mix_VolumeChunk (self, volume);
1702 OUTPUT: 2559 OUTPUT:
1703 RETVAL 2560 RETVAL
1704 2561
1705int 2562DC::Channel
1706play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2563play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1707 CODE: 2564 CODE:
2565{
1708 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2566 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2567
2568 if (RETVAL < 0)
2569 XSRETURN_UNDEF;
2570
2571 if (channel < 0)
2572 {
2573 Mix_UnregisterAllEffects (RETVAL);
2574 Mix_Volume (RETVAL, 128);
2575 }
2576}
1709 OUTPUT: 2577 OUTPUT:
1710 RETVAL 2578 RETVAL
1711 2579
1712MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1713 2581
1714int 2582int
1715volume (int volume = -1) 2583volume (int volume = -1)
2584 PROTOTYPE: ;$
1716 CODE: 2585 CODE:
2586 if (items > 0)
2587 volume = CLAMP (volume, 0, 128);
1717 RETVAL = Mix_VolumeMusic (volume); 2588 RETVAL = Mix_VolumeMusic (volume);
1718 OUTPUT: 2589 OUTPUT:
1719 RETVAL 2590 RETVAL
1720 2591
2592void
2593fade_out (int ms)
2594 CODE:
2595 Mix_FadeOutMusic (ms);
2596
2597void
2598halt ()
2599 CODE:
2600 Mix_HaltMusic ();
2601
1721CFPlus::MixMusic 2602DC::MixMusic
1722new_from_file (SV *class, char *path) 2603new (SV *class, DC::RW rwops)
1723 CODE: 2604 CODE:
1724 RETVAL = Mix_LoadMUS (path); 2605 RETVAL = Mix_LoadMUS_RW (rwops);
1725 OUTPUT: 2606 OUTPUT:
1726 RETVAL 2607 RETVAL
1727 2608
1728void 2609void
1729DESTROY (CFPlus::MixMusic self) 2610DESTROY (DC::MixMusic self)
1730 CODE: 2611 CODE:
1731 Mix_FreeMusic (self); 2612 Mix_FreeMusic (self);
1732 2613
1733int 2614int
1734play (CFPlus::MixMusic self, int loops = -1) 2615play (DC::MixMusic self, int loops = -1)
1735 CODE: 2616 CODE:
1736 RETVAL = Mix_PlayMusic (self, loops); 2617 RETVAL = Mix_PlayMusic (self, loops);
1737 OUTPUT: 2618 OUTPUT:
1738 RETVAL 2619 RETVAL
1739 2620
1740MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2621void
2622fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2623 CODE:
2624 Mix_FadeInMusicPos (self, loops, ms, position);
2625
2626MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2627
2628PROTOTYPES: ENABLE
1741 2629
1742BOOT: 2630BOOT:
1743{ 2631{
1744 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2632 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1745 static const struct { 2633 static const struct {
1746 const char *name; 2634 const char *name;
1747 IV iv; 2635 IV iv;
1748 } *civ, const_iv[] = { 2636 } *civ, const_iv[] = {
1749# define const_iv(name) { # name, (IV)name } 2637# define const_iv(name) { # name, (IV)name }
2638 const_iv (GL_VENDOR),
2639 const_iv (GL_VERSION),
2640 const_iv (GL_EXTENSIONS),
1750 const_iv (GL_COLOR_MATERIAL), 2641 const_iv (GL_COLOR_MATERIAL),
1751 const_iv (GL_SMOOTH), 2642 const_iv (GL_SMOOTH),
1752 const_iv (GL_FLAT), 2643 const_iv (GL_FLAT),
1753 const_iv (GL_DITHER), 2644 const_iv (GL_DITHER),
1754 const_iv (GL_BLEND), 2645 const_iv (GL_BLEND),
… …
1758 const_iv (GL_ALPHA_TEST), 2649 const_iv (GL_ALPHA_TEST),
1759 const_iv (GL_NORMALIZE), 2650 const_iv (GL_NORMALIZE),
1760 const_iv (GL_RESCALE_NORMAL), 2651 const_iv (GL_RESCALE_NORMAL),
1761 const_iv (GL_FRONT), 2652 const_iv (GL_FRONT),
1762 const_iv (GL_BACK), 2653 const_iv (GL_BACK),
2654 const_iv (GL_AUX0),
1763 const_iv (GL_AND), 2655 const_iv (GL_AND),
1764 const_iv (GL_ONE), 2656 const_iv (GL_ONE),
1765 const_iv (GL_ZERO), 2657 const_iv (GL_ZERO),
1766 const_iv (GL_SRC_ALPHA), 2658 const_iv (GL_SRC_ALPHA),
1767 const_iv (GL_DST_ALPHA), 2659 const_iv (GL_DST_ALPHA),
… …
1780 const_iv (GL_INTENSITY), 2672 const_iv (GL_INTENSITY),
1781 const_iv (GL_LUMINANCE), 2673 const_iv (GL_LUMINANCE),
1782 const_iv (GL_LUMINANCE_ALPHA), 2674 const_iv (GL_LUMINANCE_ALPHA),
1783 const_iv (GL_FLOAT), 2675 const_iv (GL_FLOAT),
1784 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2676 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2677 const_iv (GL_COMPRESSED_ALPHA_ARB),
2678 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2679 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2680 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2681 const_iv (GL_COMPRESSED_RGB_ARB),
2682 const_iv (GL_COMPRESSED_RGBA_ARB),
1785 const_iv (GL_COMPILE), 2683 const_iv (GL_COMPILE),
2684 const_iv (GL_PROXY_TEXTURE_1D),
2685 const_iv (GL_PROXY_TEXTURE_2D),
1786 const_iv (GL_TEXTURE_1D), 2686 const_iv (GL_TEXTURE_1D),
1787 const_iv (GL_TEXTURE_2D), 2687 const_iv (GL_TEXTURE_2D),
1788 const_iv (GL_TEXTURE_ENV), 2688 const_iv (GL_TEXTURE_ENV),
1789 const_iv (GL_TEXTURE_MAG_FILTER), 2689 const_iv (GL_TEXTURE_MAG_FILTER),
1790 const_iv (GL_TEXTURE_MIN_FILTER), 2690 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1811 const_iv (GL_COLOR_LOGIC_OP), 2711 const_iv (GL_COLOR_LOGIC_OP),
1812 const_iv (GL_SEPARABLE_2D), 2712 const_iv (GL_SEPARABLE_2D),
1813 const_iv (GL_CONVOLUTION_2D), 2713 const_iv (GL_CONVOLUTION_2D),
1814 const_iv (GL_CONVOLUTION_BORDER_MODE), 2714 const_iv (GL_CONVOLUTION_BORDER_MODE),
1815 const_iv (GL_CONSTANT_BORDER), 2715 const_iv (GL_CONSTANT_BORDER),
2716 const_iv (GL_POINTS),
1816 const_iv (GL_LINES), 2717 const_iv (GL_LINES),
1817 const_iv (GL_LINE_STRIP), 2718 const_iv (GL_LINE_STRIP),
1818 const_iv (GL_LINE_LOOP), 2719 const_iv (GL_LINE_LOOP),
1819 const_iv (GL_QUADS), 2720 const_iv (GL_QUADS),
1820 const_iv (GL_QUAD_STRIP), 2721 const_iv (GL_QUAD_STRIP),
1821 const_iv (GL_TRIANGLES), 2722 const_iv (GL_TRIANGLES),
1822 const_iv (GL_TRIANGLE_STRIP), 2723 const_iv (GL_TRIANGLE_STRIP),
1823 const_iv (GL_TRIANGLE_FAN), 2724 const_iv (GL_TRIANGLE_FAN),
2725 const_iv (GL_POLYGON),
1824 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2726 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2727 const_iv (GL_POINT_SMOOTH_HINT),
2728 const_iv (GL_LINE_SMOOTH_HINT),
2729 const_iv (GL_POLYGON_SMOOTH_HINT),
2730 const_iv (GL_GENERATE_MIPMAP_HINT),
2731 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1825 const_iv (GL_FASTEST), 2732 const_iv (GL_FASTEST),
2733 const_iv (GL_DONT_CARE),
2734 const_iv (GL_NICEST),
1826 const_iv (GL_V2F), 2735 const_iv (GL_V2F),
1827 const_iv (GL_V3F), 2736 const_iv (GL_V3F),
1828 const_iv (GL_T2F_V3F), 2737 const_iv (GL_T2F_V3F),
1829 const_iv (GL_T2F_N3F_V3F), 2738 const_iv (GL_T2F_N3F_V3F),
1830# undef const_iv 2739# undef const_iv
1831 }; 2740 };
1832 2741
1833 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2742 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1834 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2743 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2744
2745 texture_av = newAV ();
2746 AvREAL_off (texture_av);
1835} 2747}
2748
2749void
2750disable_GL_EXT_blend_func_separate ()
2751 CODE:
2752 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0;
1836 2754
1837char * 2755char *
1838gl_vendor () 2756gl_vendor ()
1839 CODE: 2757 CODE:
1840 RETVAL = (char *)glGetString (GL_VENDOR); 2758 RETVAL = (char *)glGetString (GL_VENDOR);
… …
1853 CODE: 2771 CODE:
1854 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2772 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1855 OUTPUT: 2773 OUTPUT:
1856 RETVAL 2774 RETVAL
1857 2775
2776const char *glGetString (GLenum pname)
2777
2778GLint glGetInteger (GLenum pname)
2779 CODE:
2780 glGetIntegerv (pname, &RETVAL);
2781 OUTPUT:
2782 RETVAL
2783
2784GLdouble glGetDouble (GLenum pname)
2785 CODE:
2786 glGetDoublev (pname, &RETVAL);
2787 OUTPUT:
2788 RETVAL
2789
1858int glGetError () 2790int glGetError ()
1859 2791
1860void glFinish () 2792void glFinish ()
1861 2793
1862void glClear (int mask) 2794void glClear (int mask)
… …
1899# near_ and far_ are due to microsofts buggy "c" compiler 2831# near_ and far_ are due to microsofts buggy "c" compiler
1900void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2832void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1901 2833
1902# near_ and far_ are due to microsofts buggy "c" compiler 2834# near_ and far_ are due to microsofts buggy "c" compiler
1903void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2835void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2836
2837PROTOTYPES: DISABLE
1904 2838
1905void glViewport (int x, int y, int width, int height) 2839void glViewport (int x, int y, int width, int height)
1906 2840
1907void glScissor (int x, int y, int width, int height) 2841void glScissor (int x, int y, int width, int height)
1908 2842
… …
1916 2850
1917void glRotate (float angle, float x, float y, float z) 2851void glRotate (float angle, float x, float y, float z)
1918 CODE: 2852 CODE:
1919 glRotatef (angle, x, y, z); 2853 glRotatef (angle, x, y, z);
1920 2854
1921void glBegin (int mode)
1922
1923void glEnd ()
1924
1925void glColor (float r, float g, float b, float a = 1.0) 2855void glColor (float r, float g, float b, float a = 1.0)
1926 PROTOTYPE: @
1927 ALIAS: 2856 ALIAS:
1928 glColor_premultiply = 1 2857 glColor_premultiply = 1
1929 CODE: 2858 CODE:
1930 if (ix) 2859 if (ix)
1931 { 2860 {
… …
1934 b *= a; 2863 b *= a;
1935 } 2864 }
1936 // microsoft visual "c" rounds instead of truncating... 2865 // microsoft visual "c" rounds instead of truncating...
1937 glColor4f (r, g, b, a); 2866 glColor4f (r, g, b, a);
1938 2867
1939void glInterleavedArrays (int format, int stride, char *data)
1940
1941void glDrawElements (int mode, int count, int type, char *indices)
1942
1943# 1.2 void glDrawRangeElements (int mode, int start, int end
1944
1945void glRasterPos (float x, float y, float z = 0.) 2868void glRasterPos (float x, float y, float z = 0.)
1946 CODE: 2869 CODE:
1947 glRasterPos3f (0, 0, z); 2870 glRasterPos3f (0, 0, z);
1948 glBitmap (0, 0, 0, 0, x, y, 0); 2871 glBitmap (0, 0, 0, 0, x, y, 0);
1949 2872
… …
1953 2876
1954void glTexCoord (float s, float t) 2877void glTexCoord (float s, float t)
1955 CODE: 2878 CODE:
1956 glTexCoord2f (s, t); 2879 glTexCoord2f (s, t);
1957 2880
2881void glRect (float x1, float y1, float x2, float y2)
2882 CODE:
2883 glRectf (x1, y1, x2, y2);
2884
2885void glRect_lineloop (float x1, float y1, float x2, float y2)
2886 CODE:
2887 glBegin (GL_LINE_LOOP);
2888 glVertex2f (x1, y1);
2889 glVertex2f (x2, y1);
2890 glVertex2f (x2, y2);
2891 glVertex2f (x1, y2);
2892 glEnd ();
2893
2894PROTOTYPES: ENABLE
2895
2896void glBegin (int mode)
2897
2898void glEnd ()
2899
2900void glPointSize (GLfloat size)
2901
2902void glLineWidth (GLfloat width)
2903
2904void glInterleavedArrays (int format, int stride, char *data)
2905
2906void glDrawElements (int mode, int count, int type, char *indices)
2907
2908# 1.2 void glDrawRangeElements (int mode, int start, int end
2909
1958void glTexEnv (int target, int pname, float param) 2910void glTexEnv (int target, int pname, float param)
1959 CODE: 2911 CODE:
1960 glTexEnvf (target, pname, param); 2912 glTexEnvf (target, pname, param);
1961 2913
1962void glTexParameter (int target, int pname, float param) 2914void glTexParameter (int target, int pname, float param)
… …
1978void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2930void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1979 CODE: 2931 CODE:
1980 if (gl.SeparableFilter2D) 2932 if (gl.SeparableFilter2D)
1981 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2933 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1982 2934
1983void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2935void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
1984 2936
1985void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2937void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1986 2938
1987void glDrawPixels (int width, int height, int format, int type, char *pixels) 2939void glDrawPixels (int width, int height, int format, int type, char *pixels)
2940
2941void glPixelZoom (float x, float y)
1988 2942
1989void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2943void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1990 2944
1991int glGenTexture () 2945int glGenTexture ()
1992 CODE: 2946 CODE:
1993{ 2947 RETVAL = gen_texture ();
1994 GLuint name;
1995 glGenTextures (1, &name);
1996 RETVAL = name;
1997}
1998 OUTPUT: 2948 OUTPUT:
1999 RETVAL 2949 RETVAL
2000 2950
2001void glDeleteTexture (int name) 2951void glDeleteTexture (int name)
2002 CODE: 2952 CODE:
2003{
2004 GLuint name_ = name;
2005 glDeleteTextures (1, &name_); 2953 del_texture (name);
2006} 2954
2007
2008int glGenList () 2955int glGenList ()
2009 CODE: 2956 CODE:
2010 RETVAL = glGenLists (1); 2957 RETVAL = glGenLists (1);
2011 OUTPUT: 2958 OUTPUT:
2012 RETVAL 2959 RETVAL
… …
2019 2966
2020void glEndList () 2967void glEndList ()
2021 2968
2022void glCallList (int list) 2969void glCallList (int list)
2023 2970
2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2972
2973PROTOTYPES: DISABLE
2974
2975void
2976find_widget (SV *self, NV x, NV y)
2977 PPCODE:
2978{
2979 if (within_widget (self, x, y))
2980 XPUSHs (self);
2981}
2982
2983BOOT:
2984{
2985 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2986
2987 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2988 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2989 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2990 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2991}
2992
2993void
2994draw (SV *self)
2995 CODE:
2996{
2997 HV *hv;
2998 SV **svp;
2999 NV x, y, w, h;
3000 SV *draw_x_sv = GvSV (draw_x_gv);
3001 SV *draw_y_sv = GvSV (draw_y_gv);
3002 SV *draw_w_sv = GvSV (draw_w_gv);
3003 SV *draw_h_sv = GvSV (draw_h_gv);
3004 double draw_x, draw_y;
3005
3006 if (!SvROK (self))
3007 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3008
3009 hv = (HV *)SvRV (self);
3010
3011 if (SvTYPE (hv) != SVt_PVHV)
3012 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3013
3014 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3015 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3016
3017 if (!h || !w)
3018 XSRETURN_EMPTY;
3019
3020 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3021 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3022
3023 draw_x = SvNV (draw_x_sv) + x;
3024 draw_y = SvNV (draw_y_sv) + y;
3025
3026 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3027 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3028 XSRETURN_EMPTY;
3029
3030 sv_setnv (draw_x_sv, draw_x);
3031 sv_setnv (draw_y_sv, draw_y);
3032
3033 glPushMatrix ();
3034 glTranslated (x, y, 0);
3035
3036 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3037 {
3038 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3039
3040 if (svp && SvTRUE (*svp))
3041 {
3042 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3043 glEnable (GL_BLEND);
3044 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3045 glBegin (GL_QUADS);
3046 glVertex2f (0, 0);
3047 glVertex2f (w, 0);
3048 glVertex2f (w, h);
3049 glVertex2f (0, h);
3050 glEnd ();
3051 glDisable (GL_BLEND);
3052 }
3053 }
3054#if 0
3055 // draw borders, for debugging
3056 glPushMatrix ();
3057 glColor4f (1., 1., 0., 1.);
3058 glTranslatef (.5, .5, 0.);
3059 glBegin (GL_LINE_LOOP);
3060 glVertex2f (0 , 0);
3061 glVertex2f (w - 1, 0);
3062 glVertex2f (w - 1, h - 1);
3063 glVertex2f (0 , h - 1);
3064 glEnd ();
3065 glPopMatrix ();
3066#endif
3067 PUSHMARK (SP);
3068 XPUSHs (self);
3069 PUTBACK;
3070 call_method ("_draw", G_VOID | G_DISCARD);
3071 SPAGAIN;
3072
3073 glPopMatrix ();
3074
3075 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3076 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3077}
3078

Diff Legend

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