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.124 by root, Tue Jul 4 23:23:31 2006 UTC vs.
Revision 1.202 by root, Tue Jul 17 18:34:24 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
17#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
18#include <SDL_endian.h> 32#include <SDL_endian.h>
19#include <SDL_image.h> 33#include <SDL_image.h>
20#include <SDL_mixer.h> 34#include <SDL_mixer.h>
21#include <SDL_opengl.h> 35#include <SDL_opengl.h>
22 36
31# include <sys/types.h> 45# include <sys/types.h>
32# include <sys/socket.h> 46# include <sys/socket.h>
33# include <netinet/in.h> 47# include <netinet/in.h>
34# include <netinet/tcp.h> 48# include <netinet/tcp.h>
35# include <inttypes.h> 49# 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 50#endif
44 51
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 53
49#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
50 55
51#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
53 58
54#define MIN_FONT_HEIGHT 10 59#define MIN_FONT_HEIGHT 10
55 60
56#if 1 61#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 63#else
59# define PARACHUTE 0 64# define PARACHUTE 0
60#endif 65#endif
61 66
67static AV *texture_av;
68
62static struct 69static struct
63{ 70{
64#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 72#include "glfunc.h"
66#undef GL_FUNC 73#undef GL_FUNC
67} gl; 74} gl;
68 75
76static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 78{
71 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 83 else
76 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
77} 85}
78 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
79#include "texcache.c" 111#include "texcache.c"
80 112
81#include "pango-font.c" 113#include "pango-font.c"
82#include "pango-fontmap.c" 114#include "pango-fontmap.c"
83#include "pango-render.c" 115#include "pango-render.c"
84 116
85typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
87 119
88typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
89 121
90static int 122static int
91shape_attr_p (PangoLayoutRun *run) 123shape_attr_p (PangoLayoutRun *run)
92{ 124{
93 GSList *attrs = run->item->analysis.extra_attrs; 125 GSList *attrs = run->item->analysis.extra_attrs;
107 139
108typedef struct cf_layout { 140typedef struct cf_layout {
109 PangoLayout *pl; 141 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
111 int base_height; 143 int base_height;
112 CFClient__Font font; 144 CFPlus__Font font;
113} *CFClient__Layout; 145} *CFPlus__Layout;
114 146
115static CFClient__Font default_font; 147static CFPlus__Font default_font;
116static PangoContext *opengl_context; 148static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 149static PangoFontMap *opengl_fontmap;
118 150
119static void 151static void
120substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
121{ 153{
122 FcPatternAddBool (pattern, FC_HINTING, 1); 154 FcPatternAddBool (pattern, FC_HINTING, 1);
123#ifdef FC_HINT_STYLE 155#ifdef FC_HINT_STYLE
124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif 157#endif
126#ifdef _WIN32
127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
128#else
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130#endif
131} 159}
132 160
133static void 161static void
134layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
135{ 163{
136 /* use a random scale factor to account for unknown descenders, 0.8 works 164 /* use a random scale factor to account for unknown descenders, 0.8 works
137 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
138 */ 166 */
139 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
143 171
144 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
145} 173}
146 174
147static void 175static void
148layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
149{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
150 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
151 182
152 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
153 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
154 185
155 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
156} 187 if (!rect.height) rect.height = 1;
157 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
158typedef uint16_t mapface; 194typedef uint16_t faceid;
159 195
160typedef struct { 196typedef struct {
161 GLint name; 197 int name;
162 int w, h; 198 int w, h;
163 float s, t; 199 float s, t;
164 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
165} maptex; 203} maptex;
166 204
167typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
168 int16_t darkness; 208 uint16_t darkness;
169 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
170} mapcell; 210} mapcell;
171 211
172typedef struct { 212typedef struct {
173 int32_t c0, c1; 213 int32_t c0, c1;
174 mapcell *col; 214 mapcell *col;
175} maprow; 215} maprow;
176 216
177typedef struct map { 217typedef struct map {
178 int x, y, w, h; 218 int x, y, w, h;
179 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
180 int faces; 220 int faces; tileid *face2tile; // [faceid]
181 mapface *face; 221 int texs; maptex *tex; // [tileid]
182
183 int texs;
184 maptex *tex;
185 222
186 int32_t rows; 223 int32_t rows;
187 maprow *row; 224 maprow *row;
188} *CFClient__Map; 225} *CFPlus__Map;
189 226
190static char * 227static char *
191prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
192{ 229{
193 char *p; 230 char *p;
210} 247}
211 248
212#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
214 251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
271
215static maprow * 272static maprow *
216map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
217{ 274{
218 if (0 > y) 275 if (0 > y)
219 { 276 {
220 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
221 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
259 316
260 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
261} 318}
262 319
263static mapcell * 320static mapcell *
264map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
265{ 322{
266 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
267} 324}
268 325
269static void 326static void
270map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
271{ 328{
272 int r; 329 int r;
273 330
274 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
275 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
283 self->row = 0; 340 self->row = 0;
284 self->rows = 0; 341 self->rows = 0;
285} 342}
286 343
287static void 344static void
288map_blank (CFClient__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
289{ 346{
290 int x, y; 347 int x, y;
291 maprow *row; 348 maprow *row;
349 mapcell *cell;
292 350
293 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
294 if (y >= 0) 352 if (y >= 0)
295 { 353 {
296 if (y >= self->rows) 354 if (y >= self->rows)
302 if (x >= row->c0) 360 if (x >= row->c0)
303 { 361 {
304 if (x >= row->c1) 362 if (x >= row->c1)
305 break; 363 break;
306 364
307 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
308 } 371 }
309 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
310} 389}
311 390
312static void 391static void
313music_finished (void) 392music_finished (void)
314{ 393{
350 n |= n >> 16; 429 n |= n >> 16;
351 430
352 return n + 1; 431 return n + 1;
353} 432}
354 433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
437
355MODULE = CFClient PACKAGE = CFClient 438MODULE = CFPlus PACKAGE = CFPlus
356 439
357PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
358 441
359BOOT: 442BOOT:
360{ 443{
361 HV *stash = gv_stashpv ("CFClient", 1); 444 HV *stash = gv_stashpv ("CFPlus", 1);
362 static const struct { 445 static const struct {
363 const char *name; 446 const char *name;
364 IV iv; 447 IV iv;
365 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
366# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
367 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
368 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
369 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
370 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
371 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
380 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
381 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
382 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
383 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
384 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
385 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
386 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
387 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
388 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
389 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
444 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
445 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
446 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
447 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
448 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
449 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
450 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
451 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
452 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
453 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
454 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
455 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
456 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
457 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
458 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
459 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
460 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
461 const_iv (KMOD_CTRL),
462 const_iv (KMOD_SHIFT),
463 const_iv (KMOD_ALT),
464 const_iv (KMOD_META)
465# undef const_iv 557# undef const_iv
466 }; 558 };
467 559
468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
470} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
572
573int
574in_destruct ()
575 CODE:
576 RETVAL = PL_main_cv == Nullcv;
577 OUTPUT:
578 RETVAL
471 579
472NV floor (NV x) 580NV floor (NV x)
473 581
474NV ceil (NV x) 582NV ceil (NV x)
475 583
480 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
481 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
482 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
483} 591}
484 592
593char *
594SDL_GetError ()
595
485int 596int
486SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
487 598
488void 599void
489SDL_Quit () 600SDL_Quit ()
490 601
491void 602void
492SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
493 PPCODE: 604 PPCODE:
494{ 605{
495 SDL_Rect **m; 606 SDL_Rect **m;
496 607
497 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
498 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
499 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
500 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
501 612
502 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
503 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
504 615
505 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
509 620
510 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
511 622#if SDL_VERSION_ATLEAST(1,2,10)
512 SDL_EnableUNICODE (1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
513 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
514 626
515 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
516 628
517 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
518 while (*m) 630 while (*m)
519 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
520 AV *av = newAV (); 634 AV *av = newAV ();
521 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
522 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
523 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
524 641
525 ++m; 642 ++m;
526 } 643 }
527} 644}
528 645
529char *
530SDL_GetError ()
531
532int 646int
533SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
534 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
535 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
536 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
537 ); 660 );
661
538 if (RETVAL) 662 if (RETVAL)
539 { 663 {
664 av_clear (texture_av);
665
540 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
541# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
542# include "glfunc.h" 668#include "glfunc.h"
543# undef GL_FUNC 669#undef GL_FUNC
544 } 670 }
671}
545 OUTPUT: 672 OUTPUT:
546 RETVAL 673 RETVAL
547 674
548void 675void
549SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
550 677
551char * 678char *
552SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
553 680
681int
682SDL_GetAppState ()
683
554void 684void
555SDL_PollEvent () 685poll_events ()
556 PPCODE: 686 PPCODE:
557{ 687{
558 SDL_Event ev; 688 SDL_Event ev;
559 689
560 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
561 { 692 {
562 HV *hv = newHV (); 693 HV *hv = newHV ();
563 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
564 695
565 switch (ev.type) 696 switch (ev.type)
567 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
568 case SDL_KEYUP: 699 case SDL_KEYUP:
569 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
570 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
571 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
572 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
573 break; 705 break;
574 706
575 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
576 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
577 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
578 break; 710 break;
579 711
580 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
581 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
582
583 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
584 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
585 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
586 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
587 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
588 break; 738 break;
589 739
590 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
591 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
592 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
603 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
604 break; 754 break;
605 } 755 }
606 756
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
608 } 758 }
609} 759}
610 760
611int 761int
612Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
621Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
622 772
623void 773void
624lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
625 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
626#ifndef _WIN32 782#ifdef _WIN32
627 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
628#endif 804#endif
805}
629 806
630void 807void
631add_font (char *file) 808add_font (char *file)
632 CODE: 809 CODE:
633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
634 811
635void 812void
636load_image_inline (SV *image_) 813load_image_inline (SV *image_)
637 ALIAS: 814 ALIAS:
638 load_image_file = 1 815 load_image_file = 1
680 857
681 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 858 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
682 859
683 assert (surface2->pitch == surface2->w * 4); 860 assert (surface2->pitch == surface2->w * 4);
684 861
862 SDL_LockSurface (surface2);
685 EXTEND (SP, 5); 863 EXTEND (SP, 6);
686 PUSHs (sv_2mortal (newSViv (surface2->w))); 864 PUSHs (sv_2mortal (newSViv (surface2->w)));
687 PUSHs (sv_2mortal (newSViv (surface2->h))); 865 PUSHs (sv_2mortal (newSViv (surface2->h)));
688 SDL_LockSurface (surface2);
689 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 866 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
690 SDL_UnlockSurface (surface2);
691 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 867 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
692 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 868 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
693 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 869 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
870 SDL_UnlockSurface (surface2);
694 871
695 SDL_FreeSurface (surface); 872 SDL_FreeSurface (surface);
696 SDL_FreeSurface (surface2); 873 SDL_FreeSurface (surface2);
697} 874}
698 875
737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
738#endif 915#endif
739 _exit (1); 916 _exit (1);
740 917
741void 918void
742_exit (int retval) 919_exit (int retval = 0)
743 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
744 _exit (retval); 924 _exit (retval);
925#endif
745 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
746MODULE = CFClient PACKAGE = CFClient::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
747 937
748CFClient::Font 938CFPlus::Font
749new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
750 CODE: 940 CODE:
751{ 941{
752 int count; 942 int count;
753 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
756} 946}
757 OUTPUT: 947 OUTPUT:
758 RETVAL 948 RETVAL
759 949
760void 950void
761DESTROY (CFClient::Font self) 951DESTROY (CFPlus::Font self)
762 CODE: 952 CODE:
763 pango_font_description_free (self); 953 pango_font_description_free (self);
764 954
765void 955void
766make_default (CFClient::Font self) 956make_default (CFPlus::Font self)
767 CODE: 957 CODE:
768 default_font = self; 958 default_font = self;
769 959
770MODULE = CFClient PACKAGE = CFClient::Layout 960MODULE = CFPlus PACKAGE = CFPlus::Layout
771 961
772void 962void
773clear_font_cache () 963reset_glyph_cache ()
774 CODE: 964 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear (); 965 tc_clear ();
777 966
778CFClient::Layout 967CFPlus::Layout
779new (SV *class, int type = 0) 968new (SV *class)
780 CODE: 969 CODE:
781 New (0, RETVAL, 1, struct cf_layout); 970 New (0, RETVAL, 1, struct cf_layout);
782 971
783 RETVAL->pl = pango_layout_new (opengl_context); 972 RETVAL->pl = pango_layout_new (opengl_context);
784 RETVAL->r = 1.; 973 RETVAL->r = 1.;
792 layout_update_font (RETVAL); 981 layout_update_font (RETVAL);
793 OUTPUT: 982 OUTPUT:
794 RETVAL 983 RETVAL
795 984
796void 985void
797DESTROY (CFClient::Layout self) 986DESTROY (CFPlus::Layout self)
798 CODE: 987 CODE:
799 g_object_unref (self->pl); 988 g_object_unref (self->pl);
800 Safefree (self); 989 Safefree (self);
801 990
802void 991void
803set_text (CFClient::Layout self, SV *text_) 992set_text (CFPlus::Layout self, SV *text_)
804 CODE: 993 CODE:
805{ 994{
806 STRLEN textlen; 995 STRLEN textlen;
807 char *text = SvPVutf8 (text_, textlen); 996 char *text = SvPVutf8 (text_, textlen);
808 997
809 pango_layout_set_text (self->pl, text, textlen); 998 pango_layout_set_text (self->pl, text, textlen);
810} 999}
811 1000
812void 1001void
813set_markup (CFClient::Layout self, SV *text_) 1002set_markup (CFPlus::Layout self, SV *text_)
814 CODE: 1003 CODE:
815{ 1004{
816 STRLEN textlen; 1005 STRLEN textlen;
817 char *text = SvPVutf8 (text_, textlen); 1006 char *text = SvPVutf8 (text_, textlen);
818 1007
819 pango_layout_set_markup (self->pl, text, textlen); 1008 pango_layout_set_markup (self->pl, text, textlen);
820} 1009}
821 1010
822void 1011void
823set_shapes (CFClient::Layout self, ...) 1012set_shapes (CFPlus::Layout self, ...)
824 CODE: 1013 CODE:
825{ 1014{
826 PangoAttrList *attrs = 0; 1015 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl); 1016 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text; 1017 const char *pos = text;
863 if (attrs) 1052 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs); 1053 pango_layout_set_attributes (self->pl, attrs);
865} 1054}
866 1055
867void 1056void
868get_shapes (CFClient::Layout self) 1057get_shapes (CFPlus::Layout self)
869 PPCODE: 1058 PPCODE:
870{ 1059{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872 1061
873 do 1062 do
877 if (run && shape_attr_p (run)) 1066 if (run && shape_attr_p (run))
878 { 1067 {
879 PangoRectangle extents; 1068 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents); 1069 pango_layout_iter_get_run_extents (iter, 0, &extents);
881 1070
1071 EXTEND (SP, 2);
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1072 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1073 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 } 1074 }
885 } 1075 }
886 while (pango_layout_iter_next_run (iter)); 1076 while (pango_layout_iter_next_run (iter));
887 1077
888 pango_layout_iter_free (iter); 1078 pango_layout_iter_free (iter);
889} 1079}
890 1080
891int 1081int
892has_wrapped (CFClient::Layout self) 1082has_wrapped (CFPlus::Layout self)
893 CODE: 1083 CODE:
894{ 1084{
895 int lines = 1; 1085 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl); 1086 const char *text = pango_layout_get_text (self->pl);
897 1087
902} 1092}
903 OUTPUT: 1093 OUTPUT:
904 RETVAL 1094 RETVAL
905 1095
906SV * 1096SV *
907get_text (CFClient::Layout self) 1097get_text (CFPlus::Layout self)
908 CODE: 1098 CODE:
909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
910 sv_utf8_decode (RETVAL); 1100 sv_utf8_decode (RETVAL);
911 OUTPUT: 1101 OUTPUT:
912 RETVAL 1102 RETVAL
913 1103
914void 1104void
915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
916 CODE: 1106 CODE:
917 self->r = r; 1107 self->r = r;
918 self->g = g; 1108 self->g = g;
919 self->b = b; 1109 self->b = b;
920 self->a = a; 1110 self->a = a;
921 1111
922void 1112void
923set_font (CFClient::Layout self, CFClient::Font font = 0) 1113set_font (CFPlus::Layout self, CFPlus::Font font = 0)
924 CODE: 1114 CODE:
925 if (self->font != font) 1115 if (self->font != font)
926 { 1116 {
927 self->font = font; 1117 self->font = font;
928 layout_update_font (self); 1118 layout_update_font (self);
929 } 1119 }
930 1120
931void 1121void
932set_height (CFClient::Layout self, int base_height) 1122set_height (CFPlus::Layout self, int base_height)
933 CODE: 1123 CODE:
934 if (self->base_height != base_height) 1124 if (self->base_height != base_height)
935 { 1125 {
936 self->base_height = base_height; 1126 self->base_height = base_height;
937 layout_update_font (self); 1127 layout_update_font (self);
938 } 1128 }
939 1129
940void 1130void
941set_width (CFClient::Layout self, int max_width = -1) 1131set_width (CFPlus::Layout self, int max_width = -1)
942 CODE: 1132 CODE:
943 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
944 1134
945void 1135void
946set_indent (CFClient::Layout self, int indent) 1136set_indent (CFPlus::Layout self, int indent)
947 CODE: 1137 CODE:
948 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
949 1139
950void 1140void
951set_spacing (CFClient::Layout self, int spacing) 1141set_spacing (CFPlus::Layout self, int spacing)
952 CODE: 1142 CODE:
953 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
954 1144
955void 1145void
956set_ellipsise (CFClient::Layout self, int ellipsise) 1146set_ellipsise (CFPlus::Layout self, int ellipsise)
957 CODE: 1147 CODE:
958 pango_layout_set_ellipsize (self->pl, 1148 pango_layout_set_ellipsize (self->pl,
959 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START
960 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
961 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
962 : PANGO_ELLIPSIZE_NONE 1152 : PANGO_ELLIPSIZE_NONE
963 ); 1153 );
964 1154
965void 1155void
966set_single_paragraph_mode (CFClient::Layout self, int spm) 1156set_single_paragraph_mode (CFPlus::Layout self, int spm)
967 CODE: 1157 CODE:
968 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
969 1159
970void 1160void
971size (CFClient::Layout self) 1161size (CFPlus::Layout self)
972 PPCODE: 1162 PPCODE:
973{ 1163{
974 int w, h; 1164 int w, h;
975 1165
976 layout_get_pixel_size (self, &w, &h); 1166 layout_get_pixel_size (self, &w, &h);
979 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (w)));
980 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (h)));
981} 1171}
982 1172
983int 1173int
984descent (CFClient::Layout self) 1174descent (CFPlus::Layout self)
985 CODE: 1175 CODE:
986{ 1176{
987 PangoRectangle rect; 1177 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect); 1179 pango_layout_line_get_pixel_extents (line, 0, &rect);
991} 1181}
992 OUTPUT: 1182 OUTPUT:
993 RETVAL 1183 RETVAL
994 1184
995int 1185int
996xy_to_index (CFClient::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
997 CODE: 1187 CODE:
998{ 1188{
999 int index, trailing; 1189 int index, trailing;
1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1001 RETVAL = index; 1191 RETVAL = index + trailing;
1002} 1192}
1003 OUTPUT: 1193 OUTPUT:
1004 RETVAL 1194 RETVAL
1005 1195
1006void 1196void
1007cursor_pos (CFClient::Layout self, int index) 1197cursor_pos (CFPlus::Layout self, int index)
1008 PPCODE: 1198 PPCODE:
1009{ 1199{
1010 PangoRectangle strong_pos; 1200 PangoRectangle strong_pos;
1011 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1012 1202
1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1017} 1207}
1018 1208
1019void 1209void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1211 PPCODE:
1212{
1213 int line, x;
1214
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217
1218 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1241 else
1242 {
1243 PUSHs (sv_2mortal (newSViv (index)));
1244 PUSHs (sv_2mortal (newSViv (trailing)));
1245 }
1246}
1247
1248void
1020render (CFClient::Layout self, float x, float y) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1021 PPCODE: 1250 PPCODE:
1022 pango_opengl_render_layout_subpixel ( 1251 pango_opengl_render_layout_subpixel (
1023 self->pl, 1252 self->pl,
1024 x * PANGO_SCALE, y * PANGO_SCALE, 1253 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a 1254 self->r, self->g, self->b, self->a,
1255 flags
1026 ); 1256 );
1027 1257
1028MODULE = CFClient PACKAGE = CFClient::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1259
1260int minpot (int n)
1029 1261
1030void 1262void
1031pad2pot (SV *data_, SV *w_, SV *h_) 1263pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE: 1264 CODE:
1033{ 1265{
1111 glDisable (GL_ALPHA_TEST); 1343 glDisable (GL_ALPHA_TEST);
1112 glDisable (GL_BLEND); 1344 glDisable (GL_BLEND);
1113 } 1345 }
1114} 1346}
1115 1347
1348IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1349 CODE:
1350{
1351 GLint width;
1352 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1353 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1354 RETVAL = width > 0;
1355}
1356 OUTPUT:
1357 RETVAL
1358
1116MODULE = CFClient PACKAGE = CFClient::Map 1359MODULE = CFPlus PACKAGE = CFPlus::Map
1117 1360
1118CFClient::Map 1361CFPlus::Map
1119new (SV *class, int map_width, int map_height) 1362new (SV *class)
1120 CODE: 1363 CODE:
1121 New (0, RETVAL, 1, struct map); 1364 New (0, RETVAL, 1, struct map);
1122 RETVAL->x = 0; 1365 RETVAL->x = 0;
1123 RETVAL->y = 0; 1366 RETVAL->y = 0;
1124 RETVAL->w = map_width; 1367 RETVAL->w = 0;
1125 RETVAL->h = map_height; 1368 RETVAL->h = 0;
1126 RETVAL->ox = 0; 1369 RETVAL->ox = 0;
1127 RETVAL->oy = 0; 1370 RETVAL->oy = 0;
1128 RETVAL->faces = 8192; 1371 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1129 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1372 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1130 RETVAL->texs = 8192;
1131 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1132 RETVAL->rows = 0; 1373 RETVAL->rows = 0;
1133 RETVAL->row = 0; 1374 RETVAL->row = 0;
1134 OUTPUT: 1375 OUTPUT:
1135 RETVAL 1376 RETVAL
1136 1377
1137void 1378void
1138DESTROY (CFClient::Map self) 1379DESTROY (CFPlus::Map self)
1139 CODE: 1380 CODE:
1140{ 1381{
1141 map_clear (self); 1382 map_clear (self);
1142 Safefree (self->face); 1383 Safefree (self->face2tile);
1143 Safefree (self->tex); 1384 Safefree (self->tex);
1144 Safefree (self); 1385 Safefree (self);
1145} 1386}
1146 1387
1147void 1388void
1389resize (CFPlus::Map self, int map_width, int map_height)
1390 CODE:
1391 self->w = map_width;
1392 self->h = map_height;
1393
1394void
1148clear (CFClient::Map self) 1395clear (CFPlus::Map self)
1149 CODE: 1396 CODE:
1150 map_clear (self); 1397 map_clear (self);
1151 1398
1152void 1399void
1153set_face (CFClient::Map self, int face, int texid) 1400set_tileid (CFPlus::Map self, int face, int tile)
1154 CODE: 1401 CODE:
1155{ 1402{
1156 while (self->faces <= face) 1403 need_facenum (self, face); self->face2tile [face] = tile;
1157 { 1404 need_texid (self, tile);
1158 Append (mapface, self->face, self->faces, self->faces);
1159 self->faces *= 2;
1160 }
1161
1162 self->face [face] = texid;
1163} 1405}
1164 1406
1165void 1407void
1408set_smooth (CFPlus::Map self, int face, int smooth, int level)
1409 CODE:
1410{
1411 tileid texid;
1412 maptex *tex;
1413
1414 if (face < 0 || face >= self->faces)
1415 return;
1416
1417 if (smooth < 0 || smooth >= self->faces)
1418 return;
1419
1420 texid = self->face2tile [face];
1421
1422 if (!texid)
1423 return;
1424
1425 tex = self->tex + texid;
1426 tex->smoothtile = self->face2tile [smooth];
1427 tex->smoothlevel = level;
1428}
1429
1430void
1166set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1431set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1167 CODE: 1432 CODE:
1168{ 1433{
1169 while (self->texs <= texid) 1434 need_texid (self, texid);
1170 {
1171 Append (maptex, self->tex, self->texs, self->texs);
1172 self->texs *= 2;
1173 }
1174 1435
1175 { 1436 {
1176 maptex *tex = self->tex + texid; 1437 maptex *tex = self->tex + texid;
1177 1438
1178 tex->name = name; 1439 tex->name = name;
1195 // from transparent color bleeding and ugly wrapping effects. 1456 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1457 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1197} 1458}
1198 1459
1199int 1460int
1200ox (CFClient::Map self) 1461ox (CFPlus::Map self)
1201 ALIAS: 1462 ALIAS:
1202 oy = 1 1463 oy = 1
1203 x = 2 1464 x = 2
1204 y = 3 1465 y = 3
1205 w = 4 1466 w = 4
1216 } 1477 }
1217 OUTPUT: 1478 OUTPUT:
1218 RETVAL 1479 RETVAL
1219 1480
1220void 1481void
1221scroll (CFClient::Map self, int dx, int dy) 1482scroll (CFPlus::Map self, int dx, int dy)
1222 CODE: 1483 CODE:
1223{ 1484{
1224 if (dx > 0) 1485 if (dx > 0)
1225 map_blank (self, self->x, self->y, dx - 1, self->h); 1486 map_blank (self, self->x, self->y, dx, self->h);
1226 else if (dx < 0) 1487 else if (dx < 0)
1227 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1488 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1228 1489
1229 if (dy > 0) 1490 if (dy > 0)
1230 map_blank (self, self->x, self->y, self->w, dy - 1); 1491 map_blank (self, self->x, self->y, self->w, dy);
1231 else if (dy < 0) 1492 else if (dy < 0)
1232 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1493 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1233 1494
1234 self->ox += dx; self->x += dx; 1495 self->ox += dx; self->x += dx;
1235 self->oy += dy; self->y += dy; 1496 self->oy += dy; self->y += dy;
1236 1497
1237 while (self->y < 0) 1498 while (self->y < 0)
1242 self->y += MAP_EXTEND_Y; 1503 self->y += MAP_EXTEND_Y;
1243 } 1504 }
1244} 1505}
1245 1506
1246void 1507void
1247map1a_update (CFClient::Map self, SV *data_) 1508map1a_update (CFPlus::Map self, SV *data_, int extmap)
1248 CODE: 1509 CODE:
1249{ 1510{
1250 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1511 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1251 uint8_t *data_end = (uint8_t *)SvEND (data_); 1512 uint8_t *data_end = (uint8_t *)SvEND (data_);
1252 mapcell *cell; 1513 mapcell *cell;
1253 int x, y, flags; 1514 int x, y, flags;
1254 1515
1255 while (data < data_end) 1516 while (data < data_end - 1)
1256 { 1517 {
1257 flags = (data [0] << 8) + data [1]; data += 2; 1518 flags = (data [0] << 8) + data [1]; data += 2;
1258 1519
1259 x = self->x + ((flags >> 10) & 63); 1520 x = self->x + ((flags >> 10) & 63);
1260 y = self->y + ((flags >> 4) & 63); 1521 y = self->y + ((flags >> 4) & 63);
1261 1522
1262 cell = map_get_cell (self, x, y); 1523 cell = map_get_cell (self, x, y);
1263 1524
1264 if (flags & 15) 1525 if (flags & 15)
1265 { 1526 {
1266 if (cell->darkness < 0) 1527 if (!cell->darkness)
1267 { 1528 {
1529 memset (cell, 0, sizeof (*cell));
1268 cell->darkness = 0; 1530 cell->darkness = 256;
1269 cell->face [0] = 0;
1270 cell->face [1] = 0;
1271 cell->face [2] = 0;
1272 } 1531 }
1273 1532
1274 cell->darkness = flags & 8 ? *data++ : 255;
1275
1276 //TODO: don't trust server data to be in-range(!) 1533 //TODO: don't trust server data to be in-range(!)
1534
1535 if (flags & 8)
1536 {
1537 if (extmap)
1538 {
1539 uint8_t ext, cmd;
1540
1541 do
1542 {
1543 ext = *data++;
1544 cmd = ext & 0x3f;
1545
1546 if (cmd < 4)
1547 cell->darkness = 255 - ext * 64 + 1;
1548 else if (cmd == 5) // health
1549 {
1550 cell->stat_width = 1;
1551 cell->stat_hp = *data++;
1552 }
1553 else if (cmd == 6) // monster width
1554 cell->stat_width = *data++ + 1;
1555 else if (cmd == 0x47)
1556 {
1557 if (*data == 4)
1558 ; // decode player count
1559
1560 data += *data + 1;
1561 }
1562 else if (cmd == 8) // cell flags
1563 cell->flags = *data++;
1564 else if (ext & 0x40) // unknown, multibyte => skip
1565 data += *data + 1;
1566 else
1567 data++;
1568 }
1569 while (ext & 0x80);
1570 }
1571 else
1572 cell->darkness = *data++ + 1;
1573 }
1277 1574
1278 if (flags & 4) 1575 if (flags & 4)
1279 { 1576 {
1280 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1577 faceid face = (data [0] << 8) + data [1]; data += 2;
1578 need_facenum (self, face);
1579 cell->tile [0] = self->face2tile [face];
1281 } 1580 }
1282 1581
1283 if (flags & 2) 1582 if (flags & 2)
1284 { 1583 {
1285 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1584 faceid face = (data [0] << 8) + data [1]; data += 2;
1585 need_facenum (self, face);
1586 cell->tile [1] = self->face2tile [face];
1286 } 1587 }
1287 1588
1288 if (flags & 1) 1589 if (flags & 1)
1289 { 1590 {
1290 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1591 faceid face = (data [0] << 8) + data [1]; data += 2;
1592 need_facenum (self, face);
1593 cell->tile [2] = self->face2tile [face];
1291 } 1594 }
1292 } 1595 }
1293 else 1596 else
1294 cell->darkness = -1; 1597 cell->darkness = 0;
1295 } 1598 }
1296} 1599}
1297 1600
1298SV * 1601SV *
1299mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1602mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1300 CODE: 1603 CODE:
1301{ 1604{
1302 int x1, x; 1605 int x1, x;
1303 int y1, y; 1606 int y1, y;
1304 int z; 1607 int z;
1325 { 1628 {
1326 mapcell *cell = row->col + (x - row->c0); 1629 mapcell *cell = row->col + (x - row->c0);
1327 1630
1328 for (z = 0; z <= 0; z++) 1631 for (z = 0; z <= 0; z++)
1329 { 1632 {
1330 mapface face = cell->face [z];
1331
1332 if (face)
1333 {
1334 maptex tex = self->tex [face]; 1633 maptex tex = self->tex [cell->tile [z]];
1335 int a0 = 255 - tex.a; 1634 int a0 = 255 - tex.a;
1336 int a1 = tex.a; 1635 int a1 = tex.a;
1337 1636
1338 r = (r * a0 + tex.r * a1) / 255; 1637 r = (r * a0 + tex.r * a1) / 255;
1339 g = (g * a0 + tex.g * a1) / 255; 1638 g = (g * a0 + tex.g * a1) / 255;
1340 b = (b * a0 + tex.b * a1) / 255; 1639 b = (b * a0 + tex.b * a1) / 255;
1341 a = (a * a0 + tex.a * a1) / 255; 1640 a = (a * a0 + tex.a * a1) / 255;
1342 }
1343 } 1641 }
1344 } 1642 }
1345 1643
1346 *map++ = (r ) 1644 *map++ = (r )
1347 | (g << 8) 1645 | (g << 8)
1354} 1652}
1355 OUTPUT: 1653 OUTPUT:
1356 RETVAL 1654 RETVAL
1357 1655
1358void 1656void
1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1657draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1360 CODE: 1658 CODE:
1361{ 1659{
1362 int vx, vy; 1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1663 smooth_key skey;
1363 int x, y, z; 1664 int x, y, z;
1364 int last_name; 1665 int last_name;
1365 mapface face;
1366 1666
1367 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1667 // thats current max. sorry.
1368 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1668 if (sw > 255) sw = 255;
1669 if (sh > 255) sh = 255;
1369 1670
1370 /* 1671 // clear key, in case of extra padding
1371 int vx = self->vx = self->w >= sw 1672 memset (&skey, 0, sizeof (skey));
1372 ? self->x + (self->w - sw) / 2
1373 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1374
1375 int vy = self->vy = self->h >= sh
1376 ? self->y + (self->h - sh) / 2
1377 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1378 */
1379 1673
1380 glColor4ub (255, 255, 255, 255); 1674 glColor4ub (255, 255, 255, 255);
1381 1675
1382 glEnable (GL_BLEND); 1676 glEnable (GL_BLEND);
1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1677 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1386 1680
1387 glBegin (GL_QUADS); 1681 glBegin (GL_QUADS);
1388 1682
1389 last_name = 0; 1683 last_name = 0;
1390 1684
1685 mx += self->x;
1686 my += self->y;
1687
1688 // first pass: determine smooth_max
1689 // rather ugly, if you ask me
1690 // could also be stored inside mapcell and updated on change
1691 memset (smooth_max, 0, sizeof (smooth_max));
1692
1693 for (y = 0; y < sh; y++)
1694 if (0 <= y + my && y + my < self->rows)
1695 {
1696 maprow *row = self->row + (y + my);
1697
1698 for (x = 0; x < sw; x++)
1699 if (row->c0 <= x + mx && x + mx < row->c1)
1700 {
1701 mapcell *cell = row->col + (x + mx - row->c0);
1702
1703 smooth_max[x + 1][y + 1] =
1704 MAX (self->tex [cell->tile [0]].smoothlevel,
1705 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel));
1707 }
1708 }
1709
1391 for (z = 0; z < 3; z++) 1710 for (z = 0; z <= 2; z++)
1711 {
1712 memset (smooth_level, 0, sizeof (smooth_level));
1713
1392 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1393 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1394 { 1716 {
1395 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1396 1718
1397 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1398 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1399 { 1721 {
1400 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1401
1402 face = cell->face [z]; 1723 tileid tile = cell->tile [z];
1403 1724
1404 if (face) 1725 if (tile)
1726 {
1727 maptex tex = self->tex [tile];
1728 int px = (x + 1) * T - tex.w;
1729 int py = (y + 1) * T - tex.h;
1730
1731 // suppressing texture state switches here
1732 // is only moderately effective, but worth the extra effort
1733 if (last_name != tex.name)
1734 {
1735 if (!tex.name)
1736 tex = self->tex [2]; /* missing, replace by noface */
1737
1738 glEnd ();
1739 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1740 glBegin (GL_QUADS);
1741 }
1742
1743 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1744 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1745 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1746 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1747
1748 if (cell->flags && z == 2)
1749 {
1750 if (cell->flags & 1)
1751 {
1752 maptex tex = self->tex [1];
1753 int px = x * T + T * 2 / 32;
1754 int py = y * T - T * 6 / 32;
1755
1756 glEnd ();
1757 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1758 glBegin (GL_QUADS);
1759
1760 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1761 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1762 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1763 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1764 }
1765 }
1766
1767 // update smooth hash
1768 if (tex.smoothtile)
1769 {
1770 skey.tile = tex.smoothtile;
1771 skey.level = tex.smoothlevel;
1772
1773 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1774
1775 // add bits to current tile and all neighbours. skey.x|y is
1776 // shifted +1|+1 so we always stay positive.
1777
1778 // bits is ___n cccc CCCC bbbb
1779 // n do not draw borders&corners
1780 // c draw these corners, but...
1781 // C ... not these
1782 // b draw these borders
1783
1784 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1785 // ┃· ·· ·┃ ━━
1786
1787 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1788 // ·· ·· ·┏ ┓·
1789
1790 // full tile
1791 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1792
1793 // borders
1794 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1795 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1796 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1797 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1798
1799 // corners
1800 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1801 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1802 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1803 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1804 }
1805 }
1806 }
1807 }
1808
1809 // go through all smoothlevels, lowest to highest, then draw.
1810 // this is basically counting sort
1811 {
1812 int w, b;
1813
1814 for (w = 0; w < 256 / 32; ++w)
1815 {
1816 uint32_t smask = smooth_level [w];
1817 if (smask)
1818 for (b = 0; b < 32; ++b)
1819 if (smask & (((uint32_t)1) << b))
1405 { 1820 {
1406 maptex tex = self->tex [face]; 1821 int level = (w << 5) | b;
1822 HE *he;
1407 1823
1408 int px = (x + 1) * 32 - tex.w; 1824 hv_iterinit (smooth);
1409 int py = (y + 1) * 32 - tex.h; 1825 while ((he = hv_iternext (smooth)))
1410
1411 if (last_name != tex.name)
1412 { 1826 {
1827 smooth_key *skey = (smooth_key *)HeKEY (he);
1828 IV bits = SvIVX (HeVAL (he));
1829
1830 if (!(bits & 0x1000)
1831 && skey->level == level
1832 && level > smooth_max [skey->x][skey->y])
1833 {
1834 maptex tex = self->tex [skey->tile];
1835 int px = (((int)skey->x) - 1) * T;
1836 int py = (((int)skey->y) - 1) * T;
1837 int border = bits & 15;
1838 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1839 float dx = tex.s * .0625f; // 16 images/row
1840 float dy = tex.t * .5f ; // 2 images/column
1841
1842 // this time naively avoiding texture state changes
1843 // save gobs of state changes.
1844 if (last_name != tex.name)
1845 {
1846 if (!tex.name)
1847 continue; // smoothing not yet available
1848
1413 glEnd (); 1849 glEnd ();
1414 last_name = tex.name;
1415 glBindTexture (GL_TEXTURE_2D, last_name); 1850 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1416 glBegin (GL_QUADS); 1851 glBegin (GL_QUADS);
1852 }
1853
1854 if (border)
1855 {
1856 float ox = border * dx;
1857
1858 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1859 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1860 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1861 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1862 }
1863
1864 if (corner)
1865 {
1866 float ox = corner * dx;
1867
1868 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1869 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1870 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1871 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1872 }
1873 }
1417 } 1874 }
1418
1419 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1420 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1421 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1422 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1423 } 1875 }
1424 }
1425 } 1876 }
1877 }
1878
1879 hv_clear (smooth);
1880 }
1426 1881
1427 glEnd (); 1882 glEnd ();
1428 1883
1429 glDisable (GL_TEXTURE_2D); 1884 glDisable (GL_TEXTURE_2D);
1430 glDisable (GL_BLEND); 1885 glDisable (GL_BLEND);
1431}
1432 1886
1887 // top layer: overlays such as the health bar
1888 for (y = 0; y < sh; y++)
1889 if (0 <= y + my && y + my < self->rows)
1890 {
1891 maprow *row = self->row + (y + my);
1892
1893 for (x = 0; x < sw; x++)
1894 if (row->c0 <= x + mx && x + mx < row->c1)
1895 {
1896 mapcell *cell = row->col + (x + mx - row->c0);
1897
1898 int px = x * T;
1899 int py = y * T;
1900
1901 if (cell->stat_hp)
1902 {
1903 int width = cell->stat_width * T;
1904 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1905
1906 glColor3ub (0, 0, 0);
1907 glRectf (px + 1, py - thick - 2,
1908 px + width - 1, py);
1909
1910 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1911 glRectf (px + 2,
1912 py - thick - 1,
1913 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1914 }
1915 }
1916 }
1917}
1918
1433void 1919void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1920draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE: 1921 CODE:
1436{ 1922{
1437 static float color[16][3] = { 1923 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F }, 1924 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F }, 1925 { 1.00F, 1.00F, 1.00F },
1489 glDisable (GL_BLEND); 1975 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D); 1976 glDisable (GL_TEXTURE_2D);
1491} 1977}
1492 1978
1493void 1979void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1495 PPCODE: 1981 PPCODE:
1496{ 1982{
1497 int vx, vy;
1498 int x, y; 1983 int x, y;
1499 int sw4 = (sw + 3) & ~3; 1984 int sw4 = (sw + 3) & ~3;
1500 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1501 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1502 1987
1503 memset (darkness, 255, sw4 * sh); 1988 memset (darkness, 255, sw4 * sh);
1504 SvPOK_only (darkness_sv); 1989 SvPOK_only (darkness_sv);
1505 SvCUR_set (darkness_sv, sw4 * sh); 1990 SvCUR_set (darkness_sv, sw4 * sh);
1506 1991
1507 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1992 mx += self->x;
1508 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1993 my += self->y;
1509 1994
1510 for (y = 0; y < sh; y++) 1995 for (y = 0; y < sh; y++)
1511 if (0 <= y + vy && y + vy < self->rows) 1996 if (0 <= y + my && y + my < self->rows)
1512 { 1997 {
1513 maprow *row = self->row + (y + vy); 1998 maprow *row = self->row + (y + my);
1514 1999
1515 for (x = 0; x < sw; x++) 2000 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1) 2001 if (row->c0 <= x + mx && x + mx < row->c1)
1517 { 2002 {
1518 mapcell *cell = row->col + (x + vx - row->c0); 2003 mapcell *cell = row->col + (x + mx - row->c0);
1519 2004
1520 darkness[y * sw4 + x] = cell->darkness < 0 2005 darkness[y * sw4 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1)
1521 ? 255 - FOW_DARKNESS 2007 : 255 - FOW_DARKNESS;
1522 : 255 - cell->darkness;
1523 } 2008 }
1524 } 2009 }
2010
2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2015
2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x)
2021 {
2022 float *f = (float *)matrix;
2023 int dx, dy;
2024 float sum = 0.f;
2025
2026 for (dy = -1; dy <= 1; ++dy)
2027 for (dx = -1; dx <= 1; ++dx)
2028 {
2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
2031
2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2033 }
2034
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2036 }
2037
2038 darkness_sv = darkness2_sv;
2039 }
1525 2040
1526 EXTEND (SP, 3); 2041 EXTEND (SP, 3);
1527 PUSHs (sv_2mortal (newSViv (sw4))); 2042 PUSHs (sv_2mortal (newSViv (sw4)));
1528 PUSHs (sv_2mortal (newSViv (sh))); 2043 PUSHs (sv_2mortal (newSViv (sh)));
1529 PUSHs (darkness_sv); 2044 PUSHs (darkness_sv);
1530} 2045}
1531 2046
1532SV * 2047SV *
1533get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2048get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1534 CODE: 2049 CODE:
1535{ 2050{
1536 int x, y, x1, y1; 2051 int x, y, x1, y1;
1537 SV *data_sv = newSV (w * h * 7 + 5); 2052 SV *data_sv = newSV (w * h * 7 + 5);
1538 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2053 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1563 if (row && row->c0 <= x && x < row->c1) 2078 if (row && row->c0 <= x && x < row->c1)
1564 { 2079 {
1565 mapcell *cell = row->col + (x - row->c0); 2080 mapcell *cell = row->col + (x - row->c0);
1566 uint8_t flags = 0; 2081 uint8_t flags = 0;
1567 2082
1568 if (cell->face [0]) flags |= 1; 2083 if (cell->tile [0]) flags |= 1;
1569 if (cell->face [1]) flags |= 2; 2084 if (cell->tile [1]) flags |= 2;
1570 if (cell->face [2]) flags |= 4; 2085 if (cell->tile [2]) flags |= 4;
1571 2086
1572 *data++ = flags; 2087 *data++ = flags;
1573 2088
1574 if (flags & 1) 2089 if (flags & 1)
1575 { 2090 {
2091 tileid tile = cell->tile [0];
1576 *data++ = cell->face [0] >> 8; 2092 *data++ = tile >> 8;
1577 *data++ = cell->face [0]; 2093 *data++ = tile;
1578 } 2094 }
1579 2095
1580 if (flags & 2) 2096 if (flags & 2)
1581 { 2097 {
2098 tileid tile = cell->tile [1];
1582 *data++ = cell->face [1] >> 8; 2099 *data++ = tile >> 8;
1583 *data++ = cell->face [1]; 2100 *data++ = tile;
1584 } 2101 }
1585 2102
1586 if (flags & 4) 2103 if (flags & 4)
1587 { 2104 {
2105 tileid tile = cell->tile [2];
1588 *data++ = cell->face [2] >> 8; 2106 *data++ = tile >> 8;
1589 *data++ = cell->face [2]; 2107 *data++ = tile;
1590 } 2108 }
1591 } 2109 }
1592 else 2110 else
1593 *data++ = 0; 2111 *data++ = 0;
1594 } 2112 }
1600} 2118}
1601 OUTPUT: 2119 OUTPUT:
1602 RETVAL 2120 RETVAL
1603 2121
1604void 2122void
1605set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2123set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1606 PPCODE: 2124 PPCODE:
1607{ 2125{
1608 int x, y, z; 2126 int x, y, z;
1609 int w, h; 2127 int w, h;
1610 int x1, y1; 2128 int x1, y1;
1634 { 2152 {
1635 uint8_t flags = *data++; 2153 uint8_t flags = *data++;
1636 2154
1637 if (flags) 2155 if (flags)
1638 { 2156 {
1639 mapface face[3] = { 0, 0, 0 };
1640
1641 mapcell *cell = row_get_cell (row, x); 2157 mapcell *cell = row_get_cell (row, x);
2158 tileid tile[3] = { 0, 0, 0 };
1642 2159
1643 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2160 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1644 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2161 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1645 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2162 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1646 2163
1647 if (cell->darkness <= 0) 2164 if (cell->darkness == 0)
1648 { 2165 {
1649 cell->darkness = -1; 2166 cell->darkness = 0;
1650 2167
1651 for (z = 0; z <= 2; z++) 2168 for (z = 0; z <= 2; z++)
1652 { 2169 {
1653 cell->face[z] = face[z]; 2170 tileid t = tile [z];
1654 2171
1655 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2172 if (t >= self->texs || (t && !self->tex [t].name))
2173 {
1656 XPUSHs (sv_2mortal (newSViv (face[z]))); 2174 XPUSHs (sv_2mortal (newSViv (t)));
2175 need_texid (self, t);
2176 }
2177
2178 cell->tile [z] = t;
1657 } 2179 }
1658 } 2180 }
1659 } 2181 }
1660 } 2182 }
1661 } 2183 }
1662} 2184}
1663 2185
1664MODULE = CFClient PACKAGE = CFClient::MixChunk 2186MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1665 2187
1666CFClient::MixChunk 2188CFPlus::MixChunk
1667new_from_file (SV *class, char *path) 2189new_from_file (SV *class, char *path)
1668 CODE: 2190 CODE:
1669 RETVAL = Mix_LoadWAV (path); 2191 RETVAL = Mix_LoadWAV (path);
1670 OUTPUT: 2192 OUTPUT:
1671 RETVAL 2193 RETVAL
1672 2194
1673void 2195void
1674DESTROY (CFClient::MixChunk self) 2196DESTROY (CFPlus::MixChunk self)
1675 CODE: 2197 CODE:
1676 Mix_FreeChunk (self); 2198 Mix_FreeChunk (self);
1677 2199
1678int 2200int
1679volume (CFClient::MixChunk self, int volume = -1) 2201volume (CFPlus::MixChunk self, int volume = -1)
1680 CODE: 2202 CODE:
1681 RETVAL = Mix_VolumeChunk (self, volume); 2203 RETVAL = Mix_VolumeChunk (self, volume);
1682 OUTPUT: 2204 OUTPUT:
1683 RETVAL 2205 RETVAL
1684 2206
1685int 2207int
1686play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2208play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1687 CODE: 2209 CODE:
1688 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2210 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1689 OUTPUT: 2211 OUTPUT:
1690 RETVAL 2212 RETVAL
1691 2213
1692MODULE = CFClient PACKAGE = CFClient::MixMusic 2214MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1693 2215
1694int 2216int
1695volume (int volume = -1) 2217volume (int volume = -1)
1696 CODE: 2218 CODE:
1697 RETVAL = Mix_VolumeMusic (volume); 2219 RETVAL = Mix_VolumeMusic (volume);
1698 OUTPUT: 2220 OUTPUT:
1699 RETVAL 2221 RETVAL
1700 2222
2223int
2224fade_out (int ms)
2225 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms);
2227 OUTPUT:
2228 RETVAL
2229
1701CFClient::MixMusic 2230CFPlus::MixMusic
1702new_from_file (SV *class, char *path) 2231new_from_file (SV *class, char *path)
1703 CODE: 2232 CODE:
1704 RETVAL = Mix_LoadMUS (path); 2233 RETVAL = Mix_LoadMUS (path);
1705 OUTPUT: 2234 OUTPUT:
1706 RETVAL 2235 RETVAL
1707 2236
1708void 2237void
1709DESTROY (CFClient::MixMusic self) 2238DESTROY (CFPlus::MixMusic self)
1710 CODE: 2239 CODE:
1711 Mix_FreeMusic (self); 2240 Mix_FreeMusic (self);
1712 2241
1713int 2242int
1714play (CFClient::MixMusic self, int loops = -1) 2243play (CFPlus::MixMusic self, int loops = -1)
1715 CODE: 2244 CODE:
1716 RETVAL = Mix_PlayMusic (self, loops); 2245 RETVAL = Mix_PlayMusic (self, loops);
1717 OUTPUT: 2246 OUTPUT:
1718 RETVAL 2247 RETVAL
1719 2248
2249int
2250fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2251 CODE:
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2253 OUTPUT:
2254 RETVAL
2255
1720MODULE = CFClient PACKAGE = CFClient::OpenGL 2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1721 2257
1722BOOT: 2258BOOT:
1723{ 2259{
1724 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2260 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1725 static const struct { 2261 static const struct {
1726 const char *name; 2262 const char *name;
1727 IV iv; 2263 IV iv;
1728 } *civ, const_iv[] = { 2264 } *civ, const_iv[] = {
1729# define const_iv(name) { # name, (IV)name } 2265# define const_iv(name) { # name, (IV)name }
2266 const_iv (GL_VENDOR),
2267 const_iv (GL_VERSION),
2268 const_iv (GL_EXTENSIONS),
1730 const_iv (GL_COLOR_MATERIAL), 2269 const_iv (GL_COLOR_MATERIAL),
1731 const_iv (GL_SMOOTH), 2270 const_iv (GL_SMOOTH),
1732 const_iv (GL_FLAT), 2271 const_iv (GL_FLAT),
1733 const_iv (GL_DITHER), 2272 const_iv (GL_DITHER),
1734 const_iv (GL_BLEND), 2273 const_iv (GL_BLEND),
1761 const_iv (GL_LUMINANCE), 2300 const_iv (GL_LUMINANCE),
1762 const_iv (GL_LUMINANCE_ALPHA), 2301 const_iv (GL_LUMINANCE_ALPHA),
1763 const_iv (GL_FLOAT), 2302 const_iv (GL_FLOAT),
1764 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2303 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1765 const_iv (GL_COMPILE), 2304 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D),
1766 const_iv (GL_TEXTURE_1D), 2307 const_iv (GL_TEXTURE_1D),
1767 const_iv (GL_TEXTURE_2D), 2308 const_iv (GL_TEXTURE_2D),
1768 const_iv (GL_TEXTURE_ENV), 2309 const_iv (GL_TEXTURE_ENV),
1769 const_iv (GL_TEXTURE_MAG_FILTER), 2310 const_iv (GL_TEXTURE_MAG_FILTER),
1770 const_iv (GL_TEXTURE_MIN_FILTER), 2311 const_iv (GL_TEXTURE_MIN_FILTER),
1792 const_iv (GL_SEPARABLE_2D), 2333 const_iv (GL_SEPARABLE_2D),
1793 const_iv (GL_CONVOLUTION_2D), 2334 const_iv (GL_CONVOLUTION_2D),
1794 const_iv (GL_CONVOLUTION_BORDER_MODE), 2335 const_iv (GL_CONVOLUTION_BORDER_MODE),
1795 const_iv (GL_CONSTANT_BORDER), 2336 const_iv (GL_CONSTANT_BORDER),
1796 const_iv (GL_LINES), 2337 const_iv (GL_LINES),
2338 const_iv (GL_LINE_STRIP),
1797 const_iv (GL_LINE_LOOP), 2339 const_iv (GL_LINE_LOOP),
1798 const_iv (GL_QUADS), 2340 const_iv (GL_QUADS),
1799 const_iv (GL_QUAD_STRIP), 2341 const_iv (GL_QUAD_STRIP),
1800 const_iv (GL_TRIANGLES), 2342 const_iv (GL_TRIANGLES),
1801 const_iv (GL_TRIANGLE_STRIP), 2343 const_iv (GL_TRIANGLE_STRIP),
1809# undef const_iv 2351# undef const_iv
1810 }; 2352 };
1811 2353
1812 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2354 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1813 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2355 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2356
2357 texture_av = newAV ();
2358 AvREAL_off (texture_av);
1814} 2359}
1815 2360
1816char * 2361char *
1817gl_vendor () 2362gl_vendor ()
1818 CODE: 2363 CODE:
1829 2374
1830char * 2375char *
1831gl_extensions () 2376gl_extensions ()
1832 CODE: 2377 CODE:
1833 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2378 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2379 OUTPUT:
2380 RETVAL
2381
2382const char *glGetString (GLenum pname)
2383
2384GLint glGetInteger (GLenum pname)
2385 CODE:
2386 glGetIntegerv (pname, &RETVAL);
2387 OUTPUT:
2388 RETVAL
2389
2390GLdouble glGetDouble (GLenum pname)
2391 CODE:
2392 glGetDoublev (pname, &RETVAL);
1834 OUTPUT: 2393 OUTPUT:
1835 RETVAL 2394 RETVAL
1836 2395
1837int glGetError () 2396int glGetError ()
1838 2397
1911 r *= a; 2470 r *= a;
1912 g *= a; 2471 g *= a;
1913 b *= a; 2472 b *= a;
1914 } 2473 }
1915 // microsoft visual "c" rounds instead of truncating... 2474 // microsoft visual "c" rounds instead of truncating...
1916 glColor4ub (MIN ((int)(r * 256.f), 255), 2475 glColor4f (r, g, b, a);
1917 MIN ((int)(g * 256.f), 255),
1918 MIN ((int)(b * 256.f), 255),
1919 MIN ((int)(a * 256.f), 255));
1920 2476
1921void glInterleavedArrays (int format, int stride, char *data) 2477void glInterleavedArrays (int format, int stride, char *data)
1922 2478
1923void glDrawElements (int mode, int count, int type, char *indices) 2479void glDrawElements (int mode, int count, int type, char *indices)
1924 2480
1966 2522
1967void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2523void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1968 2524
1969void glDrawPixels (int width, int height, int format, int type, char *pixels) 2525void glDrawPixels (int width, int height, int format, int type, char *pixels)
1970 2526
2527void glPixelZoom (float x, float y)
2528
1971void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2529void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1972 2530
1973int glGenTexture () 2531int glGenTexture ()
1974 CODE: 2532 CODE:
1975{ 2533 RETVAL = gen_texture ();
1976 GLuint name;
1977 glGenTextures (1, &name);
1978 RETVAL = name;
1979}
1980 OUTPUT: 2534 OUTPUT:
1981 RETVAL 2535 RETVAL
1982 2536
1983void glDeleteTexture (int name) 2537void glDeleteTexture (int name)
1984 CODE: 2538 CODE:
1985{
1986 GLuint name_ = name;
1987 glDeleteTextures (1, &name_); 2539 del_texture (name);
1988} 2540
1989
1990int glGenList () 2541int glGenList ()
1991 CODE: 2542 CODE:
1992 RETVAL = glGenLists (1); 2543 RETVAL = glGenLists (1);
1993 OUTPUT: 2544 OUTPUT:
1994 RETVAL 2545 RETVAL
2001 2552
2002void glEndList () 2553void glEndList ()
2003 2554
2004void glCallList (int list) 2555void glCallList (int list)
2005 2556
2006

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines