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.118 by root, Thu Jun 15 15:47:35 2006 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42: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" 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 52
47#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
48 54
49#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
51 57
52#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;
53 67
54static struct 68static struct
55{ 69{
56#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 71#include "glfunc.h"
58#undef GL_FUNC 72#undef GL_FUNC
59} gl; 73} gl;
60 74
75static void
61static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
62{ 77{
63 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
64 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
65 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 82 else
68 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
69} 84}
70 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
71typedef Mix_Chunk *CFClient__MixChunk; 116typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 117typedef Mix_Music *CFPlus__MixMusic;
73 118
74typedef PangoFontDescription *CFClient__Font; 119typedef PangoFontDescription *CFPlus__Font;
120
121static int
122shape_attr_p (PangoLayoutRun *run)
123{
124 GSList *attrs = run->item->analysis.extra_attrs;
125
126 while (attrs)
127 {
128 PangoAttribute *attr = attrs->data;
129
130 if (attr->klass->type == PANGO_ATTR_SHAPE)
131 return 1;
132
133 attrs = attrs->next;
134 }
135
136 return 0;
137}
75 138
76typedef struct cf_layout { 139typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 140 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 141 float r, g, b, a; // default color for rgba mode
80 int base_height; 142 int base_height;
81 CFClient__Font font; 143 CFPlus__Font font;
82} *CFClient__Layout; 144} *CFPlus__Layout;
83 145
84static CFClient__Font default_font; 146static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 147static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 148static PangoFontMap *opengl_fontmap;
87 149
88static void 150static void
89substitute_func (FcPattern *pattern, gpointer data) 151substitute_func (FcPattern *pattern, gpointer data)
90{ 152{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 153 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 154#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 156#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 158}
101 159
102static void 160static void
103layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
104{ 162{
105 /* 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
106 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
107 */ 165 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
112 170
113 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
114} 172}
115 173
116static void 174static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
120 181
121 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 184
124 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
125} 186 if (!rect.height) rect.height = 1;
126 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
127typedef uint16_t mapface; 193typedef uint16_t faceid;
128 194
129typedef struct { 195typedef struct {
130 GLint name; 196 int name;
131 int w, h; 197 int w, h;
132 float s, t; 198 float s, t;
133 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
134} maptex; 202} maptex;
135 203
136typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
137 int16_t darkness; 207 uint16_t darkness;
138 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
139} mapcell; 209} mapcell;
140 210
141typedef struct { 211typedef struct {
142 int32_t c0, c1; 212 int32_t c0, c1;
143 mapcell *col; 213 mapcell *col;
144} maprow; 214} maprow;
145 215
146typedef struct map { 216typedef struct map {
147 int x, y, w, h; 217 int x, y, w, h;
148 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
149 int faces; 219 int faces; tileid *face2tile; // [faceid]
150 mapface *face; 220 int texs; maptex *tex; // [tileid]
151
152 int texs;
153 maptex *tex;
154 221
155 int32_t rows; 222 int32_t rows;
156 maprow *row; 223 maprow *row;
157} *CFClient__Map; 224} *CFPlus__Map;
158 225
159static char * 226static char *
160prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
161{ 228{
162 char *p; 229 char *p;
179} 246}
180 247
181#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))
182#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))
183 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
184static maprow * 271static maprow *
185map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
186{ 273{
187 if (0 > y) 274 if (0 > y)
188 { 275 {
189 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
228 315
229 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
230} 317}
231 318
232static mapcell * 319static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
234{ 321{
235 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
236} 323}
237 324
238static void 325static void
239map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
240{ 327{
241 int r; 328 int r;
242 329
243 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
252 self->row = 0; 339 self->row = 0;
253 self->rows = 0; 340 self->rows = 0;
254} 341}
255 342
256static void 343static void
257map_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)
258{ 345{
259 int x, y; 346 int x, y;
260 maprow *row; 347 maprow *row;
348 mapcell *cell;
261 349
262 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 351 if (y >= 0)
264 { 352 {
265 if (y >= self->rows) 353 if (y >= self->rows)
271 if (x >= row->c0) 359 if (x >= row->c0)
272 { 360 {
273 if (x >= row->c1) 361 if (x >= row->c1)
274 break; 362 break;
275 363
276 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;
277 } 370 }
278 } 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);
279} 388}
280 389
281static void 390static void
282music_finished (void) 391music_finished (void)
283{ 392{
319 n |= n >> 16; 428 n |= n >> 16;
320 429
321 return n + 1; 430 return n + 1;
322} 431}
323 432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
436
324MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
325 438
326PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
327 440
328BOOT: 441BOOT:
329{ 442{
330 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 444 static const struct {
332 const char *name; 445 const char *name;
333 IV iv; 446 IV iv;
334 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
335# 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
336 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
337 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
338 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
339 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
340 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
349 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
350 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
351 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
352 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
353 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
354 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
355 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
356 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
357 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
358 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
413 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
414 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
415 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
416 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
417 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
418 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
419 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
420 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
421 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
422 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
423 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
424 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
425 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
426 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
427 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
428 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
429 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
430 const_iv (KMOD_CTRL),
431 const_iv (KMOD_SHIFT),
432 const_iv (KMOD_ALT),
433 const_iv (KMOD_META)
434# undef const_iv 556# undef const_iv
435 }; 557 };
436 558
437 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; )
438 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);
439} 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
440 578
441NV floor (NV x) 579NV floor (NV x)
442 580
443NV ceil (NV x) 581NV ceil (NV x)
444 582
445void 583void
446pango_init () 584pango_init ()
447 CODE: 585 CODE:
448 // delayed, so it can pick up new fonts added by AddFontResourceEx
449{ 586{
450 {
451 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
452 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);
453 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454 }
455 {
456 cairo_font_options_t *fopt = cairo_font_options_create ();
457 cairo_fontmap = pango_cairo_font_map_get_default ();
458 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459#ifdef _WIN32
460 // cairo looks like shit eaten twice on windows
461 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462#else
463 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464#endif
465 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467 pango_cairo_context_set_font_options (cairo_context, fopt);
468 cairo_font_options_destroy (fopt);
469 }
470} 590}
471 591
472int 592int
473SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
474 594
475void 595void
476SDL_Quit () 596SDL_Quit ()
477 597
478void 598void
493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496 616
497 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
498 622
499 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
500 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501 625
502 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
522 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
523 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
524 ); 648 );
525 if (RETVAL) 649 if (RETVAL)
526 { 650 {
651 av_clear (texture_av);
652
527 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
528# 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);
529# include "glfunc.h" 655# include "glfunc.h"
530# undef GL_FUNC 656# undef GL_FUNC
657
531 } 658 }
532 OUTPUT: 659 OUTPUT:
533 RETVAL 660 RETVAL
534 661
535void 662void
536SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
537 664
538char * 665char *
539SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
540 667
668int
669SDL_GetAppState ()
670
541void 671void
542SDL_PollEvent () 672poll_events ()
543 PPCODE: 673 PPCODE:
544{ 674{
545 SDL_Event ev; 675 SDL_Event ev;
546 676
547 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
548 { 679 {
549 HV *hv = newHV (); 680 HV *hv = newHV ();
550 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
551 682
552 switch (ev.type) 683 switch (ev.type)
554 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
555 case SDL_KEYUP: 686 case SDL_KEYUP:
556 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
557 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
558 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 */
559 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
560 break; 692 break;
561 693
562 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
563 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
564 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
565 break; 697 break;
566 698
567 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
568 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
569
570 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
571 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
572 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
573 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
574 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
575 break; 725 break;
576 726
577 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
578 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
579 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591 break; 741 break;
592 } 742 }
593 743
594 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595 } 745 }
596} 746}
597 747
598int 748int
599Mix_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)
608Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
609 759
610void 760void
611lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
612 CODE: 762 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
764
765void
766win32_proxy_info ()
767 PPCODE:
768{
613#ifndef _WIN32 769#ifdef _WIN32
614 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 }
615#endif 791#endif
792}
616 793
617void 794void
618add_font (char *file) 795add_font (char *file)
619 CODE: 796 CODE:
620 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 797 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621#ifdef _WIN32
622 // cairo... sigh... requires win2000
623 AddFontResourceEx (file, FR_PRIVATE, 0);
624#endif
625 798
626void 799void
627load_image_inline (SV *image_) 800load_image_inline (SV *image_)
628 ALIAS: 801 ALIAS:
629 load_image_file = 1 802 load_image_file = 1
671 844
672 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 845 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673 846
674 assert (surface2->pitch == surface2->w * 4); 847 assert (surface2->pitch == surface2->w * 4);
675 848
849 SDL_LockSurface (surface2);
676 EXTEND (SP, 5); 850 EXTEND (SP, 6);
677 PUSHs (sv_2mortal (newSViv (surface2->w))); 851 PUSHs (sv_2mortal (newSViv (surface2->w)));
678 PUSHs (sv_2mortal (newSViv (surface2->h))); 852 PUSHs (sv_2mortal (newSViv (surface2->h)));
679 SDL_LockSurface (surface2);
680 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 853 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681 SDL_UnlockSurface (surface2);
682 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)));
683 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 855 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 856 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
857 SDL_UnlockSurface (surface2);
685 858
686 SDL_FreeSurface (surface); 859 SDL_FreeSurface (surface);
687 SDL_FreeSurface (surface2); 860 SDL_FreeSurface (surface2);
688} 861}
689 862
728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
729#endif 902#endif
730 _exit (1); 903 _exit (1);
731 904
732void 905void
733_exit (int retval) 906_exit (int retval = 0)
734 CODE: 907 CODE:
908#ifdef WIN32
909 ExitThread (retval); // unclean, please beam me up
910#else
735 _exit (retval); 911 _exit (retval);
912#endif
736 913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
922
737MODULE = CFClient PACKAGE = CFClient::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
738 924
739CFClient::Font 925CFPlus::Font
740new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
741 CODE: 927 CODE:
742{ 928{
743 int count; 929 int count;
744 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
747} 933}
748 OUTPUT: 934 OUTPUT:
749 RETVAL 935 RETVAL
750 936
751void 937void
752DESTROY (CFClient::Font self) 938DESTROY (CFPlus::Font self)
753 CODE: 939 CODE:
754 pango_font_description_free (self); 940 pango_font_description_free (self);
755 941
756void 942void
757make_default (CFClient::Font self) 943make_default (CFPlus::Font self)
758 CODE: 944 CODE:
759 default_font = self; 945 default_font = self;
760 946
761MODULE = CFClient PACKAGE = CFClient::Layout 947MODULE = CFPlus PACKAGE = CFPlus::Layout
762 948
763CFClient::Layout 949void
764new (SV *class, int rgba = 0) 950reset_glyph_cache ()
951 CODE:
952 tc_clear ();
953
954CFPlus::Layout
955new (SV *class)
765 CODE: 956 CODE:
766 New (0, RETVAL, 1, struct cf_layout); 957 New (0, RETVAL, 1, struct cf_layout);
767 958
768 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 959 RETVAL->pl = pango_layout_new (opengl_context);
769 RETVAL->rgba = rgba;
770 RETVAL->r = 1.; 960 RETVAL->r = 1.;
771 RETVAL->g = 1.; 961 RETVAL->g = 1.;
772 RETVAL->b = 1.; 962 RETVAL->b = 1.;
773 RETVAL->a = 1.; 963 RETVAL->a = 1.;
774 RETVAL->base_height = MIN_FONT_HEIGHT; 964 RETVAL->base_height = MIN_FONT_HEIGHT;
778 layout_update_font (RETVAL); 968 layout_update_font (RETVAL);
779 OUTPUT: 969 OUTPUT:
780 RETVAL 970 RETVAL
781 971
782void 972void
783DESTROY (CFClient::Layout self) 973DESTROY (CFPlus::Layout self)
784 CODE: 974 CODE:
785 g_object_unref (self->pl); 975 g_object_unref (self->pl);
786 Safefree (self); 976 Safefree (self);
787 977
978void
979set_text (CFPlus::Layout self, SV *text_)
980 CODE:
981{
982 STRLEN textlen;
983 char *text = SvPVutf8 (text_, textlen);
984
985 pango_layout_set_text (self->pl, text, textlen);
986}
987
988void
989set_markup (CFPlus::Layout self, SV *text_)
990 CODE:
991{
992 STRLEN textlen;
993 char *text = SvPVutf8 (text_, textlen);
994
995 pango_layout_set_markup (self->pl, text, textlen);
996}
997
998void
999set_shapes (CFPlus::Layout self, ...)
1000 CODE:
1001{
1002 PangoAttrList *attrs = 0;
1003 const char *text = pango_layout_get_text (self->pl);
1004 const char *pos = text;
1005 int arg = 4;
1006
1007 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1008 {
1009 PangoRectangle inkrect, rect;
1010 PangoAttribute *attr;
1011
1012 int x = SvIV (ST (arg - 3));
1013 int y = SvIV (ST (arg - 2));
1014 int w = SvIV (ST (arg - 1));
1015 int h = SvIV (ST (arg ));
1016
1017 inkrect.x = 0;
1018 inkrect.y = 0;
1019 inkrect.width = 0;
1020 inkrect.height = 0;
1021
1022 rect.x = x * PANGO_SCALE;
1023 rect.y = y * PANGO_SCALE;
1024 rect.width = w * PANGO_SCALE;
1025 rect.height = h * PANGO_SCALE;
1026
1027 if (!attrs)
1028 attrs = pango_layout_get_attributes (self->pl);
1029
1030 attr = pango_attr_shape_new (&inkrect, &rect);
1031 attr->start_index = pos - text;
1032 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1033 pango_attr_list_insert (attrs, attr);
1034
1035 arg += 4;
1036 pos += sizeof (OBJ_STR) - 1;
1037 }
1038
1039 if (attrs)
1040 pango_layout_set_attributes (self->pl, attrs);
1041}
1042
1043void
1044get_shapes (CFPlus::Layout self)
1045 PPCODE:
1046{
1047 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1048
1049 do
1050 {
1051 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1052
1053 if (run && shape_attr_p (run))
1054 {
1055 PangoRectangle extents;
1056 pango_layout_iter_get_run_extents (iter, 0, &extents);
1057
1058 EXTEND (SP, 2);
1059 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1060 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1061 }
1062 }
1063 while (pango_layout_iter_next_run (iter));
1064
1065 pango_layout_iter_free (iter);
1066}
1067
788int 1068int
789is_rgba (CFClient::Layout self) 1069has_wrapped (CFPlus::Layout self)
790 CODE: 1070 CODE:
791 RETVAL = self->rgba; 1071{
1072 int lines = 1;
1073 const char *text = pango_layout_get_text (self->pl);
1074
1075 while (*text)
1076 lines += *text++ == '\n';
1077
1078 RETVAL = lines < pango_layout_get_line_count (self->pl);
1079}
792 OUTPUT: 1080 OUTPUT:
793 RETVAL 1081 RETVAL
794 1082
795void
796set_text (CFClient::Layout self, SV *text_)
797 CODE:
798{
799 STRLEN textlen;
800 char *text = SvPVutf8 (text_, textlen);
801
802 pango_layout_set_text (self->pl, text, textlen);
803}
804
805void
806set_markup (CFClient::Layout self, SV *text_)
807 CODE:
808{
809 STRLEN textlen;
810 char *text = SvPVutf8 (text_, textlen);
811
812 pango_layout_set_markup (self->pl, text, textlen);
813}
814
815SV * 1083SV *
816get_text (CFClient::Layout self) 1084get_text (CFPlus::Layout self)
817 CODE: 1085 CODE:
818 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819 sv_utf8_decode (RETVAL); 1087 sv_utf8_decode (RETVAL);
820 OUTPUT: 1088 OUTPUT:
821 RETVAL 1089 RETVAL
822 1090
823void 1091void
824set_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.)
825 CODE: 1093 CODE:
826 self->r = r; 1094 self->r = r;
827 self->g = g; 1095 self->g = g;
828 self->b = b; 1096 self->b = b;
829 self->a = a; 1097 self->a = a;
830 1098
831void 1099void
832set_font (CFClient::Layout self, CFClient::Font font = 0) 1100set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833 CODE: 1101 CODE:
834 if (self->font != font) 1102 if (self->font != font)
835 { 1103 {
836 self->font = font; 1104 self->font = font;
837 layout_update_font (self); 1105 layout_update_font (self);
838 } 1106 }
839 1107
840void 1108void
841set_height (CFClient::Layout self, int base_height) 1109set_height (CFPlus::Layout self, int base_height)
842 CODE: 1110 CODE:
843 if (self->base_height != base_height) 1111 if (self->base_height != base_height)
844 { 1112 {
845 self->base_height = base_height; 1113 self->base_height = base_height;
846 layout_update_font (self); 1114 layout_update_font (self);
847 } 1115 }
848 1116
849void 1117void
850set_width (CFClient::Layout self, int max_width = -1) 1118set_width (CFPlus::Layout self, int max_width = -1)
851 CODE: 1119 CODE:
852 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);
853 1121
854void 1122void
855set_indent (CFClient::Layout self, int indent) 1123set_indent (CFPlus::Layout self, int indent)
856 CODE: 1124 CODE:
857 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858 1126
859void 1127void
860set_spacing (CFClient::Layout self, int spacing) 1128set_spacing (CFPlus::Layout self, int spacing)
861 CODE: 1129 CODE:
862 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863 1131
864void 1132void
865set_ellipsise (CFClient::Layout self, int ellipsise) 1133set_ellipsise (CFPlus::Layout self, int ellipsise)
866 CODE: 1134 CODE:
867 pango_layout_set_ellipsize (self->pl, 1135 pango_layout_set_ellipsize (self->pl,
868 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START
869 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
871 : PANGO_ELLIPSIZE_NONE 1139 : PANGO_ELLIPSIZE_NONE
872 ); 1140 );
873 1141
874void 1142void
875set_single_paragraph_mode (CFClient::Layout self, int spm) 1143set_single_paragraph_mode (CFPlus::Layout self, int spm)
876 CODE: 1144 CODE:
877 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878 1146
879void 1147void
880size (CFClient::Layout self) 1148size (CFPlus::Layout self)
881 PPCODE: 1149 PPCODE:
882{ 1150{
883 int w, h; 1151 int w, h;
884 1152
885 layout_get_pixel_size (self, &w, &h); 1153 layout_get_pixel_size (self, &w, &h);
888 PUSHs (sv_2mortal (newSViv (w))); 1156 PUSHs (sv_2mortal (newSViv (w)));
889 PUSHs (sv_2mortal (newSViv (h))); 1157 PUSHs (sv_2mortal (newSViv (h)));
890} 1158}
891 1159
892int 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
893xy_to_index (CFClient::Layout self, int x, int y) 1173xy_to_index (CFPlus::Layout self, int x, int y)
894 CODE: 1174 CODE:
895{ 1175{
896 int index, trailing; 1176 int index, trailing;
897 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);
898 RETVAL = index; 1178 RETVAL = index + trailing;
899} 1179}
900 OUTPUT: 1180 OUTPUT:
901 RETVAL 1181 RETVAL
902 1182
903void 1183void
904cursor_pos (CFClient::Layout self, int index) 1184cursor_pos (CFPlus::Layout self, int index)
905 PPCODE: 1185 PPCODE:
906{ 1186{
907 PangoRectangle strong_pos; 1187 PangoRectangle strong_pos;
908 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909 1189
912 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914} 1194}
915 1195
916void 1196void
917render (CFClient::Layout self) 1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
918 PPCODE: 1198 PPCODE:
919{ 1199{
920 SV *retval; 1200 int line, x;
921 int w, h;
922 1201
923 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 */
924 1204
925 if (self->rgba)
926 {
927 cairo_surface_t *surface;
928 cairo_t *cairo;
929
930 retval = newSV (w * h * 4);
931 SvPOK_only (retval);
932 SvCUR_set (retval, w * h * 4);
933
934 memset (SvPVX (retval), 0, w * h * 4);
935
936 surface = cairo_image_surface_create_for_data (
937 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
938 cairo = cairo_create (surface);
939 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941 pango_cairo_show_layout (cairo, self->pl);
942
943 cairo_destroy (cairo);
944 cairo_surface_destroy (surface);
945
946 // what a mess, and its premultiplied, too :(
947 {
948 uint32_t *p = (uint32_t *)SvPVX (retval);
949 uint32_t *e = p + w * h;
950
951 while (p < e)
952 {
953 uint32_t rgba = *p;
954 rgba = (rgba >> 24) | (rgba << 8);
955#if 0
956#ifdef _WIN32
957 {//D
958 uint8_t r = rgba >> 24;
959 uint8_t g = rgba >> 16;
960 uint8_t b = rgba >> 8;
961 uint8_t a = rgba >> 0;
962
963 rgba = (rgba & 0xffffff00) | a;
964 }
965#endif
966#endif
967 rgba = SDL_SwapBE32 (rgba);
968 *p++ = rgba;
969 }
970 }
971
972 EXTEND (SP, 5); 1205 EXTEND (SP, 2);
973 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)
974 PUSHs (sv_2mortal (newSViv (h))); 1227 PUSHs (sv_2mortal (newSViv (index + trailing)));
975 PUSHs (sv_2mortal (retval));
976 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978 }
979 else 1228 else
980 { 1229 {
981 FT_Bitmap bitmap;
982
983 retval = newSV (w * h);
984 SvPOK_only (retval);
985 SvCUR_set (retval, w * h);
986
987 bitmap.rows = h;
988 bitmap.width = w;
989 bitmap.pitch = w;
990 bitmap.buffer = (unsigned char*)SvPVX (retval);
991 bitmap.num_grays = 256;
992 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994 memset (bitmap.buffer, 0, w * h);
995
996 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998 EXTEND (SP, 5);
999 PUSHs (sv_2mortal (newSViv (w))); 1230 PUSHs (sv_2mortal (newSViv (index)));
1000 PUSHs (sv_2mortal (newSViv (h))); 1231 PUSHs (sv_2mortal (newSViv (trailing)));
1001 PUSHs (sv_2mortal (retval));
1002 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004 } 1232 }
1005} 1233}
1006 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
1007MODULE = CFClient PACKAGE = CFClient::Texture 1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1008 1246
1009void 1247void
1010pad2pot (SV *data_, SV *w_, SV *h_) 1248pad2pot (SV *data_, SV *w_, SV *h_)
1011 CODE: 1249 CODE:
1012{ 1250{
1090 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1091 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1092 } 1330 }
1093} 1331}
1094 1332
1095MODULE = CFClient PACKAGE = CFClient::Map 1333MODULE = CFPlus PACKAGE = CFPlus::Map
1096 1334
1097CFClient::Map 1335CFPlus::Map
1098new (SV *class, int map_width, int map_height) 1336new (SV *class)
1099 CODE: 1337 CODE:
1100 New (0, RETVAL, 1, struct map); 1338 New (0, RETVAL, 1, struct map);
1101 RETVAL->x = 0; 1339 RETVAL->x = 0;
1102 RETVAL->y = 0; 1340 RETVAL->y = 0;
1103 RETVAL->w = map_width; 1341 RETVAL->w = 0;
1104 RETVAL->h = map_height; 1342 RETVAL->h = 0;
1105 RETVAL->ox = 0; 1343 RETVAL->ox = 0;
1106 RETVAL->oy = 0; 1344 RETVAL->oy = 0;
1107 RETVAL->faces = 8192; 1345 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1108 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1346 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1109 RETVAL->texs = 8192;
1110 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1111 RETVAL->rows = 0; 1347 RETVAL->rows = 0;
1112 RETVAL->row = 0; 1348 RETVAL->row = 0;
1113 OUTPUT: 1349 OUTPUT:
1114 RETVAL 1350 RETVAL
1115 1351
1116void 1352void
1117DESTROY (CFClient::Map self) 1353DESTROY (CFPlus::Map self)
1118 CODE: 1354 CODE:
1119{ 1355{
1120 map_clear (self); 1356 map_clear (self);
1121 Safefree (self->face); 1357 Safefree (self->face2tile);
1122 Safefree (self->tex); 1358 Safefree (self->tex);
1123 Safefree (self); 1359 Safefree (self);
1124} 1360}
1125 1361
1126void 1362void
1363resize (CFPlus::Map self, int map_width, int map_height)
1364 CODE:
1365 self->w = map_width;
1366 self->h = map_height;
1367
1368void
1127clear (CFClient::Map self) 1369clear (CFPlus::Map self)
1128 CODE: 1370 CODE:
1129 map_clear (self); 1371 map_clear (self);
1130 1372
1131void 1373void
1132set_face (CFClient::Map self, int face, int texid) 1374set_tileid (CFPlus::Map self, int face, int tile)
1133 CODE: 1375 CODE:
1134{ 1376{
1135 while (self->faces <= face) 1377 need_facenum (self, face); self->face2tile [face] = tile;
1136 { 1378 need_texid (self, tile);
1137 Append (mapface, self->face, self->faces, self->faces);
1138 self->faces *= 2;
1139 }
1140
1141 self->face [face] = texid;
1142} 1379}
1143 1380
1144void 1381void
1382set_smooth (CFPlus::Map self, int face, int smooth, int level)
1383 CODE:
1384{
1385 tileid texid;
1386 maptex *tex;
1387
1388 if (face < 0 || face >= self->faces)
1389 return;
1390
1391 if (smooth < 0 || smooth >= self->faces)
1392 return;
1393
1394 texid = self->face2tile [face];
1395
1396 if (!texid)
1397 return;
1398
1399 tex = self->tex + texid;
1400 tex->smoothtile = self->face2tile [smooth];
1401 tex->smoothlevel = level;
1402}
1403
1404void
1145set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1405set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1146 CODE: 1406 CODE:
1147{ 1407{
1148 while (self->texs <= texid) 1408 need_texid (self, texid);
1149 {
1150 Append (maptex, self->tex, self->texs, self->texs);
1151 self->texs *= 2;
1152 }
1153 1409
1154 { 1410 {
1155 maptex *tex = self->tex + texid; 1411 maptex *tex = self->tex + texid;
1156 1412
1157 tex->name = name; 1413 tex->name = name;
1174 // from transparent color bleeding and ugly wrapping effects. 1430 // from transparent color bleeding and ugly wrapping effects.
1175 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1431 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176} 1432}
1177 1433
1178int 1434int
1179ox (CFClient::Map self) 1435ox (CFPlus::Map self)
1180 ALIAS: 1436 ALIAS:
1181 oy = 1 1437 oy = 1
1182 x = 2 1438 x = 2
1183 y = 3 1439 y = 3
1184 w = 4 1440 w = 4
1195 } 1451 }
1196 OUTPUT: 1452 OUTPUT:
1197 RETVAL 1453 RETVAL
1198 1454
1199void 1455void
1200scroll (CFClient::Map self, int dx, int dy) 1456scroll (CFPlus::Map self, int dx, int dy)
1201 CODE: 1457 CODE:
1202{ 1458{
1203 if (dx > 0) 1459 if (dx > 0)
1204 map_blank (self, self->x, self->y, dx - 1, self->h); 1460 map_blank (self, self->x, self->y, dx, self->h);
1205 else if (dx < 0) 1461 else if (dx < 0)
1206 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1462 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1207 1463
1208 if (dy > 0) 1464 if (dy > 0)
1209 map_blank (self, self->x, self->y, self->w, dy - 1); 1465 map_blank (self, self->x, self->y, self->w, dy);
1210 else if (dy < 0) 1466 else if (dy < 0)
1211 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1467 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1212 1468
1213 self->ox += dx; self->x += dx; 1469 self->ox += dx; self->x += dx;
1214 self->oy += dy; self->y += dy; 1470 self->oy += dy; self->y += dy;
1215 1471
1216 while (self->y < 0) 1472 while (self->y < 0)
1221 self->y += MAP_EXTEND_Y; 1477 self->y += MAP_EXTEND_Y;
1222 } 1478 }
1223} 1479}
1224 1480
1225void 1481void
1226map1a_update (CFClient::Map self, SV *data_) 1482map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227 CODE: 1483 CODE:
1228{ 1484{
1229 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1485 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1230 uint8_t *data_end = (uint8_t *)SvEND (data_); 1486 uint8_t *data_end = (uint8_t *)SvEND (data_);
1231 mapcell *cell; 1487 mapcell *cell;
1232 int x, y, flags; 1488 int x, y, flags;
1233 1489
1234 while (data < data_end) 1490 while (data < data_end - 1)
1235 { 1491 {
1236 flags = (data [0] << 8) + data [1]; data += 2; 1492 flags = (data [0] << 8) + data [1]; data += 2;
1237 1493
1238 x = ((flags >> 10) & 63) + self->x; 1494 x = self->x + ((flags >> 10) & 63);
1239 y = ((flags >> 4) & 63) + self->y; 1495 y = self->y + ((flags >> 4) & 63);
1240 1496
1241 cell = map_get_cell (self, x, y); 1497 cell = map_get_cell (self, x, y);
1242 1498
1243 if (flags & 15) 1499 if (flags & 15)
1244 { 1500 {
1245 if (cell->darkness < 0) 1501 if (!cell->darkness)
1246 { 1502 {
1503 memset (cell, 0, sizeof (*cell));
1247 cell->darkness = 0; 1504 cell->darkness = 256;
1248 cell->face [0] = 0;
1249 cell->face [1] = 0;
1250 cell->face [2] = 0;
1251 } 1505 }
1252 1506
1253 cell->darkness = flags & 8 ? *data++ : 255;
1254
1255 //TODO: don't trust server data to be in-range(!) 1507 //TODO: don't trust server data to be in-range(!)
1508
1509 if (flags & 8)
1510 {
1511 if (extmap)
1512 {
1513 uint8_t ext, cmd;
1514
1515 do
1516 {
1517 ext = *data++;
1518 cmd = ext & 0x3f;
1519
1520 if (cmd < 4)
1521 cell->darkness = 255 - ext * 64 + 1;
1522 else if (cmd == 5) // health
1523 {
1524 cell->stat_width = 1;
1525 cell->stat_hp = *data++;
1526 }
1527 else if (cmd == 6) // monster width
1528 cell->stat_width = *data++ + 1;
1529 else if (cmd == 0x47)
1530 {
1531 if (*data == 4)
1532 ; // decode player count
1533
1534 data += *data + 1;
1535 }
1536 else if (cmd == 8) // cell flags
1537 cell->flags = *data++;
1538 else if (ext & 0x40) // unknown, multibyte => skip
1539 data += *data + 1;
1540 else
1541 data++;
1542 }
1543 while (ext & 0x80);
1544 }
1545 else
1546 cell->darkness = *data++ + 1;
1547 }
1256 1548
1257 if (flags & 4) 1549 if (flags & 4)
1258 { 1550 {
1259 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1551 faceid face = (data [0] << 8) + data [1]; data += 2;
1552 need_facenum (self, face);
1553 cell->tile [0] = self->face2tile [face];
1260 } 1554 }
1261 1555
1262 if (flags & 2) 1556 if (flags & 2)
1263 { 1557 {
1264 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1558 faceid face = (data [0] << 8) + data [1]; data += 2;
1559 need_facenum (self, face);
1560 cell->tile [1] = self->face2tile [face];
1265 } 1561 }
1266 1562
1267 if (flags & 1) 1563 if (flags & 1)
1268 { 1564 {
1269 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1565 faceid face = (data [0] << 8) + data [1]; data += 2;
1566 need_facenum (self, face);
1567 cell->tile [2] = self->face2tile [face];
1270 } 1568 }
1271 } 1569 }
1272 else 1570 else
1273 cell->darkness = -1; 1571 cell->darkness = 0;
1274 } 1572 }
1275} 1573}
1276 1574
1277SV * 1575SV *
1278mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1576mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279 CODE: 1577 CODE:
1280{ 1578{
1281 int x1, x; 1579 int x1, x;
1282 int y1, y; 1580 int y1, y;
1283 int z; 1581 int z;
1304 { 1602 {
1305 mapcell *cell = row->col + (x - row->c0); 1603 mapcell *cell = row->col + (x - row->c0);
1306 1604
1307 for (z = 0; z <= 0; z++) 1605 for (z = 0; z <= 0; z++)
1308 { 1606 {
1309 mapface face = cell->face [z];
1310
1311 if (face)
1312 {
1313 maptex tex = self->tex [face]; 1607 maptex tex = self->tex [cell->tile [z]];
1314 int a0 = 255 - tex.a; 1608 int a0 = 255 - tex.a;
1315 int a1 = tex.a; 1609 int a1 = tex.a;
1316 1610
1317 r = (r * a0 + tex.r * a1) / 255; 1611 r = (r * a0 + tex.r * a1) / 255;
1318 g = (g * a0 + tex.g * a1) / 255; 1612 g = (g * a0 + tex.g * a1) / 255;
1319 b = (b * a0 + tex.b * a1) / 255; 1613 b = (b * a0 + tex.b * a1) / 255;
1320 a = (a * a0 + tex.a * a1) / 255; 1614 a = (a * a0 + tex.a * a1) / 255;
1321 }
1322 } 1615 }
1323 } 1616 }
1324 1617
1325 *map++ = (r ) 1618 *map++ = (r )
1326 | (g << 8) 1619 | (g << 8)
1333} 1626}
1334 OUTPUT: 1627 OUTPUT:
1335 RETVAL 1628 RETVAL
1336 1629
1337void 1630void
1338draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1631draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1339 CODE: 1632 CODE:
1340{ 1633{
1341 int vx, vy; 1634 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1635 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1636 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1637 smooth_key skey;
1342 int x, y, z; 1638 int x, y, z;
1343 int last_name; 1639 int last_name;
1344 mapface face;
1345 1640
1346 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1641 // thats current max. sorry.
1347 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1642 if (sw > 255) sw = 255;
1643 if (sh > 255) sh = 255;
1348 1644
1349 /* 1645 // clear key, in case of extra padding
1350 int vx = self->vx = self->w >= sw 1646 memset (&skey, 0, sizeof (skey));
1351 ? self->x + (self->w - sw) / 2
1352 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1353
1354 int vy = self->vy = self->h >= sh
1355 ? self->y + (self->h - sh) / 2
1356 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1357 */
1358 1647
1359 glColor4ub (255, 255, 255, 255); 1648 glColor4ub (255, 255, 255, 255);
1360 1649
1361 glEnable (GL_BLEND); 1650 glEnable (GL_BLEND);
1362 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1651 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 1654
1366 glBegin (GL_QUADS); 1655 glBegin (GL_QUADS);
1367 1656
1368 last_name = 0; 1657 last_name = 0;
1369 1658
1659 mx += self->x;
1660 my += self->y;
1661
1662 // first pass: determine smooth_max
1663 // rather ugly, if you ask me
1664 // could also be stored inside mapcell and updated on change
1665 memset (smooth_max, 0, sizeof (smooth_max));
1666
1667 for (y = 0; y < sh; y++)
1668 if (0 <= y + my && y + my < self->rows)
1669 {
1670 maprow *row = self->row + (y + my);
1671
1672 for (x = 0; x < sw; x++)
1673 if (row->c0 <= x + mx && x + mx < row->c1)
1674 {
1675 mapcell *cell = row->col + (x + mx - row->c0);
1676
1677 smooth_max[x + 1][y + 1] =
1678 MAX (self->tex [cell->tile [0]].smoothlevel,
1679 MAX (self->tex [cell->tile [1]].smoothlevel,
1680 self->tex [cell->tile [2]].smoothlevel));
1681 }
1682 }
1683
1370 for (z = 0; z < 3; z++) 1684 for (z = 0; z <= 2; z++)
1685 {
1686 memset (smooth_level, 0, sizeof (smooth_level));
1687
1371 for (y = 0; y < sh; y++) 1688 for (y = 0; y < sh; y++)
1372 if (0 <= y + vy && y + vy < self->rows) 1689 if (0 <= y + my && y + my < self->rows)
1373 { 1690 {
1374 maprow *row = self->row + (y + vy); 1691 maprow *row = self->row + (y + my);
1375 1692
1376 for (x = 0; x < sw; x++) 1693 for (x = 0; x < sw; x++)
1377 if (row->c0 <= x + vx && x + vx < row->c1) 1694 if (row->c0 <= x + mx && x + mx < row->c1)
1378 { 1695 {
1379 mapcell *cell = row->col + (x + vx - row->c0); 1696 mapcell *cell = row->col + (x + mx - row->c0);
1380
1381 face = cell->face [z]; 1697 tileid tile = cell->tile [z];
1382 1698
1383 if (face) 1699 if (tile)
1700 {
1701 maptex tex = self->tex [tile];
1702 int px = (x + 1) * T - tex.w;
1703 int py = (y + 1) * T - tex.h;
1704
1705 // suppressing texture state switches here
1706 // is only moderately effective, but worth the extra effort
1707 if (last_name != tex.name)
1708 {
1709 if (!tex.name)
1710 tex = self->tex [2]; /* missing, replace by noface */
1711
1712 glEnd ();
1713 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1714 glBegin (GL_QUADS);
1715 }
1716
1717 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1718 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1719 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1720 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1721
1722 if (cell->flags && z == 2)
1723 {
1724 if (cell->flags & 1)
1725 {
1726 maptex tex = self->tex [1];
1727 int px = x * T + T * 2 / 32;
1728 int py = y * T - T * 6 / 32;
1729
1730 glEnd ();
1731 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1732 glBegin (GL_QUADS);
1733
1734 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1735 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1736 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1737 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1738 }
1739 }
1740
1741 // update smooth hash
1742 if (tex.smoothtile)
1743 {
1744 skey.tile = tex.smoothtile;
1745 skey.level = tex.smoothlevel;
1746
1747 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1748
1749 // add bits to current tile and all neighbours. skey.x|y is
1750 // shifted +1|+1 so we always stay positive.
1751
1752 // bits is ___n cccc CCCC bbbb
1753 // n do not draw borders&corners
1754 // c draw these corners, but...
1755 // C ... not these
1756 // b draw these borders
1757
1758 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1759 // ┃· ·· ·┃ ━━
1760
1761 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1762 // ·· ·· ·┏ ┓·
1763
1764 // full tile
1765 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1766
1767 // borders
1768 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1769 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1770 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1771 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1772
1773 // corners
1774 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1775 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1776 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1777 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1778 }
1779 }
1780 }
1781 }
1782
1783 // go through all smoothlevels, lowest to highest, then draw.
1784 // this is basically counting sort
1785 {
1786 int w, b;
1787
1788 for (w = 0; w < 256 / 32; ++w)
1789 {
1790 uint32_t smask = smooth_level [w];
1791 if (smask)
1792 for (b = 0; b < 32; ++b)
1793 if (smask & (((uint32_t)1) << b))
1384 { 1794 {
1385 maptex tex = self->tex [face]; 1795 int level = (w << 5) | b;
1796 HE *he;
1386 1797
1387 int px = (x + 1) * 32 - tex.w; 1798 hv_iterinit (smooth);
1388 int py = (y + 1) * 32 - tex.h; 1799 while ((he = hv_iternext (smooth)))
1389
1390 if (last_name != tex.name)
1391 { 1800 {
1801 smooth_key *skey = (smooth_key *)HeKEY (he);
1802 IV bits = SvIVX (HeVAL (he));
1803
1804 if (!(bits & 0x1000)
1805 && skey->level == level
1806 && level > smooth_max [skey->x][skey->y])
1807 {
1808 maptex tex = self->tex [skey->tile];
1809 int px = (((int)skey->x) - 1) * T;
1810 int py = (((int)skey->y) - 1) * T;
1811 int border = bits & 15;
1812 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1813 float dx = tex.s * .0625f; // 16 images/row
1814 float dy = tex.t * .5f ; // 2 images/column
1815
1816 // this time naively avoiding texture state changes
1817 // save gobs of state changes.
1818 if (last_name != tex.name)
1819 {
1820 if (!tex.name)
1821 continue; // smoothing not yet available
1822
1392 glEnd (); 1823 glEnd ();
1393 last_name = tex.name;
1394 glBindTexture (GL_TEXTURE_2D, last_name); 1824 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1395 glBegin (GL_QUADS); 1825 glBegin (GL_QUADS);
1826 }
1827
1828 if (border)
1829 {
1830 float ox = border * dx;
1831
1832 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1833 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1834 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1835 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1836 }
1837
1838 if (corner)
1839 {
1840 float ox = corner * dx;
1841
1842 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1843 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1844 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1846 }
1847 }
1396 } 1848 }
1397
1398 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1399 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1400 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1401 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1402 } 1849 }
1403 }
1404 } 1850 }
1851 }
1852
1853 hv_clear (smooth);
1854 }
1405 1855
1406 glEnd (); 1856 glEnd ();
1407 1857
1408 glDisable (GL_TEXTURE_2D); 1858 glDisable (GL_TEXTURE_2D);
1409 glDisable (GL_BLEND); 1859 glDisable (GL_BLEND);
1410}
1411 1860
1861 // top layer: overlays such as the health bar
1862 for (y = 0; y < sh; y++)
1863 if (0 <= y + my && y + my < self->rows)
1864 {
1865 maprow *row = self->row + (y + my);
1866
1867 for (x = 0; x < sw; x++)
1868 if (row->c0 <= x + mx && x + mx < row->c1)
1869 {
1870 mapcell *cell = row->col + (x + mx - row->c0);
1871
1872 int px = x * T;
1873 int py = y * T;
1874
1875 if (cell->stat_hp)
1876 {
1877 int width = cell->stat_width * T;
1878 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1879
1880 glColor3ub (0, 0, 0);
1881 glRectf (px + 1, py - thick - 2,
1882 px + width - 1, py);
1883
1884 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1885 glRectf (px + 2,
1886 py - thick - 1,
1887 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1888 }
1889 }
1890 }
1891}
1892
1412void 1893void
1413draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1894draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414 CODE: 1895 CODE:
1415{ 1896{
1416 static float color[16][3] = { 1897 static float color[16][3] = {
1417 { 0.00, 0.00, 0.00 }, 1898 { 0.00F, 0.00F, 0.00F },
1418 { 1.00, 1.00, 1.00 }, 1899 { 1.00F, 1.00F, 1.00F },
1419 { 0.00, 0.00, 0.55 }, 1900 { 0.00F, 0.00F, 0.55F },
1420 { 1.00, 0.00, 0.00 }, 1901 { 1.00F, 0.00F, 0.00F },
1421 1902
1422 { 1.00, 0.54, 0.00 }, 1903 { 1.00F, 0.54F, 0.00F },
1423 { 0.11, 0.56, 1.00 }, 1904 { 0.11F, 0.56F, 1.00F },
1424 { 0.93, 0.46, 0.00 }, 1905 { 0.93F, 0.46F, 0.00F },
1425 { 0.18, 0.54, 0.34 }, 1906 { 0.18F, 0.54F, 0.34F },
1426 1907
1427 { 0.56, 0.73, 0.56 }, 1908 { 0.56F, 0.73F, 0.56F },
1428 { 0.80, 0.80, 0.80 }, 1909 { 0.80F, 0.80F, 0.80F },
1429 { 0.55, 0.41, 0.13 }, 1910 { 0.55F, 0.41F, 0.13F },
1430 { 0.99, 0.77, 0.26 }, 1911 { 0.99F, 0.77F, 0.26F },
1431 1912
1432 { 0.74, 0.65, 0.41 }, 1913 { 0.74F, 0.65F, 0.41F },
1433 1914
1434 { 0.00, 1.00, 1.00 }, 1915 { 0.00F, 1.00F, 1.00F },
1435 { 1.00, 0.00, 1.00 }, 1916 { 1.00F, 0.00F, 1.00F },
1436 { 1.00, 1.00, 0.00 }, 1917 { 1.00F, 1.00F, 0.00F },
1437 }; 1918 };
1438 1919
1439 int x, y; 1920 int x, y;
1440 1921
1441 glEnable (GL_TEXTURE_2D); 1922 glEnable (GL_TEXTURE_2D);
1468 glDisable (GL_BLEND); 1949 glDisable (GL_BLEND);
1469 glDisable (GL_TEXTURE_2D); 1950 glDisable (GL_TEXTURE_2D);
1470} 1951}
1471 1952
1472void 1953void
1473fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1954fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1474 PPCODE: 1955 PPCODE:
1475{ 1956{
1476 int vx, vy;
1477 int x, y; 1957 int x, y;
1478 int sw4 = (sw + 3) & ~3; 1958 int sw4 = (sw + 3) & ~3;
1479 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1959 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1480 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1960 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1481 1961
1482 memset (darkness, 255, sw4 * sh); 1962 memset (darkness, 255, sw4 * sh);
1483 SvPOK_only (darkness_sv); 1963 SvPOK_only (darkness_sv);
1484 SvCUR_set (darkness_sv, sw4 * sh); 1964 SvCUR_set (darkness_sv, sw4 * sh);
1485 1965
1486 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1966 mx += self->x;
1487 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1967 my += self->y;
1488 1968
1489 for (y = 0; y < sh; y++) 1969 for (y = 0; y < sh; y++)
1490 if (0 <= y + vy && y + vy < self->rows) 1970 if (0 <= y + my && y + my < self->rows)
1491 { 1971 {
1492 maprow *row = self->row + (y + vy); 1972 maprow *row = self->row + (y + my);
1493 1973
1494 for (x = 0; x < sw; x++) 1974 for (x = 0; x < sw; x++)
1495 if (row->c0 <= x + vx && x + vx < row->c1) 1975 if (row->c0 <= x + mx && x + mx < row->c1)
1496 { 1976 {
1497 mapcell *cell = row->col + (x + vx - row->c0); 1977 mapcell *cell = row->col + (x + mx - row->c0);
1498 1978
1499 darkness[y * sw4 + x] = cell->darkness < 0 1979 darkness[y * sw4 + x] = cell->darkness
1980 ? 255 - (cell->darkness - 1)
1500 ? 255 - FOW_DARKNESS 1981 : 255 - FOW_DARKNESS;
1501 : 255 - cell->darkness;
1502 } 1982 }
1503 } 1983 }
1504 1984
1505 EXTEND (SP, 3); 1985 EXTEND (SP, 3);
1506 PUSHs (sv_2mortal (newSViv (sw4))); 1986 PUSHs (sv_2mortal (newSViv (sw4)));
1507 PUSHs (sv_2mortal (newSViv (sh))); 1987 PUSHs (sv_2mortal (newSViv (sh)));
1508 PUSHs (darkness_sv); 1988 PUSHs (darkness_sv);
1509} 1989}
1510 1990
1511SV * 1991SV *
1512get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1992get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513 CODE: 1993 CODE:
1514{ 1994{
1515 int x, y, x1, y1; 1995 int x, y, x1, y1;
1516 SV *data_sv = newSV (w * h * 7 + 5); 1996 SV *data_sv = newSV (w * h * 7 + 5);
1517 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1997 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1542 if (row && row->c0 <= x && x < row->c1) 2022 if (row && row->c0 <= x && x < row->c1)
1543 { 2023 {
1544 mapcell *cell = row->col + (x - row->c0); 2024 mapcell *cell = row->col + (x - row->c0);
1545 uint8_t flags = 0; 2025 uint8_t flags = 0;
1546 2026
1547 if (cell->face [0]) flags |= 1; 2027 if (cell->tile [0]) flags |= 1;
1548 if (cell->face [1]) flags |= 2; 2028 if (cell->tile [1]) flags |= 2;
1549 if (cell->face [2]) flags |= 4; 2029 if (cell->tile [2]) flags |= 4;
1550 2030
1551 *data++ = flags; 2031 *data++ = flags;
1552 2032
1553 if (flags & 1) 2033 if (flags & 1)
1554 { 2034 {
2035 tileid tile = cell->tile [0];
1555 *data++ = cell->face [0] >> 8; 2036 *data++ = tile >> 8;
1556 *data++ = cell->face [0]; 2037 *data++ = tile;
1557 } 2038 }
1558 2039
1559 if (flags & 2) 2040 if (flags & 2)
1560 { 2041 {
2042 tileid tile = cell->tile [1];
1561 *data++ = cell->face [1] >> 8; 2043 *data++ = tile >> 8;
1562 *data++ = cell->face [1]; 2044 *data++ = tile;
1563 } 2045 }
1564 2046
1565 if (flags & 4) 2047 if (flags & 4)
1566 { 2048 {
2049 tileid tile = cell->tile [2];
1567 *data++ = cell->face [2] >> 8; 2050 *data++ = tile >> 8;
1568 *data++ = cell->face [2]; 2051 *data++ = tile;
1569 } 2052 }
1570 } 2053 }
1571 else 2054 else
1572 *data++ = 0; 2055 *data++ = 0;
1573 } 2056 }
1579} 2062}
1580 OUTPUT: 2063 OUTPUT:
1581 RETVAL 2064 RETVAL
1582 2065
1583void 2066void
1584set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2067set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585 PPCODE: 2068 PPCODE:
1586{ 2069{
1587 int x, y, z; 2070 int x, y, z;
1588 int w, h; 2071 int w, h;
1589 int x1, y1; 2072 int x1, y1;
1613 { 2096 {
1614 uint8_t flags = *data++; 2097 uint8_t flags = *data++;
1615 2098
1616 if (flags) 2099 if (flags)
1617 { 2100 {
1618 mapface face[3] = { 0, 0, 0 };
1619
1620 mapcell *cell = row_get_cell (row, x); 2101 mapcell *cell = row_get_cell (row, x);
2102 tileid tile[3] = { 0, 0, 0 };
1621 2103
1622 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2104 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1623 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2105 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1624 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2106 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1625 2107
1626 if (cell->darkness <= 0) 2108 if (cell->darkness == 0)
1627 { 2109 {
1628 cell->darkness = -1; 2110 cell->darkness = 0;
1629 2111
1630 for (z = 0; z <= 2; z++) 2112 for (z = 0; z <= 2; z++)
1631 { 2113 {
1632 cell->face[z] = face[z]; 2114 tileid t = tile [z];
1633 2115
1634 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2116 if (t >= self->texs || (t && !self->tex [t].name))
2117 {
1635 XPUSHs (sv_2mortal (newSViv (face[z]))); 2118 XPUSHs (sv_2mortal (newSViv (t)));
2119 need_texid (self, t);
2120 }
2121
2122 cell->tile [z] = t;
1636 } 2123 }
1637 } 2124 }
1638 } 2125 }
1639 } 2126 }
1640 } 2127 }
1641} 2128}
1642 2129
1643MODULE = CFClient PACKAGE = CFClient::MixChunk 2130MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644 2131
1645CFClient::MixChunk 2132CFPlus::MixChunk
1646new_from_file (SV *class, char *path) 2133new_from_file (SV *class, char *path)
1647 CODE: 2134 CODE:
1648 RETVAL = Mix_LoadWAV (path); 2135 RETVAL = Mix_LoadWAV (path);
1649 OUTPUT: 2136 OUTPUT:
1650 RETVAL 2137 RETVAL
1651 2138
1652void 2139void
1653DESTROY (CFClient::MixChunk self) 2140DESTROY (CFPlus::MixChunk self)
1654 CODE: 2141 CODE:
1655 Mix_FreeChunk (self); 2142 Mix_FreeChunk (self);
1656 2143
1657int 2144int
1658volume (CFClient::MixChunk self, int volume = -1) 2145volume (CFPlus::MixChunk self, int volume = -1)
1659 CODE: 2146 CODE:
1660 RETVAL = Mix_VolumeChunk (self, volume); 2147 RETVAL = Mix_VolumeChunk (self, volume);
1661 OUTPUT: 2148 OUTPUT:
1662 RETVAL 2149 RETVAL
1663 2150
1664int 2151int
1665play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2152play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666 CODE: 2153 CODE:
1667 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2154 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668 OUTPUT: 2155 OUTPUT:
1669 RETVAL 2156 RETVAL
1670 2157
1671MODULE = CFClient PACKAGE = CFClient::MixMusic 2158MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672 2159
1673int 2160int
1674volume (int volume = -1) 2161volume (int volume = -1)
1675 CODE: 2162 CODE:
1676 RETVAL = Mix_VolumeMusic (volume); 2163 RETVAL = Mix_VolumeMusic (volume);
1677 OUTPUT: 2164 OUTPUT:
1678 RETVAL 2165 RETVAL
1679 2166
2167int
2168fade_out (int ms)
2169 CODE:
2170 RETVAL = Mix_FadeOutMusic (ms);
2171 OUTPUT:
2172 RETVAL
2173
1680CFClient::MixMusic 2174CFPlus::MixMusic
1681new_from_file (SV *class, char *path) 2175new_from_file (SV *class, char *path)
1682 CODE: 2176 CODE:
1683 RETVAL = Mix_LoadMUS (path); 2177 RETVAL = Mix_LoadMUS (path);
1684 OUTPUT: 2178 OUTPUT:
1685 RETVAL 2179 RETVAL
1686 2180
1687void 2181void
1688DESTROY (CFClient::MixMusic self) 2182DESTROY (CFPlus::MixMusic self)
1689 CODE: 2183 CODE:
1690 Mix_FreeMusic (self); 2184 Mix_FreeMusic (self);
1691 2185
1692int 2186int
1693play (CFClient::MixMusic self, int loops = -1) 2187play (CFPlus::MixMusic self, int loops = -1)
1694 CODE: 2188 CODE:
1695 RETVAL = Mix_PlayMusic (self, loops); 2189 RETVAL = Mix_PlayMusic (self, loops);
1696 OUTPUT: 2190 OUTPUT:
1697 RETVAL 2191 RETVAL
1698 2192
2193int
2194fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2195 CODE:
2196 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2197 OUTPUT:
2198 RETVAL
2199
1699MODULE = CFClient PACKAGE = CFClient::OpenGL 2200MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700 2201
1701BOOT: 2202BOOT:
1702{ 2203{
1703 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2204 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704 static const struct { 2205 static const struct {
1705 const char *name; 2206 const char *name;
1706 IV iv; 2207 IV iv;
1707 } *civ, const_iv[] = { 2208 } *civ, const_iv[] = {
1708# define const_iv(name) { # name, (IV)name } 2209# define const_iv(name) { # name, (IV)name }
1715 const_iv (GL_SCISSOR_TEST), 2216 const_iv (GL_SCISSOR_TEST),
1716 const_iv (GL_DEPTH_TEST), 2217 const_iv (GL_DEPTH_TEST),
1717 const_iv (GL_ALPHA_TEST), 2218 const_iv (GL_ALPHA_TEST),
1718 const_iv (GL_NORMALIZE), 2219 const_iv (GL_NORMALIZE),
1719 const_iv (GL_RESCALE_NORMAL), 2220 const_iv (GL_RESCALE_NORMAL),
2221 const_iv (GL_FRONT),
2222 const_iv (GL_BACK),
1720 const_iv (GL_AND), 2223 const_iv (GL_AND),
1721 const_iv (GL_ONE), 2224 const_iv (GL_ONE),
1722 const_iv (GL_ZERO), 2225 const_iv (GL_ZERO),
1723 const_iv (GL_SRC_ALPHA), 2226 const_iv (GL_SRC_ALPHA),
1724 const_iv (GL_DST_ALPHA), 2227 const_iv (GL_DST_ALPHA),
1769 const_iv (GL_SEPARABLE_2D), 2272 const_iv (GL_SEPARABLE_2D),
1770 const_iv (GL_CONVOLUTION_2D), 2273 const_iv (GL_CONVOLUTION_2D),
1771 const_iv (GL_CONVOLUTION_BORDER_MODE), 2274 const_iv (GL_CONVOLUTION_BORDER_MODE),
1772 const_iv (GL_CONSTANT_BORDER), 2275 const_iv (GL_CONSTANT_BORDER),
1773 const_iv (GL_LINES), 2276 const_iv (GL_LINES),
2277 const_iv (GL_LINE_STRIP),
1774 const_iv (GL_LINE_LOOP), 2278 const_iv (GL_LINE_LOOP),
1775 const_iv (GL_QUADS), 2279 const_iv (GL_QUADS),
1776 const_iv (GL_QUAD_STRIP), 2280 const_iv (GL_QUAD_STRIP),
1777 const_iv (GL_TRIANGLES), 2281 const_iv (GL_TRIANGLES),
1778 const_iv (GL_TRIANGLE_STRIP), 2282 const_iv (GL_TRIANGLE_STRIP),
1786# undef const_iv 2290# undef const_iv
1787 }; 2291 };
1788 2292
1789 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2293 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1790 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2294 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2295
2296 texture_av = newAV ();
2297 AvREAL_off (texture_av);
1791} 2298}
1792 2299
1793char * 2300char *
1794gl_vendor () 2301gl_vendor ()
1795 CODE: 2302 CODE:
1845void glPushMatrix () 2352void glPushMatrix ()
1846 2353
1847void glPopMatrix () 2354void glPopMatrix ()
1848 2355
1849void glLoadIdentity () 2356void glLoadIdentity ()
2357
2358void glDrawBuffer (int buffer)
2359
2360void glReadBuffer (int buffer)
1850 2361
1851# near_ and far_ are due to microsofts buggy "c" compiler 2362# near_ and far_ are due to microsofts buggy "c" compiler
1852void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2363void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1853 2364
1854# near_ and far_ are due to microsofts buggy "c" compiler 2365# near_ and far_ are due to microsofts buggy "c" compiler
1884 r *= a; 2395 r *= a;
1885 g *= a; 2396 g *= a;
1886 b *= a; 2397 b *= a;
1887 } 2398 }
1888 // microsoft visual "c" rounds instead of truncating... 2399 // microsoft visual "c" rounds instead of truncating...
1889 glColor4ub (MIN ((int)(r * 256.f), 255), 2400 glColor4f (r, g, b, a);
1890 MIN ((int)(g * 256.f), 255),
1891 MIN ((int)(b * 256.f), 255),
1892 MIN ((int)(a * 256.f), 255));
1893 2401
1894void glInterleavedArrays (int format, int stride, char *data) 2402void glInterleavedArrays (int format, int stride, char *data)
1895 2403
1896void glDrawElements (int mode, int count, int type, char *indices) 2404void glDrawElements (int mode, int count, int type, char *indices)
1897 2405
1943 2451
1944void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2452void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1945 2453
1946int glGenTexture () 2454int glGenTexture ()
1947 CODE: 2455 CODE:
1948{ 2456 RETVAL = gen_texture ();
1949 GLuint name;
1950 glGenTextures (1, &name);
1951 RETVAL = name;
1952}
1953 OUTPUT: 2457 OUTPUT:
1954 RETVAL 2458 RETVAL
1955 2459
1956void glDeleteTexture (int name) 2460void glDeleteTexture (int name)
1957 CODE: 2461 CODE:
1958{
1959 GLuint name_ = name;
1960 glDeleteTextures (1, &name_); 2462 del_texture (name);
1961} 2463
1962
1963int glGenList () 2464int glGenList ()
1964 CODE: 2465 CODE:
1965 RETVAL = glGenLists (1); 2466 RETVAL = glGenLists (1);
1966 OUTPUT: 2467 OUTPUT:
1967 RETVAL 2468 RETVAL
1974 2475
1975void glEndList () 2476void glEndList ()
1976 2477
1977void glCallList (int list) 2478void glCallList (int list)
1978 2479
1979

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines