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.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 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)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
15#include <stdlib.h> 23#include <stdlib.h>
16 24
18#include <SDL_endian.h> 26#include <SDL_endian.h>
19#include <SDL_image.h> 27#include <SDL_image.h>
20#include <SDL_mixer.h> 28#include <SDL_mixer.h>
21#include <SDL_opengl.h> 29#include <SDL_opengl.h>
22 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
23#include <glib/gmacros.h> 34#include <glib/gmacros.h>
24 35
25#include <pango/pango.h> 36#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 37
30#ifndef _WIN32 38#ifndef _WIN32
31# include <sys/types.h> 39# include <sys/types.h>
32# include <sys/socket.h> 40# include <sys/socket.h>
33# include <netinet/in.h> 41# include <netinet/in.h>
34# include <netinet/tcp.h> 42# include <netinet/tcp.h>
35# include <inttypes.h> 43# 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 44#endif
44 45
45#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 47
47#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
48 49
49#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
51 52
52#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
54
55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else
58# define PARACHUTE 0
59#endif
60
61static AV *texture_av;
53 62
54static struct 63static struct
55{ 64{
56#define GL_FUNC(ptr,name) ptr name; 65#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 66#include "glfunc.h"
58#undef GL_FUNC 67#undef GL_FUNC
59} gl; 68} gl;
60 69
70static void
61static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 71gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
62{ 72{
63 if (gl.BlendFuncSeparate) 73 if (gl.BlendFuncSeparate)
64 gl.BlendFuncSeparate (sa, da, saa, daa); 74 gl.BlendFuncSeparate (sa, da, saa, daa);
65 else if (gl.BlendFuncSeparateEXT) 75 else if (gl.BlendFuncSeparateEXT)
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 76 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 77 else
68 glBlendFunc (sa, da); 78 glBlendFunc (sa, da);
69} 79}
70 80
81static GLuint
82gen_texture ()
83{
84 GLuint name;
85
86 if (AvFILL (texture_av) >= 0)
87 name = (GLuint)(size_t)av_pop (texture_av);
88 else
89 glGenTextures (1, &name);
90
91 return name;
92}
93
94static void
95del_texture (GLuint name)
96{
97 /* make a half-assed attempt at returning the memory used by the texture */
98 /* textures are frequently being reused by cfplus anyway */
99 /*glBindTexture (GL_TEXTURE_2D, name);*/
100 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
101 av_push (texture_av, (SV *)(size_t)name);
102 glDeleteTextures (1, &name);
103}
104
105#include "texcache.c"
106
107#include "pango-font.c"
108#include "pango-fontmap.c"
109#include "pango-render.c"
110
71typedef Mix_Chunk *CFClient__MixChunk; 111typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 112typedef Mix_Music *CFPlus__MixMusic;
73 113
74typedef PangoFontDescription *CFClient__Font; 114typedef PangoFontDescription *CFPlus__Font;
115
116static int
117shape_attr_p (PangoLayoutRun *run)
118{
119 GSList *attrs = run->item->analysis.extra_attrs;
120
121 while (attrs)
122 {
123 PangoAttribute *attr = attrs->data;
124
125 if (attr->klass->type == PANGO_ATTR_SHAPE)
126 return 1;
127
128 attrs = attrs->next;
129 }
130
131 return 0;
132}
75 133
76typedef struct cf_layout { 134typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 135 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 136 float r, g, b, a; // default color for rgba mode
80 int base_height; 137 int base_height;
81 CFClient__Font font; 138 CFPlus__Font font;
82} *CFClient__Layout; 139} *CFPlus__Layout;
83 140
84static CFClient__Font default_font; 141static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 142static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 143static PangoFontMap *opengl_fontmap;
87 144
88static void 145static void
89substitute_func (FcPattern *pattern, gpointer data) 146substitute_func (FcPattern *pattern, gpointer data)
90{ 147{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 148 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 149#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 150 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 151#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 152 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 153}
101 154
102static void 155static void
103layout_update_font (CFClient__Layout self) 156layout_update_font (CFPlus__Layout self)
104{ 157{
105 /* use a random scale factor to account for unknown descenders, 0.8 works 158 /* use a random scale factor to account for unknown descenders, 0.8 works
106 * reasonably well with bitstream vera 159 * reasonably well with bitstream vera
107 */ 160 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 161 PangoFontDescription *font = self->font ? self->font : default_font;
112 165
113 pango_layout_set_font_description (self->pl, font); 166 pango_layout_set_font_description (self->pl, font);
114} 167}
115 168
116static void 169static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 170layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 171{
172 PangoRectangle rect;
173
174 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 175 pango_layout_get_extents (self->pl, 0, &rect);
120 176
121 if (!*w) *w = 1; 177 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 178 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 179
124 *w = (*w + 3) & ~3; 180 if (!rect.width) rect.width = 1;
125} 181 if (!rect.height) rect.height = 1;
126 182
183 *w = rect.width;
184 *h = rect.height;
185}
186
187typedef uint16_t tileid;
127typedef uint16_t mapface; 188typedef uint16_t faceid;
128 189
129typedef struct { 190typedef struct {
130 GLint name; 191 int name;
131 int w, h; 192 int w, h;
132 float s, t; 193 float s, t;
133 uint8_t r, g, b, a; 194 uint8_t r, g, b, a;
195 tileid smoothtile;
196 uint8_t smoothlevel;
134} maptex; 197} maptex;
135 198
136typedef struct { 199typedef struct {
200 uint32_t player;
201 tileid tile[3];
137 int16_t darkness; 202 uint16_t darkness;
138 mapface face[3]; 203 uint8_t stat_width, stat_hp, flags, smoothmax;
139} mapcell; 204} mapcell;
140 205
141typedef struct { 206typedef struct {
142 int32_t c0, c1; 207 int32_t c0, c1;
143 mapcell *col; 208 mapcell *col;
144} maprow; 209} maprow;
145 210
146typedef struct map { 211typedef struct map {
147 int x, y, w, h; 212 int x, y, w, h;
148 int ox, oy; /* offset to virtual global coordinate system */ 213 int ox, oy; /* offset to virtual global coordinate system */
149 int faces; 214 int faces; tileid *face2tile; // [faceid]
150 mapface *face; 215 int texs; maptex *tex; // [tileid]
151
152 int texs;
153 maptex *tex;
154 216
155 int32_t rows; 217 int32_t rows;
156 maprow *row; 218 maprow *row;
157} *CFClient__Map; 219} *CFPlus__Map;
158 220
159static char * 221static char *
160prepend (char *ptr, int sze, int inc) 222prepend (char *ptr, int sze, int inc)
161{ 223{
162 char *p; 224 char *p;
179} 241}
180 242
181#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 243#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 244#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183 245
246static void
247need_facenum (struct map *self, faceid face)
248{
249 while (self->faces <= face)
250 {
251 Append (tileid, self->face2tile, self->faces, self->faces);
252 self->faces *= 2;
253 }
254}
255
256static void
257need_texid (struct map *self, int texid)
258{
259 while (self->texs <= texid)
260 {
261 Append (maptex, self->tex, self->texs, self->texs);
262 self->texs *= 2;
263 }
264}
265
184static maprow * 266static maprow *
185map_get_row (CFClient__Map self, int y) 267map_get_row (CFPlus__Map self, int y)
186{ 268{
187 if (0 > y) 269 if (0 > y)
188 { 270 {
189 int extend = - y + MAP_EXTEND_Y; 271 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 272 Prepend (maprow, self->row, self->rows, extend);
228 310
229 return row->col + (x - row->c0); 311 return row->col + (x - row->c0);
230} 312}
231 313
232static mapcell * 314static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 315map_get_cell (CFPlus__Map self, int x, int y)
234{ 316{
235 return row_get_cell (map_get_row (self, y), x); 317 return row_get_cell (map_get_row (self, y), x);
236} 318}
237 319
238static void 320static void
239map_clear (CFClient__Map self) 321map_clear (CFPlus__Map self)
240{ 322{
241 int r; 323 int r;
242 324
243 for (r = 0; r < self->rows; r++) 325 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 326 Safefree (self->row[r].col);
252 self->row = 0; 334 self->row = 0;
253 self->rows = 0; 335 self->rows = 0;
254} 336}
255 337
256static void 338static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 339map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 340{
259 int x, y; 341 int x, y;
260 maprow *row; 342 maprow *row;
343 mapcell *cell;
261 344
262 for (y = y0; y < y0 + h; y++) 345 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 346 if (y >= 0)
264 { 347 {
265 if (y >= self->rows) 348 if (y >= self->rows)
271 if (x >= row->c0) 354 if (x >= row->c0)
272 { 355 {
273 if (x >= row->c1) 356 if (x >= row->c1)
274 break; 357 break;
275 358
276 row->col[x - row->c0].darkness = -1; 359 cell = row->col + x - row->c0;
360
361 cell->darkness = 0;
362 cell->stat_hp = 0;
363 cell->flags = 0;
364 cell->player = 0;
277 } 365 }
278 } 366 }
367}
368
369typedef struct {
370 tileid tile;
371 uint8_t x, y, level;
372} smooth_key;
373
374static void
375smooth_or_bits (HV *hv, smooth_key *key, IV bits)
376{
377 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
378
379 if (SvIOK (*sv))
380 SvIV_set (*sv, SvIVX (*sv) | bits);
381 else
382 sv_setiv (*sv, bits);
279} 383}
280 384
281static void 385static void
282music_finished (void) 386music_finished (void)
283{ 387{
302 ev.data2 = 0; 406 ev.data2 = 0;
303 407
304 SDL_PushEvent ((SDL_Event *)&ev); 408 SDL_PushEvent ((SDL_Event *)&ev);
305} 409}
306 410
411static unsigned int
412minpot (unsigned int n)
413{
414 if (!n)
415 return 0;
416
417 --n;
418
419 n |= n >> 1;
420 n |= n >> 2;
421 n |= n >> 4;
422 n |= n >> 8;
423 n |= n >> 16;
424
425 return n + 1;
426}
427
428/* SDL should provide this, really. */
429#define SDLK_MODIFIER_MIN 300
430#define SDLK_MODIFIER_MAX 314
431
307MODULE = CFClient PACKAGE = CFClient 432MODULE = CFPlus PACKAGE = CFPlus
308 433
309PROTOTYPES: ENABLE 434PROTOTYPES: ENABLE
310 435
311BOOT: 436BOOT:
312{ 437{
313 HV *stash = gv_stashpv ("CFClient", 1); 438 HV *stash = gv_stashpv ("CFPlus", 1);
314 static const struct { 439 static const struct {
315 const char *name; 440 const char *name;
316 IV iv; 441 IV iv;
317 } *civ, const_iv[] = { 442 } *civ, const_iv[] = {
318# define const_iv(name) { # name, (IV)name } 443# define const_iv(name) { # name, (IV)name }
444 const_iv (SDLK_MODIFIER_MIN),
445 const_iv (SDLK_MODIFIER_MAX),
446
319 const_iv (SDL_ACTIVEEVENT), 447 const_iv (SDL_ACTIVEEVENT),
320 const_iv (SDL_KEYDOWN), 448 const_iv (SDL_KEYDOWN),
321 const_iv (SDL_KEYUP), 449 const_iv (SDL_KEYUP),
322 const_iv (SDL_MOUSEMOTION), 450 const_iv (SDL_MOUSEMOTION),
323 const_iv (SDL_MOUSEBUTTONDOWN), 451 const_iv (SDL_MOUSEBUTTONDOWN),
332 const_iv (SDL_EVENT_RESERVEDA), 460 const_iv (SDL_EVENT_RESERVEDA),
333 const_iv (SDL_EVENT_RESERVEDB), 461 const_iv (SDL_EVENT_RESERVEDB),
334 const_iv (SDL_VIDEORESIZE), 462 const_iv (SDL_VIDEORESIZE),
335 const_iv (SDL_VIDEOEXPOSE), 463 const_iv (SDL_VIDEOEXPOSE),
336 const_iv (SDL_USEREVENT), 464 const_iv (SDL_USEREVENT),
465
466 const_iv (SDL_APPINPUTFOCUS),
467 const_iv (SDL_APPMOUSEFOCUS),
468 const_iv (SDL_APPACTIVE),
469
337 const_iv (SDLK_KP0), 470 const_iv (SDLK_KP0),
338 const_iv (SDLK_KP1), 471 const_iv (SDLK_KP1),
339 const_iv (SDLK_KP2), 472 const_iv (SDLK_KP2),
340 const_iv (SDLK_KP3), 473 const_iv (SDLK_KP3),
341 const_iv (SDLK_KP4), 474 const_iv (SDLK_KP4),
396 const_iv (SDLK_BREAK), 529 const_iv (SDLK_BREAK),
397 const_iv (SDLK_MENU), 530 const_iv (SDLK_MENU),
398 const_iv (SDLK_POWER), 531 const_iv (SDLK_POWER),
399 const_iv (SDLK_EURO), 532 const_iv (SDLK_EURO),
400 const_iv (SDLK_UNDO), 533 const_iv (SDLK_UNDO),
534
401 const_iv (KMOD_NONE), 535 const_iv (KMOD_NONE),
536 const_iv (KMOD_SHIFT),
402 const_iv (KMOD_LSHIFT), 537 const_iv (KMOD_LSHIFT),
403 const_iv (KMOD_RSHIFT), 538 const_iv (KMOD_RSHIFT),
539 const_iv (KMOD_CTRL),
404 const_iv (KMOD_LCTRL), 540 const_iv (KMOD_LCTRL),
405 const_iv (KMOD_RCTRL), 541 const_iv (KMOD_RCTRL),
542 const_iv (KMOD_ALT),
406 const_iv (KMOD_LALT), 543 const_iv (KMOD_LALT),
407 const_iv (KMOD_RALT), 544 const_iv (KMOD_RALT),
545 const_iv (KMOD_META),
408 const_iv (KMOD_LMETA), 546 const_iv (KMOD_LMETA),
409 const_iv (KMOD_RMETA), 547 const_iv (KMOD_RMETA),
410 const_iv (KMOD_NUM), 548 const_iv (KMOD_NUM),
411 const_iv (KMOD_CAPS), 549 const_iv (KMOD_CAPS),
412 const_iv (KMOD_MODE), 550 const_iv (KMOD_MODE),
413 const_iv (KMOD_CTRL),
414 const_iv (KMOD_SHIFT),
415 const_iv (KMOD_ALT),
416 const_iv (KMOD_META)
417# undef const_iv 551# undef const_iv
418 }; 552 };
419 553
420 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 554 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
421 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 555 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
556
557 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
558 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
422} 559}
560
561void
562weaken (SV *rv)
563 PROTOTYPE: $
564 CODE:
565 sv_rvweaken (rv);
566
567int
568in_destruct ()
569 CODE:
570 RETVAL = PL_main_cv == Nullcv;
571 OUTPUT:
572 RETVAL
573
574NV floor (NV x)
575
576NV ceil (NV x)
423 577
424void 578void
425pango_init () 579pango_init ()
426 CODE: 580 CODE:
427 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{ 581{
429 {
430 ft2_fontmap = pango_ft2_font_map_new (); 582 opengl_fontmap = pango_opengl_font_map_new ();
431 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 583 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
432 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 584 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433 }
434 {
435 cairo_font_options_t *fopt = cairo_font_options_create ();
436 cairo_fontmap = pango_cairo_font_map_get_default ();
437 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438#ifdef _WIN32
439 // cairo looks like shit eaten twice on windows
440 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441#else
442 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443#endif
444 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446 pango_cairo_context_set_font_options (cairo_context, fopt);
447 cairo_font_options_destroy (fopt);
448 }
449} 585}
450 586
451int 587int
452SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 588SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
453 589
454void 590void
455SDL_Quit () 591SDL_Quit ()
456 592
457void 593void
464 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 600 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 601 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 602 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467 603
468 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 604 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 605 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470 606
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 607 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 608 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 609 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 610 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475 611
476 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 612 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
613#if SDL_VERSION_ATLEAST(1,2,10)
614 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
615 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
616#endif
477 617
478 SDL_EnableUNICODE (1); 618 SDL_EnableUNICODE (1);
479 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 619 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480 620
481 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 621 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
501 RETVAL = !!SDL_SetVideoMode ( 641 RETVAL = !!SDL_SetVideoMode (
502 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 642 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
503 ); 643 );
504 if (RETVAL) 644 if (RETVAL)
505 { 645 {
646 av_clear (texture_av);
647
506 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 648 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
507# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 649# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
508# include "glfunc.h" 650# include "glfunc.h"
509# undef GL_FUNC 651# undef GL_FUNC
652
510 } 653 }
511 OUTPUT: 654 OUTPUT:
512 RETVAL 655 RETVAL
513 656
514void 657void
533 case SDL_KEYDOWN: 676 case SDL_KEYDOWN:
534 case SDL_KEYUP: 677 case SDL_KEYUP:
535 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 678 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
536 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 679 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
537 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 680 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
681 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
538 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 682 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
539 break; 683 break;
540 684
541 case SDL_ACTIVEEVENT: 685 case SDL_ACTIVEEVENT:
542 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 686 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
568 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 712 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 713 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570 break; 714 break;
571 } 715 }
572 716
573 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 717 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574 } 718 }
575} 719}
576 720
577int 721int
578Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 722Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
587Mix_AllocateChannels (int numchans = -1) 731Mix_AllocateChannels (int numchans = -1)
588 732
589void 733void
590lowdelay (int fd, int val = 1) 734lowdelay (int fd, int val = 1)
591 CODE: 735 CODE:
736 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
737
738void
739win32_proxy_info ()
740 PPCODE:
741{
592#ifndef _WIN32 742#ifdef _WIN32
593 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 743 char buffer[2048];
744 DWORD buflen;
745
746 EXTEND (SP, 3);
747
748 buflen = sizeof (buffer);
749 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
750 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
751 {
752 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
753
754 buflen = sizeof (buffer);
755 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
756 {
757 PUSHs (newSVpv (buffer, 0));
758
759 buflen = sizeof (buffer);
760 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
761 PUSHs (newSVpv (buffer, 0));
762 }
763 }
594#endif 764#endif
765}
595 766
596void 767void
597add_font (char *file) 768add_font (char *file)
598 CODE: 769 CODE:
599 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 770 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600#ifdef _WIN32
601 // cairo... sigh... requires win2000
602 AddFontResourceEx (file, FR_PRIVATE, 0);
603#endif
604 771
605void 772void
606load_image_inline (SV *image_) 773load_image_inline (SV *image_)
607 ALIAS: 774 ALIAS:
608 load_image_file = 1 775 load_image_file = 1
650 817
651 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 818 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652 819
653 assert (surface2->pitch == surface2->w * 4); 820 assert (surface2->pitch == surface2->w * 4);
654 821
822 SDL_LockSurface (surface2);
655 EXTEND (SP, 5); 823 EXTEND (SP, 6);
656 PUSHs (sv_2mortal (newSViv (surface2->w))); 824 PUSHs (sv_2mortal (newSViv (surface2->w)));
657 PUSHs (sv_2mortal (newSViv (surface2->h))); 825 PUSHs (sv_2mortal (newSViv (surface2->h)));
658 SDL_LockSurface (surface2);
659 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 826 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660 SDL_UnlockSurface (surface2);
661 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 827 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
662 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 828 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 829 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
830 SDL_UnlockSurface (surface2);
664 831
665 SDL_FreeSurface (surface); 832 SDL_FreeSurface (surface);
666 SDL_FreeSurface (surface2); 833 SDL_FreeSurface (surface2);
667} 834}
668 835
704 CODE: 871 CODE:
705 fprintf (stderr, "FATAL: %s\n", message); 872 fprintf (stderr, "FATAL: %s\n", message);
706#ifdef _WIN32 873#ifdef _WIN32
707 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 874 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
708#endif 875#endif
709 _Exit (1); 876 _exit (1);
710 877
711void 878void
712_exit (int retval) 879_exit (int retval = 0)
713 CODE: 880 CODE:
881#ifdef WIN32
882 ExitThread (retval); // unclean, please beam me up
883#else
714 _Exit (retval); 884 _exit (retval);
885#endif
715 886
716MODULE = CFClient PACKAGE = CFClient::Font 887MODULE = CFPlus PACKAGE = CFPlus::Font
717 888
718CFClient::Font 889CFPlus::Font
719new_from_file (SV *class, char *path, int id = 0) 890new_from_file (SV *class, char *path, int id = 0)
720 CODE: 891 CODE:
721{ 892{
722 int count; 893 int count;
723 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 894 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
726} 897}
727 OUTPUT: 898 OUTPUT:
728 RETVAL 899 RETVAL
729 900
730void 901void
731DESTROY (CFClient::Font self) 902DESTROY (CFPlus::Font self)
732 CODE: 903 CODE:
733 pango_font_description_free (self); 904 pango_font_description_free (self);
734 905
735void 906void
736make_default (CFClient::Font self) 907make_default (CFPlus::Font self)
737 CODE: 908 CODE:
738 default_font = self; 909 default_font = self;
739 910
740MODULE = CFClient PACKAGE = CFClient::Layout 911MODULE = CFPlus PACKAGE = CFPlus::Layout
741 912
742CFClient::Layout 913void
743new (SV *class, int rgba = 0) 914reset_glyph_cache ()
915 CODE:
916 tc_clear ();
917
918CFPlus::Layout
919new (SV *class)
744 CODE: 920 CODE:
745 New (0, RETVAL, 1, struct cf_layout); 921 New (0, RETVAL, 1, struct cf_layout);
746 922
747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 923 RETVAL->pl = pango_layout_new (opengl_context);
748 RETVAL->rgba = rgba;
749 RETVAL->r = 1.; 924 RETVAL->r = 1.;
750 RETVAL->g = 1.; 925 RETVAL->g = 1.;
751 RETVAL->b = 1.; 926 RETVAL->b = 1.;
752 RETVAL->a = 1.; 927 RETVAL->a = 1.;
753 RETVAL->base_height = MIN_FONT_HEIGHT; 928 RETVAL->base_height = MIN_FONT_HEIGHT;
757 layout_update_font (RETVAL); 932 layout_update_font (RETVAL);
758 OUTPUT: 933 OUTPUT:
759 RETVAL 934 RETVAL
760 935
761void 936void
762DESTROY (CFClient::Layout self) 937DESTROY (CFPlus::Layout self)
763 CODE: 938 CODE:
764 g_object_unref (self->pl); 939 g_object_unref (self->pl);
765 Safefree (self); 940 Safefree (self);
766 941
942void
943set_text (CFPlus::Layout self, SV *text_)
944 CODE:
945{
946 STRLEN textlen;
947 char *text = SvPVutf8 (text_, textlen);
948
949 pango_layout_set_text (self->pl, text, textlen);
950}
951
952void
953set_markup (CFPlus::Layout self, SV *text_)
954 CODE:
955{
956 STRLEN textlen;
957 char *text = SvPVutf8 (text_, textlen);
958
959 pango_layout_set_markup (self->pl, text, textlen);
960}
961
962void
963set_shapes (CFPlus::Layout self, ...)
964 CODE:
965{
966 PangoAttrList *attrs = 0;
967 const char *text = pango_layout_get_text (self->pl);
968 const char *pos = text;
969 int arg = 4;
970
971 while (arg < items && (pos = strstr (pos, OBJ_STR)))
972 {
973 PangoRectangle inkrect, rect;
974 PangoAttribute *attr;
975
976 int x = SvIV (ST (arg - 3));
977 int y = SvIV (ST (arg - 2));
978 int w = SvIV (ST (arg - 1));
979 int h = SvIV (ST (arg ));
980
981 inkrect.x = 0;
982 inkrect.y = 0;
983 inkrect.width = 0;
984 inkrect.height = 0;
985
986 rect.x = x * PANGO_SCALE;
987 rect.y = y * PANGO_SCALE;
988 rect.width = w * PANGO_SCALE;
989 rect.height = h * PANGO_SCALE;
990
991 if (!attrs)
992 attrs = pango_layout_get_attributes (self->pl);
993
994 attr = pango_attr_shape_new (&inkrect, &rect);
995 attr->start_index = pos - text;
996 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
997 pango_attr_list_insert (attrs, attr);
998
999 arg += 4;
1000 pos += sizeof (OBJ_STR) - 1;
1001 }
1002
1003 if (attrs)
1004 pango_layout_set_attributes (self->pl, attrs);
1005}
1006
1007void
1008get_shapes (CFPlus::Layout self)
1009 PPCODE:
1010{
1011 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1012
1013 do
1014 {
1015 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1016
1017 if (run && shape_attr_p (run))
1018 {
1019 PangoRectangle extents;
1020 pango_layout_iter_get_run_extents (iter, 0, &extents);
1021
1022 EXTEND (SP, 2);
1023 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1024 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1025 }
1026 }
1027 while (pango_layout_iter_next_run (iter));
1028
1029 pango_layout_iter_free (iter);
1030}
1031
767int 1032int
768is_rgba (CFClient::Layout self) 1033has_wrapped (CFPlus::Layout self)
769 CODE: 1034 CODE:
770 RETVAL = self->rgba; 1035{
1036 int lines = 1;
1037 const char *text = pango_layout_get_text (self->pl);
1038
1039 while (*text)
1040 lines += *text++ == '\n';
1041
1042 RETVAL = lines < pango_layout_get_line_count (self->pl);
1043}
771 OUTPUT: 1044 OUTPUT:
772 RETVAL 1045 RETVAL
773 1046
774void
775set_text (CFClient::Layout self, SV *text_)
776 CODE:
777{
778 STRLEN textlen;
779 char *text = SvPVutf8 (text_, textlen);
780
781 pango_layout_set_text (self->pl, text, textlen);
782}
783
784void
785set_markup (CFClient::Layout self, SV *text_)
786 CODE:
787{
788 STRLEN textlen;
789 char *text = SvPVutf8 (text_, textlen);
790
791 pango_layout_set_markup (self->pl, text, textlen);
792}
793
794SV * 1047SV *
795get_text (CFClient::Layout self) 1048get_text (CFPlus::Layout self)
796 CODE: 1049 CODE:
797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1050 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798 sv_utf8_decode (RETVAL); 1051 sv_utf8_decode (RETVAL);
799 OUTPUT: 1052 OUTPUT:
800 RETVAL 1053 RETVAL
801 1054
802void 1055void
803set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1056set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
804 CODE: 1057 CODE:
805 self->r = r; 1058 self->r = r;
806 self->g = g; 1059 self->g = g;
807 self->b = b; 1060 self->b = b;
808 self->a = a; 1061 self->a = a;
809 1062
810void 1063void
811set_font (CFClient::Layout self, CFClient::Font font = 0) 1064set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812 CODE: 1065 CODE:
813 if (self->font != font) 1066 if (self->font != font)
814 { 1067 {
815 self->font = font; 1068 self->font = font;
816 layout_update_font (self); 1069 layout_update_font (self);
817 } 1070 }
818 1071
819void 1072void
820set_height (CFClient::Layout self, int base_height) 1073set_height (CFPlus::Layout self, int base_height)
821 CODE: 1074 CODE:
822 if (self->base_height != base_height) 1075 if (self->base_height != base_height)
823 { 1076 {
824 self->base_height = base_height; 1077 self->base_height = base_height;
825 layout_update_font (self); 1078 layout_update_font (self);
826 } 1079 }
827 1080
828void 1081void
829set_width (CFClient::Layout self, int max_width = -1) 1082set_width (CFPlus::Layout self, int max_width = -1)
830 CODE: 1083 CODE:
831 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1084 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
832 1085
833void 1086void
834set_indent (CFClient::Layout self, int indent) 1087set_indent (CFPlus::Layout self, int indent)
835 CODE: 1088 CODE:
836 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1089 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837 1090
838void 1091void
839set_spacing (CFClient::Layout self, int spacing) 1092set_spacing (CFPlus::Layout self, int spacing)
840 CODE: 1093 CODE:
841 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1094 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842 1095
843void 1096void
844set_ellipsise (CFClient::Layout self, int ellipsise) 1097set_ellipsise (CFPlus::Layout self, int ellipsise)
845 CODE: 1098 CODE:
846 pango_layout_set_ellipsize (self->pl, 1099 pango_layout_set_ellipsize (self->pl,
847 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1100 ellipsise == 1 ? PANGO_ELLIPSIZE_START
848 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1101 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1102 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
850 : PANGO_ELLIPSIZE_NONE 1103 : PANGO_ELLIPSIZE_NONE
851 ); 1104 );
852 1105
853void 1106void
854set_single_paragraph_mode (CFClient::Layout self, int spm) 1107set_single_paragraph_mode (CFPlus::Layout self, int spm)
855 CODE: 1108 CODE:
856 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1109 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857 1110
858void 1111void
859size (CFClient::Layout self) 1112size (CFPlus::Layout self)
860 PPCODE: 1113 PPCODE:
861{ 1114{
862 int w, h; 1115 int w, h;
863 1116
864 layout_get_pixel_size (self, &w, &h); 1117 layout_get_pixel_size (self, &w, &h);
867 PUSHs (sv_2mortal (newSViv (w))); 1120 PUSHs (sv_2mortal (newSViv (w)));
868 PUSHs (sv_2mortal (newSViv (h))); 1121 PUSHs (sv_2mortal (newSViv (h)));
869} 1122}
870 1123
871int 1124int
1125descent (CFPlus::Layout self)
1126 CODE:
1127{
1128 PangoRectangle rect;
1129 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1130 pango_layout_line_get_pixel_extents (line, 0, &rect);
1131 RETVAL = PANGO_DESCENT (rect);
1132}
1133 OUTPUT:
1134 RETVAL
1135
1136int
872xy_to_index (CFClient::Layout self, int x, int y) 1137xy_to_index (CFPlus::Layout self, int x, int y)
873 CODE: 1138 CODE:
874{ 1139{
875 int index, trailing; 1140 int index, trailing;
876 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1141 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
877 RETVAL = index; 1142 RETVAL = index + trailing;
878} 1143}
879 OUTPUT: 1144 OUTPUT:
880 RETVAL 1145 RETVAL
881 1146
882void 1147void
883cursor_pos (CFClient::Layout self, int index) 1148cursor_pos (CFPlus::Layout self, int index)
884 PPCODE: 1149 PPCODE:
885{ 1150{
886 PangoRectangle strong_pos; 1151 PangoRectangle strong_pos;
887 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1152 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888 1153
891 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1156 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1157 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893} 1158}
894 1159
895void 1160void
896render (CFClient::Layout self) 1161index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
897 PPCODE: 1162 PPCODE:
898{ 1163{
899 SV *retval; 1164 int line, x;
900 int w, h;
901 1165
902 layout_get_pixel_size (self, &w, &h); 1166 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1167 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
903 1168
904 if (self->rgba)
905 {
906 cairo_surface_t *surface;
907 cairo_t *cairo;
908
909 retval = newSV (w * h * 4);
910 SvPOK_only (retval);
911 SvCUR_set (retval, w * h * 4);
912
913 memset (SvPVX (retval), 0, w * h * 4);
914
915 surface = cairo_image_surface_create_for_data (
916 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
917 cairo = cairo_create (surface);
918 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920 pango_cairo_show_layout (cairo, self->pl);
921
922 cairo_destroy (cairo);
923 cairo_surface_destroy (surface);
924
925 // what a mess, and its premultiplied, too :(
926 {
927 uint32_t *p = (uint32_t *)SvPVX (retval);
928 uint32_t *e = p + w * h;
929
930 while (p < e)
931 {
932 uint32_t rgba = *p;
933 rgba = (rgba >> 24) | (rgba << 8);
934#if 0
935#ifdef _WIN32
936 {//D
937 uint8_t r = rgba >> 24;
938 uint8_t g = rgba >> 16;
939 uint8_t b = rgba >> 8;
940 uint8_t a = rgba >> 0;
941
942 rgba = (rgba & 0xffffff00) | a;
943 }
944#endif
945#endif
946 rgba = SDL_SwapBE32 (rgba);
947 *p++ = rgba;
948 }
949 }
950
951 EXTEND (SP, 5); 1169 EXTEND (SP, 2);
952 PUSHs (sv_2mortal (newSViv (w))); 1170 PUSHs (sv_2mortal (newSViv (line - 1)));
1171 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1172}
1173
1174void
1175line_x_to_index (CFPlus::Layout self, int line, int x)
1176 PPCODE:
1177{
1178 PangoLayoutLine *lp;
1179 int index, trailing;
1180
1181 if (line < 0)
1182 XSRETURN_EMPTY;
1183
1184 if (!(lp = pango_layout_get_line (self->pl, line)))
1185 XSRETURN_EMPTY; /* do better */
1186
1187 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1188
1189 EXTEND (SP, 2);
1190 if (GIMME_V == G_SCALAR)
953 PUSHs (sv_2mortal (newSViv (h))); 1191 PUSHs (sv_2mortal (newSViv (index + trailing)));
954 PUSHs (sv_2mortal (retval));
955 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957 }
958 else 1192 else
959 { 1193 {
960 FT_Bitmap bitmap;
961
962 retval = newSV (w * h);
963 SvPOK_only (retval);
964 SvCUR_set (retval, w * h);
965
966 bitmap.rows = h;
967 bitmap.width = w;
968 bitmap.pitch = w;
969 bitmap.buffer = (unsigned char*)SvPVX (retval);
970 bitmap.num_grays = 256;
971 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973 memset (bitmap.buffer, 0, w * h);
974
975 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977 EXTEND (SP, 5);
978 PUSHs (sv_2mortal (newSViv (w))); 1194 PUSHs (sv_2mortal (newSViv (index)));
979 PUSHs (sv_2mortal (newSViv (h))); 1195 PUSHs (sv_2mortal (newSViv (trailing)));
980 PUSHs (sv_2mortal (retval));
981 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983 } 1196 }
984} 1197}
985 1198
1199void
1200render (CFPlus::Layout self, float x, float y, int flags = 0)
1201 PPCODE:
1202 pango_opengl_render_layout_subpixel (
1203 self->pl,
1204 x * PANGO_SCALE, y * PANGO_SCALE,
1205 self->r, self->g, self->b, self->a,
1206 flags
1207 );
1208
986MODULE = CFClient PACKAGE = CFClient::Texture 1209MODULE = CFPlus PACKAGE = CFPlus::Texture
987 1210
988void 1211void
1212pad2pot (SV *data_, SV *w_, SV *h_)
1213 CODE:
1214{
1215 int ow = SvIV (w_);
1216 int oh = SvIV (h_);
1217
1218 if (ow && oh)
1219 {
1220 int nw = minpot (ow);
1221 int nh = minpot (oh);
1222
1223 if (nw != ow || nh != oh)
1224 {
1225 if (SvOK (data_))
1226 {
1227 STRLEN datalen;
1228 char *data = SvPVbyte (data_, datalen);
1229 int bpp = datalen / (ow * oh);
1230 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1231
1232 SvPOK_only (result_);
1233 SvCUR_set (result_, nw * nh * bpp);
1234
1235 memset (SvPVX (result_), 0, nw * nh * bpp);
1236 while (oh--)
1237 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1238
1239 sv_setsv (data_, result_);
1240 }
1241
1242 sv_setiv (w_, nw);
1243 sv_setiv (h_, nh);
1244 }
1245 }
1246}
1247
1248void
989draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1249draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990 PROTOTYPE: $$$;$$ 1250 PROTOTYPE: $$$;$$
991 ALIAS: 1251 ALIAS:
992 draw_quad_alpha = 1 1252 draw_quad_alpha = 1
993 draw_quad_alpha_premultiplied = 2 1253 draw_quad_alpha_premultiplied = 2
994 CODE: 1254 CODE:
1032 glDisable (GL_ALPHA_TEST); 1292 glDisable (GL_ALPHA_TEST);
1033 glDisable (GL_BLEND); 1293 glDisable (GL_BLEND);
1034 } 1294 }
1035} 1295}
1036 1296
1037MODULE = CFClient PACKAGE = CFClient::Map 1297MODULE = CFPlus PACKAGE = CFPlus::Map
1038 1298
1039CFClient::Map 1299CFPlus::Map
1040new (SV *class, int map_width, int map_height) 1300new (SV *class)
1041 CODE: 1301 CODE:
1042 New (0, RETVAL, 1, struct map); 1302 New (0, RETVAL, 1, struct map);
1043 RETVAL->x = 0; 1303 RETVAL->x = 0;
1044 RETVAL->y = 0; 1304 RETVAL->y = 0;
1045 RETVAL->w = map_width; 1305 RETVAL->w = 0;
1046 RETVAL->h = map_height; 1306 RETVAL->h = 0;
1047 RETVAL->ox = 0; 1307 RETVAL->ox = 0;
1048 RETVAL->oy = 0; 1308 RETVAL->oy = 0;
1049 RETVAL->faces = 8192; 1309 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1050 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1310 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1051 RETVAL->texs = 8192;
1052 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1053 RETVAL->rows = 0; 1311 RETVAL->rows = 0;
1054 RETVAL->row = 0; 1312 RETVAL->row = 0;
1055 OUTPUT: 1313 OUTPUT:
1056 RETVAL 1314 RETVAL
1057 1315
1058void 1316void
1059DESTROY (CFClient::Map self) 1317DESTROY (CFPlus::Map self)
1060 CODE: 1318 CODE:
1061{ 1319{
1062 map_clear (self); 1320 map_clear (self);
1063 Safefree (self->face); 1321 Safefree (self->face2tile);
1064 Safefree (self->tex); 1322 Safefree (self->tex);
1065 Safefree (self); 1323 Safefree (self);
1066} 1324}
1067 1325
1068void 1326void
1327resize (CFPlus::Map self, int map_width, int map_height)
1328 CODE:
1329 self->w = map_width;
1330 self->h = map_height;
1331
1332void
1069clear (CFClient::Map self) 1333clear (CFPlus::Map self)
1070 CODE: 1334 CODE:
1071 map_clear (self); 1335 map_clear (self);
1072 1336
1073void 1337void
1074set_face (CFClient::Map self, int face, int texid) 1338set_tileid (CFPlus::Map self, int face, int tile)
1075 CODE: 1339 CODE:
1076{ 1340{
1077 while (self->faces <= face) 1341 need_facenum (self, face); self->face2tile [face] = tile;
1078 { 1342 need_texid (self, tile);
1079 Append (mapface, self->face, self->faces, self->faces);
1080 self->faces *= 2;
1081 }
1082
1083 self->face [face] = texid;
1084} 1343}
1085 1344
1086void 1345void
1346set_smooth (CFPlus::Map self, int face, int smooth, int level)
1347 CODE:
1348{
1349 tileid texid;
1350 maptex *tex;
1351
1352 if (face < 0 || face >= self->faces)
1353 return;
1354
1355 if (smooth < 0 || smooth >= self->faces)
1356 return;
1357
1358 texid = self->face2tile [face];
1359
1360 if (!texid)
1361 return;
1362
1363 tex = self->tex + texid;
1364 tex->smoothtile = self->face2tile [smooth];
1365 tex->smoothlevel = level;
1366}
1367
1368void
1087set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1369set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1088 CODE: 1370 CODE:
1089{ 1371{
1090 while (self->texs <= texid) 1372 need_texid (self, texid);
1091 {
1092 Append (maptex, self->tex, self->texs, self->texs);
1093 self->texs *= 2;
1094 }
1095 1373
1096 { 1374 {
1097 maptex *tex = self->tex + texid; 1375 maptex *tex = self->tex + texid;
1098 1376
1099 tex->name = name; 1377 tex->name = name;
1116 // from transparent color bleeding and ugly wrapping effects. 1394 // from transparent color bleeding and ugly wrapping effects.
1117 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1395 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118} 1396}
1119 1397
1120int 1398int
1121ox (CFClient::Map self) 1399ox (CFPlus::Map self)
1122 ALIAS: 1400 ALIAS:
1123 oy = 1 1401 oy = 1
1124 x = 2 1402 x = 2
1125 y = 3 1403 y = 3
1126 w = 4 1404 w = 4
1137 } 1415 }
1138 OUTPUT: 1416 OUTPUT:
1139 RETVAL 1417 RETVAL
1140 1418
1141void 1419void
1142scroll (CFClient::Map self, int dx, int dy) 1420scroll (CFPlus::Map self, int dx, int dy)
1143 CODE: 1421 CODE:
1144{ 1422{
1145 if (dx > 0) 1423 if (dx > 0)
1146 map_blank (self, self->x, self->y, dx - 1, self->h); 1424 map_blank (self, self->x, self->y, dx, self->h);
1147 else if (dx < 0) 1425 else if (dx < 0)
1148 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1426 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1149 1427
1150 if (dy > 0) 1428 if (dy > 0)
1151 map_blank (self, self->x, self->y, self->w, dy - 1); 1429 map_blank (self, self->x, self->y, self->w, dy);
1152 else if (dy < 0) 1430 else if (dy < 0)
1153 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1431 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1154 1432
1155 self->ox += dx; self->x += dx; 1433 self->ox += dx; self->x += dx;
1156 self->oy += dy; self->y += dy; 1434 self->oy += dy; self->y += dy;
1157 1435
1158 while (self->y < 0) 1436 while (self->y < 0)
1163 self->y += MAP_EXTEND_Y; 1441 self->y += MAP_EXTEND_Y;
1164 } 1442 }
1165} 1443}
1166 1444
1167void 1445void
1168map1a_update (CFClient::Map self, SV *data_) 1446map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169 CODE: 1447 CODE:
1170{ 1448{
1171 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1449 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172 uint8_t *data_end = (uint8_t *)SvEND (data_); 1450 uint8_t *data_end = (uint8_t *)SvEND (data_);
1173 mapcell *cell; 1451 mapcell *cell;
1174 int x, y, flags; 1452 int x, y, flags;
1175 1453
1176 while (data < data_end) 1454 while (data < data_end - 1)
1177 { 1455 {
1178 flags = (data [0] << 8) + data [1]; data += 2; 1456 flags = (data [0] << 8) + data [1]; data += 2;
1179 1457
1180 x = ((flags >> 10) & 63) + self->x; 1458 x = self->x + ((flags >> 10) & 63);
1181 y = ((flags >> 4) & 63) + self->y; 1459 y = self->y + ((flags >> 4) & 63);
1182 1460
1183 cell = map_get_cell (self, x, y); 1461 cell = map_get_cell (self, x, y);
1184 1462
1185 if (flags & 15) 1463 if (flags & 15)
1186 { 1464 {
1187 if (cell->darkness < 0) 1465 if (!cell->darkness)
1188 { 1466 {
1467 memset (cell, 0, sizeof (*cell));
1189 cell->darkness = 0; 1468 cell->darkness = 256;
1190 cell->face [0] = 0;
1191 cell->face [1] = 0;
1192 cell->face [2] = 0;
1193 } 1469 }
1194 1470
1195 cell->darkness = flags & 8 ? *data++ : 255;
1196
1197 //TODO: don't trust server data to be in-range(!) 1471 //TODO: don't trust server data to be in-range(!)
1472
1473 if (flags & 8)
1474 {
1475 if (extmap)
1476 {
1477 uint8_t ext, cmd;
1478
1479 do
1480 {
1481 ext = *data++;
1482 cmd = ext & 0x3f;
1483
1484 if (cmd < 4)
1485 cell->darkness = 255 - ext * 64 + 1;
1486 else if (cmd == 5) // health
1487 {
1488 cell->stat_width = 1;
1489 cell->stat_hp = *data++;
1490 }
1491 else if (cmd == 6) // monster width
1492 cell->stat_width = *data++ + 1;
1493 else if (cmd == 0x47)
1494 {
1495 if (*data == 4)
1496 ; // decode player count
1497
1498 data += *data + 1;
1499 }
1500 else if (cmd == 8) // cell flags
1501 cell->flags = *data++;
1502 else if (ext & 0x40) // unknown, multibyte => skip
1503 data += *data + 1;
1504 else
1505 data++;
1506 }
1507 while (ext & 0x80);
1508 }
1509 else
1510 cell->darkness = *data++ + 1;
1511 }
1198 1512
1199 if (flags & 4) 1513 if (flags & 4)
1200 { 1514 {
1201 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1515 faceid face = (data [0] << 8) + data [1]; data += 2;
1516 need_facenum (self, face);
1517 cell->tile [0] = self->face2tile [face];
1202 } 1518 }
1203 1519
1204 if (flags & 2) 1520 if (flags & 2)
1205 { 1521 {
1206 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1522 faceid face = (data [0] << 8) + data [1]; data += 2;
1523 need_facenum (self, face);
1524 cell->tile [1] = self->face2tile [face];
1207 } 1525 }
1208 1526
1209 if (flags & 1) 1527 if (flags & 1)
1210 { 1528 {
1211 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1529 faceid face = (data [0] << 8) + data [1]; data += 2;
1530 need_facenum (self, face);
1531 cell->tile [2] = self->face2tile [face];
1212 } 1532 }
1213 } 1533 }
1214 else 1534 else
1215 cell->darkness = -1; 1535 cell->darkness = 0;
1216 } 1536 }
1217} 1537}
1218 1538
1219SV * 1539SV *
1220mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1540mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221 CODE: 1541 CODE:
1222{ 1542{
1223 int x1, x; 1543 int x1, x;
1224 int y1, y; 1544 int y1, y;
1225 int z; 1545 int z;
1246 { 1566 {
1247 mapcell *cell = row->col + (x - row->c0); 1567 mapcell *cell = row->col + (x - row->c0);
1248 1568
1249 for (z = 0; z <= 0; z++) 1569 for (z = 0; z <= 0; z++)
1250 { 1570 {
1251 mapface face = cell->face [z];
1252
1253 if (face)
1254 {
1255 maptex tex = self->tex [face]; 1571 maptex tex = self->tex [cell->tile [z]];
1256 int a0 = 255 - tex.a; 1572 int a0 = 255 - tex.a;
1257 int a1 = tex.a; 1573 int a1 = tex.a;
1258 1574
1259 r = (r * a0 + tex.r * a1) / 255; 1575 r = (r * a0 + tex.r * a1) / 255;
1260 g = (g * a0 + tex.g * a1) / 255; 1576 g = (g * a0 + tex.g * a1) / 255;
1261 b = (b * a0 + tex.b * a1) / 255; 1577 b = (b * a0 + tex.b * a1) / 255;
1262 a = (a * a0 + tex.a * a1) / 255; 1578 a = (a * a0 + tex.a * a1) / 255;
1263 }
1264 } 1579 }
1265 } 1580 }
1266 1581
1267 *map++ = (r ) 1582 *map++ = (r )
1268 | (g << 8) 1583 | (g << 8)
1275} 1590}
1276 OUTPUT: 1591 OUTPUT:
1277 RETVAL 1592 RETVAL
1278 1593
1279void 1594void
1280draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1595draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1281 PPCODE: 1596 CODE:
1282{ 1597{
1283 int vx, vy; 1598 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1599 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1600 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1601 smooth_key skey;
1284 int x, y, z; 1602 int x, y, z;
1285 int last_name; 1603 int last_name;
1286 mapface face; 1604
1605 // thats current max. sorry.
1606 if (sw > 255) sw = 255;
1607 if (sh > 255) sh = 255;
1608
1609 // clear key, in case of extra padding
1610 memset (&skey, 0, sizeof (skey));
1611
1612 glColor4ub (255, 255, 255, 255);
1613
1614 glEnable (GL_BLEND);
1615 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1616 glEnable (GL_TEXTURE_2D);
1617 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1618
1619 glBegin (GL_QUADS);
1620
1621 last_name = 0;
1622
1623 mx += self->x;
1624 my += self->y;
1625
1626 // first pass: determine smooth_max
1627 // rather ugly, if you ask me
1628 // could also be stored inside mapcell and updated on change
1629 memset (smooth_max, 0, sizeof (smooth_max));
1630
1631 for (y = 0; y < sh; y++)
1632 if (0 <= y + my && y + my < self->rows)
1633 {
1634 maprow *row = self->row + (y + my);
1635
1636 for (x = 0; x < sw; x++)
1637 if (row->c0 <= x + mx && x + mx < row->c1)
1638 {
1639 mapcell *cell = row->col + (x + mx - row->c0);
1640
1641 smooth_max[x + 1][y + 1] =
1642 MAX (self->tex [cell->tile [0]].smoothlevel,
1643 MAX (self->tex [cell->tile [1]].smoothlevel,
1644 self->tex [cell->tile [2]].smoothlevel));
1645 }
1646 }
1647
1648 for (z = 0; z <= 2; z++)
1649 {
1650 memset (smooth_level, 0, sizeof (smooth_level));
1651
1652 for (y = 0; y < sh; y++)
1653 if (0 <= y + my && y + my < self->rows)
1654 {
1655 maprow *row = self->row + (y + my);
1656
1657 for (x = 0; x < sw; x++)
1658 if (row->c0 <= x + mx && x + mx < row->c1)
1659 {
1660 mapcell *cell = row->col + (x + mx - row->c0);
1661 tileid tile = cell->tile [z];
1662
1663 if (tile)
1664 {
1665 maptex tex = self->tex [tile];
1666 int px = (x + 1) * T - tex.w;
1667 int py = (y + 1) * T - tex.h;
1668
1669 // suppressing texture state switches here
1670 // is only moderately effective, but worth the extra effort
1671 if (last_name != tex.name)
1672 {
1673 if (!tex.name)
1674 tex = self->tex [2]; /* missing, replace by noface */
1675
1676 glEnd ();
1677 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1678 glBegin (GL_QUADS);
1679 }
1680
1681 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1682 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1683 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1684 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1685
1686 if (cell->flags && z == 2)
1687 {
1688 if (cell->flags & 1)
1689 {
1690 maptex tex = self->tex [1];
1691 int px = x * T + T * 2 / 32;
1692 int py = y * T - T * 6 / 32;
1693
1694 glEnd ();
1695 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1696 glBegin (GL_QUADS);
1697
1698 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1699 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1700 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1701 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1702 }
1703 }
1704
1705 // update smooth hash
1706 if (tex.smoothtile)
1707 {
1708 skey.tile = tex.smoothtile;
1709 skey.level = tex.smoothlevel;
1710
1711 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1712
1713 // add bits to current tile and all neighbours. skey.x|y is
1714 // shifted +1|+1 so we always stay positive.
1715
1716 // bits is ___n cccc CCCC bbbb
1717 // n do not draw borders&corners
1718 // c draw these corners, but...
1719 // C ... not these
1720 // b draw these borders
1721
1722 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1723 // ┃· ·· ·┃ ━━
1724
1725 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1726 // ·· ·· ·┏ ┓·
1727
1728 // full tile
1729 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1730
1731 // borders
1732 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1733 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1734 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1735 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1736
1737 // corners
1738 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1739 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1740 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1741 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1742 }
1743 }
1744 }
1745 }
1746
1747 // go through all smoothlevels, lowest to highest, then draw.
1748 // this is basically counting sort
1749 {
1750 int w, b;
1751
1752 for (w = 0; w < 256 / 32; ++w)
1753 {
1754 uint32_t smask = smooth_level [w];
1755 if (smask)
1756 for (b = 0; b < 32; ++b)
1757 if (smask & (((uint32_t)1) << b))
1758 {
1759 int level = (w << 5) | b;
1760 HE *he;
1761
1762 hv_iterinit (smooth);
1763 while ((he = hv_iternext (smooth)))
1764 {
1765 smooth_key *skey = (smooth_key *)HeKEY (he);
1766 IV bits = SvIVX (HeVAL (he));
1767
1768 if (!(bits & 0x1000)
1769 && skey->level == level
1770 && level > smooth_max [skey->x][skey->y])
1771 {
1772 maptex tex = self->tex [skey->tile];
1773 int px = (((int)skey->x) - 1) * T;
1774 int py = (((int)skey->y) - 1) * T;
1775 int border = bits & 15;
1776 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1777 float dx = tex.s * .0625f; // 16 images/row
1778 float dy = tex.t * .5f ; // 2 images/column
1779
1780 // this time naively avoiding texture state changes
1781 // save gobs of state changes.
1782 if (last_name != tex.name)
1783 {
1784 if (!tex.name)
1785 continue; // smoothing not yet available
1786
1787 glEnd ();
1788 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1789 glBegin (GL_QUADS);
1790 }
1791
1792 if (border)
1793 {
1794 float ox = border * dx;
1795
1796 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1797 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1798 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1799 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1800 }
1801
1802 if (corner)
1803 {
1804 float ox = corner * dx;
1805
1806 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1807 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1808 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1809 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1810 }
1811 }
1812 }
1813 }
1814 }
1815 }
1816
1817 hv_clear (smooth);
1818 }
1819
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 glDisable (GL_BLEND);
1824
1825 // top layer: overlays such as the health bar
1826 for (y = 0; y < sh; y++)
1827 if (0 <= y + my && y + my < self->rows)
1828 {
1829 maprow *row = self->row + (y + my);
1830
1831 for (x = 0; x < sw; x++)
1832 if (row->c0 <= x + mx && x + mx < row->c1)
1833 {
1834 mapcell *cell = row->col + (x + mx - row->c0);
1835
1836 int px = x * T;
1837 int py = y * T;
1838
1839 if (cell->stat_hp)
1840 {
1841 int width = cell->stat_width * T;
1842 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1843
1844 glColor3ub (0, 0, 0);
1845 glRectf (px + 1, py - thick - 2,
1846 px + width - 1, py);
1847
1848 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1849 glRectf (px + 2,
1850 py - thick - 1,
1851 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1852 }
1853 }
1854 }
1855}
1856
1857void
1858draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1859 CODE:
1860{
1861 static float color[16][3] = {
1862 { 0.00F, 0.00F, 0.00F },
1863 { 1.00F, 1.00F, 1.00F },
1864 { 0.00F, 0.00F, 0.55F },
1865 { 1.00F, 0.00F, 0.00F },
1866
1867 { 1.00F, 0.54F, 0.00F },
1868 { 0.11F, 0.56F, 1.00F },
1869 { 0.93F, 0.46F, 0.00F },
1870 { 0.18F, 0.54F, 0.34F },
1871
1872 { 0.56F, 0.73F, 0.56F },
1873 { 0.80F, 0.80F, 0.80F },
1874 { 0.55F, 0.41F, 0.13F },
1875 { 0.99F, 0.77F, 0.26F },
1876
1877 { 0.74F, 0.65F, 0.41F },
1878
1879 { 0.00F, 1.00F, 1.00F },
1880 { 1.00F, 0.00F, 1.00F },
1881 { 1.00F, 1.00F, 0.00F },
1882 };
1883
1884 int x, y;
1885
1886 glEnable (GL_TEXTURE_2D);
1887 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1888 glEnable (GL_BLEND);
1889 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1890 glBegin (GL_QUADS);
1891
1892 for (y = 0; y < h; y++)
1893 for (x = 0; x < w; x++)
1894 {
1895 unsigned char m = data [x + y * w];
1896
1897 if (m)
1898 {
1899 float *c = color [m & 15];
1900
1901 float tx1 = m & 0x40 ? 0.5 : 0.;
1902 float tx2 = tx1 + 0.5;
1903
1904 glColor4f (c[0], c[1], c[2], 0.75);
1905 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1906 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1907 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1908 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1909 }
1910 }
1911
1912 glEnd ();
1913 glDisable (GL_BLEND);
1914 glDisable (GL_TEXTURE_2D);
1915}
1916
1917void
1918fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1919 PPCODE:
1920{
1921 int x, y;
1287 int sw4 = (sw + 3) & ~3; 1922 int sw4 = (sw + 3) & ~3;
1288 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1923 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1924 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290 1925
1291 memset (darkness, 255, sw4 * sh); 1926 memset (darkness, 255, sw4 * sh);
1292 SvPOK_only (darkness_sv); 1927 SvPOK_only (darkness_sv);
1293 SvCUR_set (darkness_sv, sw4 * sh); 1928 SvCUR_set (darkness_sv, sw4 * sh);
1294 1929
1295 vx = self->x + (self->w - sw) / 2 - shift_x; 1930 mx += self->x;
1296 vy = self->y + (self->h - sh) / 2 - shift_y; 1931 my += self->y;
1297 1932
1298 /*
1299 int vx = self->vx = self->w >= sw
1300 ? self->x + (self->w - sw) / 2
1301 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1302
1303 int vy = self->vy = self->h >= sh
1304 ? self->y + (self->h - sh) / 2
1305 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306 */
1307
1308 glColor4ub (255, 255, 255, 255);
1309
1310 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311 glEnable (GL_BLEND);
1312 glEnable (GL_TEXTURE_2D);
1313 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314
1315 glBegin (GL_QUADS);
1316
1317 last_name = 0;
1318
1319 for (z = 0; z < 3; z++)
1320 for (y = 0; y < sh; y++) 1933 for (y = 0; y < sh; y++)
1321 if (0 <= y + vy && y + vy < self->rows) 1934 if (0 <= y + my && y + my < self->rows)
1322 { 1935 {
1323 maprow *row = self->row + (y + vy); 1936 maprow *row = self->row + (y + my);
1324 1937
1325 for (x = 0; x < sw; x++) 1938 for (x = 0; x < sw; x++)
1326 if (row->c0 <= x + vx && x + vx < row->c1) 1939 if (row->c0 <= x + mx && x + mx < row->c1)
1327 { 1940 {
1328 mapcell *cell = row->col + (x + vx - row->c0); 1941 mapcell *cell = row->col + (x + mx - row->c0);
1329 1942
1330 darkness[y * sw4 + x] = cell->darkness < 0 1943 darkness[y * sw4 + x] = cell->darkness
1944 ? 255 - (cell->darkness - 1)
1331 ? 255 - FOW_DARKNESS 1945 : 255 - FOW_DARKNESS;
1332 : 255 - cell->darkness;
1333
1334 face = cell->face [z];
1335
1336 if (face)
1337 {
1338 maptex tex = self->tex [face];
1339
1340 int px = (x + 1) * 32 - tex.w;
1341 int py = (y + 1) * 32 - tex.h;
1342
1343 if (last_name != tex.name)
1344 {
1345 glEnd ();
1346 last_name = tex.name;
1347 glBindTexture (GL_TEXTURE_2D, last_name);
1348 glBegin (GL_QUADS);
1349 }
1350
1351 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1352 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1353 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1354 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1355 }
1356 } 1946 }
1357 } 1947 }
1358
1359 glEnd ();
1360
1361 glDisable (GL_TEXTURE_2D);
1362 glDisable (GL_BLEND);
1363 1948
1364 EXTEND (SP, 3); 1949 EXTEND (SP, 3);
1365 PUSHs (sv_2mortal (newSViv (sw4))); 1950 PUSHs (sv_2mortal (newSViv (sw4)));
1366 PUSHs (sv_2mortal (newSViv (sh))); 1951 PUSHs (sv_2mortal (newSViv (sh)));
1367 PUSHs (darkness_sv); 1952 PUSHs (darkness_sv);
1368} 1953}
1369 1954
1370SV * 1955SV *
1371get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1956get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1372 CODE: 1957 CODE:
1373{ 1958{
1374 int x, y, x1, y1; 1959 int x, y, x1, y1;
1375 SV *data_sv = newSV (w * h * 7 + 5); 1960 SV *data_sv = newSV (w * h * 7 + 5);
1376 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1961 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1401 if (row && row->c0 <= x && x < row->c1) 1986 if (row && row->c0 <= x && x < row->c1)
1402 { 1987 {
1403 mapcell *cell = row->col + (x - row->c0); 1988 mapcell *cell = row->col + (x - row->c0);
1404 uint8_t flags = 0; 1989 uint8_t flags = 0;
1405 1990
1406 if (cell->face [0]) flags |= 1; 1991 if (cell->tile [0]) flags |= 1;
1407 if (cell->face [1]) flags |= 2; 1992 if (cell->tile [1]) flags |= 2;
1408 if (cell->face [2]) flags |= 4; 1993 if (cell->tile [2]) flags |= 4;
1409 1994
1410 *data++ = flags; 1995 *data++ = flags;
1411 1996
1412 if (flags & 1) 1997 if (flags & 1)
1413 { 1998 {
1999 tileid tile = cell->tile [0];
1414 *data++ = cell->face [0] >> 8; 2000 *data++ = tile >> 8;
1415 *data++ = cell->face [0]; 2001 *data++ = tile;
1416 } 2002 }
1417 2003
1418 if (flags & 2) 2004 if (flags & 2)
1419 { 2005 {
2006 tileid tile = cell->tile [1];
1420 *data++ = cell->face [1] >> 8; 2007 *data++ = tile >> 8;
1421 *data++ = cell->face [1]; 2008 *data++ = tile;
1422 } 2009 }
1423 2010
1424 if (flags & 4) 2011 if (flags & 4)
1425 { 2012 {
2013 tileid tile = cell->tile [2];
1426 *data++ = cell->face [2] >> 8; 2014 *data++ = tile >> 8;
1427 *data++ = cell->face [2]; 2015 *data++ = tile;
1428 } 2016 }
1429 } 2017 }
1430 else 2018 else
1431 *data++ = 0; 2019 *data++ = 0;
1432 } 2020 }
1438} 2026}
1439 OUTPUT: 2027 OUTPUT:
1440 RETVAL 2028 RETVAL
1441 2029
1442void 2030void
1443set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2031set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444 PPCODE: 2032 PPCODE:
1445{ 2033{
1446 int x, y, z; 2034 int x, y, z;
1447 int w, h; 2035 int w, h;
1448 int x1, y1; 2036 int x1, y1;
1472 { 2060 {
1473 uint8_t flags = *data++; 2061 uint8_t flags = *data++;
1474 2062
1475 if (flags) 2063 if (flags)
1476 { 2064 {
1477 mapface face[3] = { 0, 0, 0 };
1478
1479 mapcell *cell = row_get_cell (row, x); 2065 mapcell *cell = row_get_cell (row, x);
2066 tileid tile[3] = { 0, 0, 0 };
1480 2067
1481 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2068 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1482 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2069 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1483 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2070 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1484 2071
1485 if (cell->darkness <= 0) 2072 if (cell->darkness == 0)
1486 { 2073 {
1487 cell->darkness = -1; 2074 cell->darkness = 0;
1488 2075
1489 for (z = 0; z <= 2; z++) 2076 for (z = 0; z <= 2; z++)
1490 { 2077 {
1491 cell->face[z] = face[z]; 2078 tileid t = tile [z];
1492 2079
1493 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2080 if (t >= self->texs || (t && !self->tex [t].name))
2081 {
1494 XPUSHs (sv_2mortal (newSViv (face[z]))); 2082 XPUSHs (sv_2mortal (newSViv (t)));
2083 need_texid (self, t);
2084 }
2085
2086 cell->tile [z] = t;
1495 } 2087 }
1496 } 2088 }
1497 } 2089 }
1498 } 2090 }
1499 } 2091 }
1500} 2092}
1501 2093
1502MODULE = CFClient PACKAGE = CFClient::MixChunk 2094MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503 2095
1504CFClient::MixChunk 2096CFPlus::MixChunk
1505new_from_file (SV *class, char *path) 2097new_from_file (SV *class, char *path)
1506 CODE: 2098 CODE:
1507 RETVAL = Mix_LoadWAV (path); 2099 RETVAL = Mix_LoadWAV (path);
1508 OUTPUT: 2100 OUTPUT:
1509 RETVAL 2101 RETVAL
1510 2102
1511void 2103void
1512DESTROY (CFClient::MixChunk self) 2104DESTROY (CFPlus::MixChunk self)
1513 CODE: 2105 CODE:
1514 Mix_FreeChunk (self); 2106 Mix_FreeChunk (self);
1515 2107
1516int 2108int
1517volume (CFClient::MixChunk self, int volume = -1) 2109volume (CFPlus::MixChunk self, int volume = -1)
1518 CODE: 2110 CODE:
1519 RETVAL = Mix_VolumeChunk (self, volume); 2111 RETVAL = Mix_VolumeChunk (self, volume);
1520 OUTPUT: 2112 OUTPUT:
1521 RETVAL 2113 RETVAL
1522 2114
1523int 2115int
1524play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2116play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1525 CODE: 2117 CODE:
1526 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2118 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527 OUTPUT: 2119 OUTPUT:
1528 RETVAL 2120 RETVAL
1529 2121
1530MODULE = CFClient PACKAGE = CFClient::MixMusic 2122MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531 2123
1532int 2124int
1533volume (int volume = -1) 2125volume (int volume = -1)
1534 CODE: 2126 CODE:
1535 RETVAL = Mix_VolumeMusic (volume); 2127 RETVAL = Mix_VolumeMusic (volume);
1536 OUTPUT: 2128 OUTPUT:
1537 RETVAL 2129 RETVAL
1538 2130
1539CFClient::MixMusic 2131CFPlus::MixMusic
1540new_from_file (SV *class, char *path) 2132new_from_file (SV *class, char *path)
1541 CODE: 2133 CODE:
1542 RETVAL = Mix_LoadMUS (path); 2134 RETVAL = Mix_LoadMUS (path);
1543 OUTPUT: 2135 OUTPUT:
1544 RETVAL 2136 RETVAL
1545 2137
1546void 2138void
1547DESTROY (CFClient::MixMusic self) 2139DESTROY (CFPlus::MixMusic self)
1548 CODE: 2140 CODE:
1549 Mix_FreeMusic (self); 2141 Mix_FreeMusic (self);
1550 2142
1551int 2143int
1552play (CFClient::MixMusic self, int loops = -1) 2144play (CFPlus::MixMusic self, int loops = -1)
1553 CODE: 2145 CODE:
1554 RETVAL = Mix_PlayMusic (self, loops); 2146 RETVAL = Mix_PlayMusic (self, loops);
1555 OUTPUT: 2147 OUTPUT:
1556 RETVAL 2148 RETVAL
1557 2149
1558MODULE = CFClient PACKAGE = CFClient::OpenGL 2150MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559 2151
1560BOOT: 2152BOOT:
1561{ 2153{
1562 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2154 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563 static const struct { 2155 static const struct {
1564 const char *name; 2156 const char *name;
1565 IV iv; 2157 IV iv;
1566 } *civ, const_iv[] = { 2158 } *civ, const_iv[] = {
1567# define const_iv(name) { # name, (IV)name } 2159# define const_iv(name) { # name, (IV)name }
1574 const_iv (GL_SCISSOR_TEST), 2166 const_iv (GL_SCISSOR_TEST),
1575 const_iv (GL_DEPTH_TEST), 2167 const_iv (GL_DEPTH_TEST),
1576 const_iv (GL_ALPHA_TEST), 2168 const_iv (GL_ALPHA_TEST),
1577 const_iv (GL_NORMALIZE), 2169 const_iv (GL_NORMALIZE),
1578 const_iv (GL_RESCALE_NORMAL), 2170 const_iv (GL_RESCALE_NORMAL),
2171 const_iv (GL_FRONT),
2172 const_iv (GL_BACK),
1579 const_iv (GL_AND), 2173 const_iv (GL_AND),
1580 const_iv (GL_ONE), 2174 const_iv (GL_ONE),
1581 const_iv (GL_ZERO), 2175 const_iv (GL_ZERO),
1582 const_iv (GL_SRC_ALPHA), 2176 const_iv (GL_SRC_ALPHA),
1583 const_iv (GL_DST_ALPHA), 2177 const_iv (GL_DST_ALPHA),
1584 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2178 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585 const_iv (GL_ONE_MINUS_DST_ALPHA), 2179 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE), 2180 const_iv (GL_SRC_ALPHA_SATURATE),
1587 const_iv (GL_RGB), 2181 const_iv (GL_RGB),
1588 const_iv (GL_RGBA), 2182 const_iv (GL_RGBA),
2183 const_iv (GL_RGBA4),
2184 const_iv (GL_RGBA8),
2185 const_iv (GL_RGB5_A1),
1589 const_iv (GL_UNSIGNED_BYTE), 2186 const_iv (GL_UNSIGNED_BYTE),
1590 const_iv (GL_UNSIGNED_SHORT), 2187 const_iv (GL_UNSIGNED_SHORT),
1591 const_iv (GL_UNSIGNED_INT), 2188 const_iv (GL_UNSIGNED_INT),
1592 const_iv (GL_ALPHA), 2189 const_iv (GL_ALPHA),
1593 const_iv (GL_INTENSITY), 2190 const_iv (GL_INTENSITY),
1625 const_iv (GL_SEPARABLE_2D), 2222 const_iv (GL_SEPARABLE_2D),
1626 const_iv (GL_CONVOLUTION_2D), 2223 const_iv (GL_CONVOLUTION_2D),
1627 const_iv (GL_CONVOLUTION_BORDER_MODE), 2224 const_iv (GL_CONVOLUTION_BORDER_MODE),
1628 const_iv (GL_CONSTANT_BORDER), 2225 const_iv (GL_CONSTANT_BORDER),
1629 const_iv (GL_LINES), 2226 const_iv (GL_LINES),
2227 const_iv (GL_LINE_STRIP),
1630 const_iv (GL_LINE_LOOP), 2228 const_iv (GL_LINE_LOOP),
1631 const_iv (GL_QUADS), 2229 const_iv (GL_QUADS),
1632 const_iv (GL_QUAD_STRIP), 2230 const_iv (GL_QUAD_STRIP),
1633 const_iv (GL_TRIANGLES), 2231 const_iv (GL_TRIANGLES),
1634 const_iv (GL_TRIANGLE_STRIP), 2232 const_iv (GL_TRIANGLE_STRIP),
1642# undef const_iv 2240# undef const_iv
1643 }; 2241 };
1644 2242
1645 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2243 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1646 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2244 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2245
2246 texture_av = newAV ();
2247 AvREAL_off (texture_av);
1647} 2248}
1648 2249
1649char * 2250char *
1650gl_vendor () 2251gl_vendor ()
1651 CODE: 2252 CODE:
1667 OUTPUT: 2268 OUTPUT:
1668 RETVAL 2269 RETVAL
1669 2270
1670int glGetError () 2271int glGetError ()
1671 2272
2273void glFinish ()
2274
1672void glClear (int mask) 2275void glClear (int mask)
1673 2276
1674void glClearColor (float r, float g, float b, float a = 1.0) 2277void glClearColor (float r, float g, float b, float a = 1.0)
1675 PROTOTYPE: @ 2278 PROTOTYPE: @
1676 2279
1699void glPushMatrix () 2302void glPushMatrix ()
1700 2303
1701void glPopMatrix () 2304void glPopMatrix ()
1702 2305
1703void glLoadIdentity () 2306void glLoadIdentity ()
2307
2308void glDrawBuffer (int buffer)
2309
2310void glReadBuffer (int buffer)
1704 2311
1705# near_ and far_ are due to microsofts buggy "c" compiler 2312# near_ and far_ are due to microsofts buggy "c" compiler
1706void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2313void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707 2314
1708# near_ and far_ are due to microsofts buggy "c" compiler 2315# near_ and far_ are due to microsofts buggy "c" compiler
1738 r *= a; 2345 r *= a;
1739 g *= a; 2346 g *= a;
1740 b *= a; 2347 b *= a;
1741 } 2348 }
1742 // microsoft visual "c" rounds instead of truncating... 2349 // microsoft visual "c" rounds instead of truncating...
1743 glColor4ub (MIN ((int)(r * 256.f), 255), 2350 glColor4f (r, g, b, a);
1744 MIN ((int)(g * 256.f), 255),
1745 MIN ((int)(b * 256.f), 255),
1746 MIN ((int)(a * 256.f), 255));
1747 2351
1748void glInterleavedArrays (int format, int stride, char *data) 2352void glInterleavedArrays (int format, int stride, char *data)
1749 2353
1750void glDrawElements (int mode, int count, int type, char *indices) 2354void glDrawElements (int mode, int count, int type, char *indices)
1751 2355
1797 2401
1798void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2402void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1799 2403
1800int glGenTexture () 2404int glGenTexture ()
1801 CODE: 2405 CODE:
1802{ 2406 RETVAL = gen_texture ();
1803 GLuint name;
1804 glGenTextures (1, &name);
1805 RETVAL = name;
1806}
1807 OUTPUT: 2407 OUTPUT:
1808 RETVAL 2408 RETVAL
1809 2409
1810void glDeleteTexture (int name) 2410void glDeleteTexture (int name)
1811 CODE: 2411 CODE:
1812{
1813 GLuint name_ = name;
1814 glDeleteTextures (1, &name_); 2412 del_texture (name);
1815} 2413
1816
1817int glGenList () 2414int glGenList ()
1818 CODE: 2415 CODE:
1819 RETVAL = glGenLists (1); 2416 RETVAL = glGenLists (1);
1820 OUTPUT: 2417 OUTPUT:
1821 RETVAL 2418 RETVAL
1828 2425
1829void glEndList () 2426void glEndList ()
1830 2427
1831void glCallList (int list) 2428void glCallList (int list)
1832 2429
1833

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines