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.180 by root, Fri Apr 13 18:11:26 2007 UTC vs.
Revision 1.257 by root, Mon Mar 24 01:15:21 2008 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
17#endif 27#endif
18 28
19#include <assert.h> 29#include <assert.h>
20#include <math.h> 30#include <math.h>
21#include <string.h> 31#include <string.h>
22#include <stdio.h> 32#include <stdio.h>
23#include <stdlib.h> 33#include <stdlib.h>
24 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
25#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
26#include <SDL_endian.h> 39#include <SDL_endian.h>
27#include <SDL_image.h> 40#include <SDL_image.h>
28#include <SDL_mixer.h> 41#include <SDL_mixer.h>
29#include <SDL_opengl.h> 42#include <SDL_opengl.h>
30 43
… …
32#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
33 46
34#include <glib/gmacros.h> 47#include <glib/gmacros.h>
35 48
36#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
37 61
38#ifndef _WIN32 62#ifndef _WIN32
39# include <sys/types.h> 63# include <sys/types.h>
40# include <sys/socket.h> 64# include <sys/socket.h>
41# include <netinet/in.h> 65# include <netinet/in.h>
… …
50#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
52 76
53#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
54 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
55#if 0 82#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 84#else
58# define PARACHUTE 0 85# define PARACHUTE 0
59#endif 86#endif
60 87
88static AV *texture_av;
89
61static struct 90static struct
62{ 91{
63#define GL_FUNC(ptr,name) ptr name; 92#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 93#include "glfunc.h"
65#undef GL_FUNC 94#undef GL_FUNC
66} gl; 95} gl;
67 96
97static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 98gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 99{
70 if (gl.BlendFuncSeparate) 100 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 101 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 102 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 103 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 104 else
75 glBlendFunc (sa, da); 105 glBlendFunc (sa, da);
76} 106}
77 107
108static GLuint
109gen_texture ()
110{
111 GLuint name;
112
113 if (AvFILL (texture_av) >= 0)
114 name = (GLuint)(size_t)av_pop (texture_av);
115 else
116 glGenTextures (1, &name);
117
118 return name;
119}
120
121static void
122del_texture (GLuint name)
123{
124 /* make a half-assed attempt at returning the memory used by the texture */
125 /* textures are frequently being reused by cfplus anyway */
126 /*glBindTexture (GL_TEXTURE_2D, name);*/
127 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
128 av_push (texture_av, (SV *)(size_t)name);
129 glDeleteTextures (1, &name);
130}
131
78#include "texcache.c" 132#include "texcache.c"
133#include "rendercache.c"
79 134
80#include "pango-font.c" 135#include "pango-font.c"
81#include "pango-fontmap.c" 136#include "pango-fontmap.c"
82#include "pango-render.c" 137#include "pango-render.c"
83 138
139typedef IV DC__Channel;
140typedef SDL_RWops *DC__RW;
84typedef Mix_Chunk *CFPlus__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
85typedef Mix_Music *CFPlus__MixMusic; 142typedef Mix_Music *DC__MixMusic;
86 143
87typedef PangoFontDescription *CFPlus__Font; 144typedef PangoFontDescription *DC__Font;
88 145
89static int 146static int
90shape_attr_p (PangoLayoutRun *run) 147shape_attr_p (PangoLayoutRun *run)
91{ 148{
92 GSList *attrs = run->item->analysis.extra_attrs; 149 GSList *attrs = run->item->analysis.extra_attrs;
… …
106 163
107typedef struct cf_layout { 164typedef struct cf_layout {
108 PangoLayout *pl; 165 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode 166 float r, g, b, a; // default color for rgba mode
110 int base_height; 167 int base_height;
111 CFPlus__Font font; 168 DC__Font font;
169 rc_t *rc;
112} *CFPlus__Layout; 170} *DC__Layout;
113 171
114static CFPlus__Font default_font; 172static DC__Font default_font;
115static PangoContext *opengl_context; 173static PangoContext *opengl_context;
116static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
117 175
118static void 176static void
119substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
… …
124#endif 182#endif
125 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
126} 184}
127 185
128static void 186static void
129layout_update_font (CFPlus__Layout self) 187layout_update_font (DC__Layout self)
130{ 188{
131 /* use a random scale factor to account for unknown descenders, 0.8 works 189 /* use a random scale factor to account for unknown descenders, 0.8 works
132 * reasonably well with bitstream vera 190 * reasonably well with bitstream vera
133 */ 191 */
134 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
… …
138 196
139 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
140} 198}
141 199
142static void 200static void
143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
144{ 202{
145 PangoRectangle rect; 203 PangoRectangle rect;
146 204
147 // get_pixel_* wrongly rounds down 205 // get_pixel_* wrongly rounds down
148 pango_layout_get_extents (self->pl, 0, &rect); 206 pango_layout_get_extents (self->pl, 0, &rect);
… …
159 217
160typedef uint16_t tileid; 218typedef uint16_t tileid;
161typedef uint16_t faceid; 219typedef uint16_t faceid;
162 220
163typedef struct { 221typedef struct {
164 int name; 222 GLuint name;
165 int w, h; 223 int w, h;
166 float s, t; 224 float s, t;
167 uint8_t r, g, b, a; 225 uint8_t r, g, b, a;
168 tileid smoothtile; 226 tileid smoothtile;
169 uint8_t smoothlevel; 227 uint8_t smoothlevel;
… …
187 int faces; tileid *face2tile; // [faceid] 245 int faces; tileid *face2tile; // [faceid]
188 int texs; maptex *tex; // [tileid] 246 int texs; maptex *tex; // [tileid]
189 247
190 int32_t rows; 248 int32_t rows;
191 maprow *row; 249 maprow *row;
192} *CFPlus__Map; 250} *DC__Map;
193 251
194static char * 252static char *
195prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
196{ 254{
197 char *p; 255 char *p;
… …
235 self->texs *= 2; 293 self->texs *= 2;
236 } 294 }
237} 295}
238 296
239static maprow * 297static maprow *
240map_get_row (CFPlus__Map self, int y) 298map_get_row (DC__Map self, int y)
241{ 299{
242 if (0 > y) 300 if (0 > y)
243 { 301 {
244 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
245 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
… …
283 341
284 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
285} 343}
286 344
287static mapcell * 345static mapcell *
288map_get_cell (CFPlus__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
289{ 347{
290 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
291} 349}
292 350
293static void 351static void
294map_clear (CFPlus__Map self) 352map_clear (DC__Map self)
295{ 353{
296 int r; 354 int r;
297 355
298 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
299 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
… …
307 self->row = 0; 365 self->row = 0;
308 self->rows = 0; 366 self->rows = 0;
309} 367}
310 368
311static void 369static void
312map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 370map_blank (DC__Map self, int x0, int y0, int w, int h)
313{ 371{
314 int x, y; 372 int x, y;
315 maprow *row; 373 maprow *row;
316 mapcell *cell; 374 mapcell *cell;
317 375
… …
345} smooth_key; 403} smooth_key;
346 404
347static void 405static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 406smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 407{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 409
352 if (SvIOK (*sv)) 410 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 411 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 412 else
355 sv_setiv (*sv, bits); 413 sv_setiv (*sv, bits);
… …
396 n |= n >> 16; 454 n |= n >> 16;
397 455
398 return n + 1; 456 return n + 1;
399} 457}
400 458
459static unsigned int
460popcount (unsigned int n)
461{
462 n -= (n >> 1) & 0x55555555U;
463 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
464 n = ((n >> 4) + n) & 0x0f0f0f0fU;
465 n *= 0x01010101U;
466
467 return n >> 24;
468}
469
401/* SDL should provide this, really. */ 470/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 471#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 472#define SDLK_MODIFIER_MAX 314
404 473
405MODULE = CFPlus PACKAGE = CFPlus 474/******************************************************************************/
475
476static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
477static GV *hover_gv;
478
479static int
480within_widget (SV *widget, NV x, NV y)
481{
482 HV *self;
483 SV **svp;
484 NV wx, ww, wy, wh;
485
486 if (!SvROK (widget))
487 return 0;
488
489 self = (HV *)SvRV (widget);
490
491 if (SvTYPE (self) != SVt_PVHV)
492 return 0;
493
494 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
495 if (y < wy)
496 return 0;
497
498 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
499 if (y >= wy + wh)
500 return 0;
501
502 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
503 if (x < wx)
504 return 0;
505
506 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
507 if (x >= wx + ww)
508 return 0;
509
510 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
511 if (!svp || !SvTRUE (*svp))
512 return 0;
513
514 return 1;
515}
516
517MODULE = Deliantra::Client PACKAGE = DC
406 518
407PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
408 520
409BOOT: 521BOOT:
410{ 522{
411 HV *stash = gv_stashpv ("CFPlus", 1); 523 HV *stash = gv_stashpv ("DC", 1);
412 static const struct { 524 static const struct {
413 const char *name; 525 const char *name;
414 IV iv; 526 IV iv;
415 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
416# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
… …
438 550
439 const_iv (SDL_APPINPUTFOCUS), 551 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS), 552 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE), 553 const_iv (SDL_APPACTIVE),
442 554
555 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST),
443 const_iv (SDLK_KP0), 557 const_iv (SDLK_KP0),
444 const_iv (SDLK_KP1), 558 const_iv (SDLK_KP1),
445 const_iv (SDLK_KP2), 559 const_iv (SDLK_KP2),
446 const_iv (SDLK_KP3), 560 const_iv (SDLK_KP3),
447 const_iv (SDLK_KP4), 561 const_iv (SDLK_KP4),
… …
519 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
520 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
521 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
522 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
523 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
638
639 const_iv (MIX_DEFAULT_FORMAT),
524# undef const_iv 640# undef const_iv
525 }; 641 };
526 642
527 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
546 662
547NV floor (NV x) 663NV floor (NV x)
548 664
549NV ceil (NV x) 665NV ceil (NV x)
550 666
667IV minpot (UV n)
668
669IV popcount (UV n)
670
551void 671void
552pango_init () 672pango_init ()
553 CODE: 673 CODE:
554{ 674{
555 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
556 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
557 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
678 /*pango_context_set_font_description (opengl_context, default_font);*/
679#if PANGO_VERSION_CHECK (1, 15, 2)
680 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif
558} 683}
684
685char *
686SDL_GetError ()
559 687
560int 688int
561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
562 690
563void 691void
564SDL_Quit () 692SDL_Quit ()
565 693
566void 694void
567SDL_ListModes () 695SDL_ListModes (int rgb, int alpha)
568 PPCODE: 696 PPCODE:
569{ 697{
570 SDL_Rect **m; 698 SDL_Rect **m;
571 699
572 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 700 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 701 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 702 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 703 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576 704
577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 705 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 706 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579 707
580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 708 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 712
585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586#if SDL_VERSION_ATLEAST(1,2,10) 714#if SDL_VERSION_ATLEAST(1,2,10)
587 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
588 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589#endif 717#endif
590 718
591 SDL_EnableUNICODE (1);
592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
593
594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
595 720
596 if (m && m != (SDL_Rect **)-1) 721 if (m && m != (SDL_Rect **)-1)
597 while (*m) 722 while (*m)
598 { 723 {
724 if ((*m)->w >= 800 && (*m)->h >= 480)
725 {
599 AV *av = newAV (); 726 AV *av = newAV ();
600 av_push (av, newSViv ((*m)->w)); 727 av_push (av, newSViv ((*m)->w));
601 av_push (av, newSViv ((*m)->h)); 728 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb));
730 av_push (av, newSViv (alpha));
602 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 731 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
732 }
603 733
604 ++m; 734 ++m;
605 } 735 }
606} 736}
607 737
608char *
609SDL_GetError ()
610
611int 738int
612SDL_SetVideoMode (int w, int h, int fullscreen) 739SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613 CODE: 740 CODE:
741{
742 SDL_EnableUNICODE (1);
743 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
744
745 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
746 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
747 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
748 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
749
614 RETVAL = !!SDL_SetVideoMode ( 750 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 751 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 752 );
753
617 if (RETVAL) 754 if (RETVAL)
618 { 755 {
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 756 av_clear (texture_av);
757
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h" 760#include "glfunc.h"
622# undef GL_FUNC 761#undef GL_FUNC
623 } 762 }
763}
624 OUTPUT: 764 OUTPUT:
625 RETVAL 765 RETVAL
626 766
627void 767void
628SDL_GL_SwapBuffers () 768SDL_GL_SwapBuffers ()
629 769
630char * 770char *
631SDL_GetKeyName (int sym) 771SDL_GetKeyName (int sym)
632 772
773int
774SDL_GetAppState ()
775
776int
777SDL_GetModState ()
778
633void 779void
634SDL_PollEvent () 780poll_events ()
635 PPCODE: 781 PPCODE:
636{ 782{
637 SDL_Event ev; 783 SDL_Event ev;
638 784
639 while (SDL_PollEvent (&ev)) 785 SDL_PumpEvents ();
786 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 787 {
641 HV *hv = newHV (); 788 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 789 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 790
644 switch (ev.type) 791 switch (ev.type)
645 { 792 {
646 case SDL_KEYDOWN: 793 case SDL_KEYDOWN:
647 case SDL_KEYUP: 794 case SDL_KEYUP:
648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
650 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
651 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
653 break; 800 break;
654 801
655 case SDL_ACTIVEEVENT: 802 case SDL_ACTIVEEVENT:
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 805 break;
659 806
660 case SDL_MOUSEMOTION: 807 case SDL_MOUSEMOTION:
808 {
809 int state = ev.motion.state;
810 int x = ev.motion.x;
811 int y = ev.motion.y;
812 int xrel = ev.motion.xrel;
813 int yrel = ev.motion.yrel;
814
815 /* do simplistic event compression */
816 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
817 && state == ev.motion.state)
818 {
819 xrel += ev.motion.xrel;
820 yrel += ev.motion.yrel;
821 x = ev.motion.x;
822 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 }
825
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 827 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 828 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 829 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 830 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 831 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
832 }
668 break; 833 break;
669 834
670 case SDL_MOUSEBUTTONDOWN: 835 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 836 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 837 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
673 838
674 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 839 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
675 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 840 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
676 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 841 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
677 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 842 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
682 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 847 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
683 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 848 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
684 break; 849 break;
685 } 850 }
686 851
687 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
688 } 853 }
689} 854}
690 855
691int 856int
692Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
693 POSTCALL: 858 POSTCALL:
694 Mix_HookMusicFinished (music_finished); 859 Mix_HookMusicFinished (music_finished);
695 Mix_ChannelFinished (channel_finished); 860 Mix_ChannelFinished (channel_finished);
696 861
697void 862void
863Mix_QuerySpec ()
864 PPCODE:
865{
866 int freq, channels;
867 Uint16 format;
868
869 if (Mix_QuerySpec (&freq, &format, &channels))
870 {
871 EXTEND (SP, 3);
872 PUSHs (sv_2mortal (newSViv (freq)));
873 PUSHs (sv_2mortal (newSViv (format)));
874 PUSHs (sv_2mortal (newSViv (channels)));
875 }
876}
877
878void
698Mix_CloseAudio () 879Mix_CloseAudio ()
699 880
700int 881int
701Mix_AllocateChannels (int numchans = -1) 882Mix_AllocateChannels (int numchans = -1)
883
884const char *
885Mix_GetError ()
702 886
703void 887void
704lowdelay (int fd, int val = 1) 888lowdelay (int fd, int val = 1)
705 CODE: 889 CODE:
706 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 890 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
732 } 916 }
733 } 917 }
734#endif 918#endif
735} 919}
736 920
737void 921int
738add_font (char *file) 922add_font (char *file)
739 CODE: 923 CODE:
740 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT:
926 RETVAL
741 927
742void 928void
743load_image_inline (SV *image_) 929load_image_inline (SV *image_)
744 ALIAS: 930 ALIAS:
745 load_image_file = 1 931 load_image_file = 1
… …
748 STRLEN image_len; 934 STRLEN image_len;
749 char *image = (char *)SvPVbyte (image_, image_len); 935 char *image = (char *)SvPVbyte (image_, image_len);
750 SDL_Surface *surface, *surface2; 936 SDL_Surface *surface, *surface2;
751 SDL_PixelFormat fmt; 937 SDL_PixelFormat fmt;
752 SDL_RWops *rw = ix 938 SDL_RWops *rw = ix
753 ? SDL_RWFromFile (image, "r") 939 ? SDL_RWFromFile (image, "rb")
754 : SDL_RWFromConstMem (image, image_len); 940 : SDL_RWFromConstMem (image, image_len);
755 941
756 if (!rw) 942 if (!rw)
757 croak ("load_image: %s", SDL_GetError ()); 943 croak ("load_image: %s", SDL_GetError ());
758 944
… …
831void 1017void
832error (char *message) 1018error (char *message)
833 CODE: 1019 CODE:
834 fprintf (stderr, "ERROR: %s\n", message); 1020 fprintf (stderr, "ERROR: %s\n", message);
835#ifdef _WIN32 1021#ifdef _WIN32
836 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1022 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
837#endif 1023#endif
838 1024
839void 1025void
840fatal (char *message) 1026fatal (char *message)
841 CODE: 1027 CODE:
842 fprintf (stderr, "FATAL: %s\n", message); 1028 fprintf (stderr, "FATAL: %s\n", message);
843#ifdef _WIN32 1029#ifdef _WIN32
844 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1030 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
845#endif 1031#endif
846 _exit (1); 1032 _exit (1);
847 1033
848void 1034void
849_exit (int retval = 0) 1035_exit (int retval = 0)
… …
852 ExitThread (retval); // unclean, please beam me up 1038 ExitThread (retval); // unclean, please beam me up
853#else 1039#else
854 _exit (retval); 1040 _exit (retval);
855#endif 1041#endif
856 1042
857MODULE = CFPlus PACKAGE = CFPlus::Font 1043void
1044debug ()
1045 CODE:
1046{
1047#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK;
1049#endif
1050}
858 1051
859CFPlus::Font 1052MODULE = Deliantra::Client PACKAGE = DC::Font
1053
1054PROTOTYPES: DISABLE
1055
1056DC::Font
860new_from_file (SV *class, char *path, int id = 0) 1057new_from_file (SV *class, char *path, int id = 0)
861 CODE: 1058 CODE:
862{ 1059{
863 int count; 1060 int count;
864 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
867} 1064}
868 OUTPUT: 1065 OUTPUT:
869 RETVAL 1066 RETVAL
870 1067
871void 1068void
872DESTROY (CFPlus::Font self) 1069DESTROY (DC::Font self)
873 CODE: 1070 CODE:
874 pango_font_description_free (self); 1071 pango_font_description_free (self);
875 1072
876void 1073void
877make_default (CFPlus::Font self) 1074make_default (DC::Font self)
1075 PROTOTYPE: $
878 CODE: 1076 CODE:
879 default_font = self; 1077 default_font = self;
880 1078
881MODULE = CFPlus PACKAGE = CFPlus::Layout 1079MODULE = Deliantra::Client PACKAGE = DC::Layout
882 1080
1081PROTOTYPES: DISABLE
1082
883void 1083void
884reset_glyph_cache () 1084glyph_cache_backup ()
1085 PROTOTYPE:
885 CODE: 1086 CODE:
1087 tc_backup ();
1088
1089void
1090glyph_cache_restore ()
1091 PROTOTYPE:
1092 CODE:
886 tc_clear (); 1093 tc_restore ();
887 1094
888CFPlus::Layout 1095DC::Layout
889new (SV *class) 1096new (SV *class)
890 CODE: 1097 CODE:
891 New (0, RETVAL, 1, struct cf_layout); 1098 New (0, RETVAL, 1, struct cf_layout);
892 1099
893 RETVAL->pl = pango_layout_new (opengl_context); 1100 RETVAL->pl = pango_layout_new (opengl_context);
… …
895 RETVAL->g = 1.; 1102 RETVAL->g = 1.;
896 RETVAL->b = 1.; 1103 RETVAL->b = 1.;
897 RETVAL->a = 1.; 1104 RETVAL->a = 1.;
898 RETVAL->base_height = MIN_FONT_HEIGHT; 1105 RETVAL->base_height = MIN_FONT_HEIGHT;
899 RETVAL->font = 0; 1106 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
900 1108
901 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
902 layout_update_font (RETVAL); 1110 layout_update_font (RETVAL);
903 OUTPUT: 1111 OUTPUT:
904 RETVAL 1112 RETVAL
905 1113
906void 1114void
907DESTROY (CFPlus::Layout self) 1115DESTROY (DC::Layout self)
908 CODE: 1116 CODE:
909 g_object_unref (self->pl); 1117 g_object_unref (self->pl);
1118 rc_free (self->rc);
910 Safefree (self); 1119 Safefree (self);
911 1120
912void 1121void
913set_text (CFPlus::Layout self, SV *text_) 1122set_text (DC::Layout self, SV *text_)
914 CODE: 1123 CODE:
915{ 1124{
916 STRLEN textlen; 1125 STRLEN textlen;
917 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
918 1127
919 pango_layout_set_text (self->pl, text, textlen); 1128 pango_layout_set_text (self->pl, text, textlen);
920} 1129}
921 1130
922void 1131void
923set_markup (CFPlus::Layout self, SV *text_) 1132set_markup (DC::Layout self, SV *text_)
924 CODE: 1133 CODE:
925{ 1134{
926 STRLEN textlen; 1135 STRLEN textlen;
927 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
928 1137
929 pango_layout_set_markup (self->pl, text, textlen); 1138 pango_layout_set_markup (self->pl, text, textlen);
930} 1139}
931 1140
932void 1141void
933set_shapes (CFPlus::Layout self, ...) 1142set_shapes (DC::Layout self, ...)
934 CODE: 1143 CODE:
935{ 1144{
936 PangoAttrList *attrs = 0; 1145 PangoAttrList *attrs = 0;
937 const char *text = pango_layout_get_text (self->pl); 1146 const char *text = pango_layout_get_text (self->pl);
938 const char *pos = text; 1147 const char *pos = text;
… …
973 if (attrs) 1182 if (attrs)
974 pango_layout_set_attributes (self->pl, attrs); 1183 pango_layout_set_attributes (self->pl, attrs);
975} 1184}
976 1185
977void 1186void
978get_shapes (CFPlus::Layout self) 1187get_shapes (DC::Layout self)
979 PPCODE: 1188 PPCODE:
980{ 1189{
981 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1190 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
982 1191
983 do 1192 do
984 { 1193 {
985 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1194 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
986 1195
987 if (run && shape_attr_p (run)) 1196 if (run && shape_attr_p (run))
988 { 1197 {
989 PangoRectangle extents; 1198 PangoRectangle extents;
990 pango_layout_iter_get_run_extents (iter, 0, &extents); 1199 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
998 1207
999 pango_layout_iter_free (iter); 1208 pango_layout_iter_free (iter);
1000} 1209}
1001 1210
1002int 1211int
1003has_wrapped (CFPlus::Layout self) 1212has_wrapped (DC::Layout self)
1004 CODE: 1213 CODE:
1005{ 1214{
1006 int lines = 1; 1215 int lines = 1;
1007 const char *text = pango_layout_get_text (self->pl); 1216 const char *text = pango_layout_get_text (self->pl);
1008 1217
… …
1013} 1222}
1014 OUTPUT: 1223 OUTPUT:
1015 RETVAL 1224 RETVAL
1016 1225
1017SV * 1226SV *
1018get_text (CFPlus::Layout self) 1227get_text (DC::Layout self)
1019 CODE: 1228 CODE:
1020 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1229 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1021 sv_utf8_decode (RETVAL); 1230 sv_utf8_decode (RETVAL);
1022 OUTPUT: 1231 OUTPUT:
1023 RETVAL 1232 RETVAL
1024 1233
1025void 1234void
1026set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1235set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1027 CODE: 1236 CODE:
1028 self->r = r; 1237 self->r = r;
1029 self->g = g; 1238 self->g = g;
1030 self->b = b; 1239 self->b = b;
1031 self->a = a; 1240 self->a = a;
1032 1241
1033void 1242void
1034set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1243set_font (DC::Layout self, DC::Font font = 0)
1035 CODE: 1244 CODE:
1036 if (self->font != font) 1245 if (self->font != font)
1037 { 1246 {
1038 self->font = font; 1247 self->font = font;
1039 layout_update_font (self); 1248 layout_update_font (self);
1040 } 1249 }
1041 1250
1042void 1251void
1043set_height (CFPlus::Layout self, int base_height) 1252set_height (DC::Layout self, int base_height)
1044 CODE: 1253 CODE:
1045 if (self->base_height != base_height) 1254 if (self->base_height != base_height)
1046 { 1255 {
1047 self->base_height = base_height; 1256 self->base_height = base_height;
1048 layout_update_font (self); 1257 layout_update_font (self);
1049 } 1258 }
1050 1259
1051void 1260void
1052set_width (CFPlus::Layout self, int max_width = -1) 1261set_width (DC::Layout self, int max_width = -1)
1053 CODE: 1262 CODE:
1054 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1263 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1055 1264
1056void 1265void
1057set_indent (CFPlus::Layout self, int indent) 1266set_indent (DC::Layout self, int indent)
1058 CODE: 1267 CODE:
1059 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1268 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1060 1269
1061void 1270void
1062set_spacing (CFPlus::Layout self, int spacing) 1271set_spacing (DC::Layout self, int spacing)
1063 CODE: 1272 CODE:
1064 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1273 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1065 1274
1066void 1275void
1067set_ellipsise (CFPlus::Layout self, int ellipsise) 1276set_ellipsise (DC::Layout self, int ellipsise)
1068 CODE: 1277 CODE:
1069 pango_layout_set_ellipsize (self->pl, 1278 pango_layout_set_ellipsize (self->pl,
1070 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1279 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1071 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1280 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1072 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1281 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1073 : PANGO_ELLIPSIZE_NONE 1282 : PANGO_ELLIPSIZE_NONE
1074 ); 1283 );
1075 1284
1076void 1285void
1077set_single_paragraph_mode (CFPlus::Layout self, int spm) 1286set_single_paragraph_mode (DC::Layout self, int spm)
1078 CODE: 1287 CODE:
1079 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1288 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1080 1289
1081void 1290void
1082size (CFPlus::Layout self) 1291size (DC::Layout self)
1083 PPCODE: 1292 PPCODE:
1084{ 1293{
1085 int w, h; 1294 int w, h;
1086 1295
1087 layout_get_pixel_size (self, &w, &h); 1296 layout_get_pixel_size (self, &w, &h);
… …
1090 PUSHs (sv_2mortal (newSViv (w))); 1299 PUSHs (sv_2mortal (newSViv (w)));
1091 PUSHs (sv_2mortal (newSViv (h))); 1300 PUSHs (sv_2mortal (newSViv (h)));
1092} 1301}
1093 1302
1094int 1303int
1095descent (CFPlus::Layout self) 1304descent (DC::Layout self)
1096 CODE: 1305 CODE:
1097{ 1306{
1098 PangoRectangle rect; 1307 PangoRectangle rect;
1099 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1308 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1100 pango_layout_line_get_pixel_extents (line, 0, &rect); 1309 pango_layout_line_get_pixel_extents (line, 0, &rect);
1101 RETVAL = PANGO_DESCENT (rect); 1310 RETVAL = PANGO_DESCENT (rect);
1102} 1311}
1103 OUTPUT: 1312 OUTPUT:
1104 RETVAL 1313 RETVAL
1105 1314
1106int 1315int
1107xy_to_index (CFPlus::Layout self, int x, int y) 1316xy_to_index (DC::Layout self, int x, int y)
1108 CODE: 1317 CODE:
1109{ 1318{
1110 int index, trailing; 1319 int index, trailing;
1111 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1320 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1112 RETVAL = index + trailing; 1321 RETVAL = index + trailing;
1113} 1322}
1114 OUTPUT: 1323 OUTPUT:
1115 RETVAL 1324 RETVAL
1116 1325
1117void 1326void
1118cursor_pos (CFPlus::Layout self, int index) 1327cursor_pos (DC::Layout self, int index)
1119 PPCODE: 1328 PPCODE:
1120{ 1329{
1121 PangoRectangle strong_pos; 1330 PangoRectangle pos;
1122 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1331 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1123 1332
1124 EXTEND (SP, 3); 1333 EXTEND (SP, 3);
1125 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1334 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1126 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1335 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1127 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1336 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1128} 1337}
1129 1338
1130void 1339void
1131index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1340index_to_line_x (DC::Layout self, int index, int trailing = 0)
1132 PPCODE: 1341 PPCODE:
1133{ 1342{
1134 int line, x; 1343 int line, x;
1135 1344
1136 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1345 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1346#if !PANGO_VERSION_CHECK (1, 17, 3)
1137 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1347 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1138 1348 --line;
1349#endif
1139 EXTEND (SP, 2); 1350 EXTEND (SP, 2);
1140 PUSHs (sv_2mortal (newSViv (line - 1))); 1351 PUSHs (sv_2mortal (newSViv (line)));
1141 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1352 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1142} 1353}
1143 1354
1144void 1355void
1145line_x_to_index (CFPlus::Layout self, int line, int x) 1356line_x_to_index (DC::Layout self, int line, int x)
1146 PPCODE: 1357 PPCODE:
1147{ 1358{
1148 PangoLayoutLine *lp; 1359 PangoLayoutLine *lp;
1149 int index, trailing; 1360 int index, trailing;
1150 1361
1151 if (line < 0) 1362 if (line < 0)
1152 XSRETURN_EMPTY; 1363 XSRETURN_EMPTY;
1153 1364
1154 if (!(lp = pango_layout_get_line (self->pl, line))) 1365 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1155 XSRETURN_EMPTY; /* do better */ 1366 XSRETURN_EMPTY; /* do better */
1156 1367
1157 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1368 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1158 1369
1159 EXTEND (SP, 2); 1370 EXTEND (SP, 2);
… …
1165 PUSHs (sv_2mortal (newSViv (trailing))); 1376 PUSHs (sv_2mortal (newSViv (trailing)));
1166 } 1377 }
1167} 1378}
1168 1379
1169void 1380void
1170render (CFPlus::Layout self, float x, float y, int flags = 0) 1381render (DC::Layout self, float x, float y, int flags = 0)
1171 PPCODE: 1382 CODE:
1383 rc_clear (self->rc);
1172 pango_opengl_render_layout_subpixel ( 1384 pango_opengl_render_layout_subpixel (
1173 self->pl, 1385 self->pl,
1386 self->rc,
1174 x * PANGO_SCALE, y * PANGO_SCALE, 1387 x * PANGO_SCALE, y * PANGO_SCALE,
1175 self->r, self->g, self->b, self->a, 1388 self->r, self->g, self->b, self->a,
1176 flags 1389 flags
1177 ); 1390 );
1391 // we assume that context_change actually clears/frees stuff
1392 // and does not do any recomputation...
1393 pango_layout_context_changed (self->pl);
1178 1394
1179MODULE = CFPlus PACKAGE = CFPlus::Texture
1180
1181void 1395void
1182pad2pot (SV *data_, SV *w_, SV *h_) 1396draw (DC::Layout self)
1183 CODE: 1397 CODE:
1184{ 1398{
1185 int ow = SvIV (w_); 1399 glEnable (GL_TEXTURE_2D);
1186 int oh = SvIV (h_); 1400 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1401 glEnable (GL_BLEND);
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1187 1406
1188 if (ow && oh) 1407 rc_draw (self->rc);
1408
1409 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D);
1412}
1413
1414MODULE = Deliantra::Client PACKAGE = DC::Texture
1415
1416PROTOTYPES: ENABLE
1417
1418void
1419pad (SV *data_, int ow, int oh, int nw, int nh)
1420 CODE:
1421{
1422 if ((nw != ow || nh != oh) && SvOK (data_))
1189 { 1423 {
1190 int nw = minpot (ow);
1191 int nh = minpot (oh);
1192
1193 if (nw != ow || nh != oh)
1194 {
1195 if (SvOK (data_))
1196 {
1197 STRLEN datalen; 1424 STRLEN datalen;
1198 char *data = SvPVbyte (data_, datalen); 1425 char *data = SvPVbyte (data_, datalen);
1199 int bpp = datalen / (ow * oh); 1426 int bpp = datalen / (ow * oh);
1200 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1427 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1201 1428
1202 SvPOK_only (result_); 1429 SvPOK_only (result_);
1203 SvCUR_set (result_, nw * nh * bpp); 1430 SvCUR_set (result_, nw * nh * bpp);
1204 1431
1205 memset (SvPVX (result_), 0, nw * nh * bpp); 1432 memset (SvPVX (result_), 0, nw * nh * bpp);
1206 while (oh--) 1433 while (oh--)
1207 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1434 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1208 1435
1209 sv_setsv (data_, result_); 1436 sv_setsv (data_, result_);
1210 }
1211
1212 sv_setiv (w_, nw);
1213 sv_setiv (h_, nh);
1214 }
1215 } 1437 }
1216} 1438}
1217 1439
1218void 1440void
1219draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1441draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1225{ 1447{
1226 HV *hv = (HV *)SvRV (self); 1448 HV *hv = (HV *)SvRV (self);
1227 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1449 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1228 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1450 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1229 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1451 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1452
1453 if (name <= 0)
1454 XSRETURN_EMPTY;
1230 1455
1231 if (items < 5) 1456 if (items < 5)
1232 { 1457 {
1233 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1458 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1234 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1459 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1262 glDisable (GL_ALPHA_TEST); 1487 glDisable (GL_ALPHA_TEST);
1263 glDisable (GL_BLEND); 1488 glDisable (GL_BLEND);
1264 } 1489 }
1265} 1490}
1266 1491
1267MODULE = CFPlus PACKAGE = CFPlus::Map 1492IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1493 CODE:
1494{
1495 GLint width;
1496 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1497 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1498 RETVAL = width > 0;
1499}
1500 OUTPUT:
1501 RETVAL
1268 1502
1269CFPlus::Map 1503MODULE = Deliantra::Client PACKAGE = DC::Map
1504
1505PROTOTYPES: DISABLE
1506
1507DC::Map
1270new (SV *class) 1508new (SV *class)
1271 CODE: 1509 CODE:
1272 New (0, RETVAL, 1, struct map); 1510 New (0, RETVAL, 1, struct map);
1273 RETVAL->x = 0; 1511 RETVAL->x = 0;
1274 RETVAL->y = 0; 1512 RETVAL->y = 0;
… …
1282 RETVAL->row = 0; 1520 RETVAL->row = 0;
1283 OUTPUT: 1521 OUTPUT:
1284 RETVAL 1522 RETVAL
1285 1523
1286void 1524void
1287DESTROY (CFPlus::Map self) 1525DESTROY (DC::Map self)
1288 CODE: 1526 CODE:
1289{ 1527{
1290 map_clear (self); 1528 map_clear (self);
1291 Safefree (self->face2tile); 1529 Safefree (self->face2tile);
1292 Safefree (self->tex); 1530 Safefree (self->tex);
1293 Safefree (self); 1531 Safefree (self);
1294} 1532}
1295 1533
1296void 1534void
1297resize (CFPlus::Map self, int map_width, int map_height) 1535resize (DC::Map self, int map_width, int map_height)
1298 CODE: 1536 CODE:
1299 self->w = map_width; 1537 self->w = map_width;
1300 self->h = map_height; 1538 self->h = map_height;
1301 1539
1302void 1540void
1303clear (CFPlus::Map self) 1541clear (DC::Map self)
1304 CODE: 1542 CODE:
1305 map_clear (self); 1543 map_clear (self);
1306 1544
1307void 1545void
1308set_tileid (CFPlus::Map self, int face, int tile) 1546set_tileid (DC::Map self, int face, int tile)
1309 CODE: 1547 CODE:
1310{ 1548{
1311 need_facenum (self, face); self->face2tile [face] = tile; 1549 need_facenum (self, face); self->face2tile [face] = tile;
1312 need_texid (self, tile); 1550 need_texid (self, tile);
1313} 1551}
1314 1552
1315void 1553void
1316set_smooth (CFPlus::Map self, int face, int smooth, int level) 1554set_smooth (DC::Map self, int face, int smooth, int level)
1317 CODE: 1555 CODE:
1318{ 1556{
1319 tileid texid; 1557 tileid texid;
1320 maptex *tex; 1558 maptex *tex;
1321 1559
… …
1334 tex->smoothtile = self->face2tile [smooth]; 1572 tex->smoothtile = self->face2tile [smooth];
1335 tex->smoothlevel = level; 1573 tex->smoothlevel = level;
1336} 1574}
1337 1575
1338void 1576void
1339set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1577set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1340 CODE: 1578 CODE:
1341{ 1579{
1342 need_texid (self, texid); 1580 need_texid (self, texid);
1343 1581
1344 { 1582 {
… …
1364 // from transparent color bleeding and ugly wrapping effects. 1602 // from transparent color bleeding and ugly wrapping effects.
1365 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1366} 1604}
1367 1605
1368int 1606int
1369ox (CFPlus::Map self) 1607ox (DC::Map self)
1370 ALIAS: 1608 ALIAS:
1371 oy = 1 1609 oy = 1
1372 x = 2 1610 x = 2
1373 y = 3 1611 y = 3
1374 w = 4 1612 w = 4
… …
1385 } 1623 }
1386 OUTPUT: 1624 OUTPUT:
1387 RETVAL 1625 RETVAL
1388 1626
1389void 1627void
1390scroll (CFPlus::Map self, int dx, int dy) 1628scroll (DC::Map self, int dx, int dy)
1391 CODE: 1629 CODE:
1392{ 1630{
1393 if (dx > 0) 1631 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 1632 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 1633 else if (dx < 0)
1396 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1634 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1397 1635
1398 if (dy > 0) 1636 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 1637 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 1638 else if (dy < 0)
1401 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1639 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1402 1640
1403 self->ox += dx; self->x += dx; 1641 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 1642 self->oy += dy; self->y += dy;
1405 1643
1406 while (self->y < 0) 1644 while (self->y < 0)
… …
1410 self->rows += MAP_EXTEND_Y; 1648 self->rows += MAP_EXTEND_Y;
1411 self->y += MAP_EXTEND_Y; 1649 self->y += MAP_EXTEND_Y;
1412 } 1650 }
1413} 1651}
1414 1652
1415void 1653SV *
1416map1a_update (CFPlus::Map self, SV *data_, int extmap) 1654map1a_update (DC::Map self, SV *data_, int extmap)
1417 CODE: 1655 CODE:
1418{ 1656{
1419 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1420 uint8_t *data_end = (uint8_t *)SvEND (data_); 1658 uint8_t *data_end = (uint8_t *)SvEND (data_);
1421 mapcell *cell; 1659 mapcell *cell;
1422 int x, y, flags; 1660 int x, y, z, flags;
1661 AV *missing = newAV ();
1662 RETVAL = newRV_noinc ((SV *)missing);
1423 1663
1424 while (data < data_end - 1) 1664 while (data < data_end - 1)
1425 { 1665 {
1426 flags = (data [0] << 8) + data [1]; data += 2; 1666 flags = (data [0] << 8) + data [1]; data += 2;
1427 1667
… …
1460 } 1700 }
1461 else if (cmd == 6) // monster width 1701 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1; 1702 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47) 1703 else if (cmd == 0x47)
1464 { 1704 {
1465 if (*data == 8) 1705 if (*data == 4)
1466 ; // decode player uuid 1706 ; // decode player count
1467 1707
1468 data += *data + 1; 1708 data += *data + 1;
1469 } 1709 }
1470 else if (cmd == 8) // cell flags 1710 else if (cmd == 8) // cell flags
1471 cell->flags = *data++; 1711 cell->flags = *data++;
… …
1478 } 1718 }
1479 else 1719 else
1480 cell->darkness = *data++ + 1; 1720 cell->darkness = *data++ + 1;
1481 } 1721 }
1482 1722
1723 for (z = 0; z <= 2; ++z)
1483 if (flags & 4) 1724 if (flags & (4 >> z))
1484 { 1725 {
1485 faceid face = (data [0] << 8) + data [1]; data += 2; 1726 faceid face = (data [0] << 8) + data [1]; data += 2;
1486 need_facenum (self, face); 1727 need_facenum (self, face);
1487 cell->tile [0] = self->face2tile [face]; 1728 cell->tile [z] = self->face2tile [face];
1729
1730 if (cell->tile [z])
1731 {
1732 maptex *tex = self->tex + cell->tile [z];
1733 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z]));
1735
1736 if (tex->smoothtile)
1737 {
1738 maptex *smooth = self->tex + tex->smoothtile;
1739 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile));
1741 }
1742 }
1488 } 1743 }
1489
1490 if (flags & 2)
1491 {
1492 faceid face = (data [0] << 8) + data [1]; data += 2;
1493 need_facenum (self, face);
1494 cell->tile [1] = self->face2tile [face];
1495 }
1496
1497 if (flags & 1)
1498 {
1499 faceid face = (data [0] << 8) + data [1]; data += 2;
1500 need_facenum (self, face);
1501 cell->tile [2] = self->face2tile [face];
1502 }
1503 } 1744 }
1504 else 1745 else
1505 cell->darkness = 0; 1746 cell->darkness = 0;
1506 } 1747 }
1507} 1748}
1749 OUTPUT:
1750 RETVAL
1508 1751
1509SV * 1752SV *
1510mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1753mapmap (DC::Map self, int x0, int y0, int w, int h)
1511 CODE: 1754 CODE:
1512{ 1755{
1513 int x1, x; 1756 int x1, x;
1514 int y1, y; 1757 int y1, y;
1515 int z; 1758 int z;
… …
1560} 1803}
1561 OUTPUT: 1804 OUTPUT:
1562 RETVAL 1805 RETVAL
1563 1806
1564void 1807void
1565draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1808draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1566 CODE: 1809 CODE:
1567{ 1810{
1811 int x, y, z;
1812
1568 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1569 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1570 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1571 smooth_key skey; 1816 smooth_key skey;
1572 int x, y, z; 1817
1573 int last_name; 1818 rc_t *rc = rc_alloc ();
1819 rc_key_t key;
1820 rc_array_t *arr;
1574 1821
1575 // thats current max. sorry. 1822 // thats current max. sorry.
1576 if (sw > 255) sw = 255; 1823 if (sw > 255) sw = 255;
1577 if (sh > 255) sh = 255; 1824 if (sh > 255) sh = 255;
1578 1825
1579 // clear key, in case of extra padding 1826 // clear key, in case of extra padding
1580 memset (&skey, 0, sizeof (skey)); 1827 memset (&skey, 0, sizeof (skey));
1581 1828
1582 glColor4ub (255, 255, 255, 255); 1829 memset (&key, 0, sizeof (key));
1583 1830 key.r = 255;
1584 glEnable (GL_BLEND); 1831 key.g = 255;
1585 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1832 key.b = 255;
1586 glEnable (GL_TEXTURE_2D); 1833 key.a = 255;
1587 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1834 key.mode = GL_QUADS;
1588 1835 key.format = GL_T2F_V3F;
1589 glBegin (GL_QUADS); 1836 key.texname = -1;
1590
1591 last_name = 0;
1592 1837
1593 mx += self->x; 1838 mx += self->x;
1594 my += self->y; 1839 my += self->y;
1595 1840
1596 // first pass: determine smooth_max 1841 // first pass: determine smooth_max
… …
1612 MAX (self->tex [cell->tile [0]].smoothlevel, 1857 MAX (self->tex [cell->tile [0]].smoothlevel,
1613 MAX (self->tex [cell->tile [1]].smoothlevel, 1858 MAX (self->tex [cell->tile [1]].smoothlevel,
1614 self->tex [cell->tile [2]].smoothlevel)); 1859 self->tex [cell->tile [2]].smoothlevel));
1615 } 1860 }
1616 } 1861 }
1862
1863 glEnable (GL_BLEND);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1617 1866
1618 for (z = 0; z <= 2; z++) 1867 for (z = 0; z <= 2; z++)
1619 { 1868 {
1620 memset (smooth_level, 0, sizeof (smooth_level)); 1869 memset (smooth_level, 0, sizeof (smooth_level));
1621 1870
… …
1631 tileid tile = cell->tile [z]; 1880 tileid tile = cell->tile [z];
1632 1881
1633 if (tile) 1882 if (tile)
1634 { 1883 {
1635 maptex tex = self->tex [tile]; 1884 maptex tex = self->tex [tile];
1636 int px = (x + 1) * T - tex.w; 1885 int px, py;
1637 int py = (y + 1) * T - tex.h;
1638 1886
1639 // suppressing texture state switches here
1640 // is only moderately effective, but worth the extra effort
1641 if (last_name != tex.name) 1887 if (key.texname != tex.name)
1642 { 1888 {
1643 if (!tex.name) 1889 if (!tex.name)
1644 tex = self->tex [2]; /* missing, replace by noface */ 1890 tex = self->tex [2]; /* missing, replace by noface */
1645 1891
1646 glEnd (); 1892 key.texname = tex.name;
1647 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1893 arr = rc_array (rc, &key);
1648 glBegin (GL_QUADS);
1649 } 1894 }
1650 1895
1651 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1896 px = (x + 1) * T - tex.w;
1897 py = (y + 1) * T - tex.h;
1898
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1652 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1653 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1654 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1655 1903
1656 if (cell->flags && z == 2) 1904 if (cell->flags && z == 2)
1657 { 1905 {
1906 // overlays such as the speech bubble, probably more to come
1658 if (cell->flags & 1) 1907 if (cell->flags & 1)
1659 { 1908 {
1660 maptex tex = self->tex [1]; 1909 maptex tex = self->tex [1];
1661 int px = x * T + T * 2 / 32; 1910 int px = x * T + T * 2 / 32;
1662 int py = y * T - T * 6 / 32; 1911 int py = y * T - T * 6 / 32;
1663 1912
1913 if (tex.name)
1664 glEnd (); 1914 {
1665 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1666 glBegin (GL_QUADS); 1925 }
1667
1668 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1669 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1670 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1671 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1672 } 1926 }
1673 } 1927 }
1674 1928
1675 // update smooth hash 1929 // update smooth hash
1676 if (tex.smoothtile) 1930 if (tex.smoothtile)
… …
1712 } 1966 }
1713 } 1967 }
1714 } 1968 }
1715 } 1969 }
1716 1970
1971 rc_draw (rc);
1972 rc_clear (rc);
1973
1717 // go through all smoothlevels, lowest to highest, then draw 1974 // go through all smoothlevels, lowest to highest, then draw.
1718 // this is basically counting sort 1975 // this is basically counting sort
1719 { 1976 {
1720 int w, b; 1977 int w, b;
1721 1978
1979 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS);
1722 for (w = 0; w < 256 / 32; ++w) 1981 for (w = 0; w < 256 / 32; ++w)
1723 { 1982 {
1724 uint32_t smask = smooth_level [w]; 1983 uint32_t smask = smooth_level [w];
1725 if (smask) 1984 if (smask)
1726 for (b = 0; b < 32; ++b) 1985 for (b = 0; b < 32; ++b)
… …
1735 smooth_key *skey = (smooth_key *)HeKEY (he); 1994 smooth_key *skey = (smooth_key *)HeKEY (he);
1736 IV bits = SvIVX (HeVAL (he)); 1995 IV bits = SvIVX (HeVAL (he));
1737 1996
1738 if (!(bits & 0x1000) 1997 if (!(bits & 0x1000)
1739 && skey->level == level 1998 && skey->level == level
1740 && level >= smooth_max [skey->x][skey->y]) 1999 && level > smooth_max [skey->x][skey->y])
1741 { 2000 {
1742 maptex tex = self->tex [skey->tile]; 2001 maptex tex = self->tex [skey->tile];
1743 int px = (((int)skey->x) - 1) * T; 2002 int px = (((int)skey->x) - 1) * T;
1744 int py = (((int)skey->y) - 1) * T; 2003 int py = (((int)skey->y) - 1) * T;
1745 int border = bits & 15; 2004 int border = bits & 15;
1746 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1747 float dx = tex.s * .0625f; // 16 images/row 2006 float dx = tex.s * .0625f; // 16 images/row
1748 float dy = tex.t * .5f ; // 2 images/column 2007 float dy = tex.t * .5f ; // 2 images/column
1749 2008
1750 // this time naively avoiding texture state changes
1751 // save gobs of state changes.
1752 if (last_name != tex.name) 2009 if (tex.name)
1753 { 2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
1754 if (!tex.name) 2013 if (key.texname != tex.name)
1755 continue; // smoothing not yet available 2014 {
1756
1757 glEnd (); 2015 glEnd ();
1758 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1759 glBegin (GL_QUADS); 2017 glBegin (GL_QUADS);
1760 } 2018 }
1761 2019
1762 if (border) 2020 if (border)
1763 { 2021 {
1764 float ox = border * dx; 2022 float ox = border * dx;
1765 2023
1766 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1767 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1768 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1769 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1770 } 2028 }
1771 2029
1772 if (corner) 2030 if (corner)
1773 { 2031 {
1774 float ox = corner * dx; 2032 float ox = corner * dx;
1775 2033
1776 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2034 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1777 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1778 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1779 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2038 }
1780 } 2039 }
1781 } 2040 }
1782 } 2041 }
1783 } 2042 }
1784 } 2043 }
2044
2045 glEnd ();
2046 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1;
1785 } 2048 }
1786 2049
1787 hv_clear (smooth); 2050 hv_clear (smooth);
1788 } 2051 }
1789 2052
1790 glEnd ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 glDisable (GL_BLEND); 2053 glDisable (GL_BLEND);
2054 rc_free (rc);
1794 2055
1795 // top layer: overlays such as the health bar 2056 // top layer: overlays such as the health bar
1796 for (y = 0; y < sh; y++) 2057 for (y = 0; y < sh; y++)
1797 if (0 <= y + my && y + my < self->rows) 2058 if (0 <= y + my && y + my < self->rows)
1798 { 2059 {
… …
1823 } 2084 }
1824 } 2085 }
1825} 2086}
1826 2087
1827void 2088void
1828draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1829 CODE: 2090 CODE:
1830{ 2091{
1831 static float color[16][3] = { 2092 static float color[16][3] = {
1832 { 0.00F, 0.00F, 0.00F }, 2093 { 0.00F, 0.00F, 0.00F },
1833 { 1.00F, 1.00F, 1.00F }, 2094 { 1.00F, 1.00F, 1.00F },
… …
1883 glDisable (GL_BLEND); 2144 glDisable (GL_BLEND);
1884 glDisable (GL_TEXTURE_2D); 2145 glDisable (GL_TEXTURE_2D);
1885} 2146}
1886 2147
1887void 2148void
1888fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2149fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1889 PPCODE: 2150 PPCODE:
1890{ 2151{
1891 int x, y; 2152 int x, y;
2153 int sw1 = sw + 2;
2154 int sh1 = sh + 2;
2155 int sh3 = sh * 3;
1892 int sw4 = (sw + 3) & ~3; 2156 int sw34 = (sw * 3 + 3) & ~3;
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1893 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1894 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1895 2160
1896 memset (darkness, 255, sw4 * sh);
1897 SvPOK_only (darkness_sv); 2161 SvPOK_only (darkness3_sv);
1898 SvCUR_set (darkness_sv, sw4 * sh); 2162 SvCUR_set (darkness3_sv, sw34 * sh3);
1899 2163
1900 mx += self->x; 2164 mx += self->x - 1;
1901 my += self->y; 2165 my += self->y - 1;
1902 2166
2167 memset (darkness1, 255, sw1 * sh1);
2168
1903 for (y = 0; y < sh; y++) 2169 for (y = 0; y < sh1; y++)
1904 if (0 <= y + my && y + my < self->rows) 2170 if (0 <= y + my && y + my < self->rows)
1905 { 2171 {
1906 maprow *row = self->row + (y + my); 2172 maprow *row = self->row + (y + my);
1907 2173
1908 for (x = 0; x < sw; x++) 2174 for (x = 0; x < sw1; x++)
1909 if (row->c0 <= x + mx && x + mx < row->c1) 2175 if (row->c0 <= x + mx && x + mx < row->c1)
1910 { 2176 {
1911 mapcell *cell = row->col + (x + mx - row->c0); 2177 mapcell *cell = row->col + (x + mx - row->c0);
1912 2178
1913 darkness[y * sw4 + x] = cell->darkness 2179 darkness1 [y * sw1 + x] = cell->darkness
1914 ? 255 - (cell->darkness - 1) 2180 ? 255 - (cell->darkness - 1)
1915 : 255 - FOW_DARKNESS; 2181 : 255 - FOW_DARKNESS;
1916 } 2182 }
1917 } 2183 }
1918 2184
2185 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x)
2187 {
2188 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2189 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2190 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2191 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2192 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2193 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2194 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2195 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2196 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2197
2198 uint8_t r11 = (d11 + d21 + d12) / 3;
2199 uint8_t r21 = d21;
2200 uint8_t r31 = (d21 + d31 + d32) / 3;
2201
2202 uint8_t r12 = d12;
2203 uint8_t r22 = d22;
2204 uint8_t r32 = d32;
2205
2206 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3;
2209
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2214 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2219 }
2220
2221 free (darkness1);
2222
1919 EXTEND (SP, 3); 2223 EXTEND (SP, 3);
1920 PUSHs (sv_2mortal (newSViv (sw4))); 2224 PUSHs (sv_2mortal (newSViv (sw34)));
1921 PUSHs (sv_2mortal (newSViv (sh))); 2225 PUSHs (sv_2mortal (newSViv (sh3)));
1922 PUSHs (darkness_sv); 2226 PUSHs (darkness3_sv);
1923} 2227}
1924 2228
1925SV * 2229SV *
1926get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2230get_rect (DC::Map self, int x0, int y0, int w, int h)
1927 CODE: 2231 CODE:
1928{ 2232{
1929 int x, y, x1, y1; 2233 int x, y, x1, y1;
1930 SV *data_sv = newSV (w * h * 7 + 5); 2234 SV *data_sv = newSV (w * h * 7 + 5);
1931 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2235 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1996} 2300}
1997 OUTPUT: 2301 OUTPUT:
1998 RETVAL 2302 RETVAL
1999 2303
2000void 2304void
2001set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2305set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2002 PPCODE: 2306 PPCODE:
2003{ 2307{
2004 int x, y, z; 2308 int x, y, z;
2005 int w, h; 2309 int w, h;
2006 int x1, y1; 2310 int x1, y1;
2007 2311
2008 if (*data++ != 0) 2312 if (*data++ != 0)
2009 return; /* version mismatch */ 2313 XSRETURN_EMPTY; /* version mismatch */
2010 2314
2011 w = *data++ << 8; w |= *data++; 2315 w = *data++ << 8; w |= *data++;
2012 h = *data++ << 8; h |= *data++; 2316 h = *data++ << 8; h |= *data++;
2013 2317
2014 // we need to do this 'cause we don't keep an absolute coord system for rows 2318 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2059 } 2363 }
2060 } 2364 }
2061 } 2365 }
2062} 2366}
2063 2367
2064MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2368MODULE = Deliantra::Client PACKAGE = DC::RW
2065 2369
2066CFPlus::MixChunk 2370DC::RW
2067new_from_file (SV *class, char *path) 2371new (SV *class, SV *data_sv)
2068 CODE: 2372 CODE:
2069 RETVAL = Mix_LoadWAV (path); 2373{
2374 STRLEN datalen;
2375 char *data = SvPVbyte (data_sv, datalen);
2376
2377 RETVAL = SDL_RWFromConstMem (data, datalen);
2378}
2070 OUTPUT: 2379 OUTPUT:
2071 RETVAL 2380 RETVAL
2072 2381
2382DC::RW
2383new_from_file (SV *class, const char *path, const char *mode = "rb")
2384 CODE:
2385 RETVAL = SDL_RWFromFile (path, mode);
2386 OUTPUT:
2387 RETVAL
2388
2389# fails on win32:
2390# dc.xs(2268) : error C2059: syntax error : '('
2073void 2391#void
2392#close (DC::RW self)
2393# CODE:
2394# (self->(close)) (self);
2395
2396MODULE = Deliantra::Client PACKAGE = DC::Channel
2397
2398PROTOTYPES: DISABLE
2399
2400DC::Channel
2401find ()
2402 CODE:
2403{
2404 RETVAL = Mix_GroupAvailable (-1);
2405
2406 if (RETVAL < 0)
2407 {
2408 RETVAL = Mix_GroupOldest (-1);
2409
2410 if (RETVAL < 0)
2411 XSRETURN_UNDEF;
2412
2413 Mix_HaltChannel (RETVAL);
2414 }
2415
2416 Mix_UnregisterAllEffects (RETVAL);
2417 Mix_Volume (RETVAL, 128);
2418}
2419 OUTPUT:
2420 RETVAL
2421
2422void
2423halt (DC::Channel self)
2424 CODE:
2425 Mix_HaltChannel (self);
2426
2427void
2428expire (DC::Channel self, int ticks = -1)
2429 CODE:
2430 Mix_ExpireChannel (self, ticks);
2431
2432void
2433fade_out (DC::Channel self, int ticks = -1)
2434 CODE:
2435 Mix_FadeOutChannel (self, ticks);
2436
2437int
2438volume (DC::Channel self, int volume)
2439 CODE:
2440 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2441 OUTPUT:
2442 RETVAL
2443
2444void
2445unregister_all_effects (DC::Channel self)
2446 CODE:
2447 Mix_UnregisterAllEffects (self);
2448
2449void
2450set_panning (DC::Channel self, int left, int right)
2451 CODE:
2452 left = CLAMP (left , 0, 255);
2453 right = CLAMP (right, 0, 255);
2454 Mix_SetPanning (self, left, right);
2455
2456void
2457set_distance (DC::Channel self, int distance)
2458 CODE:
2459 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2460
2461void
2462set_position (DC::Channel self, int angle, int distance)
2463 CODE:
2464
2465void
2466set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2467 CODE:
2468{
2469 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2470 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2471 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2472}
2473
2474void
2475set_reverse_stereo (DC::Channel self, int flip)
2476 CODE:
2477 Mix_SetReverseStereo (self, flip);
2478
2479MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2480
2481PROTOTYPES: DISABLE
2482
2483DC::MixChunk
2484new (SV *class, DC::RW rwops)
2485 CODE:
2486 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2487 OUTPUT:
2488 RETVAL
2489
2490void
2074DESTROY (CFPlus::MixChunk self) 2491DESTROY (DC::MixChunk self)
2075 CODE: 2492 CODE:
2076 Mix_FreeChunk (self); 2493 Mix_FreeChunk (self);
2077 2494
2078int 2495int
2079volume (CFPlus::MixChunk self, int volume = -1) 2496volume (DC::MixChunk self, int volume = -1)
2080 CODE: 2497 CODE:
2498 if (items > 1)
2499 volume = CLAMP (volume, 0, 128);
2081 RETVAL = Mix_VolumeChunk (self, volume); 2500 RETVAL = Mix_VolumeChunk (self, volume);
2082 OUTPUT: 2501 OUTPUT:
2083 RETVAL 2502 RETVAL
2084 2503
2085int 2504DC::Channel
2086play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2505play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2087 CODE: 2506 CODE:
2507{
2088 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2508 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2509
2510 if (RETVAL < 0)
2511 XSRETURN_UNDEF;
2512
2513 if (channel < 0)
2514 {
2515 Mix_UnregisterAllEffects (RETVAL);
2516 Mix_Volume (RETVAL, 128);
2517 }
2518}
2089 OUTPUT: 2519 OUTPUT:
2090 RETVAL 2520 RETVAL
2091 2521
2092MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2522MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2093 2523
2094int 2524int
2095volume (int volume = -1) 2525volume (int volume = -1)
2526 PROTOTYPE: ;$
2096 CODE: 2527 CODE:
2528 if (items > 0)
2529 volume = CLAMP (volume, 0, 128);
2097 RETVAL = Mix_VolumeMusic (volume); 2530 RETVAL = Mix_VolumeMusic (volume);
2098 OUTPUT: 2531 OUTPUT:
2099 RETVAL 2532 RETVAL
2100 2533
2534void
2535fade_out (int ms)
2536 CODE:
2537 Mix_FadeOutMusic (ms);
2538
2539void
2540halt ()
2541 CODE:
2542 Mix_HaltMusic ();
2543
2101CFPlus::MixMusic 2544DC::MixMusic
2102new_from_file (SV *class, char *path) 2545new (SV *class, DC::RW rwops)
2103 CODE: 2546 CODE:
2104 RETVAL = Mix_LoadMUS (path); 2547 RETVAL = Mix_LoadMUS_RW (rwops);
2105 OUTPUT: 2548 OUTPUT:
2106 RETVAL 2549 RETVAL
2107 2550
2108void 2551void
2109DESTROY (CFPlus::MixMusic self) 2552DESTROY (DC::MixMusic self)
2110 CODE: 2553 CODE:
2111 Mix_FreeMusic (self); 2554 Mix_FreeMusic (self);
2112 2555
2113int 2556int
2114play (CFPlus::MixMusic self, int loops = -1) 2557play (DC::MixMusic self, int loops = -1)
2115 CODE: 2558 CODE:
2116 RETVAL = Mix_PlayMusic (self, loops); 2559 RETVAL = Mix_PlayMusic (self, loops);
2117 OUTPUT: 2560 OUTPUT:
2118 RETVAL 2561 RETVAL
2119 2562
2120MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2563void
2564fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2565 CODE:
2566 Mix_FadeInMusicPos (self, loops, ms, position);
2567
2568MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2569
2570PROTOTYPES: ENABLE
2121 2571
2122BOOT: 2572BOOT:
2123{ 2573{
2124 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2574 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2125 static const struct { 2575 static const struct {
2126 const char *name; 2576 const char *name;
2127 IV iv; 2577 IV iv;
2128 } *civ, const_iv[] = { 2578 } *civ, const_iv[] = {
2129# define const_iv(name) { # name, (IV)name } 2579# define const_iv(name) { # name, (IV)name }
2580 const_iv (GL_VENDOR),
2581 const_iv (GL_VERSION),
2582 const_iv (GL_EXTENSIONS),
2130 const_iv (GL_COLOR_MATERIAL), 2583 const_iv (GL_COLOR_MATERIAL),
2131 const_iv (GL_SMOOTH), 2584 const_iv (GL_SMOOTH),
2132 const_iv (GL_FLAT), 2585 const_iv (GL_FLAT),
2133 const_iv (GL_DITHER), 2586 const_iv (GL_DITHER),
2134 const_iv (GL_BLEND), 2587 const_iv (GL_BLEND),
… …
2138 const_iv (GL_ALPHA_TEST), 2591 const_iv (GL_ALPHA_TEST),
2139 const_iv (GL_NORMALIZE), 2592 const_iv (GL_NORMALIZE),
2140 const_iv (GL_RESCALE_NORMAL), 2593 const_iv (GL_RESCALE_NORMAL),
2141 const_iv (GL_FRONT), 2594 const_iv (GL_FRONT),
2142 const_iv (GL_BACK), 2595 const_iv (GL_BACK),
2596 const_iv (GL_AUX0),
2143 const_iv (GL_AND), 2597 const_iv (GL_AND),
2144 const_iv (GL_ONE), 2598 const_iv (GL_ONE),
2145 const_iv (GL_ZERO), 2599 const_iv (GL_ZERO),
2146 const_iv (GL_SRC_ALPHA), 2600 const_iv (GL_SRC_ALPHA),
2147 const_iv (GL_DST_ALPHA), 2601 const_iv (GL_DST_ALPHA),
… …
2160 const_iv (GL_INTENSITY), 2614 const_iv (GL_INTENSITY),
2161 const_iv (GL_LUMINANCE), 2615 const_iv (GL_LUMINANCE),
2162 const_iv (GL_LUMINANCE_ALPHA), 2616 const_iv (GL_LUMINANCE_ALPHA),
2163 const_iv (GL_FLOAT), 2617 const_iv (GL_FLOAT),
2164 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2618 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2619 const_iv (GL_COMPRESSED_ALPHA_ARB),
2620 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2621 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2622 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2623 const_iv (GL_COMPRESSED_RGB_ARB),
2624 const_iv (GL_COMPRESSED_RGBA_ARB),
2165 const_iv (GL_COMPILE), 2625 const_iv (GL_COMPILE),
2626 const_iv (GL_PROXY_TEXTURE_1D),
2627 const_iv (GL_PROXY_TEXTURE_2D),
2166 const_iv (GL_TEXTURE_1D), 2628 const_iv (GL_TEXTURE_1D),
2167 const_iv (GL_TEXTURE_2D), 2629 const_iv (GL_TEXTURE_2D),
2168 const_iv (GL_TEXTURE_ENV), 2630 const_iv (GL_TEXTURE_ENV),
2169 const_iv (GL_TEXTURE_MAG_FILTER), 2631 const_iv (GL_TEXTURE_MAG_FILTER),
2170 const_iv (GL_TEXTURE_MIN_FILTER), 2632 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2191 const_iv (GL_COLOR_LOGIC_OP), 2653 const_iv (GL_COLOR_LOGIC_OP),
2192 const_iv (GL_SEPARABLE_2D), 2654 const_iv (GL_SEPARABLE_2D),
2193 const_iv (GL_CONVOLUTION_2D), 2655 const_iv (GL_CONVOLUTION_2D),
2194 const_iv (GL_CONVOLUTION_BORDER_MODE), 2656 const_iv (GL_CONVOLUTION_BORDER_MODE),
2195 const_iv (GL_CONSTANT_BORDER), 2657 const_iv (GL_CONSTANT_BORDER),
2658 const_iv (GL_POINTS),
2196 const_iv (GL_LINES), 2659 const_iv (GL_LINES),
2197 const_iv (GL_LINE_STRIP), 2660 const_iv (GL_LINE_STRIP),
2198 const_iv (GL_LINE_LOOP), 2661 const_iv (GL_LINE_LOOP),
2199 const_iv (GL_QUADS), 2662 const_iv (GL_QUADS),
2200 const_iv (GL_QUAD_STRIP), 2663 const_iv (GL_QUAD_STRIP),
2201 const_iv (GL_TRIANGLES), 2664 const_iv (GL_TRIANGLES),
2202 const_iv (GL_TRIANGLE_STRIP), 2665 const_iv (GL_TRIANGLE_STRIP),
2203 const_iv (GL_TRIANGLE_FAN), 2666 const_iv (GL_TRIANGLE_FAN),
2667 const_iv (GL_POLYGON),
2204 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2668 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2669 const_iv (GL_POINT_SMOOTH_HINT),
2670 const_iv (GL_LINE_SMOOTH_HINT),
2671 const_iv (GL_POLYGON_SMOOTH_HINT),
2672 const_iv (GL_GENERATE_MIPMAP_HINT),
2673 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2205 const_iv (GL_FASTEST), 2674 const_iv (GL_FASTEST),
2675 const_iv (GL_DONT_CARE),
2676 const_iv (GL_NICEST),
2206 const_iv (GL_V2F), 2677 const_iv (GL_V2F),
2207 const_iv (GL_V3F), 2678 const_iv (GL_V3F),
2208 const_iv (GL_T2F_V3F), 2679 const_iv (GL_T2F_V3F),
2209 const_iv (GL_T2F_N3F_V3F), 2680 const_iv (GL_T2F_N3F_V3F),
2210# undef const_iv 2681# undef const_iv
2211 }; 2682 };
2212 2683
2213 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2684 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2214 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2685 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2686
2687 texture_av = newAV ();
2688 AvREAL_off (texture_av);
2215} 2689}
2690
2691void
2692disable_GL_EXT_blend_func_separate ()
2693 CODE:
2694 gl.BlendFuncSeparate = 0;
2695 gl.BlendFuncSeparateEXT = 0;
2216 2696
2217char * 2697char *
2218gl_vendor () 2698gl_vendor ()
2219 CODE: 2699 CODE:
2220 RETVAL = (char *)glGetString (GL_VENDOR); 2700 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2233 CODE: 2713 CODE:
2234 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2714 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2235 OUTPUT: 2715 OUTPUT:
2236 RETVAL 2716 RETVAL
2237 2717
2718const char *glGetString (GLenum pname)
2719
2720GLint glGetInteger (GLenum pname)
2721 CODE:
2722 glGetIntegerv (pname, &RETVAL);
2723 OUTPUT:
2724 RETVAL
2725
2726GLdouble glGetDouble (GLenum pname)
2727 CODE:
2728 glGetDoublev (pname, &RETVAL);
2729 OUTPUT:
2730 RETVAL
2731
2238int glGetError () 2732int glGetError ()
2239 2733
2240void glFinish () 2734void glFinish ()
2241 2735
2242void glClear (int mask) 2736void glClear (int mask)
… …
2279# near_ and far_ are due to microsofts buggy "c" compiler 2773# near_ and far_ are due to microsofts buggy "c" compiler
2280void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2774void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2281 2775
2282# near_ and far_ are due to microsofts buggy "c" compiler 2776# near_ and far_ are due to microsofts buggy "c" compiler
2283void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2777void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2778
2779PROTOTYPES: DISABLE
2284 2780
2285void glViewport (int x, int y, int width, int height) 2781void glViewport (int x, int y, int width, int height)
2286 2782
2287void glScissor (int x, int y, int width, int height) 2783void glScissor (int x, int y, int width, int height)
2288 2784
… …
2296 2792
2297void glRotate (float angle, float x, float y, float z) 2793void glRotate (float angle, float x, float y, float z)
2298 CODE: 2794 CODE:
2299 glRotatef (angle, x, y, z); 2795 glRotatef (angle, x, y, z);
2300 2796
2301void glBegin (int mode)
2302
2303void glEnd ()
2304
2305void glColor (float r, float g, float b, float a = 1.0) 2797void glColor (float r, float g, float b, float a = 1.0)
2306 PROTOTYPE: @
2307 ALIAS: 2798 ALIAS:
2308 glColor_premultiply = 1 2799 glColor_premultiply = 1
2309 CODE: 2800 CODE:
2310 if (ix) 2801 if (ix)
2311 { 2802 {
… …
2314 b *= a; 2805 b *= a;
2315 } 2806 }
2316 // microsoft visual "c" rounds instead of truncating... 2807 // microsoft visual "c" rounds instead of truncating...
2317 glColor4f (r, g, b, a); 2808 glColor4f (r, g, b, a);
2318 2809
2319void glInterleavedArrays (int format, int stride, char *data)
2320
2321void glDrawElements (int mode, int count, int type, char *indices)
2322
2323# 1.2 void glDrawRangeElements (int mode, int start, int end
2324
2325void glRasterPos (float x, float y, float z = 0.) 2810void glRasterPos (float x, float y, float z = 0.)
2326 CODE: 2811 CODE:
2327 glRasterPos3f (0, 0, z); 2812 glRasterPos3f (0, 0, z);
2328 glBitmap (0, 0, 0, 0, x, y, 0); 2813 glBitmap (0, 0, 0, 0, x, y, 0);
2329 2814
… …
2333 2818
2334void glTexCoord (float s, float t) 2819void glTexCoord (float s, float t)
2335 CODE: 2820 CODE:
2336 glTexCoord2f (s, t); 2821 glTexCoord2f (s, t);
2337 2822
2823void glRect (float x1, float y1, float x2, float y2)
2824 CODE:
2825 glRectf (x1, y1, x2, y2);
2826
2827void glRect_lineloop (float x1, float y1, float x2, float y2)
2828 CODE:
2829 glBegin (GL_LINE_LOOP);
2830 glVertex2f (x1, y1);
2831 glVertex2f (x2, y1);
2832 glVertex2f (x2, y2);
2833 glVertex2f (x1, y2);
2834 glEnd ();
2835
2836PROTOTYPES: ENABLE
2837
2838void glBegin (int mode)
2839
2840void glEnd ()
2841
2842void glPointSize (GLfloat size)
2843
2844void glLineWidth (GLfloat width)
2845
2846void glInterleavedArrays (int format, int stride, char *data)
2847
2848void glDrawElements (int mode, int count, int type, char *indices)
2849
2850# 1.2 void glDrawRangeElements (int mode, int start, int end
2851
2338void glTexEnv (int target, int pname, float param) 2852void glTexEnv (int target, int pname, float param)
2339 CODE: 2853 CODE:
2340 glTexEnvf (target, pname, param); 2854 glTexEnvf (target, pname, param);
2341 2855
2342void glTexParameter (int target, int pname, float param) 2856void glTexParameter (int target, int pname, float param)
… …
2358void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2872void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2359 CODE: 2873 CODE:
2360 if (gl.SeparableFilter2D) 2874 if (gl.SeparableFilter2D)
2361 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2875 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2362 2876
2363void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2877void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2364 2878
2365void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2879void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2366 2880
2367void glDrawPixels (int width, int height, int format, int type, char *pixels) 2881void glDrawPixels (int width, int height, int format, int type, char *pixels)
2882
2883void glPixelZoom (float x, float y)
2368 2884
2369void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2885void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2370 2886
2371int glGenTexture () 2887int glGenTexture ()
2372 CODE: 2888 CODE:
2373{ 2889 RETVAL = gen_texture ();
2374 GLuint name;
2375 glGenTextures (1, &name);
2376 RETVAL = name;
2377}
2378 OUTPUT: 2890 OUTPUT:
2379 RETVAL 2891 RETVAL
2380 2892
2381void glDeleteTexture (int name) 2893void glDeleteTexture (int name)
2382 CODE: 2894 CODE:
2383{
2384 GLuint name_ = name;
2385 glDeleteTextures (1, &name_); 2895 del_texture (name);
2386} 2896
2387
2388int glGenList () 2897int glGenList ()
2389 CODE: 2898 CODE:
2390 RETVAL = glGenLists (1); 2899 RETVAL = glGenLists (1);
2391 OUTPUT: 2900 OUTPUT:
2392 RETVAL 2901 RETVAL
… …
2399 2908
2400void glEndList () 2909void glEndList ()
2401 2910
2402void glCallList (int list) 2911void glCallList (int list)
2403 2912
2913MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2914
2915PROTOTYPES: DISABLE
2916
2917void
2918find_widget (SV *self, NV x, NV y)
2919 PPCODE:
2920{
2921 if (within_widget (self, x, y))
2922 XPUSHs (self);
2923}
2924
2925BOOT:
2926{
2927 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2928
2929 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2930 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2931 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2932 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2933}
2934
2935void
2936draw (SV *self)
2937 CODE:
2938{
2939 HV *hv;
2940 SV **svp;
2941 NV x, y, w, h;
2942 SV *draw_x_sv = GvSV (draw_x_gv);
2943 SV *draw_y_sv = GvSV (draw_y_gv);
2944 SV *draw_w_sv = GvSV (draw_w_gv);
2945 SV *draw_h_sv = GvSV (draw_h_gv);
2946 double draw_x, draw_y;
2947
2948 if (!SvROK (self))
2949 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2950
2951 hv = (HV *)SvRV (self);
2952
2953 if (SvTYPE (hv) != SVt_PVHV)
2954 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2955
2956 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2957 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2958
2959 if (!h || !w)
2960 XSRETURN_EMPTY;
2961
2962 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2963 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2964
2965 draw_x = SvNV (draw_x_sv) + x;
2966 draw_y = SvNV (draw_y_sv) + y;
2967
2968 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2969 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2970 XSRETURN_EMPTY;
2971
2972 sv_setnv (draw_x_sv, draw_x);
2973 sv_setnv (draw_y_sv, draw_y);
2974
2975 glPushMatrix ();
2976 glTranslated (x, y, 0);
2977
2978 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2979 {
2980 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2981
2982 if (svp && SvTRUE (*svp))
2983 {
2984 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2985 glEnable (GL_BLEND);
2986 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2987 glBegin (GL_QUADS);
2988 glVertex2f (0, 0);
2989 glVertex2f (w, 0);
2990 glVertex2f (w, h);
2991 glVertex2f (0, h);
2992 glEnd ();
2993 glDisable (GL_BLEND);
2994 }
2995 }
2996#if 0
2997 // draw borders, for debugging
2998 glPushMatrix ();
2999 glColor4f (1., 1., 0., 1.);
3000 glTranslatef (.5, .5, 0.);
3001 glBegin (GL_LINE_LOOP);
3002 glVertex2f (0 , 0);
3003 glVertex2f (w - 1, 0);
3004 glVertex2f (w - 1, h - 1);
3005 glVertex2f (0 , h - 1);
3006 glEnd ();
3007 glPopMatrix ();
3008#endif
3009 PUSHMARK (SP);
3010 XPUSHs (self);
3011 PUTBACK;
3012 call_method ("_draw", G_VOID | G_DISCARD);
3013 SPAGAIN;
3014
3015 glPopMatrix ();
3016
3017 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3018 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3019}
3020

Diff Legend

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