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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines