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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines