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.131 by root, Thu Jul 13 01:54:18 2006 UTC vs.
Revision 1.205 by root, Thu Jul 19 22:38:52 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines