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.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# 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>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22#endif
23
24#include <assert.h>
12#include <math.h> 25#include <math.h>
13#include <string.h> 26#include <string.h>
14#include <stdio.h> 27#include <stdio.h>
15#include <stdlib.h> 28#include <stdlib.h>
16 29
18#include <SDL_endian.h> 31#include <SDL_endian.h>
19#include <SDL_image.h> 32#include <SDL_image.h>
20#include <SDL_mixer.h> 33#include <SDL_mixer.h>
21#include <SDL_opengl.h> 34#include <SDL_opengl.h>
22 35
36#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS
38
23#include <glib/gmacros.h> 39#include <glib/gmacros.h>
24 40
25#include <pango/pango.h> 41#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 42
30#ifndef _WIN32 43#ifndef _WIN32
31# include <sys/types.h> 44# include <sys/types.h>
32# include <sys/socket.h> 45# include <sys/socket.h>
33# include <netinet/in.h> 46# include <netinet/in.h>
34# include <netinet/tcp.h> 47# include <netinet/tcp.h>
35# include <inttypes.h> 48# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 49#endif
44 50
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 52
49#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
50 54
51#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
53 57
54#define MIN_FONT_HEIGHT 10 58#define MIN_FONT_HEIGHT 10
59
60#if 0
61# define PARACHUTE SDL_INIT_NOPARACHUTE
62#else
63# define PARACHUTE 0
64#endif
65
66static AV *texture_av;
55 67
56static struct 68static struct
57{ 69{
58#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
59#include "glfunc.h" 71#include "glfunc.h"
60#undef GL_FUNC 72#undef GL_FUNC
61} gl; 73} gl;
62 74
75static void
63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
64{ 77{
65 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
66 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
67 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
68 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69 else 82 else
70 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
71} 84}
72 85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
110#include "texcache.c"
111
112#include "pango-font.c"
113#include "pango-fontmap.c"
114#include "pango-render.c"
115
73typedef Mix_Chunk *CFClient__MixChunk; 116typedef Mix_Chunk *CFPlus__MixChunk;
74typedef Mix_Music *CFClient__MixMusic; 117typedef Mix_Music *CFPlus__MixMusic;
75 118
76typedef PangoFontDescription *CFClient__Font; 119typedef PangoFontDescription *CFPlus__Font;
77 120
78static int 121static int
79shape_attr_p (PangoLayoutRun *run) 122shape_attr_p (PangoLayoutRun *run)
80{ 123{
81 GSList *attrs = run->item->analysis.extra_attrs; 124 GSList *attrs = run->item->analysis.extra_attrs;
92 135
93 return 0; 136 return 0;
94} 137}
95 138
96typedef struct cf_layout { 139typedef struct cf_layout {
97 PangoLayout *pl; // either derived from a cairo or ft2 context 140 PangoLayout *pl;
98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99 float r, g, b, a; // default color for rgba mode 141 float r, g, b, a; // default color for rgba mode
100 int base_height; 142 int base_height;
101 CFClient__Font font; 143 CFPlus__Font font;
102} *CFClient__Layout; 144} *CFPlus__Layout;
103 145
104static CFClient__Font default_font; 146static CFPlus__Font default_font;
105static PangoContext *ft2_context, *cairo_context; 147static PangoContext *opengl_context;
106static PangoFontMap *ft2_fontmap, *cairo_fontmap; 148static PangoFontMap *opengl_fontmap;
107 149
108static void 150static void
109substitute_func (FcPattern *pattern, gpointer data) 151substitute_func (FcPattern *pattern, gpointer data)
110{ 152{
111 FcPatternAddBool (pattern, FC_HINTING, 1); 153 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE 154#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif 156#endif
115#ifdef _WIN32
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
118 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
120} 158}
121 159
122static void 160static void
123layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
124{ 162{
125 /* use a random scale factor to account for unknown descenders, 0.8 works 163 /* use a random scale factor to account for unknown descenders, 0.8 works
126 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
127 */ 165 */
128 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
132 170
133 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
134} 172}
135 173
136static void 174static void
137layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
139 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
140 181
141 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143 184
144 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
145} 186 if (!rect.height) rect.height = 1;
146 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
147typedef uint16_t mapface; 193typedef uint16_t faceid;
148 194
149typedef struct { 195typedef struct {
150 GLint name; 196 int name;
151 int w, h; 197 int w, h;
152 float s, t; 198 float s, t;
153 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
154} maptex; 202} maptex;
155 203
156typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
157 int16_t darkness; 207 uint16_t darkness;
158 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
159} mapcell; 209} mapcell;
160 210
161typedef struct { 211typedef struct {
162 int32_t c0, c1; 212 int32_t c0, c1;
163 mapcell *col; 213 mapcell *col;
164} maprow; 214} maprow;
165 215
166typedef struct map { 216typedef struct map {
167 int x, y, w, h; 217 int x, y, w, h;
168 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
169 int faces; 219 int faces; tileid *face2tile; // [faceid]
170 mapface *face; 220 int texs; maptex *tex; // [tileid]
171
172 int texs;
173 maptex *tex;
174 221
175 int32_t rows; 222 int32_t rows;
176 maprow *row; 223 maprow *row;
177} *CFClient__Map; 224} *CFPlus__Map;
178 225
179static char * 226static char *
180prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
181{ 228{
182 char *p; 229 char *p;
199} 246}
200 247
201#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203 250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
270
204static maprow * 271static maprow *
205map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
206{ 273{
207 if (0 > y) 274 if (0 > y)
208 { 275 {
209 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
210 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
248 315
249 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
250} 317}
251 318
252static mapcell * 319static mapcell *
253map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
254{ 321{
255 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
256} 323}
257 324
258static void 325static void
259map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
260{ 327{
261 int r; 328 int r;
262 329
263 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
264 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
272 self->row = 0; 339 self->row = 0;
273 self->rows = 0; 340 self->rows = 0;
274} 341}
275 342
276static void 343static void
277map_blank (CFClient__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278{ 345{
279 int x, y; 346 int x, y;
280 maprow *row; 347 maprow *row;
348 mapcell *cell;
281 349
282 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
283 if (y >= 0) 351 if (y >= 0)
284 { 352 {
285 if (y >= self->rows) 353 if (y >= self->rows)
291 if (x >= row->c0) 359 if (x >= row->c0)
292 { 360 {
293 if (x >= row->c1) 361 if (x >= row->c1)
294 break; 362 break;
295 363
296 row->col[x - row->c0].darkness = -1; 364 cell = row->col + x - row->c0;
365
366 cell->darkness = 0;
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
297 } 370 }
298 } 371 }
372}
373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
299} 388}
300 389
301static void 390static void
302music_finished (void) 391music_finished (void)
303{ 392{
339 n |= n >> 16; 428 n |= n >> 16;
340 429
341 return n + 1; 430 return n + 1;
342} 431}
343 432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
436
344MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
345 438
346PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
347 440
348BOOT: 441BOOT:
349{ 442{
350 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
351 static const struct { 444 static const struct {
352 const char *name; 445 const char *name;
353 IV iv; 446 IV iv;
354 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
355# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
356 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
357 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
358 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
359 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
360 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
369 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
370 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
371 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
372 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
373 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
374 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
375 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
376 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
377 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
378 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
433 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
434 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
435 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
436 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
437 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
438 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
439 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
440 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
441 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
442 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
443 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
444 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
445 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
446 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
447 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
448 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
449 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
450 const_iv (KMOD_CTRL),
451 const_iv (KMOD_SHIFT),
452 const_iv (KMOD_ALT),
453 const_iv (KMOD_META)
454# undef const_iv 556# undef const_iv
455 }; 557 };
456 558
457 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
459} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
571
572int
573in_destruct ()
574 CODE:
575 RETVAL = PL_main_cv == Nullcv;
576 OUTPUT:
577 RETVAL
460 578
461NV floor (NV x) 579NV floor (NV x)
462 580
463NV ceil (NV x) 581NV ceil (NV x)
464 582
465void 583void
466pango_init () 584pango_init ()
467 CODE: 585 CODE:
468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{ 586{
470 {
471 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
472 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
477 cairo_fontmap = pango_cairo_font_map_get_default ();
478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
490} 590}
491 591
492int 592int
493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494 594
495void 595void
496SDL_Quit () 596SDL_Quit ()
497 597
498void 598void
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516 616
517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
518 622
519 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521 625
522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
542 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
544 ); 648 );
545 if (RETVAL) 649 if (RETVAL)
546 { 650 {
651 av_clear (texture_av);
652
547 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
549# include "glfunc.h" 655# include "glfunc.h"
550# undef GL_FUNC 656# undef GL_FUNC
657
551 } 658 }
552 OUTPUT: 659 OUTPUT:
553 RETVAL 660 RETVAL
554 661
555void 662void
556SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
557 664
558char * 665char *
559SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
560 667
668int
669SDL_GetAppState ()
670
561void 671void
562SDL_PollEvent () 672poll_events ()
563 PPCODE: 673 PPCODE:
564{ 674{
565 SDL_Event ev; 675 SDL_Event ev;
566 676
567 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
568 { 679 {
569 HV *hv = newHV (); 680 HV *hv = newHV ();
570 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
571 682
572 switch (ev.type) 683 switch (ev.type)
574 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
575 case SDL_KEYUP: 686 case SDL_KEYUP:
576 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
579 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580 break; 692 break;
581 693
582 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
584 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
585 break; 697 break;
586 698
587 case SDL_MOUSEMOTION: 699 case SDL_MOUSEMOTION:
700 {
701 int state = ev.motion.state;
702 int x = ev.motion.x;
703 int y = ev.motion.y;
704 int xrel = ev.motion.xrel;
705 int yrel = ev.motion.yrel;
706
707 /* do simplistic event compression */
708 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
709 && state == ev.motion.state)
710 {
711 xrel += ev.motion.xrel;
712 yrel += ev.motion.yrel;
713 x = ev.motion.x;
714 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 }
717
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
590 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
591 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
592 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
593 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
594 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
595 break; 725 break;
596 726
597 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
598 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
609 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611 break; 741 break;
612 } 742 }
613 743
614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615 } 745 }
616} 746}
617 747
618int 748int
619Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 749Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
628Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
629 759
630void 760void
631lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
632 CODE: 762 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
764
765void
766win32_proxy_info ()
767 PPCODE:
768{
633#ifndef _WIN32 769#ifdef _WIN32
634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 770 char buffer[2048];
771 DWORD buflen;
772
773 EXTEND (SP, 3);
774
775 buflen = sizeof (buffer);
776 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
777 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
778 {
779 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
780
781 buflen = sizeof (buffer);
782 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
783 {
784 PUSHs (newSVpv (buffer, 0));
785
786 buflen = sizeof (buffer);
787 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
788 PUSHs (newSVpv (buffer, 0));
789 }
790 }
635#endif 791#endif
792}
636 793
637void 794void
638add_font (char *file) 795add_font (char *file)
639 CODE: 796 CODE:
640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 797 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641#ifdef _WIN32
642 // cairo... sigh... requires win2000
643 AddFontResourceEx (file, FR_PRIVATE, 0);
644#endif
645 798
646void 799void
647load_image_inline (SV *image_) 800load_image_inline (SV *image_)
648 ALIAS: 801 ALIAS:
649 load_image_file = 1 802 load_image_file = 1
691 844
692 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 845 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693 846
694 assert (surface2->pitch == surface2->w * 4); 847 assert (surface2->pitch == surface2->w * 4);
695 848
849 SDL_LockSurface (surface2);
696 EXTEND (SP, 5); 850 EXTEND (SP, 6);
697 PUSHs (sv_2mortal (newSViv (surface2->w))); 851 PUSHs (sv_2mortal (newSViv (surface2->w)));
698 PUSHs (sv_2mortal (newSViv (surface2->h))); 852 PUSHs (sv_2mortal (newSViv (surface2->h)));
699 SDL_LockSurface (surface2);
700 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 853 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701 SDL_UnlockSurface (surface2);
702 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 854 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 855 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 856 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
857 SDL_UnlockSurface (surface2);
705 858
706 SDL_FreeSurface (surface); 859 SDL_FreeSurface (surface);
707 SDL_FreeSurface (surface2); 860 SDL_FreeSurface (surface2);
708} 861}
709 862
748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749#endif 902#endif
750 _exit (1); 903 _exit (1);
751 904
752void 905void
753_exit (int retval) 906_exit (int retval = 0)
754 CODE: 907 CODE:
908#ifdef WIN32
909 ExitThread (retval); // unclean, please beam me up
910#else
755 _exit (retval); 911 _exit (retval);
912#endif
756 913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
922
757MODULE = CFClient PACKAGE = CFClient::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
758 924
759CFClient::Font 925CFPlus::Font
760new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
761 CODE: 927 CODE:
762{ 928{
763 int count; 929 int count;
764 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
767} 933}
768 OUTPUT: 934 OUTPUT:
769 RETVAL 935 RETVAL
770 936
771void 937void
772DESTROY (CFClient::Font self) 938DESTROY (CFPlus::Font self)
773 CODE: 939 CODE:
774 pango_font_description_free (self); 940 pango_font_description_free (self);
775 941
776void 942void
777make_default (CFClient::Font self) 943make_default (CFPlus::Font self)
778 CODE: 944 CODE:
779 default_font = self; 945 default_font = self;
780 946
781MODULE = CFClient PACKAGE = CFClient::Layout 947MODULE = CFPlus PACKAGE = CFPlus::Layout
782 948
783CFClient::Layout 949void
784new (SV *class, int rgba = 0) 950reset_glyph_cache ()
951 CODE:
952 tc_clear ();
953
954CFPlus::Layout
955new (SV *class)
785 CODE: 956 CODE:
786 New (0, RETVAL, 1, struct cf_layout); 957 New (0, RETVAL, 1, struct cf_layout);
787 958
788 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 959 RETVAL->pl = pango_layout_new (opengl_context);
789 RETVAL->rgba = rgba;
790 RETVAL->r = 1.; 960 RETVAL->r = 1.;
791 RETVAL->g = 1.; 961 RETVAL->g = 1.;
792 RETVAL->b = 1.; 962 RETVAL->b = 1.;
793 RETVAL->a = 1.; 963 RETVAL->a = 1.;
794 RETVAL->base_height = MIN_FONT_HEIGHT; 964 RETVAL->base_height = MIN_FONT_HEIGHT;
798 layout_update_font (RETVAL); 968 layout_update_font (RETVAL);
799 OUTPUT: 969 OUTPUT:
800 RETVAL 970 RETVAL
801 971
802void 972void
803DESTROY (CFClient::Layout self) 973DESTROY (CFPlus::Layout self)
804 CODE: 974 CODE:
805 g_object_unref (self->pl); 975 g_object_unref (self->pl);
806 Safefree (self); 976 Safefree (self);
807 977
808int
809is_rgba (CFClient::Layout self)
810 CODE:
811 RETVAL = self->rgba;
812 OUTPUT:
813 RETVAL
814
815void 978void
816set_text (CFClient::Layout self, SV *text_) 979set_text (CFPlus::Layout self, SV *text_)
817 CODE: 980 CODE:
818{ 981{
819 STRLEN textlen; 982 STRLEN textlen;
820 char *text = SvPVutf8 (text_, textlen); 983 char *text = SvPVutf8 (text_, textlen);
821 984
822 pango_layout_set_text (self->pl, text, textlen); 985 pango_layout_set_text (self->pl, text, textlen);
823} 986}
824 987
825void 988void
826set_markup (CFClient::Layout self, SV *text_) 989set_markup (CFPlus::Layout self, SV *text_)
827 CODE: 990 CODE:
828{ 991{
829 STRLEN textlen; 992 STRLEN textlen;
830 char *text = SvPVutf8 (text_, textlen); 993 char *text = SvPVutf8 (text_, textlen);
831 994
832 pango_layout_set_markup (self->pl, text, textlen); 995 pango_layout_set_markup (self->pl, text, textlen);
833} 996}
834 997
835void 998void
836set_shapes (CFClient::Layout self, ...) 999set_shapes (CFPlus::Layout self, ...)
837 CODE: 1000 CODE:
838{ 1001{
839 PangoAttrList *attrs = 0; 1002 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl); 1003 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text; 1004 const char *pos = text;
842 int arg = 2; 1005 int arg = 4;
843 1006
844 while (arg < items && (pos = strstr (pos, OBJ_STR))) 1007 while (arg < items && (pos = strstr (pos, OBJ_STR)))
845 { 1008 {
846 PangoRectangle rect; 1009 PangoRectangle inkrect, rect;
847 PangoAttribute *attr; 1010 PangoAttribute *attr;
848 1011
1012 int x = SvIV (ST (arg - 3));
1013 int y = SvIV (ST (arg - 2));
849 int w = SvIV (ST (arg - 1)); 1014 int w = SvIV (ST (arg - 1));
850 int h = SvIV (ST (arg)); 1015 int h = SvIV (ST (arg ));
851 1016
852 arg += 2;
853
854 rect.x = 0; 1017 inkrect.x = 0;
1018 inkrect.y = 0;
1019 inkrect.width = 0;
1020 inkrect.height = 0;
1021
1022 rect.x = x * PANGO_SCALE;
855 rect.y = -h * PANGO_SCALE; 1023 rect.y = y * PANGO_SCALE;
856 rect.width = w * PANGO_SCALE; 1024 rect.width = w * PANGO_SCALE;
857 rect.height = h * PANGO_SCALE; 1025 rect.height = h * PANGO_SCALE;
858 1026
859 if (!attrs) 1027 if (!attrs)
860 attrs = pango_layout_get_attributes (self->pl); 1028 attrs = pango_layout_get_attributes (self->pl);
861 1029
862 attr = pango_attr_shape_new (&rect, &rect); 1030 attr = pango_attr_shape_new (&inkrect, &rect);
863 attr->start_index = pos - text; 1031 attr->start_index = pos - text;
864 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1; 1032 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865 pango_attr_list_insert (attrs, attr); 1033 pango_attr_list_insert (attrs, attr);
866 1034
1035 arg += 4;
867 pos += sizeof (OBJ_STR) - 1; 1036 pos += sizeof (OBJ_STR) - 1;
868 } 1037 }
869 1038
870 if (attrs) 1039 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs); 1040 pango_layout_set_attributes (self->pl, attrs);
872} 1041}
873 1042
874void 1043void
875get_shapes (CFClient::Layout self) 1044get_shapes (CFPlus::Layout self)
876 PPCODE: 1045 PPCODE:
877{ 1046{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1047 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879 1048
880 do 1049 do
884 if (run && shape_attr_p (run)) 1053 if (run && shape_attr_p (run))
885 { 1054 {
886 PangoRectangle extents; 1055 PangoRectangle extents;
887 pango_layout_iter_get_run_extents (iter, 0, &extents); 1056 pango_layout_iter_get_run_extents (iter, 0, &extents);
888 1057
1058 EXTEND (SP, 2);
889 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1059 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1060 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891 } 1061 }
892 } 1062 }
893 while (pango_layout_iter_next_run (iter)); 1063 while (pango_layout_iter_next_run (iter));
894 1064
895 pango_layout_iter_free (iter); 1065 pango_layout_iter_free (iter);
896} 1066}
897 1067
898int 1068int
899has_wrapped (CFClient::Layout self) 1069has_wrapped (CFPlus::Layout self)
900 CODE: 1070 CODE:
901{ 1071{
902 int lines = 1; 1072 int lines = 1;
903 const char *text = pango_layout_get_text (self->pl); 1073 const char *text = pango_layout_get_text (self->pl);
904 1074
909} 1079}
910 OUTPUT: 1080 OUTPUT:
911 RETVAL 1081 RETVAL
912 1082
913SV * 1083SV *
914get_text (CFClient::Layout self) 1084get_text (CFPlus::Layout self)
915 CODE: 1085 CODE:
916 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917 sv_utf8_decode (RETVAL); 1087 sv_utf8_decode (RETVAL);
918 OUTPUT: 1088 OUTPUT:
919 RETVAL 1089 RETVAL
920 1090
921void 1091void
922set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1092set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923 CODE: 1093 CODE:
924 self->r = r; 1094 self->r = r;
925 self->g = g; 1095 self->g = g;
926 self->b = b; 1096 self->b = b;
927 self->a = a; 1097 self->a = a;
928 1098
929void 1099void
930set_font (CFClient::Layout self, CFClient::Font font = 0) 1100set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931 CODE: 1101 CODE:
932 if (self->font != font) 1102 if (self->font != font)
933 { 1103 {
934 self->font = font; 1104 self->font = font;
935 layout_update_font (self); 1105 layout_update_font (self);
936 } 1106 }
937 1107
938void 1108void
939set_height (CFClient::Layout self, int base_height) 1109set_height (CFPlus::Layout self, int base_height)
940 CODE: 1110 CODE:
941 if (self->base_height != base_height) 1111 if (self->base_height != base_height)
942 { 1112 {
943 self->base_height = base_height; 1113 self->base_height = base_height;
944 layout_update_font (self); 1114 layout_update_font (self);
945 } 1115 }
946 1116
947void 1117void
948set_width (CFClient::Layout self, int max_width = -1) 1118set_width (CFPlus::Layout self, int max_width = -1)
949 CODE: 1119 CODE:
950 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1120 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951 1121
952void 1122void
953set_indent (CFClient::Layout self, int indent) 1123set_indent (CFPlus::Layout self, int indent)
954 CODE: 1124 CODE:
955 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956 1126
957void 1127void
958set_spacing (CFClient::Layout self, int spacing) 1128set_spacing (CFPlus::Layout self, int spacing)
959 CODE: 1129 CODE:
960 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961 1131
962void 1132void
963set_ellipsise (CFClient::Layout self, int ellipsise) 1133set_ellipsise (CFPlus::Layout self, int ellipsise)
964 CODE: 1134 CODE:
965 pango_layout_set_ellipsize (self->pl, 1135 pango_layout_set_ellipsize (self->pl,
966 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START
967 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
969 : PANGO_ELLIPSIZE_NONE 1139 : PANGO_ELLIPSIZE_NONE
970 ); 1140 );
971 1141
972void 1142void
973set_single_paragraph_mode (CFClient::Layout self, int spm) 1143set_single_paragraph_mode (CFPlus::Layout self, int spm)
974 CODE: 1144 CODE:
975 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976 1146
977void 1147void
978size (CFClient::Layout self) 1148size (CFPlus::Layout self)
979 PPCODE: 1149 PPCODE:
980{ 1150{
981 int w, h; 1151 int w, h;
982 1152
983 layout_get_pixel_size (self, &w, &h); 1153 layout_get_pixel_size (self, &w, &h);
986 PUSHs (sv_2mortal (newSViv (w))); 1156 PUSHs (sv_2mortal (newSViv (w)));
987 PUSHs (sv_2mortal (newSViv (h))); 1157 PUSHs (sv_2mortal (newSViv (h)));
988} 1158}
989 1159
990int 1160int
1161descent (CFPlus::Layout self)
1162 CODE:
1163{
1164 PangoRectangle rect;
1165 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1166 pango_layout_line_get_pixel_extents (line, 0, &rect);
1167 RETVAL = PANGO_DESCENT (rect);
1168}
1169 OUTPUT:
1170 RETVAL
1171
1172int
991xy_to_index (CFClient::Layout self, int x, int y) 1173xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1174 CODE:
993{ 1175{
994 int index, trailing; 1176 int index, trailing;
995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996 RETVAL = index; 1178 RETVAL = index + trailing;
997} 1179}
998 OUTPUT: 1180 OUTPUT:
999 RETVAL 1181 RETVAL
1000 1182
1001void 1183void
1002cursor_pos (CFClient::Layout self, int index) 1184cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1185 PPCODE:
1004{ 1186{
1005 PangoRectangle strong_pos; 1187 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1189
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1194}
1013 1195
1014void 1196void
1015render (CFClient::Layout self) 1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1016 PPCODE: 1198 PPCODE:
1017{ 1199{
1018 SV *retval; 1200 int line, x;
1019 int w, h;
1020 1201
1021 layout_get_pixel_size (self, &w, &h); 1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1022 1204
1023 if (self->rgba)
1024 {
1025 cairo_surface_t *surface;
1026 cairo_t *cairo;
1027
1028 retval = newSV (w * h * 4);
1029 SvPOK_only (retval);
1030 SvCUR_set (retval, w * h * 4);
1031
1032 memset (SvPVX (retval), 0, w * h * 4);
1033
1034 surface = cairo_image_surface_create_for_data (
1035 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1036 cairo = cairo_create (surface);
1037 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039 pango_cairo_show_layout (cairo, self->pl);
1040
1041 cairo_destroy (cairo);
1042 cairo_surface_destroy (surface);
1043
1044 // what a mess, and its premultiplied, too :(
1045 {
1046 uint32_t *p = (uint32_t *)SvPVX (retval);
1047 uint32_t *e = p + w * h;
1048
1049 while (p < e)
1050 {
1051 uint32_t rgba = *p;
1052 rgba = (rgba >> 24) | (rgba << 8);
1053#if 0
1054#ifdef _WIN32
1055 {//D
1056 uint8_t r = rgba >> 24;
1057 uint8_t g = rgba >> 16;
1058 uint8_t b = rgba >> 8;
1059 uint8_t a = rgba >> 0;
1060
1061 rgba = (rgba & 0xffffff00) | a;
1062 }
1063#endif
1064#endif
1065 rgba = SDL_SwapBE32 (rgba);
1066 *p++ = rgba;
1067 }
1068 }
1069
1070 EXTEND (SP, 5); 1205 EXTEND (SP, 2);
1071 PUSHs (sv_2mortal (newSViv (w))); 1206 PUSHs (sv_2mortal (newSViv (line - 1)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208}
1209
1210void
1211line_x_to_index (CFPlus::Layout self, int line, int x)
1212 PPCODE:
1213{
1214 PangoLayoutLine *lp;
1215 int index, trailing;
1216
1217 if (line < 0)
1218 XSRETURN_EMPTY;
1219
1220 if (!(lp = pango_layout_get_line (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */
1222
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224
1225 EXTEND (SP, 2);
1226 if (GIMME_V == G_SCALAR)
1072 PUSHs (sv_2mortal (newSViv (h))); 1227 PUSHs (sv_2mortal (newSViv (index + trailing)));
1073 PUSHs (sv_2mortal (retval));
1074 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 }
1077 else 1228 else
1078 { 1229 {
1079 FT_Bitmap bitmap;
1080
1081 retval = newSV (w * h);
1082 SvPOK_only (retval);
1083 SvCUR_set (retval, w * h);
1084
1085 bitmap.rows = h;
1086 bitmap.width = w;
1087 bitmap.pitch = w;
1088 bitmap.buffer = (unsigned char*)SvPVX (retval);
1089 bitmap.num_grays = 256;
1090 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092 memset (bitmap.buffer, 0, w * h);
1093
1094 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096 EXTEND (SP, 5);
1097 PUSHs (sv_2mortal (newSViv (w))); 1230 PUSHs (sv_2mortal (newSViv (index)));
1098 PUSHs (sv_2mortal (newSViv (h))); 1231 PUSHs (sv_2mortal (newSViv (trailing)));
1099 PUSHs (sv_2mortal (retval));
1100 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102 } 1232 }
1103} 1233}
1104 1234
1235void
1236render (CFPlus::Layout self, float x, float y, int flags = 0)
1237 PPCODE:
1238 pango_opengl_render_layout_subpixel (
1239 self->pl,
1240 x * PANGO_SCALE, y * PANGO_SCALE,
1241 self->r, self->g, self->b, self->a,
1242 flags
1243 );
1244
1105MODULE = CFClient PACKAGE = CFClient::Texture 1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1246
1247int minpot (int n)
1106 1248
1107void 1249void
1108pad2pot (SV *data_, SV *w_, SV *h_) 1250pad2pot (SV *data_, SV *w_, SV *h_)
1109 CODE: 1251 CODE:
1110{ 1252{
1188 glDisable (GL_ALPHA_TEST); 1330 glDisable (GL_ALPHA_TEST);
1189 glDisable (GL_BLEND); 1331 glDisable (GL_BLEND);
1190 } 1332 }
1191} 1333}
1192 1334
1335IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1336 CODE:
1337{
1338 GLint width;
1339 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1340 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1341 RETVAL = width > 0;
1342}
1343 OUTPUT:
1344 RETVAL
1345
1193MODULE = CFClient PACKAGE = CFClient::Map 1346MODULE = CFPlus PACKAGE = CFPlus::Map
1194 1347
1195CFClient::Map 1348CFPlus::Map
1196new (SV *class, int map_width, int map_height) 1349new (SV *class)
1197 CODE: 1350 CODE:
1198 New (0, RETVAL, 1, struct map); 1351 New (0, RETVAL, 1, struct map);
1199 RETVAL->x = 0; 1352 RETVAL->x = 0;
1200 RETVAL->y = 0; 1353 RETVAL->y = 0;
1201 RETVAL->w = map_width; 1354 RETVAL->w = 0;
1202 RETVAL->h = map_height; 1355 RETVAL->h = 0;
1203 RETVAL->ox = 0; 1356 RETVAL->ox = 0;
1204 RETVAL->oy = 0; 1357 RETVAL->oy = 0;
1205 RETVAL->faces = 8192; 1358 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1206 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1359 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1207 RETVAL->texs = 8192;
1208 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1209 RETVAL->rows = 0; 1360 RETVAL->rows = 0;
1210 RETVAL->row = 0; 1361 RETVAL->row = 0;
1211 OUTPUT: 1362 OUTPUT:
1212 RETVAL 1363 RETVAL
1213 1364
1214void 1365void
1215DESTROY (CFClient::Map self) 1366DESTROY (CFPlus::Map self)
1216 CODE: 1367 CODE:
1217{ 1368{
1218 map_clear (self); 1369 map_clear (self);
1219 Safefree (self->face); 1370 Safefree (self->face2tile);
1220 Safefree (self->tex); 1371 Safefree (self->tex);
1221 Safefree (self); 1372 Safefree (self);
1222} 1373}
1223 1374
1224void 1375void
1376resize (CFPlus::Map self, int map_width, int map_height)
1377 CODE:
1378 self->w = map_width;
1379 self->h = map_height;
1380
1381void
1225clear (CFClient::Map self) 1382clear (CFPlus::Map self)
1226 CODE: 1383 CODE:
1227 map_clear (self); 1384 map_clear (self);
1228 1385
1229void 1386void
1230set_face (CFClient::Map self, int face, int texid) 1387set_tileid (CFPlus::Map self, int face, int tile)
1231 CODE: 1388 CODE:
1232{ 1389{
1233 while (self->faces <= face) 1390 need_facenum (self, face); self->face2tile [face] = tile;
1234 { 1391 need_texid (self, tile);
1235 Append (mapface, self->face, self->faces, self->faces);
1236 self->faces *= 2;
1237 }
1238
1239 self->face [face] = texid;
1240} 1392}
1241 1393
1242void 1394void
1395set_smooth (CFPlus::Map self, int face, int smooth, int level)
1396 CODE:
1397{
1398 tileid texid;
1399 maptex *tex;
1400
1401 if (face < 0 || face >= self->faces)
1402 return;
1403
1404 if (smooth < 0 || smooth >= self->faces)
1405 return;
1406
1407 texid = self->face2tile [face];
1408
1409 if (!texid)
1410 return;
1411
1412 tex = self->tex + texid;
1413 tex->smoothtile = self->face2tile [smooth];
1414 tex->smoothlevel = level;
1415}
1416
1417void
1243set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1418set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1244 CODE: 1419 CODE:
1245{ 1420{
1246 while (self->texs <= texid) 1421 need_texid (self, texid);
1247 {
1248 Append (maptex, self->tex, self->texs, self->texs);
1249 self->texs *= 2;
1250 }
1251 1422
1252 { 1423 {
1253 maptex *tex = self->tex + texid; 1424 maptex *tex = self->tex + texid;
1254 1425
1255 tex->name = name; 1426 tex->name = name;
1272 // from transparent color bleeding and ugly wrapping effects. 1443 // from transparent color bleeding and ugly wrapping effects.
1273 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1444 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274} 1445}
1275 1446
1276int 1447int
1277ox (CFClient::Map self) 1448ox (CFPlus::Map self)
1278 ALIAS: 1449 ALIAS:
1279 oy = 1 1450 oy = 1
1280 x = 2 1451 x = 2
1281 y = 3 1452 y = 3
1282 w = 4 1453 w = 4
1293 } 1464 }
1294 OUTPUT: 1465 OUTPUT:
1295 RETVAL 1466 RETVAL
1296 1467
1297void 1468void
1298scroll (CFClient::Map self, int dx, int dy) 1469scroll (CFPlus::Map self, int dx, int dy)
1299 CODE: 1470 CODE:
1300{ 1471{
1301 if (dx > 0) 1472 if (dx > 0)
1302 map_blank (self, self->x, self->y, dx - 1, self->h); 1473 map_blank (self, self->x, self->y, dx, self->h);
1303 else if (dx < 0) 1474 else if (dx < 0)
1304 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1475 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1305 1476
1306 if (dy > 0) 1477 if (dy > 0)
1307 map_blank (self, self->x, self->y, self->w, dy - 1); 1478 map_blank (self, self->x, self->y, self->w, dy);
1308 else if (dy < 0) 1479 else if (dy < 0)
1309 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1480 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1310 1481
1311 self->ox += dx; self->x += dx; 1482 self->ox += dx; self->x += dx;
1312 self->oy += dy; self->y += dy; 1483 self->oy += dy; self->y += dy;
1313 1484
1314 while (self->y < 0) 1485 while (self->y < 0)
1319 self->y += MAP_EXTEND_Y; 1490 self->y += MAP_EXTEND_Y;
1320 } 1491 }
1321} 1492}
1322 1493
1323void 1494void
1324map1a_update (CFClient::Map self, SV *data_) 1495map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325 CODE: 1496 CODE:
1326{ 1497{
1327 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1498 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1328 uint8_t *data_end = (uint8_t *)SvEND (data_); 1499 uint8_t *data_end = (uint8_t *)SvEND (data_);
1329 mapcell *cell; 1500 mapcell *cell;
1330 int x, y, flags; 1501 int x, y, flags;
1331 1502
1332 while (data < data_end) 1503 while (data < data_end - 1)
1333 { 1504 {
1334 flags = (data [0] << 8) + data [1]; data += 2; 1505 flags = (data [0] << 8) + data [1]; data += 2;
1335 1506
1336 x = self->x + ((flags >> 10) & 63); 1507 x = self->x + ((flags >> 10) & 63);
1337 y = self->y + ((flags >> 4) & 63); 1508 y = self->y + ((flags >> 4) & 63);
1338 1509
1339 cell = map_get_cell (self, x, y); 1510 cell = map_get_cell (self, x, y);
1340 1511
1341 if (flags & 15) 1512 if (flags & 15)
1342 { 1513 {
1343 if (cell->darkness < 0) 1514 if (!cell->darkness)
1344 { 1515 {
1516 memset (cell, 0, sizeof (*cell));
1345 cell->darkness = 0; 1517 cell->darkness = 256;
1346 cell->face [0] = 0;
1347 cell->face [1] = 0;
1348 cell->face [2] = 0;
1349 } 1518 }
1350 1519
1351 cell->darkness = flags & 8 ? *data++ : 255;
1352
1353 //TODO: don't trust server data to be in-range(!) 1520 //TODO: don't trust server data to be in-range(!)
1521
1522 if (flags & 8)
1523 {
1524 if (extmap)
1525 {
1526 uint8_t ext, cmd;
1527
1528 do
1529 {
1530 ext = *data++;
1531 cmd = ext & 0x3f;
1532
1533 if (cmd < 4)
1534 cell->darkness = 255 - ext * 64 + 1;
1535 else if (cmd == 5) // health
1536 {
1537 cell->stat_width = 1;
1538 cell->stat_hp = *data++;
1539 }
1540 else if (cmd == 6) // monster width
1541 cell->stat_width = *data++ + 1;
1542 else if (cmd == 0x47)
1543 {
1544 if (*data == 4)
1545 ; // decode player count
1546
1547 data += *data + 1;
1548 }
1549 else if (cmd == 8) // cell flags
1550 cell->flags = *data++;
1551 else if (ext & 0x40) // unknown, multibyte => skip
1552 data += *data + 1;
1553 else
1554 data++;
1555 }
1556 while (ext & 0x80);
1557 }
1558 else
1559 cell->darkness = *data++ + 1;
1560 }
1354 1561
1355 if (flags & 4) 1562 if (flags & 4)
1356 { 1563 {
1357 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1564 faceid face = (data [0] << 8) + data [1]; data += 2;
1565 need_facenum (self, face);
1566 cell->tile [0] = self->face2tile [face];
1358 } 1567 }
1359 1568
1360 if (flags & 2) 1569 if (flags & 2)
1361 { 1570 {
1362 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1571 faceid face = (data [0] << 8) + data [1]; data += 2;
1572 need_facenum (self, face);
1573 cell->tile [1] = self->face2tile [face];
1363 } 1574 }
1364 1575
1365 if (flags & 1) 1576 if (flags & 1)
1366 { 1577 {
1367 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1578 faceid face = (data [0] << 8) + data [1]; data += 2;
1579 need_facenum (self, face);
1580 cell->tile [2] = self->face2tile [face];
1368 } 1581 }
1369 } 1582 }
1370 else 1583 else
1371 cell->darkness = -1; 1584 cell->darkness = 0;
1372 } 1585 }
1373} 1586}
1374 1587
1375SV * 1588SV *
1376mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1589mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377 CODE: 1590 CODE:
1378{ 1591{
1379 int x1, x; 1592 int x1, x;
1380 int y1, y; 1593 int y1, y;
1381 int z; 1594 int z;
1402 { 1615 {
1403 mapcell *cell = row->col + (x - row->c0); 1616 mapcell *cell = row->col + (x - row->c0);
1404 1617
1405 for (z = 0; z <= 0; z++) 1618 for (z = 0; z <= 0; z++)
1406 { 1619 {
1407 mapface face = cell->face [z];
1408
1409 if (face)
1410 {
1411 maptex tex = self->tex [face]; 1620 maptex tex = self->tex [cell->tile [z]];
1412 int a0 = 255 - tex.a; 1621 int a0 = 255 - tex.a;
1413 int a1 = tex.a; 1622 int a1 = tex.a;
1414 1623
1415 r = (r * a0 + tex.r * a1) / 255; 1624 r = (r * a0 + tex.r * a1) / 255;
1416 g = (g * a0 + tex.g * a1) / 255; 1625 g = (g * a0 + tex.g * a1) / 255;
1417 b = (b * a0 + tex.b * a1) / 255; 1626 b = (b * a0 + tex.b * a1) / 255;
1418 a = (a * a0 + tex.a * a1) / 255; 1627 a = (a * a0 + tex.a * a1) / 255;
1419 }
1420 } 1628 }
1421 } 1629 }
1422 1630
1423 *map++ = (r ) 1631 *map++ = (r )
1424 | (g << 8) 1632 | (g << 8)
1431} 1639}
1432 OUTPUT: 1640 OUTPUT:
1433 RETVAL 1641 RETVAL
1434 1642
1435void 1643void
1436draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1644draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1437 CODE: 1645 CODE:
1438{ 1646{
1439 int vx, vy; 1647 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1648 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1649 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1650 smooth_key skey;
1440 int x, y, z; 1651 int x, y, z;
1441 int last_name; 1652 int last_name;
1442 mapface face;
1443 1653
1444 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1654 // thats current max. sorry.
1445 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1655 if (sw > 255) sw = 255;
1656 if (sh > 255) sh = 255;
1446 1657
1447 /* 1658 // clear key, in case of extra padding
1448 int vx = self->vx = self->w >= sw 1659 memset (&skey, 0, sizeof (skey));
1449 ? self->x + (self->w - sw) / 2
1450 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1451
1452 int vy = self->vy = self->h >= sh
1453 ? self->y + (self->h - sh) / 2
1454 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1455 */
1456 1660
1457 glColor4ub (255, 255, 255, 255); 1661 glColor4ub (255, 255, 255, 255);
1458 1662
1459 glEnable (GL_BLEND); 1663 glEnable (GL_BLEND);
1460 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1664 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1463 1667
1464 glBegin (GL_QUADS); 1668 glBegin (GL_QUADS);
1465 1669
1466 last_name = 0; 1670 last_name = 0;
1467 1671
1672 mx += self->x;
1673 my += self->y;
1674
1675 // first pass: determine smooth_max
1676 // rather ugly, if you ask me
1677 // could also be stored inside mapcell and updated on change
1678 memset (smooth_max, 0, sizeof (smooth_max));
1679
1680 for (y = 0; y < sh; y++)
1681 if (0 <= y + my && y + my < self->rows)
1682 {
1683 maprow *row = self->row + (y + my);
1684
1685 for (x = 0; x < sw; x++)
1686 if (row->c0 <= x + mx && x + mx < row->c1)
1687 {
1688 mapcell *cell = row->col + (x + mx - row->c0);
1689
1690 smooth_max[x + 1][y + 1] =
1691 MAX (self->tex [cell->tile [0]].smoothlevel,
1692 MAX (self->tex [cell->tile [1]].smoothlevel,
1693 self->tex [cell->tile [2]].smoothlevel));
1694 }
1695 }
1696
1468 for (z = 0; z < 3; z++) 1697 for (z = 0; z <= 2; z++)
1698 {
1699 memset (smooth_level, 0, sizeof (smooth_level));
1700
1469 for (y = 0; y < sh; y++) 1701 for (y = 0; y < sh; y++)
1470 if (0 <= y + vy && y + vy < self->rows) 1702 if (0 <= y + my && y + my < self->rows)
1471 { 1703 {
1472 maprow *row = self->row + (y + vy); 1704 maprow *row = self->row + (y + my);
1473 1705
1474 for (x = 0; x < sw; x++) 1706 for (x = 0; x < sw; x++)
1475 if (row->c0 <= x + vx && x + vx < row->c1) 1707 if (row->c0 <= x + mx && x + mx < row->c1)
1476 { 1708 {
1477 mapcell *cell = row->col + (x + vx - row->c0); 1709 mapcell *cell = row->col + (x + mx - row->c0);
1478
1479 face = cell->face [z]; 1710 tileid tile = cell->tile [z];
1480 1711
1481 if (face) 1712 if (tile)
1713 {
1714 maptex tex = self->tex [tile];
1715 int px = (x + 1) * T - tex.w;
1716 int py = (y + 1) * T - tex.h;
1717
1718 // suppressing texture state switches here
1719 // is only moderately effective, but worth the extra effort
1720 if (last_name != tex.name)
1721 {
1722 if (!tex.name)
1723 tex = self->tex [2]; /* missing, replace by noface */
1724
1725 glEnd ();
1726 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1727 glBegin (GL_QUADS);
1728 }
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1734
1735 if (cell->flags && z == 2)
1736 {
1737 if (cell->flags & 1)
1738 {
1739 maptex tex = self->tex [1];
1740 int px = x * T + T * 2 / 32;
1741 int py = y * T - T * 6 / 32;
1742
1743 glEnd ();
1744 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1745 glBegin (GL_QUADS);
1746
1747 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1748 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1749 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1750 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1751 }
1752 }
1753
1754 // update smooth hash
1755 if (tex.smoothtile)
1756 {
1757 skey.tile = tex.smoothtile;
1758 skey.level = tex.smoothlevel;
1759
1760 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1761
1762 // add bits to current tile and all neighbours. skey.x|y is
1763 // shifted +1|+1 so we always stay positive.
1764
1765 // bits is ___n cccc CCCC bbbb
1766 // n do not draw borders&corners
1767 // c draw these corners, but...
1768 // C ... not these
1769 // b draw these borders
1770
1771 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1772 // ┃· ·· ·┃ ━━
1773
1774 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1775 // ·· ·· ·┏ ┓·
1776
1777 // full tile
1778 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1779
1780 // borders
1781 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1782 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1783 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1784 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1785
1786 // corners
1787 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1788 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1789 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1790 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1791 }
1792 }
1793 }
1794 }
1795
1796 // go through all smoothlevels, lowest to highest, then draw.
1797 // this is basically counting sort
1798 {
1799 int w, b;
1800
1801 for (w = 0; w < 256 / 32; ++w)
1802 {
1803 uint32_t smask = smooth_level [w];
1804 if (smask)
1805 for (b = 0; b < 32; ++b)
1806 if (smask & (((uint32_t)1) << b))
1482 { 1807 {
1483 maptex tex = self->tex [face]; 1808 int level = (w << 5) | b;
1809 HE *he;
1484 1810
1485 int px = (x + 1) * 32 - tex.w; 1811 hv_iterinit (smooth);
1486 int py = (y + 1) * 32 - tex.h; 1812 while ((he = hv_iternext (smooth)))
1487
1488 if (last_name != tex.name)
1489 { 1813 {
1814 smooth_key *skey = (smooth_key *)HeKEY (he);
1815 IV bits = SvIVX (HeVAL (he));
1816
1817 if (!(bits & 0x1000)
1818 && skey->level == level
1819 && level > smooth_max [skey->x][skey->y])
1820 {
1821 maptex tex = self->tex [skey->tile];
1822 int px = (((int)skey->x) - 1) * T;
1823 int py = (((int)skey->y) - 1) * T;
1824 int border = bits & 15;
1825 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1826 float dx = tex.s * .0625f; // 16 images/row
1827 float dy = tex.t * .5f ; // 2 images/column
1828
1829 // this time naively avoiding texture state changes
1830 // save gobs of state changes.
1831 if (last_name != tex.name)
1832 {
1833 if (!tex.name)
1834 continue; // smoothing not yet available
1835
1490 glEnd (); 1836 glEnd ();
1491 last_name = tex.name;
1492 glBindTexture (GL_TEXTURE_2D, last_name); 1837 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493 glBegin (GL_QUADS); 1838 glBegin (GL_QUADS);
1839 }
1840
1841 if (border)
1842 {
1843 float ox = border * dx;
1844
1845 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1846 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1847 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1848 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1849 }
1850
1851 if (corner)
1852 {
1853 float ox = corner * dx;
1854
1855 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1856 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1857 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1858 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1859 }
1860 }
1494 } 1861 }
1495
1496 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1497 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1498 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1499 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1500 } 1862 }
1501 }
1502 } 1863 }
1864 }
1865
1866 hv_clear (smooth);
1867 }
1503 1868
1504 glEnd (); 1869 glEnd ();
1505 1870
1506 glDisable (GL_TEXTURE_2D); 1871 glDisable (GL_TEXTURE_2D);
1507 glDisable (GL_BLEND); 1872 glDisable (GL_BLEND);
1508}
1509 1873
1874 // top layer: overlays such as the health bar
1875 for (y = 0; y < sh; y++)
1876 if (0 <= y + my && y + my < self->rows)
1877 {
1878 maprow *row = self->row + (y + my);
1879
1880 for (x = 0; x < sw; x++)
1881 if (row->c0 <= x + mx && x + mx < row->c1)
1882 {
1883 mapcell *cell = row->col + (x + mx - row->c0);
1884
1885 int px = x * T;
1886 int py = y * T;
1887
1888 if (cell->stat_hp)
1889 {
1890 int width = cell->stat_width * T;
1891 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1892
1893 glColor3ub (0, 0, 0);
1894 glRectf (px + 1, py - thick - 2,
1895 px + width - 1, py);
1896
1897 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1898 glRectf (px + 2,
1899 py - thick - 1,
1900 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1901 }
1902 }
1903 }
1904}
1905
1510void 1906void
1511draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1907draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512 CODE: 1908 CODE:
1513{ 1909{
1514 static float color[16][3] = { 1910 static float color[16][3] = {
1515 { 0.00, 0.00, 0.00 }, 1911 { 0.00F, 0.00F, 0.00F },
1516 { 1.00, 1.00, 1.00 }, 1912 { 1.00F, 1.00F, 1.00F },
1517 { 0.00, 0.00, 0.55 }, 1913 { 0.00F, 0.00F, 0.55F },
1518 { 1.00, 0.00, 0.00 }, 1914 { 1.00F, 0.00F, 0.00F },
1519 1915
1520 { 1.00, 0.54, 0.00 }, 1916 { 1.00F, 0.54F, 0.00F },
1521 { 0.11, 0.56, 1.00 }, 1917 { 0.11F, 0.56F, 1.00F },
1522 { 0.93, 0.46, 0.00 }, 1918 { 0.93F, 0.46F, 0.00F },
1523 { 0.18, 0.54, 0.34 }, 1919 { 0.18F, 0.54F, 0.34F },
1524 1920
1525 { 0.56, 0.73, 0.56 }, 1921 { 0.56F, 0.73F, 0.56F },
1526 { 0.80, 0.80, 0.80 }, 1922 { 0.80F, 0.80F, 0.80F },
1527 { 0.55, 0.41, 0.13 }, 1923 { 0.55F, 0.41F, 0.13F },
1528 { 0.99, 0.77, 0.26 }, 1924 { 0.99F, 0.77F, 0.26F },
1529 1925
1530 { 0.74, 0.65, 0.41 }, 1926 { 0.74F, 0.65F, 0.41F },
1531 1927
1532 { 0.00, 1.00, 1.00 }, 1928 { 0.00F, 1.00F, 1.00F },
1533 { 1.00, 0.00, 1.00 }, 1929 { 1.00F, 0.00F, 1.00F },
1534 { 1.00, 1.00, 0.00 }, 1930 { 1.00F, 1.00F, 0.00F },
1535 }; 1931 };
1536 1932
1537 int x, y; 1933 int x, y;
1538 1934
1539 glEnable (GL_TEXTURE_2D); 1935 glEnable (GL_TEXTURE_2D);
1566 glDisable (GL_BLEND); 1962 glDisable (GL_BLEND);
1567 glDisable (GL_TEXTURE_2D); 1963 glDisable (GL_TEXTURE_2D);
1568} 1964}
1569 1965
1570void 1966void
1571fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1967fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1572 PPCODE: 1968 PPCODE:
1573{ 1969{
1574 int vx, vy;
1575 int x, y; 1970 int x, y;
1576 int sw4 = (sw + 3) & ~3; 1971 int sw4 = (sw + 3) & ~3;
1577 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1972 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1578 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1973 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1579 1974
1580 memset (darkness, 255, sw4 * sh); 1975 memset (darkness, 255, sw4 * sh);
1581 SvPOK_only (darkness_sv); 1976 SvPOK_only (darkness_sv);
1582 SvCUR_set (darkness_sv, sw4 * sh); 1977 SvCUR_set (darkness_sv, sw4 * sh);
1583 1978
1584 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1979 mx += self->x;
1585 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1980 my += self->y;
1586 1981
1587 for (y = 0; y < sh; y++) 1982 for (y = 0; y < sh; y++)
1588 if (0 <= y + vy && y + vy < self->rows) 1983 if (0 <= y + my && y + my < self->rows)
1589 { 1984 {
1590 maprow *row = self->row + (y + vy); 1985 maprow *row = self->row + (y + my);
1591 1986
1592 for (x = 0; x < sw; x++) 1987 for (x = 0; x < sw; x++)
1593 if (row->c0 <= x + vx && x + vx < row->c1) 1988 if (row->c0 <= x + mx && x + mx < row->c1)
1594 { 1989 {
1595 mapcell *cell = row->col + (x + vx - row->c0); 1990 mapcell *cell = row->col + (x + mx - row->c0);
1596 1991
1597 darkness[y * sw4 + x] = cell->darkness < 0 1992 darkness[y * sw4 + x] = cell->darkness
1993 ? 255 - (cell->darkness - 1)
1598 ? 255 - FOW_DARKNESS 1994 : 255 - FOW_DARKNESS;
1599 : 255 - cell->darkness;
1600 } 1995 }
1601 } 1996 }
1602 1997
1603 EXTEND (SP, 3); 1998 EXTEND (SP, 3);
1604 PUSHs (sv_2mortal (newSViv (sw4))); 1999 PUSHs (sv_2mortal (newSViv (sw4)));
1605 PUSHs (sv_2mortal (newSViv (sh))); 2000 PUSHs (sv_2mortal (newSViv (sh)));
1606 PUSHs (darkness_sv); 2001 PUSHs (darkness_sv);
1607} 2002}
1608 2003
1609SV * 2004SV *
1610get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2005get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611 CODE: 2006 CODE:
1612{ 2007{
1613 int x, y, x1, y1; 2008 int x, y, x1, y1;
1614 SV *data_sv = newSV (w * h * 7 + 5); 2009 SV *data_sv = newSV (w * h * 7 + 5);
1615 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2010 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1640 if (row && row->c0 <= x && x < row->c1) 2035 if (row && row->c0 <= x && x < row->c1)
1641 { 2036 {
1642 mapcell *cell = row->col + (x - row->c0); 2037 mapcell *cell = row->col + (x - row->c0);
1643 uint8_t flags = 0; 2038 uint8_t flags = 0;
1644 2039
1645 if (cell->face [0]) flags |= 1; 2040 if (cell->tile [0]) flags |= 1;
1646 if (cell->face [1]) flags |= 2; 2041 if (cell->tile [1]) flags |= 2;
1647 if (cell->face [2]) flags |= 4; 2042 if (cell->tile [2]) flags |= 4;
1648 2043
1649 *data++ = flags; 2044 *data++ = flags;
1650 2045
1651 if (flags & 1) 2046 if (flags & 1)
1652 { 2047 {
2048 tileid tile = cell->tile [0];
1653 *data++ = cell->face [0] >> 8; 2049 *data++ = tile >> 8;
1654 *data++ = cell->face [0]; 2050 *data++ = tile;
1655 } 2051 }
1656 2052
1657 if (flags & 2) 2053 if (flags & 2)
1658 { 2054 {
2055 tileid tile = cell->tile [1];
1659 *data++ = cell->face [1] >> 8; 2056 *data++ = tile >> 8;
1660 *data++ = cell->face [1]; 2057 *data++ = tile;
1661 } 2058 }
1662 2059
1663 if (flags & 4) 2060 if (flags & 4)
1664 { 2061 {
2062 tileid tile = cell->tile [2];
1665 *data++ = cell->face [2] >> 8; 2063 *data++ = tile >> 8;
1666 *data++ = cell->face [2]; 2064 *data++ = tile;
1667 } 2065 }
1668 } 2066 }
1669 else 2067 else
1670 *data++ = 0; 2068 *data++ = 0;
1671 } 2069 }
1677} 2075}
1678 OUTPUT: 2076 OUTPUT:
1679 RETVAL 2077 RETVAL
1680 2078
1681void 2079void
1682set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2080set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683 PPCODE: 2081 PPCODE:
1684{ 2082{
1685 int x, y, z; 2083 int x, y, z;
1686 int w, h; 2084 int w, h;
1687 int x1, y1; 2085 int x1, y1;
1711 { 2109 {
1712 uint8_t flags = *data++; 2110 uint8_t flags = *data++;
1713 2111
1714 if (flags) 2112 if (flags)
1715 { 2113 {
1716 mapface face[3] = { 0, 0, 0 };
1717
1718 mapcell *cell = row_get_cell (row, x); 2114 mapcell *cell = row_get_cell (row, x);
2115 tileid tile[3] = { 0, 0, 0 };
1719 2116
1720 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2117 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1721 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2118 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1722 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2119 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1723 2120
1724 if (cell->darkness <= 0) 2121 if (cell->darkness == 0)
1725 { 2122 {
1726 cell->darkness = -1; 2123 cell->darkness = 0;
1727 2124
1728 for (z = 0; z <= 2; z++) 2125 for (z = 0; z <= 2; z++)
1729 { 2126 {
1730 cell->face[z] = face[z]; 2127 tileid t = tile [z];
1731 2128
1732 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2129 if (t >= self->texs || (t && !self->tex [t].name))
2130 {
1733 XPUSHs (sv_2mortal (newSViv (face[z]))); 2131 XPUSHs (sv_2mortal (newSViv (t)));
2132 need_texid (self, t);
2133 }
2134
2135 cell->tile [z] = t;
1734 } 2136 }
1735 } 2137 }
1736 } 2138 }
1737 } 2139 }
1738 } 2140 }
1739} 2141}
1740 2142
1741MODULE = CFClient PACKAGE = CFClient::MixChunk 2143MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742 2144
1743CFClient::MixChunk 2145CFPlus::MixChunk
1744new_from_file (SV *class, char *path) 2146new_from_file (SV *class, char *path)
1745 CODE: 2147 CODE:
1746 RETVAL = Mix_LoadWAV (path); 2148 RETVAL = Mix_LoadWAV (path);
1747 OUTPUT: 2149 OUTPUT:
1748 RETVAL 2150 RETVAL
1749 2151
1750void 2152void
1751DESTROY (CFClient::MixChunk self) 2153DESTROY (CFPlus::MixChunk self)
1752 CODE: 2154 CODE:
1753 Mix_FreeChunk (self); 2155 Mix_FreeChunk (self);
1754 2156
1755int 2157int
1756volume (CFClient::MixChunk self, int volume = -1) 2158volume (CFPlus::MixChunk self, int volume = -1)
1757 CODE: 2159 CODE:
1758 RETVAL = Mix_VolumeChunk (self, volume); 2160 RETVAL = Mix_VolumeChunk (self, volume);
1759 OUTPUT: 2161 OUTPUT:
1760 RETVAL 2162 RETVAL
1761 2163
1762int 2164int
1763play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2165play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764 CODE: 2166 CODE:
1765 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2167 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766 OUTPUT: 2168 OUTPUT:
1767 RETVAL 2169 RETVAL
1768 2170
1769MODULE = CFClient PACKAGE = CFClient::MixMusic 2171MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770 2172
1771int 2173int
1772volume (int volume = -1) 2174volume (int volume = -1)
1773 CODE: 2175 CODE:
1774 RETVAL = Mix_VolumeMusic (volume); 2176 RETVAL = Mix_VolumeMusic (volume);
1775 OUTPUT: 2177 OUTPUT:
1776 RETVAL 2178 RETVAL
1777 2179
2180int
2181fade_out (int ms)
2182 CODE:
2183 RETVAL = Mix_FadeOutMusic (ms);
2184 OUTPUT:
2185 RETVAL
2186
1778CFClient::MixMusic 2187CFPlus::MixMusic
1779new_from_file (SV *class, char *path) 2188new_from_file (SV *class, char *path)
1780 CODE: 2189 CODE:
1781 RETVAL = Mix_LoadMUS (path); 2190 RETVAL = Mix_LoadMUS (path);
1782 OUTPUT: 2191 OUTPUT:
1783 RETVAL 2192 RETVAL
1784 2193
1785void 2194void
1786DESTROY (CFClient::MixMusic self) 2195DESTROY (CFPlus::MixMusic self)
1787 CODE: 2196 CODE:
1788 Mix_FreeMusic (self); 2197 Mix_FreeMusic (self);
1789 2198
1790int 2199int
1791play (CFClient::MixMusic self, int loops = -1) 2200play (CFPlus::MixMusic self, int loops = -1)
1792 CODE: 2201 CODE:
1793 RETVAL = Mix_PlayMusic (self, loops); 2202 RETVAL = Mix_PlayMusic (self, loops);
1794 OUTPUT: 2203 OUTPUT:
1795 RETVAL 2204 RETVAL
1796 2205
2206int
2207fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2208 CODE:
2209 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2210 OUTPUT:
2211 RETVAL
2212
1797MODULE = CFClient PACKAGE = CFClient::OpenGL 2213MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798 2214
1799BOOT: 2215BOOT:
1800{ 2216{
1801 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2217 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802 static const struct { 2218 static const struct {
1803 const char *name; 2219 const char *name;
1804 IV iv; 2220 IV iv;
1805 } *civ, const_iv[] = { 2221 } *civ, const_iv[] = {
1806# define const_iv(name) { # name, (IV)name } 2222# define const_iv(name) { # name, (IV)name }
2223 const_iv (GL_VENDOR),
2224 const_iv (GL_VERSION),
2225 const_iv (GL_EXTENSIONS),
1807 const_iv (GL_COLOR_MATERIAL), 2226 const_iv (GL_COLOR_MATERIAL),
1808 const_iv (GL_SMOOTH), 2227 const_iv (GL_SMOOTH),
1809 const_iv (GL_FLAT), 2228 const_iv (GL_FLAT),
1810 const_iv (GL_DITHER), 2229 const_iv (GL_DITHER),
1811 const_iv (GL_BLEND), 2230 const_iv (GL_BLEND),
1838 const_iv (GL_LUMINANCE), 2257 const_iv (GL_LUMINANCE),
1839 const_iv (GL_LUMINANCE_ALPHA), 2258 const_iv (GL_LUMINANCE_ALPHA),
1840 const_iv (GL_FLOAT), 2259 const_iv (GL_FLOAT),
1841 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2260 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1842 const_iv (GL_COMPILE), 2261 const_iv (GL_COMPILE),
2262 const_iv (GL_PROXY_TEXTURE_1D),
2263 const_iv (GL_PROXY_TEXTURE_2D),
1843 const_iv (GL_TEXTURE_1D), 2264 const_iv (GL_TEXTURE_1D),
1844 const_iv (GL_TEXTURE_2D), 2265 const_iv (GL_TEXTURE_2D),
1845 const_iv (GL_TEXTURE_ENV), 2266 const_iv (GL_TEXTURE_ENV),
1846 const_iv (GL_TEXTURE_MAG_FILTER), 2267 const_iv (GL_TEXTURE_MAG_FILTER),
1847 const_iv (GL_TEXTURE_MIN_FILTER), 2268 const_iv (GL_TEXTURE_MIN_FILTER),
1869 const_iv (GL_SEPARABLE_2D), 2290 const_iv (GL_SEPARABLE_2D),
1870 const_iv (GL_CONVOLUTION_2D), 2291 const_iv (GL_CONVOLUTION_2D),
1871 const_iv (GL_CONVOLUTION_BORDER_MODE), 2292 const_iv (GL_CONVOLUTION_BORDER_MODE),
1872 const_iv (GL_CONSTANT_BORDER), 2293 const_iv (GL_CONSTANT_BORDER),
1873 const_iv (GL_LINES), 2294 const_iv (GL_LINES),
2295 const_iv (GL_LINE_STRIP),
1874 const_iv (GL_LINE_LOOP), 2296 const_iv (GL_LINE_LOOP),
1875 const_iv (GL_QUADS), 2297 const_iv (GL_QUADS),
1876 const_iv (GL_QUAD_STRIP), 2298 const_iv (GL_QUAD_STRIP),
1877 const_iv (GL_TRIANGLES), 2299 const_iv (GL_TRIANGLES),
1878 const_iv (GL_TRIANGLE_STRIP), 2300 const_iv (GL_TRIANGLE_STRIP),
1886# undef const_iv 2308# undef const_iv
1887 }; 2309 };
1888 2310
1889 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2311 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2312 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2313
2314 texture_av = newAV ();
2315 AvREAL_off (texture_av);
1891} 2316}
1892 2317
1893char * 2318char *
1894gl_vendor () 2319gl_vendor ()
1895 CODE: 2320 CODE:
1906 2331
1907char * 2332char *
1908gl_extensions () 2333gl_extensions ()
1909 CODE: 2334 CODE:
1910 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2335 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2336 OUTPUT:
2337 RETVAL
2338
2339char *glGetString (GLenum pname)
2340
2341GLint glGetInteger (GLenum pname)
2342 CODE:
2343 glGetIntegerv (pname, &RETVAL);
2344 OUTPUT:
2345 RETVAL
2346
2347GLdouble glGetDouble (GLenum pname)
2348 CODE:
2349 glGetDoublev (pname, &RETVAL);
1911 OUTPUT: 2350 OUTPUT:
1912 RETVAL 2351 RETVAL
1913 2352
1914int glGetError () 2353int glGetError ()
1915 2354
1988 r *= a; 2427 r *= a;
1989 g *= a; 2428 g *= a;
1990 b *= a; 2429 b *= a;
1991 } 2430 }
1992 // microsoft visual "c" rounds instead of truncating... 2431 // microsoft visual "c" rounds instead of truncating...
1993 glColor4ub (MIN ((int)(r * 256.f), 255), 2432 glColor4f (r, g, b, a);
1994 MIN ((int)(g * 256.f), 255),
1995 MIN ((int)(b * 256.f), 255),
1996 MIN ((int)(a * 256.f), 255));
1997 2433
1998void glInterleavedArrays (int format, int stride, char *data) 2434void glInterleavedArrays (int format, int stride, char *data)
1999 2435
2000void glDrawElements (int mode, int count, int type, char *indices) 2436void glDrawElements (int mode, int count, int type, char *indices)
2001 2437
2043 2479
2044void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2480void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2045 2481
2046void glDrawPixels (int width, int height, int format, int type, char *pixels) 2482void glDrawPixels (int width, int height, int format, int type, char *pixels)
2047 2483
2484void glPixelZoom (float x, float y)
2485
2048void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2486void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2049 2487
2050int glGenTexture () 2488int glGenTexture ()
2051 CODE: 2489 CODE:
2052{ 2490 RETVAL = gen_texture ();
2053 GLuint name;
2054 glGenTextures (1, &name);
2055 RETVAL = name;
2056}
2057 OUTPUT: 2491 OUTPUT:
2058 RETVAL 2492 RETVAL
2059 2493
2060void glDeleteTexture (int name) 2494void glDeleteTexture (int name)
2061 CODE: 2495 CODE:
2062{
2063 GLuint name_ = name;
2064 glDeleteTextures (1, &name_); 2496 del_texture (name);
2065} 2497
2066
2067int glGenList () 2498int glGenList ()
2068 CODE: 2499 CODE:
2069 RETVAL = glGenLists (1); 2500 RETVAL = glGenLists (1);
2070 OUTPUT: 2501 OUTPUT:
2071 RETVAL 2502 RETVAL
2078 2509
2079void glEndList () 2510void glEndList ()
2080 2511
2081void glCallList (int list) 2512void glCallList (int list)
2082 2513
2083

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines