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.158 by root, Sun Oct 1 18:17:37 2006 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC

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

Diff Legend

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