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.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.195 by root, Sat Jul 14 12:05:52 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);
91#ifdef FC_HINT_STYLE 154#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#endif 156#endif
94#ifdef _WIN32
95 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96#else
97 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98#endif
99} 158}
100 159
101static void 160static void
102layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
103{ 162{
104 /* 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
105 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
106 */ 165 */
107 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
111 170
112 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
113} 172}
114 173
115static void 174static void
116layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
118 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
119 181
120 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122 184
123 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
124} 186 if (!rect.height) rect.height = 1;
125 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
126typedef uint16_t mapface; 193typedef uint16_t faceid;
127 194
128typedef struct { 195typedef struct {
129 GLint name; 196 int name;
130 int w, h; 197 int w, h;
131 float s, t; 198 float s, t;
132 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
133} maptex; 202} maptex;
134 203
135typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
136 int16_t darkness; 207 uint16_t darkness;
137 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
138} mapcell; 209} mapcell;
139 210
140typedef struct { 211typedef struct {
141 int32_t c0, c1; 212 int32_t c0, c1;
142 mapcell *col; 213 mapcell *col;
143} maprow; 214} maprow;
144 215
145typedef struct map { 216typedef struct map {
146 int x, y, w, h; 217 int x, y, w, h;
147 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
148 int faces; 219 int faces; tileid *face2tile; // [faceid]
149 mapface *face; 220 int texs; maptex *tex; // [tileid]
150
151 int texs;
152 maptex *tex;
153 221
154 int32_t rows; 222 int32_t rows;
155 maprow *row; 223 maprow *row;
156} *CFClient__Map; 224} *CFPlus__Map;
157 225
158static char * 226static char *
159prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
160{ 228{
161 char *p; 229 char *p;
178} 246}
179 247
180#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))
181#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))
182 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
183static maprow * 271static maprow *
184map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
185{ 273{
186 if (0 > y) 274 if (0 > y)
187 { 275 {
188 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
189 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
227 315
228 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
229} 317}
230 318
231static mapcell * 319static mapcell *
232map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
233{ 321{
234 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
235} 323}
236 324
237static void 325static void
238map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
239{ 327{
240 int r; 328 int r;
241 329
242 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
243 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
251 self->row = 0; 339 self->row = 0;
252 self->rows = 0; 340 self->rows = 0;
253} 341}
254 342
255static void 343static void
256map_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)
257{ 345{
258 int x, y; 346 int x, y;
259 maprow *row; 347 maprow *row;
348 mapcell *cell;
260 349
261 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
262 if (y >= 0) 351 if (y >= 0)
263 { 352 {
264 if (y >= self->rows) 353 if (y >= self->rows)
270 if (x >= row->c0) 359 if (x >= row->c0)
271 { 360 {
272 if (x >= row->c1) 361 if (x >= row->c1)
273 break; 362 break;
274 363
275 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;
276 } 370 }
277 } 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);
278} 388}
279 389
280static void 390static void
281music_finished (void) 391music_finished (void)
282{ 392{
301 ev.data2 = 0; 411 ev.data2 = 0;
302 412
303 SDL_PushEvent ((SDL_Event *)&ev); 413 SDL_PushEvent ((SDL_Event *)&ev);
304} 414}
305 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
306MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
307 438
308PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
309 440
310BOOT: 441BOOT:
311{ 442{
312 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
313 static const struct { 444 static const struct {
314 const char *name; 445 const char *name;
315 IV iv; 446 IV iv;
316 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
317# 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
318 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
319 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
320 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
321 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
322 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
331 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
332 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
333 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
334 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
335 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
336 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
337 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
338 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
339 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
340 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
395 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
396 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
397 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
398 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
399 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
400 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
401 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
402 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
403 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
404 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
405 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
406 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
407 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
408 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
409 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
410 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
411 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
412 const_iv (KMOD_CTRL),
413 const_iv (KMOD_SHIFT),
414 const_iv (KMOD_ALT),
415 const_iv (KMOD_META)
416# undef const_iv 556# undef const_iv
417 }; 557 };
418 558
419 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; )
420 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);
421} 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)
422 582
423void 583void
424pango_init () 584pango_init ()
425 CODE: 585 CODE:
426 // delayed, so it can pick up new fonts added by AddFontResourceEx
427{ 586{
428 {
429 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
430 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);
431 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432 }
433 {
434 cairo_font_options_t *fopt = cairo_font_options_create ();
435 cairo_fontmap = pango_cairo_font_map_get_default ();
436 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437#ifdef _WIN32
438 // cairo looks like shit eaten twice on windows
439 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440#else
441 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442#endif
443 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445 pango_cairo_context_set_font_options (cairo_context, fopt);
446 cairo_font_options_destroy (fopt);
447 }
448} 590}
449 591
450int 592int
451SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452 594
453void 595void
454SDL_Quit () 596SDL_Quit ()
455 597
456void 598void
463 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466 608
467 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469 611
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474 616
475 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
476 622
477 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
478 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479 625
480 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
500 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
501 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
502 ); 648 );
503 if (RETVAL) 649 if (RETVAL)
504 { 650 {
651 av_clear (texture_av);
652
505 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
506# 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);
507# include "glfunc.h" 655# include "glfunc.h"
508# undef GL_FUNC 656# undef GL_FUNC
657
509 } 658 }
510 OUTPUT: 659 OUTPUT:
511 RETVAL 660 RETVAL
512 661
513void 662void
532 case SDL_KEYDOWN: 681 case SDL_KEYDOWN:
533 case SDL_KEYUP: 682 case SDL_KEYUP:
534 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
535 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
536 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 */
537 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 687 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
538 break; 688 break;
539 689
540 case SDL_ACTIVEEVENT: 690 case SDL_ACTIVEEVENT:
541 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
567 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 717 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 718 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569 break; 719 break;
570 } 720 }
571 721
572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 722 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573 } 723 }
574} 724}
575 725
576int 726int
577Mix_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)
586Mix_AllocateChannels (int numchans = -1) 736Mix_AllocateChannels (int numchans = -1)
587 737
588void 738void
589lowdelay (int fd, int val = 1) 739lowdelay (int fd, int val = 1)
590 CODE: 740 CODE:
741 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
742
743void
744win32_proxy_info ()
745 PPCODE:
746{
591#ifndef _WIN32 747#ifdef _WIN32
592 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 }
593#endif 769#endif
770}
594 771
595void 772void
596add_font (char *file) 773add_font (char *file)
597 CODE: 774 CODE:
598 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 775 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599#ifdef _WIN32
600 // cairo... sigh... requires win2000
601 AddFontResourceEx (file, FR_PRIVATE, 0);
602#endif
603 776
604void 777void
605load_image_inline (SV *image_) 778load_image_inline (SV *image_)
606 ALIAS: 779 ALIAS:
607 load_image_file = 1 780 load_image_file = 1
649 822
650 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 823 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651 824
652 assert (surface2->pitch == surface2->w * 4); 825 assert (surface2->pitch == surface2->w * 4);
653 826
827 SDL_LockSurface (surface2);
654 EXTEND (SP, 5); 828 EXTEND (SP, 6);
655 PUSHs (sv_2mortal (newSViv (surface2->w))); 829 PUSHs (sv_2mortal (newSViv (surface2->w)));
656 PUSHs (sv_2mortal (newSViv (surface2->h))); 830 PUSHs (sv_2mortal (newSViv (surface2->h)));
657 SDL_LockSurface (surface2);
658 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 831 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659 SDL_UnlockSurface (surface2);
660 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)));
661 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 833 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 834 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
835 SDL_UnlockSurface (surface2);
663 836
664 SDL_FreeSurface (surface); 837 SDL_FreeSurface (surface);
665 SDL_FreeSurface (surface2); 838 SDL_FreeSurface (surface2);
666} 839}
667 840
703 CODE: 876 CODE:
704 fprintf (stderr, "FATAL: %s\n", message); 877 fprintf (stderr, "FATAL: %s\n", message);
705#ifdef _WIN32 878#ifdef _WIN32
706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 879 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707#endif 880#endif
708 exit (1); 881 _exit (1);
709 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
710MODULE = CFClient PACKAGE = CFClient::Font 901MODULE = CFPlus PACKAGE = CFPlus::Font
711 902
712CFClient::Font 903CFPlus::Font
713new_from_file (SV *class, char *path, int id = 0) 904new_from_file (SV *class, char *path, int id = 0)
714 CODE: 905 CODE:
715{ 906{
716 int count; 907 int count;
717 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 908 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
720} 911}
721 OUTPUT: 912 OUTPUT:
722 RETVAL 913 RETVAL
723 914
724void 915void
725DESTROY (CFClient::Font self) 916DESTROY (CFPlus::Font self)
726 CODE: 917 CODE:
727 pango_font_description_free (self); 918 pango_font_description_free (self);
728 919
729void 920void
730make_default (CFClient::Font self) 921make_default (CFPlus::Font self)
731 CODE: 922 CODE:
732 default_font = self; 923 default_font = self;
733 924
734MODULE = CFClient PACKAGE = CFClient::Layout 925MODULE = CFPlus PACKAGE = CFPlus::Layout
735 926
736CFClient::Layout 927void
737new (SV *class, int rgba = 0) 928reset_glyph_cache ()
929 CODE:
930 tc_clear ();
931
932CFPlus::Layout
933new (SV *class)
738 CODE: 934 CODE:
739 New (0, RETVAL, 1, struct cf_layout); 935 New (0, RETVAL, 1, struct cf_layout);
740 936
741 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 937 RETVAL->pl = pango_layout_new (opengl_context);
742 RETVAL->rgba = rgba;
743 RETVAL->r = 1.; 938 RETVAL->r = 1.;
744 RETVAL->g = 1.; 939 RETVAL->g = 1.;
745 RETVAL->b = 1.; 940 RETVAL->b = 1.;
746 RETVAL->a = 1.; 941 RETVAL->a = 1.;
747 RETVAL->base_height = MIN_FONT_HEIGHT; 942 RETVAL->base_height = MIN_FONT_HEIGHT;
751 layout_update_font (RETVAL); 946 layout_update_font (RETVAL);
752 OUTPUT: 947 OUTPUT:
753 RETVAL 948 RETVAL
754 949
755void 950void
756DESTROY (CFClient::Layout self) 951DESTROY (CFPlus::Layout self)
757 CODE: 952 CODE:
758 g_object_unref (self->pl); 953 g_object_unref (self->pl);
759 Safefree (self); 954 Safefree (self);
760 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
761int 1046int
762is_rgba (CFClient::Layout self) 1047has_wrapped (CFPlus::Layout self)
763 CODE: 1048 CODE:
764 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}
765 OUTPUT: 1058 OUTPUT:
766 RETVAL 1059 RETVAL
767 1060
768void
769set_text (CFClient::Layout self, SV *text_)
770 CODE:
771{
772 STRLEN textlen;
773 char *text = SvPVutf8 (text_, textlen);
774
775 pango_layout_set_text (self->pl, text, textlen);
776}
777
778void
779set_markup (CFClient::Layout self, SV *text_)
780 CODE:
781{
782 STRLEN textlen;
783 char *text = SvPVutf8 (text_, textlen);
784
785 pango_layout_set_markup (self->pl, text, textlen);
786}
787
788SV * 1061SV *
789get_text (CFClient::Layout self) 1062get_text (CFPlus::Layout self)
790 CODE: 1063 CODE:
791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1064 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792 sv_utf8_decode (RETVAL); 1065 sv_utf8_decode (RETVAL);
793 OUTPUT: 1066 OUTPUT:
794 RETVAL 1067 RETVAL
795 1068
796void 1069void
797set_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.)
798 CODE: 1071 CODE:
799 self->r = r; 1072 self->r = r;
800 self->g = g; 1073 self->g = g;
801 self->b = b; 1074 self->b = b;
802 self->a = a; 1075 self->a = a;
803 1076
804void 1077void
805set_font (CFClient::Layout self, CFClient::Font font = 0) 1078set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806 CODE: 1079 CODE:
807 if (self->font != font) 1080 if (self->font != font)
808 { 1081 {
809 self->font = font; 1082 self->font = font;
810 layout_update_font (self); 1083 layout_update_font (self);
811 } 1084 }
812 1085
813void 1086void
814set_height (CFClient::Layout self, int base_height) 1087set_height (CFPlus::Layout self, int base_height)
815 CODE: 1088 CODE:
816 if (self->base_height != base_height) 1089 if (self->base_height != base_height)
817 { 1090 {
818 self->base_height = base_height; 1091 self->base_height = base_height;
819 layout_update_font (self); 1092 layout_update_font (self);
820 } 1093 }
821 1094
822void 1095void
823set_width (CFClient::Layout self, int max_width = -1) 1096set_width (CFPlus::Layout self, int max_width = -1)
824 CODE: 1097 CODE:
825 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);
826 1099
827void 1100void
828set_indent (CFClient::Layout self, int indent) 1101set_indent (CFPlus::Layout self, int indent)
829 CODE: 1102 CODE:
830 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1103 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831 1104
832void 1105void
833set_spacing (CFClient::Layout self, int spacing) 1106set_spacing (CFPlus::Layout self, int spacing)
834 CODE: 1107 CODE:
835 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1108 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836 1109
837void 1110void
838set_ellipsise (CFClient::Layout self, int ellipsise) 1111set_ellipsise (CFPlus::Layout self, int ellipsise)
839 CODE: 1112 CODE:
840 pango_layout_set_ellipsize (self->pl, 1113 pango_layout_set_ellipsize (self->pl,
841 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1114 ellipsise == 1 ? PANGO_ELLIPSIZE_START
842 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1115 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1116 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
844 : PANGO_ELLIPSIZE_NONE 1117 : PANGO_ELLIPSIZE_NONE
845 ); 1118 );
846 1119
847void 1120void
848set_single_paragraph_mode (CFClient::Layout self, int spm) 1121set_single_paragraph_mode (CFPlus::Layout self, int spm)
849 CODE: 1122 CODE:
850 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1123 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851 1124
852void 1125void
853size (CFClient::Layout self) 1126size (CFPlus::Layout self)
854 PPCODE: 1127 PPCODE:
855{ 1128{
856 int w, h; 1129 int w, h;
857 1130
858 layout_get_pixel_size (self, &w, &h); 1131 layout_get_pixel_size (self, &w, &h);
861 PUSHs (sv_2mortal (newSViv (w))); 1134 PUSHs (sv_2mortal (newSViv (w)));
862 PUSHs (sv_2mortal (newSViv (h))); 1135 PUSHs (sv_2mortal (newSViv (h)));
863} 1136}
864 1137
865int 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
866xy_to_index (CFClient::Layout self, int x, int y) 1151xy_to_index (CFPlus::Layout self, int x, int y)
867 CODE: 1152 CODE:
868{ 1153{
869 int index, trailing; 1154 int index, trailing;
870 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);
871 RETVAL = index; 1156 RETVAL = index + trailing;
872} 1157}
873 OUTPUT: 1158 OUTPUT:
874 RETVAL 1159 RETVAL
875 1160
876void 1161void
877cursor_pos (CFClient::Layout self, int index) 1162cursor_pos (CFPlus::Layout self, int index)
878 PPCODE: 1163 PPCODE:
879{ 1164{
880 PangoRectangle strong_pos; 1165 PangoRectangle strong_pos;
881 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1166 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882 1167
885 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1170 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1171 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887} 1172}
888 1173
889void 1174void
890render (CFClient::Layout self) 1175index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
891 PPCODE: 1176 PPCODE:
892{ 1177{
893 SV *retval; 1178 int line, x;
894 int w, h;
895 1179
896 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 */
897 1182
898 if (self->rgba)
899 {
900 cairo_surface_t *surface;
901 cairo_t *cairo;
902
903 retval = newSV (w * h * 4);
904 SvPOK_only (retval);
905 SvCUR_set (retval, w * h * 4);
906
907 memset (SvPVX (retval), 0, w * h * 4);
908
909 surface = cairo_image_surface_create_for_data (
910 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911 cairo = cairo_create (surface);
912 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914 pango_cairo_show_layout (cairo, self->pl);
915
916 cairo_destroy (cairo);
917 cairo_surface_destroy (surface);
918
919 // what a mess, and its premultiplied, too :(
920 {
921 uint32_t *p = (uint32_t *)SvPVX (retval);
922 uint32_t *e = p + w * h;
923
924 while (p < e)
925 {
926 uint32_t rgba = *p;
927 rgba = (rgba >> 24) | (rgba << 8);
928#if 0
929#ifdef _WIN32
930 {//D
931 uint8_t r = rgba >> 24;
932 uint8_t g = rgba >> 16;
933 uint8_t b = rgba >> 8;
934 uint8_t a = rgba >> 0;
935
936 rgba = (rgba & 0xffffff00) | a;
937 }
938#endif
939#endif
940 rgba = SDL_SwapBE32 (rgba);
941 *p++ = rgba;
942 }
943 }
944
945 EXTEND (SP, 5); 1183 EXTEND (SP, 2);
946 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)
947 PUSHs (sv_2mortal (newSViv (h))); 1205 PUSHs (sv_2mortal (newSViv (index + trailing)));
948 PUSHs (sv_2mortal (retval));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951 }
952 else 1206 else
953 { 1207 {
954 FT_Bitmap bitmap;
955
956 retval = newSV (w * h);
957 SvPOK_only (retval);
958 SvCUR_set (retval, w * h);
959
960 bitmap.rows = h;
961 bitmap.width = w;
962 bitmap.pitch = w;
963 bitmap.buffer = (unsigned char*)SvPVX (retval);
964 bitmap.num_grays = 256;
965 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967 memset (bitmap.buffer, 0, w * h);
968
969 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971 EXTEND (SP, 5);
972 PUSHs (sv_2mortal (newSViv (w))); 1208 PUSHs (sv_2mortal (newSViv (index)));
973 PUSHs (sv_2mortal (newSViv (h))); 1209 PUSHs (sv_2mortal (newSViv (trailing)));
974 PUSHs (sv_2mortal (retval));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977 } 1210 }
978} 1211}
979 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
980MODULE = CFClient PACKAGE = CFClient::Texture 1223MODULE = CFPlus PACKAGE = CFPlus::Texture
981 1224
982void 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
983draw_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.)
984 PROTOTYPE: $$$;$$ 1264 PROTOTYPE: $$$;$$
985 ALIAS: 1265 ALIAS:
986 draw_quad_alpha = 1 1266 draw_quad_alpha = 1
987 draw_quad_alpha_premultiplied = 2 1267 draw_quad_alpha_premultiplied = 2
988 CODE: 1268 CODE:
1026 glDisable (GL_ALPHA_TEST); 1306 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1307 glDisable (GL_BLEND);
1028 } 1308 }
1029} 1309}
1030 1310
1031MODULE = CFClient PACKAGE = CFClient::Map 1311MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1312
1033CFClient::Map 1313CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1314new (SV *class)
1035 CODE: 1315 CODE:
1036 New (0, RETVAL, 1, struct map); 1316 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1317 RETVAL->x = 0;
1038 RETVAL->y = 0; 1318 RETVAL->y = 0;
1039 RETVAL->w = map_width; 1319 RETVAL->w = 0;
1040 RETVAL->h = map_height; 1320 RETVAL->h = 0;
1041 RETVAL->ox = 0; 1321 RETVAL->ox = 0;
1042 RETVAL->oy = 0; 1322 RETVAL->oy = 0;
1043 RETVAL->faces = 8192; 1323 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1044 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1324 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1045 RETVAL->texs = 8192;
1046 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1047 RETVAL->rows = 0; 1325 RETVAL->rows = 0;
1048 RETVAL->row = 0; 1326 RETVAL->row = 0;
1049 OUTPUT: 1327 OUTPUT:
1050 RETVAL 1328 RETVAL
1051 1329
1052void 1330void
1053DESTROY (CFClient::Map self) 1331DESTROY (CFPlus::Map self)
1054 CODE: 1332 CODE:
1055{ 1333{
1056 map_clear (self); 1334 map_clear (self);
1057 Safefree (self->face); 1335 Safefree (self->face2tile);
1336 Safefree (self->tex);
1058 Safefree (self); 1337 Safefree (self);
1059} 1338}
1060 1339
1061void 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
1062clear (CFClient::Map self) 1347clear (CFPlus::Map self)
1063 CODE: 1348 CODE:
1064 map_clear (self); 1349 map_clear (self);
1065 1350
1066void 1351void
1067set_face (CFClient::Map self, int face, int texid) 1352set_tileid (CFPlus::Map self, int face, int tile)
1068 CODE: 1353 CODE:
1069{ 1354{
1070 while (self->faces <= face) 1355 need_facenum (self, face); self->face2tile [face] = tile;
1071 { 1356 need_texid (self, tile);
1072 Append (mapface, self->face, self->faces, self->faces);
1073 self->faces *= 2;
1074 }
1075
1076 self->face [face] = texid;
1077} 1357}
1078 1358
1079void 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
1080set_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)
1081 CODE: 1384 CODE:
1082{ 1385{
1083 while (self->texs <= texid) 1386 need_texid (self, texid);
1084 {
1085 Append (maptex, self->tex, self->texs, self->texs);
1086 self->texs *= 2;
1087 }
1088 1387
1089 { 1388 {
1090 maptex *tex = self->tex + texid; 1389 maptex *tex = self->tex + texid;
1091 1390
1092 tex->name = name; 1391 tex->name = name;
1109 // from transparent color bleeding and ugly wrapping effects. 1408 // from transparent color bleeding and ugly wrapping effects.
1110 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1409 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111} 1410}
1112 1411
1113int 1412int
1114ox (CFClient::Map self) 1413ox (CFPlus::Map self)
1115 ALIAS: 1414 ALIAS:
1116 oy = 1 1415 oy = 1
1117 x = 2 1416 x = 2
1118 y = 3 1417 y = 3
1119 w = 4 1418 w = 4
1130 } 1429 }
1131 OUTPUT: 1430 OUTPUT:
1132 RETVAL 1431 RETVAL
1133 1432
1134void 1433void
1135scroll (CFClient::Map self, int dx, int dy) 1434scroll (CFPlus::Map self, int dx, int dy)
1136 CODE: 1435 CODE:
1137{ 1436{
1138 if (dx > 0) 1437 if (dx > 0)
1139 map_blank (self, self->x, self->y, dx - 1, self->h); 1438 map_blank (self, self->x, self->y, dx, self->h);
1140 else if (dx < 0) 1439 else if (dx < 0)
1141 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);
1142 1441
1143 if (dy > 0) 1442 if (dy > 0)
1144 map_blank (self, self->x, self->y, self->w, dy - 1); 1443 map_blank (self, self->x, self->y, self->w, dy);
1145 else if (dy < 0) 1444 else if (dy < 0)
1146 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);
1147 1446
1148 self->ox += dx; self->x += dx; 1447 self->ox += dx; self->x += dx;
1149 self->oy += dy; self->y += dy; 1448 self->oy += dy; self->y += dy;
1150 1449
1151 while (self->y < 0) 1450 while (self->y < 0)
1156 self->y += MAP_EXTEND_Y; 1455 self->y += MAP_EXTEND_Y;
1157 } 1456 }
1158} 1457}
1159 1458
1160void 1459void
1161map1a_update (CFClient::Map self, SV *data_) 1460map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162 CODE: 1461 CODE:
1163{ 1462{
1164 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1463 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165 uint8_t *data_end = (uint8_t *)SvEND (data_); 1464 uint8_t *data_end = (uint8_t *)SvEND (data_);
1166 mapcell *cell; 1465 mapcell *cell;
1167 int x, y, flags; 1466 int x, y, flags;
1168 1467
1169 while (data < data_end) 1468 while (data < data_end - 1)
1170 { 1469 {
1171 flags = (data [0] << 8) + data [1]; data += 2; 1470 flags = (data [0] << 8) + data [1]; data += 2;
1172 1471
1173 x = ((flags >> 10) & 63) + self->x; 1472 x = self->x + ((flags >> 10) & 63);
1174 y = ((flags >> 4) & 63) + self->y; 1473 y = self->y + ((flags >> 4) & 63);
1175 1474
1176 cell = map_get_cell (self, x, y); 1475 cell = map_get_cell (self, x, y);
1177 1476
1178 if (flags & 15) 1477 if (flags & 15)
1179 { 1478 {
1180 if (cell->darkness < 0) 1479 if (!cell->darkness)
1181 { 1480 {
1481 memset (cell, 0, sizeof (*cell));
1182 cell->darkness = 0; 1482 cell->darkness = 256;
1183 cell->face [0] = 0;
1184 cell->face [1] = 0;
1185 cell->face [2] = 0;
1186 } 1483 }
1187 1484
1188 cell->darkness = flags & 8 ? *data++ : 255;
1189
1190 //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 }
1191 1526
1192 if (flags & 4) 1527 if (flags & 4)
1193 { 1528 {
1194 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];
1195 } 1532 }
1196 1533
1197 if (flags & 2) 1534 if (flags & 2)
1198 { 1535 {
1199 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];
1200 } 1539 }
1201 1540
1202 if (flags & 1) 1541 if (flags & 1)
1203 { 1542 {
1204 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];
1205 } 1546 }
1206 } 1547 }
1207 else 1548 else
1208 cell->darkness = -1; 1549 cell->darkness = 0;
1209 } 1550 }
1210} 1551}
1211 1552
1212SV * 1553SV *
1213mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1554mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214 CODE: 1555 CODE:
1215{ 1556{
1216 int x1, x; 1557 int x1, x;
1217 int y1, y; 1558 int y1, y;
1218 int z; 1559 int z;
1239 { 1580 {
1240 mapcell *cell = row->col + (x - row->c0); 1581 mapcell *cell = row->col + (x - row->c0);
1241 1582
1242 for (z = 0; z <= 0; z++) 1583 for (z = 0; z <= 0; z++)
1243 { 1584 {
1244 mapface face = cell->face [z];
1245
1246 if (face)
1247 {
1248 maptex tex = self->tex [face]; 1585 maptex tex = self->tex [cell->tile [z]];
1249 int a0 = 255 - tex.a; 1586 int a0 = 255 - tex.a;
1250 int a1 = tex.a; 1587 int a1 = tex.a;
1251 1588
1252 r = (r * a0 + tex.r * a1) / 255; 1589 r = (r * a0 + tex.r * a1) / 255;
1253 g = (g * a0 + tex.g * a1) / 255; 1590 g = (g * a0 + tex.g * a1) / 255;
1254 b = (b * a0 + tex.b * a1) / 255; 1591 b = (b * a0 + tex.b * a1) / 255;
1255 a = (a * a0 + tex.a * a1) / 255; 1592 a = (a * a0 + tex.a * a1) / 255;
1256 }
1257 } 1593 }
1258 } 1594 }
1259 1595
1260 *map++ = (r ) 1596 *map++ = (r )
1261 | (g << 8) 1597 | (g << 8)
1268} 1604}
1269 OUTPUT: 1605 OUTPUT:
1270 RETVAL 1606 RETVAL
1271 1607
1272void 1608void
1273draw (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)
1274 PPCODE: 1610 CODE:
1275{ 1611{
1276 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;
1277 int x, y, z; 1616 int x, y, z;
1278 int last_name; 1617 int last_name;
1279 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;
1280 int sw4 = (sw + 3) & ~3; 1936 int sw4 = (sw + 3) & ~3;
1281 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1937 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1938 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283 1939
1284 memset (darkness, 255, sw4 * sh); 1940 memset (darkness, 255, sw4 * sh);
1285 SvPOK_only (darkness_sv); 1941 SvPOK_only (darkness_sv);
1286 SvCUR_set (darkness_sv, sw4 * sh); 1942 SvCUR_set (darkness_sv, sw4 * sh);
1287 1943
1288 vx = self->x + (self->w - sw) / 2 - shift_x; 1944 mx += self->x;
1289 vy = self->y + (self->h - sh) / 2 - shift_y; 1945 my += self->y;
1290 1946
1291 /*
1292 int vx = self->vx = self->w >= sw
1293 ? self->x + (self->w - sw) / 2
1294 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1295
1296 int vy = self->vy = self->h >= sh
1297 ? self->y + (self->h - sh) / 2
1298 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299 */
1300
1301 glColor4ub (255, 255, 255, 255);
1302
1303 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304 glEnable (GL_BLEND);
1305 glEnable (GL_TEXTURE_2D);
1306 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307
1308 glBegin (GL_QUADS);
1309
1310 last_name = 0;
1311
1312 for (z = 0; z < 3; z++)
1313 for (y = 0; y < sh; y++) 1947 for (y = 0; y < sh; y++)
1314 if (0 <= y + vy && y + vy < self->rows) 1948 if (0 <= y + my && y + my < self->rows)
1315 { 1949 {
1316 maprow *row = self->row + (y + vy); 1950 maprow *row = self->row + (y + my);
1317 1951
1318 for (x = 0; x < sw; x++) 1952 for (x = 0; x < sw; x++)
1319 if (row->c0 <= x + vx && x + vx < row->c1) 1953 if (row->c0 <= x + mx && x + mx < row->c1)
1320 { 1954 {
1321 mapcell *cell = row->col + (x + vx - row->c0); 1955 mapcell *cell = row->col + (x + mx - row->c0);
1322 1956
1323 darkness[y * sw4 + x] = cell->darkness < 0 1957 darkness[y * sw4 + x] = cell->darkness
1958 ? 255 - (cell->darkness - 1)
1324 ? 255 - FOW_DARKNESS 1959 : 255 - FOW_DARKNESS;
1325 : 255 - cell->darkness;
1326
1327 face = cell->face [z];
1328
1329 if (face)
1330 {
1331 maptex tex = self->tex [face];
1332
1333 int px = (x + 1) * 32 - tex.w;
1334 int py = (y + 1) * 32 - tex.h;
1335
1336 if (last_name != tex.name)
1337 {
1338 glEnd ();
1339 last_name = tex.name;
1340 glBindTexture (GL_TEXTURE_2D, last_name);
1341 glBegin (GL_QUADS);
1342 }
1343
1344 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1347 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348 }
1349 } 1960 }
1350 } 1961 }
1351
1352 glEnd ();
1353
1354 glDisable (GL_TEXTURE_2D);
1355 glDisable (GL_BLEND);
1356 1962
1357 EXTEND (SP, 3); 1963 EXTEND (SP, 3);
1358 PUSHs (sv_2mortal (newSViv (sw4))); 1964 PUSHs (sv_2mortal (newSViv (sw4)));
1359 PUSHs (sv_2mortal (newSViv (sh))); 1965 PUSHs (sv_2mortal (newSViv (sh)));
1360 PUSHs (darkness_sv); 1966 PUSHs (darkness_sv);
1361} 1967}
1362 1968
1363SV * 1969SV *
1364get_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)
1365 CODE: 1971 CODE:
1366{ 1972{
1367 int x, y, x1, y1; 1973 int x, y, x1, y1;
1368 SV *data_sv = newSV (w * h * 7 + 5); 1974 SV *data_sv = newSV (w * h * 7 + 5);
1369 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1975 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1394 if (row && row->c0 <= x && x < row->c1) 2000 if (row && row->c0 <= x && x < row->c1)
1395 { 2001 {
1396 mapcell *cell = row->col + (x - row->c0); 2002 mapcell *cell = row->col + (x - row->c0);
1397 uint8_t flags = 0; 2003 uint8_t flags = 0;
1398 2004
1399 if (cell->face [0]) flags |= 1; 2005 if (cell->tile [0]) flags |= 1;
1400 if (cell->face [1]) flags |= 2; 2006 if (cell->tile [1]) flags |= 2;
1401 if (cell->face [2]) flags |= 4; 2007 if (cell->tile [2]) flags |= 4;
1402 2008
1403 *data++ = flags; 2009 *data++ = flags;
1404 2010
1405 if (flags & 1) 2011 if (flags & 1)
1406 { 2012 {
2013 tileid tile = cell->tile [0];
1407 *data++ = cell->face [0] >> 8; 2014 *data++ = tile >> 8;
1408 *data++ = cell->face [0]; 2015 *data++ = tile;
1409 } 2016 }
1410 2017
1411 if (flags & 2) 2018 if (flags & 2)
1412 { 2019 {
2020 tileid tile = cell->tile [1];
1413 *data++ = cell->face [1] >> 8; 2021 *data++ = tile >> 8;
1414 *data++ = cell->face [1]; 2022 *data++ = tile;
1415 } 2023 }
1416 2024
1417 if (flags & 4) 2025 if (flags & 4)
1418 { 2026 {
2027 tileid tile = cell->tile [2];
1419 *data++ = cell->face [2] >> 8; 2028 *data++ = tile >> 8;
1420 *data++ = cell->face [2]; 2029 *data++ = tile;
1421 } 2030 }
1422 } 2031 }
1423 else 2032 else
1424 *data++ = 0; 2033 *data++ = 0;
1425 } 2034 }
1431} 2040}
1432 OUTPUT: 2041 OUTPUT:
1433 RETVAL 2042 RETVAL
1434 2043
1435void 2044void
1436set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2045set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437 PPCODE: 2046 PPCODE:
1438{ 2047{
1439 int x, y, z; 2048 int x, y, z;
1440 int w, h; 2049 int w, h;
1441 int x1, y1; 2050 int x1, y1;
1465 { 2074 {
1466 uint8_t flags = *data++; 2075 uint8_t flags = *data++;
1467 2076
1468 if (flags) 2077 if (flags)
1469 { 2078 {
1470 mapface face[3] = { 0, 0, 0 };
1471
1472 mapcell *cell = row_get_cell (row, x); 2079 mapcell *cell = row_get_cell (row, x);
2080 tileid tile[3] = { 0, 0, 0 };
1473 2081
1474 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2082 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1475 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2083 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1476 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2084 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1477 2085
1478 if (cell->darkness <= 0) 2086 if (cell->darkness == 0)
1479 { 2087 {
1480 cell->darkness = -1; 2088 cell->darkness = 0;
1481 2089
1482 for (z = 0; z <= 2; z++) 2090 for (z = 0; z <= 2; z++)
1483 { 2091 {
1484 cell->face[z] = face[z]; 2092 tileid t = tile [z];
1485 2093
1486 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2094 if (t >= self->texs || (t && !self->tex [t].name))
2095 {
1487 XPUSHs (sv_2mortal (newSViv (face[z]))); 2096 XPUSHs (sv_2mortal (newSViv (t)));
2097 need_texid (self, t);
2098 }
2099
2100 cell->tile [z] = t;
1488 } 2101 }
1489 } 2102 }
1490 } 2103 }
1491 } 2104 }
1492 } 2105 }
1493} 2106}
1494 2107
1495MODULE = CFClient PACKAGE = CFClient::MixChunk 2108MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496 2109
1497CFClient::MixChunk 2110CFPlus::MixChunk
1498new_from_file (SV *class, char *path) 2111new_from_file (SV *class, char *path)
1499 CODE: 2112 CODE:
1500 RETVAL = Mix_LoadWAV (path); 2113 RETVAL = Mix_LoadWAV (path);
1501 OUTPUT: 2114 OUTPUT:
1502 RETVAL 2115 RETVAL
1503 2116
1504void 2117void
1505DESTROY (CFClient::MixChunk self) 2118DESTROY (CFPlus::MixChunk self)
1506 CODE: 2119 CODE:
1507 Mix_FreeChunk (self); 2120 Mix_FreeChunk (self);
1508 2121
1509int 2122int
1510volume (CFClient::MixChunk self, int volume = -1) 2123volume (CFPlus::MixChunk self, int volume = -1)
1511 CODE: 2124 CODE:
1512 RETVAL = Mix_VolumeChunk (self, volume); 2125 RETVAL = Mix_VolumeChunk (self, volume);
1513 OUTPUT: 2126 OUTPUT:
1514 RETVAL 2127 RETVAL
1515 2128
1516int 2129int
1517play (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)
1518 CODE: 2131 CODE:
1519 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2132 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520 OUTPUT: 2133 OUTPUT:
1521 RETVAL 2134 RETVAL
1522 2135
1523MODULE = CFClient PACKAGE = CFClient::MixMusic 2136MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524 2137
1525int 2138int
1526volume (int volume = -1) 2139volume (int volume = -1)
1527 CODE: 2140 CODE:
1528 RETVAL = Mix_VolumeMusic (volume); 2141 RETVAL = Mix_VolumeMusic (volume);
1529 OUTPUT: 2142 OUTPUT:
1530 RETVAL 2143 RETVAL
1531 2144
2145int
2146fade_out (int ms)
2147 CODE:
2148 RETVAL = Mix_FadeOutMusic (ms);
2149 OUTPUT:
2150 RETVAL
2151
1532CFClient::MixMusic 2152CFPlus::MixMusic
1533new_from_file (SV *class, char *path) 2153new_from_file (SV *class, char *path)
1534 CODE: 2154 CODE:
1535 RETVAL = Mix_LoadMUS (path); 2155 RETVAL = Mix_LoadMUS (path);
1536 OUTPUT: 2156 OUTPUT:
1537 RETVAL 2157 RETVAL
1538 2158
1539void 2159void
1540DESTROY (CFClient::MixMusic self) 2160DESTROY (CFPlus::MixMusic self)
1541 CODE: 2161 CODE:
1542 Mix_FreeMusic (self); 2162 Mix_FreeMusic (self);
1543 2163
1544int 2164int
1545play (CFClient::MixMusic self, int loops = -1) 2165play (CFPlus::MixMusic self, int loops = -1)
1546 CODE: 2166 CODE:
1547 RETVAL = Mix_PlayMusic (self, loops); 2167 RETVAL = Mix_PlayMusic (self, loops);
1548 OUTPUT: 2168 OUTPUT:
1549 RETVAL 2169 RETVAL
1550 2170
2171int
2172fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2173 CODE:
2174 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2175 OUTPUT:
2176 RETVAL
2177
1551MODULE = CFClient PACKAGE = CFClient::OpenGL 2178MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552 2179
1553BOOT: 2180BOOT:
1554{ 2181{
1555 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2182 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556 static const struct { 2183 static const struct {
1557 const char *name; 2184 const char *name;
1558 IV iv; 2185 IV iv;
1559 } *civ, const_iv[] = { 2186 } *civ, const_iv[] = {
1560# define const_iv(name) { # name, (IV)name } 2187# define const_iv(name) { # name, (IV)name }
1567 const_iv (GL_SCISSOR_TEST), 2194 const_iv (GL_SCISSOR_TEST),
1568 const_iv (GL_DEPTH_TEST), 2195 const_iv (GL_DEPTH_TEST),
1569 const_iv (GL_ALPHA_TEST), 2196 const_iv (GL_ALPHA_TEST),
1570 const_iv (GL_NORMALIZE), 2197 const_iv (GL_NORMALIZE),
1571 const_iv (GL_RESCALE_NORMAL), 2198 const_iv (GL_RESCALE_NORMAL),
2199 const_iv (GL_FRONT),
2200 const_iv (GL_BACK),
1572 const_iv (GL_AND), 2201 const_iv (GL_AND),
1573 const_iv (GL_ONE), 2202 const_iv (GL_ONE),
1574 const_iv (GL_ZERO), 2203 const_iv (GL_ZERO),
1575 const_iv (GL_SRC_ALPHA), 2204 const_iv (GL_SRC_ALPHA),
1576 const_iv (GL_DST_ALPHA), 2205 const_iv (GL_DST_ALPHA),
1577 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2206 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578 const_iv (GL_ONE_MINUS_DST_ALPHA), 2207 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 2208 const_iv (GL_SRC_ALPHA_SATURATE),
1580 const_iv (GL_RGB), 2209 const_iv (GL_RGB),
1581 const_iv (GL_RGBA), 2210 const_iv (GL_RGBA),
2211 const_iv (GL_RGBA4),
2212 const_iv (GL_RGBA8),
2213 const_iv (GL_RGB5_A1),
1582 const_iv (GL_UNSIGNED_BYTE), 2214 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT), 2215 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT), 2216 const_iv (GL_UNSIGNED_INT),
1585 const_iv (GL_ALPHA), 2217 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY), 2218 const_iv (GL_INTENSITY),
1618 const_iv (GL_SEPARABLE_2D), 2250 const_iv (GL_SEPARABLE_2D),
1619 const_iv (GL_CONVOLUTION_2D), 2251 const_iv (GL_CONVOLUTION_2D),
1620 const_iv (GL_CONVOLUTION_BORDER_MODE), 2252 const_iv (GL_CONVOLUTION_BORDER_MODE),
1621 const_iv (GL_CONSTANT_BORDER), 2253 const_iv (GL_CONSTANT_BORDER),
1622 const_iv (GL_LINES), 2254 const_iv (GL_LINES),
2255 const_iv (GL_LINE_STRIP),
1623 const_iv (GL_LINE_LOOP), 2256 const_iv (GL_LINE_LOOP),
1624 const_iv (GL_QUADS), 2257 const_iv (GL_QUADS),
1625 const_iv (GL_QUAD_STRIP), 2258 const_iv (GL_QUAD_STRIP),
1626 const_iv (GL_TRIANGLES), 2259 const_iv (GL_TRIANGLES),
1627 const_iv (GL_TRIANGLE_STRIP), 2260 const_iv (GL_TRIANGLE_STRIP),
1635# undef const_iv 2268# undef const_iv
1636 }; 2269 };
1637 2270
1638 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2271 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1639 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2272 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2273
2274 texture_av = newAV ();
2275 AvREAL_off (texture_av);
1640} 2276}
1641 2277
1642char * 2278char *
1643gl_vendor () 2279gl_vendor ()
1644 CODE: 2280 CODE:
1660 OUTPUT: 2296 OUTPUT:
1661 RETVAL 2297 RETVAL
1662 2298
1663int glGetError () 2299int glGetError ()
1664 2300
2301void glFinish ()
2302
1665void glClear (int mask) 2303void glClear (int mask)
1666 2304
1667void glClearColor (float r, float g, float b, float a = 1.0) 2305void glClearColor (float r, float g, float b, float a = 1.0)
1668 PROTOTYPE: @ 2306 PROTOTYPE: @
1669 2307
1692void glPushMatrix () 2330void glPushMatrix ()
1693 2331
1694void glPopMatrix () 2332void glPopMatrix ()
1695 2333
1696void glLoadIdentity () 2334void glLoadIdentity ()
2335
2336void glDrawBuffer (int buffer)
2337
2338void glReadBuffer (int buffer)
1697 2339
1698# near_ and far_ are due to microsofts buggy "c" compiler 2340# near_ and far_ are due to microsofts buggy "c" compiler
1699void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2341void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700 2342
1701# near_ and far_ are due to microsofts buggy "c" compiler 2343# near_ and far_ are due to microsofts buggy "c" compiler
1731 r *= a; 2373 r *= a;
1732 g *= a; 2374 g *= a;
1733 b *= a; 2375 b *= a;
1734 } 2376 }
1735 // microsoft visual "c" rounds instead of truncating... 2377 // microsoft visual "c" rounds instead of truncating...
1736 glColor4ub (MIN ((int)(r * 256.f), 255), 2378 glColor4f (r, g, b, a);
1737 MIN ((int)(g * 256.f), 255),
1738 MIN ((int)(b * 256.f), 255),
1739 MIN ((int)(a * 256.f), 255));
1740 2379
1741void glInterleavedArrays (int format, int stride, char *data) 2380void glInterleavedArrays (int format, int stride, char *data)
1742 2381
1743void glDrawElements (int mode, int count, int type, char *indices) 2382void glDrawElements (int mode, int count, int type, char *indices)
1744 2383
1790 2429
1791void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2430void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1792 2431
1793int glGenTexture () 2432int glGenTexture ()
1794 CODE: 2433 CODE:
1795{ 2434 RETVAL = gen_texture ();
1796 GLuint name;
1797 glGenTextures (1, &name);
1798 RETVAL = name;
1799}
1800 OUTPUT: 2435 OUTPUT:
1801 RETVAL 2436 RETVAL
1802 2437
1803void glDeleteTexture (int name) 2438void glDeleteTexture (int name)
1804 CODE: 2439 CODE:
1805{
1806 GLuint name_ = name;
1807 glDeleteTextures (1, &name_); 2440 del_texture (name);
1808} 2441
1809
1810int glGenList () 2442int glGenList ()
1811 CODE: 2443 CODE:
1812 RETVAL = glGenLists (1); 2444 RETVAL = glGenLists (1);
1813 OUTPUT: 2445 OUTPUT:
1814 RETVAL 2446 RETVAL
1821 2453
1822void glEndList () 2454void glEndList ()
1823 2455
1824void glCallList (int list) 2456void glCallList (int list)
1825 2457
1826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines