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

Diff Legend

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