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.123 by root, Wed Jun 28 23:41:11 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
14
15#ifdef _WIN32
16# undef pipe
17#endif
11 18
12#include <math.h> 19#include <math.h>
13#include <string.h> 20#include <string.h>
14#include <stdio.h> 21#include <stdio.h>
15#include <stdlib.h> 22#include <stdlib.h>
… …
18#include <SDL_endian.h> 25#include <SDL_endian.h>
19#include <SDL_image.h> 26#include <SDL_image.h>
20#include <SDL_mixer.h> 27#include <SDL_mixer.h>
21#include <SDL_opengl.h> 28#include <SDL_opengl.h>
22 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
23#include <glib/gmacros.h> 33#include <glib/gmacros.h>
24 34
25#include <pango/pango.h> 35#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 36
30#ifndef _WIN32 37#ifndef _WIN32
31# include <sys/types.h> 38# include <sys/types.h>
32# include <sys/socket.h> 39# include <sys/socket.h>
33# include <netinet/in.h> 40# include <netinet/in.h>
34# include <netinet/tcp.h> 41# include <netinet/tcp.h>
35# include <inttypes.h> 42# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 43#endif
44 44
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 46
49#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
50 48
51#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
53 51
54#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
53
54#if 0
55# define PARACHUTE SDL_INIT_NOPARACHUTE
56#else
57# define PARACHUTE 0
58#endif
55 59
56static struct 60static struct
57{ 61{
58#define GL_FUNC(ptr,name) ptr name; 62#define GL_FUNC(ptr,name) ptr name;
59#include "glfunc.h" 63#include "glfunc.h"
… …
68 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 72 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69 else 73 else
70 glBlendFunc (sa, da); 74 glBlendFunc (sa, da);
71} 75}
72 76
77#include "texcache.c"
78
79#include "pango-font.c"
80#include "pango-fontmap.c"
81#include "pango-render.c"
82
73typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
74typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
75 85
76typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
77 87
78static int 88static int
79shape_attr_p (PangoLayoutRun *run) 89shape_attr_p (PangoLayoutRun *run)
80{ 90{
81 GSList *attrs = run->item->analysis.extra_attrs; 91 GSList *attrs = run->item->analysis.extra_attrs;
… …
92 102
93 return 0; 103 return 0;
94} 104}
95 105
96typedef struct cf_layout { 106typedef struct cf_layout {
97 PangoLayout *pl; // either derived from a cairo or ft2 context 107 PangoLayout *pl;
98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
100 int base_height; 109 int base_height;
101 CFClient__Font font; 110 CFPlus__Font font;
102} *CFClient__Layout; 111} *CFPlus__Layout;
103 112
104static CFClient__Font default_font; 113static CFPlus__Font default_font;
105static PangoContext *ft2_context, *cairo_context; 114static PangoContext *opengl_context;
106static PangoFontMap *ft2_fontmap, *cairo_fontmap; 115static PangoFontMap *opengl_fontmap;
107 116
108static void 117static void
109substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
110{ 119{
111 FcPatternAddBool (pattern, FC_HINTING, 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE 121#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif 123#endif
115#ifdef _WIN32
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
118 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
120} 125}
121 126
122static void 127static void
123layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
124{ 129{
125 /* use a random scale factor to account for unknown descenders, 0.8 works 130 /* use a random scale factor to account for unknown descenders, 0.8 works
126 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
127 */ 132 */
128 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
… …
132 137
133 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
134} 139}
135 140
136static void 141static void
137layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
139 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
140 148
141 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143 151
144 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
145} 157}
146 158
147typedef uint16_t mapface; 159typedef uint16_t mapface;
148 160
149typedef struct { 161typedef struct {
… …
152 float s, t; 164 float s, t;
153 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
154} maptex; 166} maptex;
155 167
156typedef struct { 168typedef struct {
157 int16_t darkness; 169 uint32_t player;
158 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
159} mapcell; 173} mapcell;
160 174
161typedef struct { 175typedef struct {
162 int32_t c0, c1; 176 int32_t c0, c1;
163 mapcell *col; 177 mapcell *col;
… …
172 int texs; 186 int texs;
173 maptex *tex; 187 maptex *tex;
174 188
175 int32_t rows; 189 int32_t rows;
176 maprow *row; 190 maprow *row;
177} *CFClient__Map; 191} *CFPlus__Map;
178 192
179static char * 193static char *
180prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
181{ 195{
182 char *p; 196 char *p;
… …
200 214
201#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203 217
204static maprow * 218static maprow *
205map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
206{ 220{
207 if (0 > y) 221 if (0 > y)
208 { 222 {
209 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
210 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
… …
248 262
249 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
250} 264}
251 265
252static mapcell * 266static mapcell *
253map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
254{ 268{
255 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
256} 270}
257 271
258static void 272static void
259map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
260{ 274{
261 int r; 275 int r;
262 276
263 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
264 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
… …
272 self->row = 0; 286 self->row = 0;
273 self->rows = 0; 287 self->rows = 0;
274} 288}
275 289
276static void 290static void
277map_blank (CFClient__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278{ 292{
279 int x, y; 293 int x, y;
280 maprow *row; 294 maprow *row;
295 mapcell *cell;
281 296
282 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
283 if (y >= 0) 298 if (y >= 0)
284 { 299 {
285 if (y >= self->rows) 300 if (y >= self->rows)
… …
291 if (x >= row->c0) 306 if (x >= row->c0)
292 { 307 {
293 if (x >= row->c1) 308 if (x >= row->c1)
294 break; 309 break;
295 310
296 row->col[x - row->c0].darkness = -1; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
297 } 317 }
298 } 318 }
299} 319}
300 320
301static void 321static void
… …
339 n |= n >> 16; 359 n |= n >> 16;
340 360
341 return n + 1; 361 return n + 1;
342} 362}
343 363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
367
344MODULE = CFClient PACKAGE = CFClient 368MODULE = CFPlus PACKAGE = CFPlus
345 369
346PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
347 371
348BOOT: 372BOOT:
349{ 373{
350 HV *stash = gv_stashpv ("CFClient", 1); 374 HV *stash = gv_stashpv ("CFPlus", 1);
351 static const struct { 375 static const struct {
352 const char *name; 376 const char *name;
353 IV iv; 377 IV iv;
354 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
355# define const_iv(name) { # name, (IV)name } 379# define const_iv(name) { # name, (IV)name }
380 const_iv (SDLK_MODIFIER_MIN),
381 const_iv (SDLK_MODIFIER_MAX),
382
356 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
357 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
358 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
359 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
360 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
… …
369 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
370 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
371 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
372 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
373 const_iv (SDL_USEREVENT), 400 const_iv (SDL_USEREVENT),
401
402 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE),
405
374 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
375 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
376 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
377 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
378 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
… …
433 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
434 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
435 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
436 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
437 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
438 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
439 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
440 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
441 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
442 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
443 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
444 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
445 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
446 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
447 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
448 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
449 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
450 const_iv (KMOD_CTRL),
451 const_iv (KMOD_SHIFT),
452 const_iv (KMOD_ALT),
453 const_iv (KMOD_META)
454# undef const_iv 487# undef const_iv
455 }; 488 };
456 489
457 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
459} 495}
496
497int
498in_destruct ()
499 CODE:
500 RETVAL = PL_main_cv == Nullcv;
501 OUTPUT:
502 RETVAL
460 503
461NV floor (NV x) 504NV floor (NV x)
462 505
463NV ceil (NV x) 506NV ceil (NV x)
464 507
465void 508void
466pango_init () 509pango_init ()
467 CODE: 510 CODE:
468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{ 511{
470 {
471 ft2_fontmap = pango_ft2_font_map_new (); 512 opengl_fontmap = pango_opengl_font_map_new ();
472 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 513 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 514 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
477 cairo_fontmap = pango_cairo_font_map_get_default ();
478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
490} 515}
491 516
492int 517int
493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 518SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494 519
495void 520void
496SDL_Quit () 521SDL_Quit ()
497 522
498void 523void
… …
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 538 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 539 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 540 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516 541
517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 542 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543#if SDL_VERSION_ATLEAST(1,2,10)
544 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
545 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546#endif
518 547
519 SDL_EnableUNICODE (1); 548 SDL_EnableUNICODE (1);
520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 549 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521 550
522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 551 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
574 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
575 case SDL_KEYUP: 604 case SDL_KEYUP:
576 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
579 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580 break; 610 break;
581 611
582 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
609 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 639 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 640 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611 break; 641 break;
612 } 642 }
613 643
614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 644 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615 } 645 }
616} 646}
617 647
618int 648int
619Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 649Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
633#ifndef _WIN32 663#ifndef _WIN32
634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
635#endif 665#endif
636 666
637void 667void
668win32_proxy_info ()
669 PPCODE:
670{
671#ifdef _WIN32
672 char buffer[2048];
673 DWORD buflen;
674
675 EXTEND (SP, 3);
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
679 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
680 {
681 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
682
683 buflen = sizeof (buffer);
684 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
685 {
686 PUSHs (newSVpv (buffer, 0));
687
688 buflen = sizeof (buffer);
689 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
690 PUSHs (newSVpv (buffer, 0));
691 }
692 }
693#endif
694}
695
696void
638add_font (char *file) 697add_font (char *file)
639 CODE: 698 CODE:
640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641#ifdef _WIN32
642 // cairo... sigh... requires win2000
643 AddFontResourceEx (file, FR_PRIVATE, 0);
644#endif
645 700
646void 701void
647load_image_inline (SV *image_) 702load_image_inline (SV *image_)
648 ALIAS: 703 ALIAS:
649 load_image_file = 1 704 load_image_file = 1
… …
691 746
692 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 747 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693 748
694 assert (surface2->pitch == surface2->w * 4); 749 assert (surface2->pitch == surface2->w * 4);
695 750
751 SDL_LockSurface (surface2);
696 EXTEND (SP, 5); 752 EXTEND (SP, 6);
697 PUSHs (sv_2mortal (newSViv (surface2->w))); 753 PUSHs (sv_2mortal (newSViv (surface2->w)));
698 PUSHs (sv_2mortal (newSViv (surface2->h))); 754 PUSHs (sv_2mortal (newSViv (surface2->h)));
699 SDL_LockSurface (surface2);
700 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 755 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701 SDL_UnlockSurface (surface2);
702 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 756 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 757 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 758 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
759 SDL_UnlockSurface (surface2);
705 760
706 SDL_FreeSurface (surface); 761 SDL_FreeSurface (surface);
707 SDL_FreeSurface (surface2); 762 SDL_FreeSurface (surface2);
708} 763}
709 764
… …
748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749#endif 804#endif
750 _exit (1); 805 _exit (1);
751 806
752void 807void
753_exit (int retval) 808_exit (int retval = 0)
754 CODE: 809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
755 _exit (retval); 813 _exit (retval);
814#endif
756 815
757MODULE = CFClient PACKAGE = CFClient::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
758 817
759CFClient::Font 818CFPlus::Font
760new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
761 CODE: 820 CODE:
762{ 821{
763 int count; 822 int count;
764 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 823 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
767} 826}
768 OUTPUT: 827 OUTPUT:
769 RETVAL 828 RETVAL
770 829
771void 830void
772DESTROY (CFClient::Font self) 831DESTROY (CFPlus::Font self)
773 CODE: 832 CODE:
774 pango_font_description_free (self); 833 pango_font_description_free (self);
775 834
776void 835void
777make_default (CFClient::Font self) 836make_default (CFPlus::Font self)
778 CODE: 837 CODE:
779 default_font = self; 838 default_font = self;
780 839
781MODULE = CFClient PACKAGE = CFClient::Layout 840MODULE = CFPlus PACKAGE = CFPlus::Layout
782 841
783CFClient::Layout 842void
784new (SV *class, int rgba = 0) 843reset_glyph_cache ()
844 CODE:
845 tc_clear ();
846
847CFPlus::Layout
848new (SV *class)
785 CODE: 849 CODE:
786 New (0, RETVAL, 1, struct cf_layout); 850 New (0, RETVAL, 1, struct cf_layout);
787 851
788 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 852 RETVAL->pl = pango_layout_new (opengl_context);
789 RETVAL->rgba = rgba;
790 RETVAL->r = 1.; 853 RETVAL->r = 1.;
791 RETVAL->g = 1.; 854 RETVAL->g = 1.;
792 RETVAL->b = 1.; 855 RETVAL->b = 1.;
793 RETVAL->a = 1.; 856 RETVAL->a = 1.;
794 RETVAL->base_height = MIN_FONT_HEIGHT; 857 RETVAL->base_height = MIN_FONT_HEIGHT;
… …
798 layout_update_font (RETVAL); 861 layout_update_font (RETVAL);
799 OUTPUT: 862 OUTPUT:
800 RETVAL 863 RETVAL
801 864
802void 865void
803DESTROY (CFClient::Layout self) 866DESTROY (CFPlus::Layout self)
804 CODE: 867 CODE:
805 g_object_unref (self->pl); 868 g_object_unref (self->pl);
806 Safefree (self); 869 Safefree (self);
807 870
808int
809is_rgba (CFClient::Layout self)
810 CODE:
811 RETVAL = self->rgba;
812 OUTPUT:
813 RETVAL
814
815void 871void
816set_text (CFClient::Layout self, SV *text_) 872set_text (CFPlus::Layout self, SV *text_)
817 CODE: 873 CODE:
818{ 874{
819 STRLEN textlen; 875 STRLEN textlen;
820 char *text = SvPVutf8 (text_, textlen); 876 char *text = SvPVutf8 (text_, textlen);
821 877
822 pango_layout_set_text (self->pl, text, textlen); 878 pango_layout_set_text (self->pl, text, textlen);
823} 879}
824 880
825void 881void
826set_markup (CFClient::Layout self, SV *text_) 882set_markup (CFPlus::Layout self, SV *text_)
827 CODE: 883 CODE:
828{ 884{
829 STRLEN textlen; 885 STRLEN textlen;
830 char *text = SvPVutf8 (text_, textlen); 886 char *text = SvPVutf8 (text_, textlen);
831 887
832 pango_layout_set_markup (self->pl, text, textlen); 888 pango_layout_set_markup (self->pl, text, textlen);
833} 889}
834 890
835void 891void
836set_shapes (CFClient::Layout self, ...) 892set_shapes (CFPlus::Layout self, ...)
837 CODE: 893 CODE:
838{ 894{
839 PangoAttrList *attrs = 0; 895 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl); 896 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text; 897 const char *pos = text;
… …
876 if (attrs) 932 if (attrs)
877 pango_layout_set_attributes (self->pl, attrs); 933 pango_layout_set_attributes (self->pl, attrs);
878} 934}
879 935
880void 936void
881get_shapes (CFClient::Layout self) 937get_shapes (CFPlus::Layout self)
882 PPCODE: 938 PPCODE:
883{ 939{
884 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 940 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885 941
886 do 942 do
… …
890 if (run && shape_attr_p (run)) 946 if (run && shape_attr_p (run))
891 { 947 {
892 PangoRectangle extents; 948 PangoRectangle extents;
893 pango_layout_iter_get_run_extents (iter, 0, &extents); 949 pango_layout_iter_get_run_extents (iter, 0, &extents);
894 950
951 EXTEND (SP, 2);
895 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 952 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 953 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897 } 954 }
898 } 955 }
899 while (pango_layout_iter_next_run (iter)); 956 while (pango_layout_iter_next_run (iter));
900 957
901 pango_layout_iter_free (iter); 958 pango_layout_iter_free (iter);
902} 959}
903 960
904int 961int
905has_wrapped (CFClient::Layout self) 962has_wrapped (CFPlus::Layout self)
906 CODE: 963 CODE:
907{ 964{
908 int lines = 1; 965 int lines = 1;
909 const char *text = pango_layout_get_text (self->pl); 966 const char *text = pango_layout_get_text (self->pl);
910 967
… …
915} 972}
916 OUTPUT: 973 OUTPUT:
917 RETVAL 974 RETVAL
918 975
919SV * 976SV *
920get_text (CFClient::Layout self) 977get_text (CFPlus::Layout self)
921 CODE: 978 CODE:
922 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 979 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923 sv_utf8_decode (RETVAL); 980 sv_utf8_decode (RETVAL);
924 OUTPUT: 981 OUTPUT:
925 RETVAL 982 RETVAL
926 983
927void 984void
928set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 985set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929 CODE: 986 CODE:
930 self->r = r; 987 self->r = r;
931 self->g = g; 988 self->g = g;
932 self->b = b; 989 self->b = b;
933 self->a = a; 990 self->a = a;
934 991
935void 992void
936set_font (CFClient::Layout self, CFClient::Font font = 0) 993set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937 CODE: 994 CODE:
938 if (self->font != font) 995 if (self->font != font)
939 { 996 {
940 self->font = font; 997 self->font = font;
941 layout_update_font (self); 998 layout_update_font (self);
942 } 999 }
943 1000
944void 1001void
945set_height (CFClient::Layout self, int base_height) 1002set_height (CFPlus::Layout self, int base_height)
946 CODE: 1003 CODE:
947 if (self->base_height != base_height) 1004 if (self->base_height != base_height)
948 { 1005 {
949 self->base_height = base_height; 1006 self->base_height = base_height;
950 layout_update_font (self); 1007 layout_update_font (self);
951 } 1008 }
952 1009
953void 1010void
954set_width (CFClient::Layout self, int max_width = -1) 1011set_width (CFPlus::Layout self, int max_width = -1)
955 CODE: 1012 CODE:
956 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1013 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957 1014
958void 1015void
959set_indent (CFClient::Layout self, int indent) 1016set_indent (CFPlus::Layout self, int indent)
960 CODE: 1017 CODE:
961 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1018 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962 1019
963void 1020void
964set_spacing (CFClient::Layout self, int spacing) 1021set_spacing (CFPlus::Layout self, int spacing)
965 CODE: 1022 CODE:
966 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1023 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967 1024
968void 1025void
969set_ellipsise (CFClient::Layout self, int ellipsise) 1026set_ellipsise (CFPlus::Layout self, int ellipsise)
970 CODE: 1027 CODE:
971 pango_layout_set_ellipsize (self->pl, 1028 pango_layout_set_ellipsize (self->pl,
972 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1029 ellipsise == 1 ? PANGO_ELLIPSIZE_START
973 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1030 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1031 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
975 : PANGO_ELLIPSIZE_NONE 1032 : PANGO_ELLIPSIZE_NONE
976 ); 1033 );
977 1034
978void 1035void
979set_single_paragraph_mode (CFClient::Layout self, int spm) 1036set_single_paragraph_mode (CFPlus::Layout self, int spm)
980 CODE: 1037 CODE:
981 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1038 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982 1039
983void 1040void
984size (CFClient::Layout self) 1041size (CFPlus::Layout self)
985 PPCODE: 1042 PPCODE:
986{ 1043{
987 int w, h; 1044 int w, h;
988 1045
989 layout_get_pixel_size (self, &w, &h); 1046 layout_get_pixel_size (self, &w, &h);
… …
992 PUSHs (sv_2mortal (newSViv (w))); 1049 PUSHs (sv_2mortal (newSViv (w)));
993 PUSHs (sv_2mortal (newSViv (h))); 1050 PUSHs (sv_2mortal (newSViv (h)));
994} 1051}
995 1052
996int 1053int
997descent (CFClient::Layout self) 1054descent (CFPlus::Layout self)
998 CODE: 1055 CODE:
999{ 1056{
1000 PangoRectangle rect; 1057 PangoRectangle rect;
1001 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1058 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002 pango_layout_line_get_pixel_extents (line, 0, &rect); 1059 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
1004} 1061}
1005 OUTPUT: 1062 OUTPUT:
1006 RETVAL 1063 RETVAL
1007 1064
1008int 1065int
1009xy_to_index (CFClient::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
1010 CODE: 1067 CODE:
1011{ 1068{
1012 int index, trailing; 1069 int index, trailing;
1013 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014 RETVAL = index; 1071 RETVAL = index + trailing;
1015} 1072}
1016 OUTPUT: 1073 OUTPUT:
1017 RETVAL 1074 RETVAL
1018 1075
1019void 1076void
1020cursor_pos (CFClient::Layout self, int index) 1077cursor_pos (CFPlus::Layout self, int index)
1021 PPCODE: 1078 PPCODE:
1022{ 1079{
1023 PangoRectangle strong_pos; 1080 PangoRectangle strong_pos;
1024 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1081 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025 1082
… …
1028 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030} 1087}
1031 1088
1032void 1089void
1033render (CFClient::Layout self) 1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1034 PPCODE: 1091 PPCODE:
1035{ 1092{
1036 SV *retval; 1093 int line, x;
1037 int w, h;
1038 1094
1039 layout_get_pixel_size (self, &w, &h); 1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1040 1097
1041 if (self->rgba)
1042 {
1043 cairo_surface_t *surface;
1044 cairo_t *cairo;
1045
1046 retval = newSV (w * h * 4);
1047 SvPOK_only (retval);
1048 SvCUR_set (retval, w * h * 4);
1049
1050 memset (SvPVX (retval), 0, w * h * 4);
1051
1052 surface = cairo_image_surface_create_for_data (
1053 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1054 cairo = cairo_create (surface);
1055 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057 pango_cairo_show_layout (cairo, self->pl);
1058
1059 cairo_destroy (cairo);
1060 cairo_surface_destroy (surface);
1061
1062 // what a mess, and its premultiplied, too :(
1063 {
1064 uint32_t *p = (uint32_t *)SvPVX (retval);
1065 uint32_t *e = p + w * h;
1066
1067 while (p < e)
1068 {
1069 uint32_t rgba = *p;
1070 rgba = (rgba >> 24) | (rgba << 8);
1071#if 0
1072#ifdef _WIN32
1073 {//D
1074 uint8_t r = rgba >> 24;
1075 uint8_t g = rgba >> 16;
1076 uint8_t b = rgba >> 8;
1077 uint8_t a = rgba >> 0;
1078
1079 rgba = (rgba & 0xffffff00) | a;
1080 }
1081#endif
1082#endif
1083 rgba = SDL_SwapBE32 (rgba);
1084 *p++ = rgba;
1085 }
1086 }
1087
1088 EXTEND (SP, 5); 1098 EXTEND (SP, 2);
1089 PUSHs (sv_2mortal (newSViv (w))); 1099 PUSHs (sv_2mortal (newSViv (line - 1)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101}
1102
1103void
1104line_x_to_index (CFPlus::Layout self, int line, int x)
1105 PPCODE:
1106{
1107 PangoLayoutLine *lp;
1108 int index, trailing;
1109
1110 if (line < 0)
1111 XSRETURN_EMPTY;
1112
1113 if (!(lp = pango_layout_get_line (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */
1115
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117
1118 EXTEND (SP, 2);
1119 if (GIMME_V == G_SCALAR)
1090 PUSHs (sv_2mortal (newSViv (h))); 1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
1091 PUSHs (sv_2mortal (retval));
1092 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094 }
1095 else 1121 else
1096 { 1122 {
1097 FT_Bitmap bitmap;
1098
1099 retval = newSV (w * h);
1100 SvPOK_only (retval);
1101 SvCUR_set (retval, w * h);
1102
1103 bitmap.rows = h;
1104 bitmap.width = w;
1105 bitmap.pitch = w;
1106 bitmap.buffer = (unsigned char*)SvPVX (retval);
1107 bitmap.num_grays = 256;
1108 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110 memset (bitmap.buffer, 0, w * h);
1111
1112 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114 EXTEND (SP, 5);
1115 PUSHs (sv_2mortal (newSViv (w))); 1123 PUSHs (sv_2mortal (newSViv (index)));
1116 PUSHs (sv_2mortal (newSViv (h))); 1124 PUSHs (sv_2mortal (newSViv (trailing)));
1117 PUSHs (sv_2mortal (retval));
1118 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120 } 1125 }
1121} 1126}
1122 1127
1128void
1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1130 PPCODE:
1131 pango_opengl_render_layout_subpixel (
1132 self->pl,
1133 x * PANGO_SCALE, y * PANGO_SCALE,
1134 self->r, self->g, self->b, self->a,
1135 flags
1136 );
1137
1123MODULE = CFClient PACKAGE = CFClient::Texture 1138MODULE = CFPlus PACKAGE = CFPlus::Texture
1124 1139
1125void 1140void
1126pad2pot (SV *data_, SV *w_, SV *h_) 1141pad2pot (SV *data_, SV *w_, SV *h_)
1127 CODE: 1142 CODE:
1128{ 1143{
… …
1206 glDisable (GL_ALPHA_TEST); 1221 glDisable (GL_ALPHA_TEST);
1207 glDisable (GL_BLEND); 1222 glDisable (GL_BLEND);
1208 } 1223 }
1209} 1224}
1210 1225
1211MODULE = CFClient PACKAGE = CFClient::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1212 1227
1213CFClient::Map 1228CFPlus::Map
1214new (SV *class, int map_width, int map_height) 1229new (SV *class)
1215 CODE: 1230 CODE:
1216 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1217 RETVAL->x = 0; 1232 RETVAL->x = 0;
1218 RETVAL->y = 0; 1233 RETVAL->y = 0;
1219 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1220 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1221 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1222 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1223 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1224 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1225 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
… …
1228 RETVAL->row = 0; 1243 RETVAL->row = 0;
1229 OUTPUT: 1244 OUTPUT:
1230 RETVAL 1245 RETVAL
1231 1246
1232void 1247void
1233DESTROY (CFClient::Map self) 1248DESTROY (CFPlus::Map self)
1234 CODE: 1249 CODE:
1235{ 1250{
1236 map_clear (self); 1251 map_clear (self);
1237 Safefree (self->face); 1252 Safefree (self->face);
1238 Safefree (self->tex); 1253 Safefree (self->tex);
1239 Safefree (self); 1254 Safefree (self);
1240} 1255}
1241 1256
1242void 1257void
1258resize (CFPlus::Map self, int map_width, int map_height)
1259 CODE:
1260 self->w = map_width;
1261 self->h = map_height;
1262
1263void
1243clear (CFClient::Map self) 1264clear (CFPlus::Map self)
1244 CODE: 1265 CODE:
1245 map_clear (self); 1266 map_clear (self);
1246 1267
1247void 1268void
1248set_face (CFClient::Map self, int face, int texid) 1269set_face (CFPlus::Map self, int face, int texid)
1249 CODE: 1270 CODE:
1250{ 1271{
1251 while (self->faces <= face) 1272 while (self->faces <= face)
1252 { 1273 {
1253 Append (mapface, self->face, self->faces, self->faces); 1274 Append (mapface, self->face, self->faces, self->faces);
… …
1256 1277
1257 self->face [face] = texid; 1278 self->face [face] = texid;
1258} 1279}
1259 1280
1260void 1281void
1261set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1282set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1262 CODE: 1283 CODE:
1263{ 1284{
1264 while (self->texs <= texid) 1285 while (self->texs <= texid)
1265 { 1286 {
1266 Append (maptex, self->tex, self->texs, self->texs); 1287 Append (maptex, self->tex, self->texs, self->texs);
… …
1290 // from transparent color bleeding and ugly wrapping effects. 1311 // from transparent color bleeding and ugly wrapping effects.
1291 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1312 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292} 1313}
1293 1314
1294int 1315int
1295ox (CFClient::Map self) 1316ox (CFPlus::Map self)
1296 ALIAS: 1317 ALIAS:
1297 oy = 1 1318 oy = 1
1298 x = 2 1319 x = 2
1299 y = 3 1320 y = 3
1300 w = 4 1321 w = 4
… …
1311 } 1332 }
1312 OUTPUT: 1333 OUTPUT:
1313 RETVAL 1334 RETVAL
1314 1335
1315void 1336void
1316scroll (CFClient::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
1317 CODE: 1338 CODE:
1318{ 1339{
1319 if (dx > 0) 1340 if (dx > 0)
1320 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
1321 else if (dx < 0) 1342 else if (dx < 0)
1322 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1343 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1323 1344
1324 if (dy > 0) 1345 if (dy > 0)
1325 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
1326 else if (dy < 0) 1347 else if (dy < 0)
1327 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1348 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1328 1349
1329 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
1330 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
1331 1352
1332 while (self->y < 0) 1353 while (self->y < 0)
… …
1337 self->y += MAP_EXTEND_Y; 1358 self->y += MAP_EXTEND_Y;
1338 } 1359 }
1339} 1360}
1340 1361
1341void 1362void
1342map1a_update (CFClient::Map self, SV *data_) 1363map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343 CODE: 1364 CODE:
1344{ 1365{
1345 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1346 uint8_t *data_end = (uint8_t *)SvEND (data_); 1367 uint8_t *data_end = (uint8_t *)SvEND (data_);
1347 mapcell *cell; 1368 mapcell *cell;
1348 int x, y, flags; 1369 int x, y, flags;
1349 1370
1350 while (data < data_end) 1371 while (data < data_end - 1)
1351 { 1372 {
1352 flags = (data [0] << 8) + data [1]; data += 2; 1373 flags = (data [0] << 8) + data [1]; data += 2;
1353 1374
1354 x = self->x + ((flags >> 10) & 63); 1375 x = self->x + ((flags >> 10) & 63);
1355 y = self->y + ((flags >> 4) & 63); 1376 y = self->y + ((flags >> 4) & 63);
1356 1377
1357 cell = map_get_cell (self, x, y); 1378 cell = map_get_cell (self, x, y);
1358 1379
1359 if (flags & 15) 1380 if (flags & 15)
1360 { 1381 {
1361 if (cell->darkness < 0) 1382 if (!cell->darkness)
1362 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
1363 cell->darkness = 0; 1385 cell->darkness = 256;
1364 cell->face [0] = 0;
1365 cell->face [1] = 0;
1366 cell->face [2] = 0;
1367 } 1386 }
1368 1387
1369 cell->darkness = flags & 8 ? *data++ : 255;
1370
1371 //TODO: don't trust server data to be in-range(!) 1388 //TODO: don't trust server data to be in-range(!)
1389
1390 if (flags & 8)
1391 {
1392 if (extmap)
1393 {
1394 uint8_t ext, cmd;
1395
1396 do
1397 {
1398 ext = *data++;
1399 cmd = ext & 0x3f;
1400
1401 if (cmd < 4)
1402 cell->darkness = 255 - ext * 64 + 1;
1403 else if (cmd == 5) // health
1404 {
1405 cell->stat_width = 1;
1406 cell->stat_hp = *data++;
1407 }
1408 else if (cmd == 6) // monster width
1409 cell->stat_width = *data++ + 1;
1410 else if (cmd == 0x47) // monster width
1411 {
1412 if (*data == 4)
1413 ; // decode player tag
1414
1415 data += *data + 1;
1416 }
1417 else if (cmd == 8) // cell flags
1418 cell->flags = *data++;
1419 else if (ext & 0x40) // unknown, multibyte => skip
1420 data += *data + 1;
1421 else
1422 data++;
1423 }
1424 while (ext & 0x80);
1425 }
1426 else
1427 cell->darkness = *data++ + 1;
1428 }
1372 1429
1373 if (flags & 4) 1430 if (flags & 4)
1374 { 1431 {
1375 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1432 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1376 } 1433 }
… …
1384 { 1441 {
1385 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1442 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1386 } 1443 }
1387 } 1444 }
1388 else 1445 else
1389 cell->darkness = -1; 1446 cell->darkness = 0;
1390 } 1447 }
1391} 1448}
1392 1449
1393SV * 1450SV *
1394mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395 CODE: 1452 CODE:
1396{ 1453{
1397 int x1, x; 1454 int x1, x;
1398 int y1, y; 1455 int y1, y;
1399 int z; 1456 int z;
… …
1449} 1506}
1450 OUTPUT: 1507 OUTPUT:
1451 RETVAL 1508 RETVAL
1452 1509
1453void 1510void
1454draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1511draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1455 CODE: 1512 CODE:
1456{ 1513{
1457 int vx, vy;
1458 int x, y, z; 1514 int x, y, z;
1459 int last_name; 1515 int last_name;
1460 mapface face; 1516 mapface face;
1461
1462 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1463 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1464
1465 /*
1466 int vx = self->vx = self->w >= sw
1467 ? self->x + (self->w - sw) / 2
1468 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1469
1470 int vy = self->vy = self->h >= sh
1471 ? self->y + (self->h - sh) / 2
1472 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1473 */
1474 1517
1475 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1476 1519
1477 glEnable (GL_BLEND); 1520 glEnable (GL_BLEND);
1478 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1481 1524
1482 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1483 1526
1484 last_name = 0; 1527 last_name = 0;
1485 1528
1529 mx += self->x;
1530 my += self->y;
1531
1486 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1487 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1488 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1489 { 1535 {
1490 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1491 1537
1492 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1493 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1494 { 1540 {
1495 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1496 1542
1497 face = cell->face [z]; 1543 face = cell->face [z];
1498 1544
1499 if (face) 1545 if (face && face < self->texs)
1500 { 1546 {
1501 maptex tex = self->tex [face]; 1547 maptex tex = self->tex [face];
1502
1503 int px = (x + 1) * 32 - tex.w; 1548 int px = (x + 1) * 32 - tex.w;
1504 int py = (y + 1) * 32 - tex.h; 1549 int py = (y + 1) * 32 - tex.h;
1505 1550
1506 if (last_name != tex.name) 1551 if (last_name != tex.name)
1507 { 1552 {
1508 glEnd (); 1553 glEnd ();
1509 last_name = tex.name;
1510 glBindTexture (GL_TEXTURE_2D, last_name); 1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511 glBegin (GL_QUADS); 1555 glBegin (GL_QUADS);
1512 } 1556 }
1513 1557
1514 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1560 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1517 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518 } 1562 }
1563
1564 if (cell->flags && z == 2)
1565 {
1566 if (cell->flags & 1)
1567 {
1568 maptex tex = self->tex [1];
1569 int px = (x + 1) * 32 - tex.w + 2;
1570 int py = (y + 1) * 32 - tex.h - 6;
1571
1572 glEnd ();
1573 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574 glBegin (GL_QUADS);
1575
1576 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580 }
1581 }
1519 } 1582 }
1520 } 1583 }
1521 1584
1522 glEnd (); 1585 glEnd ();
1523 1586
1524 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1525 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1526}
1527 1589
1590 // top layer: overlays such as the health bar
1591 for (y = 0; y < sh; y++)
1592 if (0 <= y + my && y + my < self->rows)
1593 {
1594 maprow *row = self->row + (y + my);
1595
1596 for (x = 0; x < sw; x++)
1597 if (row->c0 <= x + mx && x + mx < row->c1)
1598 {
1599 mapcell *cell = row->col + (x + mx - row->c0);
1600
1601 int px = x * 32;
1602 int py = y * 32;
1603
1604 if (cell->stat_hp)
1605 {
1606 int width = cell->stat_width * 32;
1607 int thick = sh / 28 + 1 + cell->stat_width;
1608
1609 glColor3ub (0, 0, 0);
1610 glRectf (px + 1, py - thick - 2,
1611 px + width - 1, py);
1612
1613 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1614 glRectf (px + 2,
1615 py - thick - 1,
1616 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1617 }
1618 }
1619 }
1620}
1621
1528void 1622void
1529draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1623draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530 CODE: 1624 CODE:
1531{ 1625{
1532 static float color[16][3] = { 1626 static float color[16][3] = {
1533 { 0.00F, 0.00F, 0.00F }, 1627 { 0.00F, 0.00F, 0.00F },
1534 { 1.00F, 1.00F, 1.00F }, 1628 { 1.00F, 1.00F, 1.00F },
… …
1584 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1585 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1586} 1680}
1587 1681
1588void 1682void
1589fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1590 PPCODE: 1684 PPCODE:
1591{ 1685{
1592 int vx, vy;
1593 int x, y; 1686 int x, y;
1594 int sw4 = (sw + 3) & ~3; 1687 int sw4 = (sw + 3) & ~3;
1595 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1596 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1597 1690
1598 memset (darkness, 255, sw4 * sh); 1691 memset (darkness, 255, sw4 * sh);
1599 SvPOK_only (darkness_sv); 1692 SvPOK_only (darkness_sv);
1600 SvCUR_set (darkness_sv, sw4 * sh); 1693 SvCUR_set (darkness_sv, sw4 * sh);
1601 1694
1602 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1695 mx += self->x;
1603 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1696 my += self->y;
1604 1697
1605 for (y = 0; y < sh; y++) 1698 for (y = 0; y < sh; y++)
1606 if (0 <= y + vy && y + vy < self->rows) 1699 if (0 <= y + my && y + my < self->rows)
1607 { 1700 {
1608 maprow *row = self->row + (y + vy); 1701 maprow *row = self->row + (y + my);
1609 1702
1610 for (x = 0; x < sw; x++) 1703 for (x = 0; x < sw; x++)
1611 if (row->c0 <= x + vx && x + vx < row->c1) 1704 if (row->c0 <= x + mx && x + mx < row->c1)
1612 { 1705 {
1613 mapcell *cell = row->col + (x + vx - row->c0); 1706 mapcell *cell = row->col + (x + mx - row->c0);
1614 1707
1615 darkness[y * sw4 + x] = cell->darkness < 0 1708 darkness[y * sw4 + x] = cell->darkness
1709 ? 255 - (cell->darkness - 1)
1616 ? 255 - FOW_DARKNESS 1710 : 255 - FOW_DARKNESS;
1617 : 255 - cell->darkness;
1618 } 1711 }
1619 } 1712 }
1620 1713
1621 EXTEND (SP, 3); 1714 EXTEND (SP, 3);
1622 PUSHs (sv_2mortal (newSViv (sw4))); 1715 PUSHs (sv_2mortal (newSViv (sw4)));
1623 PUSHs (sv_2mortal (newSViv (sh))); 1716 PUSHs (sv_2mortal (newSViv (sh)));
1624 PUSHs (darkness_sv); 1717 PUSHs (darkness_sv);
1625} 1718}
1626 1719
1627SV * 1720SV *
1628get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1721get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629 CODE: 1722 CODE:
1630{ 1723{
1631 int x, y, x1, y1; 1724 int x, y, x1, y1;
1632 SV *data_sv = newSV (w * h * 7 + 5); 1725 SV *data_sv = newSV (w * h * 7 + 5);
1633 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1726 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1695} 1788}
1696 OUTPUT: 1789 OUTPUT:
1697 RETVAL 1790 RETVAL
1698 1791
1699void 1792void
1700set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1793set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701 PPCODE: 1794 PPCODE:
1702{ 1795{
1703 int x, y, z; 1796 int x, y, z;
1704 int w, h; 1797 int w, h;
1705 int x1, y1; 1798 int x1, y1;
… …
1737 1830
1738 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1739 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1740 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1741 1834
1742 if (cell->darkness <= 0) 1835 if (cell->darkness == 0)
1743 { 1836 {
1744 cell->darkness = -1; 1837 cell->darkness = 0;
1745 1838
1746 for (z = 0; z <= 2; z++) 1839 for (z = 0; z <= 2; z++)
1747 { 1840 {
1748 cell->face[z] = face[z]; 1841 cell->face[z] = face[z];
1749 1842
… …
1754 } 1847 }
1755 } 1848 }
1756 } 1849 }
1757} 1850}
1758 1851
1759MODULE = CFClient PACKAGE = CFClient::MixChunk 1852MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760 1853
1761CFClient::MixChunk 1854CFPlus::MixChunk
1762new_from_file (SV *class, char *path) 1855new_from_file (SV *class, char *path)
1763 CODE: 1856 CODE:
1764 RETVAL = Mix_LoadWAV (path); 1857 RETVAL = Mix_LoadWAV (path);
1765 OUTPUT: 1858 OUTPUT:
1766 RETVAL 1859 RETVAL
1767 1860
1768void 1861void
1769DESTROY (CFClient::MixChunk self) 1862DESTROY (CFPlus::MixChunk self)
1770 CODE: 1863 CODE:
1771 Mix_FreeChunk (self); 1864 Mix_FreeChunk (self);
1772 1865
1773int 1866int
1774volume (CFClient::MixChunk self, int volume = -1) 1867volume (CFPlus::MixChunk self, int volume = -1)
1775 CODE: 1868 CODE:
1776 RETVAL = Mix_VolumeChunk (self, volume); 1869 RETVAL = Mix_VolumeChunk (self, volume);
1777 OUTPUT: 1870 OUTPUT:
1778 RETVAL 1871 RETVAL
1779 1872
1780int 1873int
1781play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1874play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782 CODE: 1875 CODE:
1783 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1876 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784 OUTPUT: 1877 OUTPUT:
1785 RETVAL 1878 RETVAL
1786 1879
1787MODULE = CFClient PACKAGE = CFClient::MixMusic 1880MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788 1881
1789int 1882int
1790volume (int volume = -1) 1883volume (int volume = -1)
1791 CODE: 1884 CODE:
1792 RETVAL = Mix_VolumeMusic (volume); 1885 RETVAL = Mix_VolumeMusic (volume);
1793 OUTPUT: 1886 OUTPUT:
1794 RETVAL 1887 RETVAL
1795 1888
1796CFClient::MixMusic 1889CFPlus::MixMusic
1797new_from_file (SV *class, char *path) 1890new_from_file (SV *class, char *path)
1798 CODE: 1891 CODE:
1799 RETVAL = Mix_LoadMUS (path); 1892 RETVAL = Mix_LoadMUS (path);
1800 OUTPUT: 1893 OUTPUT:
1801 RETVAL 1894 RETVAL
1802 1895
1803void 1896void
1804DESTROY (CFClient::MixMusic self) 1897DESTROY (CFPlus::MixMusic self)
1805 CODE: 1898 CODE:
1806 Mix_FreeMusic (self); 1899 Mix_FreeMusic (self);
1807 1900
1808int 1901int
1809play (CFClient::MixMusic self, int loops = -1) 1902play (CFPlus::MixMusic self, int loops = -1)
1810 CODE: 1903 CODE:
1811 RETVAL = Mix_PlayMusic (self, loops); 1904 RETVAL = Mix_PlayMusic (self, loops);
1812 OUTPUT: 1905 OUTPUT:
1813 RETVAL 1906 RETVAL
1814 1907
1815MODULE = CFClient PACKAGE = CFClient::OpenGL 1908MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816 1909
1817BOOT: 1910BOOT:
1818{ 1911{
1819 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1912 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820 static const struct { 1913 static const struct {
1821 const char *name; 1914 const char *name;
1822 IV iv; 1915 IV iv;
1823 } *civ, const_iv[] = { 1916 } *civ, const_iv[] = {
1824# define const_iv(name) { # name, (IV)name } 1917# define const_iv(name) { # name, (IV)name }
… …
1887 const_iv (GL_SEPARABLE_2D), 1980 const_iv (GL_SEPARABLE_2D),
1888 const_iv (GL_CONVOLUTION_2D), 1981 const_iv (GL_CONVOLUTION_2D),
1889 const_iv (GL_CONVOLUTION_BORDER_MODE), 1982 const_iv (GL_CONVOLUTION_BORDER_MODE),
1890 const_iv (GL_CONSTANT_BORDER), 1983 const_iv (GL_CONSTANT_BORDER),
1891 const_iv (GL_LINES), 1984 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP),
1892 const_iv (GL_LINE_LOOP), 1986 const_iv (GL_LINE_LOOP),
1893 const_iv (GL_QUADS), 1987 const_iv (GL_QUADS),
1894 const_iv (GL_QUAD_STRIP), 1988 const_iv (GL_QUAD_STRIP),
1895 const_iv (GL_TRIANGLES), 1989 const_iv (GL_TRIANGLES),
1896 const_iv (GL_TRIANGLE_STRIP), 1990 const_iv (GL_TRIANGLE_STRIP),
… …
2006 r *= a; 2100 r *= a;
2007 g *= a; 2101 g *= a;
2008 b *= a; 2102 b *= a;
2009 } 2103 }
2010 // microsoft visual "c" rounds instead of truncating... 2104 // microsoft visual "c" rounds instead of truncating...
2011 glColor4ub (MIN ((int)(r * 256.f), 255), 2105 glColor4f (r, g, b, a);
2012 MIN ((int)(g * 256.f), 255),
2013 MIN ((int)(b * 256.f), 255),
2014 MIN ((int)(a * 256.f), 255));
2015 2106
2016void glInterleavedArrays (int format, int stride, char *data) 2107void glInterleavedArrays (int format, int stride, char *data)
2017 2108
2018void glDrawElements (int mode, int count, int type, char *indices) 2109void glDrawElements (int mode, int count, int type, char *indices)
2019 2110
… …
2096 2187
2097void glEndList () 2188void glEndList ()
2098 2189
2099void glCallList (int list) 2190void glCallList (int list)
2100 2191
2101

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines