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.160 by root, Mon Oct 9 01:06:36 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2long _ftol (double); /* defined by VC6 C libs */
3long _ftol2 (double dblSource) { return _ftol (dblSource); }
4# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 5# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 6# include <malloc.h>
4# include <windows.h> 7# include <windows.h>
8# include <wininet.h>
5# pragma warning(disable:4244) 9# pragma warning(disable:4244)
6#endif 10#endif
7 11
8#include "EXTERN.h" 12#include "EXTERN.h"
9#include "perl.h" 13#include "perl.h"
10#include "XSUB.h" 14#include "XSUB.h"
11 15
16#ifdef _WIN32
17# undef pipe
18#endif
19
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
15 24
16#include <SDL.h> 25#include <SDL.h>
17#include <SDL_endian.h> 26#include <SDL_endian.h>
18#include <SDL_image.h> 27#include <SDL_image.h>
19#include <SDL_mixer.h> 28#include <SDL_mixer.h>
20#include <SDL_opengl.h> 29#include <SDL_opengl.h>
21 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
22#include <glib/gmacros.h> 34#include <glib/gmacros.h>
23 35
24#include <pango/pango.h> 36#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 37
29#ifndef _WIN32 38#ifndef _WIN32
30# include <sys/types.h> 39# include <sys/types.h>
31# include <sys/socket.h> 40# include <sys/socket.h>
32# include <netinet/in.h> 41# include <netinet/in.h>
39 typedef signed char int8_t; 48 typedef signed char int8_t;
40 typedef signed short int16_t; 49 typedef signed short int16_t;
41 typedef signed int int32_t; 50 typedef signed int int32_t;
42#endif 51#endif
43 52
44#include "glext.h" 53#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45 54
46#define FOW_DARKNESS 32 55#define FOW_DARKNESS 32
47 56
48#define MAP_EXTEND_X 32 57#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 58#define MAP_EXTEND_Y 512
50 59
51#define MIN_FONT_HEIGHT 10 60#define MIN_FONT_HEIGHT 10
61
62#if 0
63# define PARACHUTE SDL_INIT_NOPARACHUTE
64#else
65# define PARACHUTE 0
66#endif
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"
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 80 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 81 else
67 glBlendFunc (sa, da); 82 glBlendFunc (sa, da);
68} 83}
69 84
85#include "texcache.c"
86
87#include "pango-font.c"
88#include "pango-fontmap.c"
89#include "pango-render.c"
90
70typedef Mix_Chunk *CFClient__MixChunk; 91typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 92typedef Mix_Music *CFPlus__MixMusic;
72 93
73typedef PangoFontDescription *CFClient__Font; 94typedef PangoFontDescription *CFPlus__Font;
95
96static int
97shape_attr_p (PangoLayoutRun *run)
98{
99 GSList *attrs = run->item->analysis.extra_attrs;
100
101 while (attrs)
102 {
103 PangoAttribute *attr = attrs->data;
104
105 if (attr->klass->type == PANGO_ATTR_SHAPE)
106 return 1;
107
108 attrs = attrs->next;
109 }
110
111 return 0;
112}
74 113
75typedef struct cf_layout { 114typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 115 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 116 float r, g, b, a; // default color for rgba mode
79 int base_height; 117 int base_height;
80 CFClient__Font font; 118 CFPlus__Font font;
81} *CFClient__Layout; 119} *CFPlus__Layout;
82 120
83static CFClient__Font default_font; 121static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 122static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 123static PangoFontMap *opengl_fontmap;
86 124
87static void 125static void
88substitute_func (FcPattern *pattern, gpointer data) 126substitute_func (FcPattern *pattern, gpointer data)
89{ 127{
90 FcPatternAddBool (pattern, FC_HINTING, 1); 128 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef FC_HINT_STYLE 129#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 130 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#endif 131#endif
94#ifdef _WIN32
95 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96#else
97 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 132 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98#endif
99} 133}
100 134
101static void 135static void
102layout_update_font (CFClient__Layout self) 136layout_update_font (CFPlus__Layout self)
103{ 137{
104 /* use a random scale factor to account for unknown descenders, 0.8 works 138 /* use a random scale factor to account for unknown descenders, 0.8 works
105 * reasonably well with bitstream vera 139 * reasonably well with bitstream vera
106 */ 140 */
107 PangoFontDescription *font = self->font ? self->font : default_font; 141 PangoFontDescription *font = self->font ? self->font : default_font;
111 145
112 pango_layout_set_font_description (self->pl, font); 146 pango_layout_set_font_description (self->pl, font);
113} 147}
114 148
115static void 149static void
116layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 150layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117{ 151{
152 PangoRectangle rect;
153
154 // get_pixel_* wrongly rounds down
118 pango_layout_get_pixel_size (self->pl, w, h); 155 pango_layout_get_extents (self->pl, 0, &rect);
119 156
120 if (!*w) *w = 1; 157 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121 if (!*h) *h = 1; 158 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122 159
123 *w = (*w + 3) & ~3; 160 if (!rect.width) rect.width = 1;
161 if (!rect.height) rect.height = 1;
162
163 *w = rect.width;
164 *h = rect.height;
124} 165}
125 166
126typedef uint16_t mapface; 167typedef uint16_t mapface;
127 168
128typedef struct { 169typedef struct {
131 float s, t; 172 float s, t;
132 uint8_t r, g, b, a; 173 uint8_t r, g, b, a;
133} maptex; 174} maptex;
134 175
135typedef struct { 176typedef struct {
136 int16_t darkness; 177 uint32_t player;
137 mapface face[3]; 178 mapface face[3];
179 uint16_t darkness;
180 uint8_t stat_width, stat_hp, flags;
138} mapcell; 181} mapcell;
139 182
140typedef struct { 183typedef struct {
141 int32_t c0, c1; 184 int32_t c0, c1;
142 mapcell *col; 185 mapcell *col;
151 int texs; 194 int texs;
152 maptex *tex; 195 maptex *tex;
153 196
154 int32_t rows; 197 int32_t rows;
155 maprow *row; 198 maprow *row;
156} *CFClient__Map; 199} *CFPlus__Map;
157 200
158static char * 201static char *
159prepend (char *ptr, int sze, int inc) 202prepend (char *ptr, int sze, int inc)
160{ 203{
161 char *p; 204 char *p;
179 222
180#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 223#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)) 224#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182 225
183static maprow * 226static maprow *
184map_get_row (CFClient__Map self, int y) 227map_get_row (CFPlus__Map self, int y)
185{ 228{
186 if (0 > y) 229 if (0 > y)
187 { 230 {
188 int extend = - y + MAP_EXTEND_Y; 231 int extend = - y + MAP_EXTEND_Y;
189 Prepend (maprow, self->row, self->rows, extend); 232 Prepend (maprow, self->row, self->rows, extend);
227 270
228 return row->col + (x - row->c0); 271 return row->col + (x - row->c0);
229} 272}
230 273
231static mapcell * 274static mapcell *
232map_get_cell (CFClient__Map self, int x, int y) 275map_get_cell (CFPlus__Map self, int x, int y)
233{ 276{
234 return row_get_cell (map_get_row (self, y), x); 277 return row_get_cell (map_get_row (self, y), x);
235} 278}
236 279
237static void 280static void
238map_clear (CFClient__Map self) 281map_clear (CFPlus__Map self)
239{ 282{
240 int r; 283 int r;
241 284
242 for (r = 0; r < self->rows; r++) 285 for (r = 0; r < self->rows; r++)
243 Safefree (self->row[r].col); 286 Safefree (self->row[r].col);
251 self->row = 0; 294 self->row = 0;
252 self->rows = 0; 295 self->rows = 0;
253} 296}
254 297
255static void 298static void
256map_blank (CFClient__Map self, int x0, int y0, int w, int h) 299map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
257{ 300{
258 int x, y; 301 int x, y;
259 maprow *row; 302 maprow *row;
303 mapcell *cell;
260 304
261 for (y = y0; y < y0 + h; y++) 305 for (y = y0; y < y0 + h; y++)
262 if (y >= 0) 306 if (y >= 0)
263 { 307 {
264 if (y >= self->rows) 308 if (y >= self->rows)
270 if (x >= row->c0) 314 if (x >= row->c0)
271 { 315 {
272 if (x >= row->c1) 316 if (x >= row->c1)
273 break; 317 break;
274 318
275 row->col[x - row->c0].darkness = -1; 319 cell = row->col + x - row->c0;
320
321 cell->darkness = 0;
322 cell->stat_hp = 0;
323 cell->flags = 0;
324 cell->player = 0;
276 } 325 }
277 } 326 }
278} 327}
279 328
280static void 329static void
301 ev.data2 = 0; 350 ev.data2 = 0;
302 351
303 SDL_PushEvent ((SDL_Event *)&ev); 352 SDL_PushEvent ((SDL_Event *)&ev);
304} 353}
305 354
355static unsigned int
356minpot (unsigned int n)
357{
358 if (!n)
359 return 0;
360
361 --n;
362
363 n |= n >> 1;
364 n |= n >> 2;
365 n |= n >> 4;
366 n |= n >> 8;
367 n |= n >> 16;
368
369 return n + 1;
370}
371
306MODULE = CFClient PACKAGE = CFClient 372MODULE = CFPlus PACKAGE = CFPlus
307 373
308PROTOTYPES: ENABLE 374PROTOTYPES: ENABLE
309 375
310BOOT: 376BOOT:
311{ 377{
312 HV *stash = gv_stashpv ("CFClient", 1); 378 HV *stash = gv_stashpv ("CFPlus", 1);
313 static const struct { 379 static const struct {
314 const char *name; 380 const char *name;
315 IV iv; 381 IV iv;
316 } *civ, const_iv[] = { 382 } *civ, const_iv[] = {
317# define const_iv(name) { # name, (IV)name } 383# define const_iv(name) { # name, (IV)name }
418 484
419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 485 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 486 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
421} 487}
422 488
489int
490in_destruct ()
491 CODE:
492 RETVAL = PL_main_cv == Nullcv;
493 OUTPUT:
494 RETVAL
495
496NV floor (NV x)
497
498NV ceil (NV x)
499
423void 500void
424pango_init () 501pango_init ()
425 CODE: 502 CODE:
426 // delayed, so it can pick up new fonts added by AddFontResourceEx
427{ 503{
428 {
429 ft2_fontmap = pango_ft2_font_map_new (); 504 opengl_fontmap = pango_opengl_font_map_new ();
430 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 505 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); 506 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} 507}
449 508
450int 509int
451SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 510SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452 511
453void 512void
454SDL_Quit () 513SDL_Quit ()
455 514
456void 515void
463 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 522 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 523 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 524 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466 525
467 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 526 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 527 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469 528
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 531 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 532 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474 533
475 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 534 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
535#if SDL_VERSION_ATLEAST(1,2,10)
536 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
537 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
538#endif
476 539
477 SDL_EnableUNICODE (1); 540 SDL_EnableUNICODE (1);
478 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 541 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479 542
480 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 543 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
567 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 630 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 631 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569 break; 632 break;
570 } 633 }
571 634
572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 635 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573 } 636 }
574} 637}
575 638
576int 639int
577Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 640Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
591#ifndef _WIN32 654#ifndef _WIN32
592 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 655 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
593#endif 656#endif
594 657
595void 658void
659win32_proxy_info ()
660 PPCODE:
661{
662#ifdef _WIN32
663 char buffer[2048];
664 DWORD buflen;
665
666 EXTEND (SP, 3);
667
668 buflen = sizeof (buffer);
669 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
670 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
671 {
672 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
673
674 buflen = sizeof (buffer);
675 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
676 {
677 PUSHs (newSVpv (buffer, 0));
678
679 buflen = sizeof (buffer);
680 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
681 PUSHs (newSVpv (buffer, 0));
682 }
683 }
684#endif
685}
686
687void
596add_font (char *file) 688add_font (char *file)
597 CODE: 689 CODE:
598 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 690 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599#ifdef _WIN32
600 // cairo... sigh... requires win2000
601 AddFontResourceEx (file, FR_PRIVATE, 0);
602#endif
603 691
604void 692void
605load_image_inline (SV *image_) 693load_image_inline (SV *image_)
606 ALIAS: 694 ALIAS:
607 load_image_file = 1 695 load_image_file = 1
649 737
650 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 738 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651 739
652 assert (surface2->pitch == surface2->w * 4); 740 assert (surface2->pitch == surface2->w * 4);
653 741
742 SDL_LockSurface (surface2);
654 EXTEND (SP, 5); 743 EXTEND (SP, 6);
655 PUSHs (sv_2mortal (newSViv (surface2->w))); 744 PUSHs (sv_2mortal (newSViv (surface2->w)));
656 PUSHs (sv_2mortal (newSViv (surface2->h))); 745 PUSHs (sv_2mortal (newSViv (surface2->h)));
657 SDL_LockSurface (surface2);
658 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 746 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))); 747 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
661 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 748 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 749 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
750 SDL_UnlockSurface (surface2);
663 751
664 SDL_FreeSurface (surface); 752 SDL_FreeSurface (surface);
665 SDL_FreeSurface (surface2); 753 SDL_FreeSurface (surface2);
666} 754}
667 755
703 CODE: 791 CODE:
704 fprintf (stderr, "FATAL: %s\n", message); 792 fprintf (stderr, "FATAL: %s\n", message);
705#ifdef _WIN32 793#ifdef _WIN32
706 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 794 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707#endif 795#endif
708 exit (1); 796 _exit (1);
709 797
798void
799_exit (int retval = 0)
800 CODE:
801 _exit (retval);
802
710MODULE = CFClient PACKAGE = CFClient::Font 803MODULE = CFPlus PACKAGE = CFPlus::Font
711 804
712CFClient::Font 805CFPlus::Font
713new_from_file (SV *class, char *path, int id = 0) 806new_from_file (SV *class, char *path, int id = 0)
714 CODE: 807 CODE:
715{ 808{
716 int count; 809 int count;
717 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 810 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
720} 813}
721 OUTPUT: 814 OUTPUT:
722 RETVAL 815 RETVAL
723 816
724void 817void
725DESTROY (CFClient::Font self) 818DESTROY (CFPlus::Font self)
726 CODE: 819 CODE:
727 pango_font_description_free (self); 820 pango_font_description_free (self);
728 821
729void 822void
730make_default (CFClient::Font self) 823make_default (CFPlus::Font self)
731 CODE: 824 CODE:
732 default_font = self; 825 default_font = self;
733 826
734MODULE = CFClient PACKAGE = CFClient::Layout 827MODULE = CFPlus PACKAGE = CFPlus::Layout
735 828
736CFClient::Layout 829void
737new (SV *class, int rgba = 0) 830reset_glyph_cache ()
831 CODE:
832 tc_clear ();
833
834CFPlus::Layout
835new (SV *class)
738 CODE: 836 CODE:
739 New (0, RETVAL, 1, struct cf_layout); 837 New (0, RETVAL, 1, struct cf_layout);
740 838
741 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 839 RETVAL->pl = pango_layout_new (opengl_context);
742 RETVAL->rgba = rgba;
743 RETVAL->r = 1.; 840 RETVAL->r = 1.;
744 RETVAL->g = 1.; 841 RETVAL->g = 1.;
745 RETVAL->b = 1.; 842 RETVAL->b = 1.;
746 RETVAL->a = 1.; 843 RETVAL->a = 1.;
747 RETVAL->base_height = MIN_FONT_HEIGHT; 844 RETVAL->base_height = MIN_FONT_HEIGHT;
751 layout_update_font (RETVAL); 848 layout_update_font (RETVAL);
752 OUTPUT: 849 OUTPUT:
753 RETVAL 850 RETVAL
754 851
755void 852void
756DESTROY (CFClient::Layout self) 853DESTROY (CFPlus::Layout self)
757 CODE: 854 CODE:
758 g_object_unref (self->pl); 855 g_object_unref (self->pl);
759 Safefree (self); 856 Safefree (self);
760 857
761int
762is_rgba (CFClient::Layout self)
763 CODE:
764 RETVAL = self->rgba;
765 OUTPUT:
766 RETVAL
767
768void 858void
769set_text (CFClient::Layout self, SV *text_) 859set_text (CFPlus::Layout self, SV *text_)
770 CODE: 860 CODE:
771{ 861{
772 STRLEN textlen; 862 STRLEN textlen;
773 char *text = SvPVutf8 (text_, textlen); 863 char *text = SvPVutf8 (text_, textlen);
774 864
775 pango_layout_set_text (self->pl, text, textlen); 865 pango_layout_set_text (self->pl, text, textlen);
776} 866}
777 867
778void 868void
779set_markup (CFClient::Layout self, SV *text_) 869set_markup (CFPlus::Layout self, SV *text_)
780 CODE: 870 CODE:
781{ 871{
782 STRLEN textlen; 872 STRLEN textlen;
783 char *text = SvPVutf8 (text_, textlen); 873 char *text = SvPVutf8 (text_, textlen);
784 874
785 pango_layout_set_markup (self->pl, text, textlen); 875 pango_layout_set_markup (self->pl, text, textlen);
786} 876}
787 877
878void
879set_shapes (CFPlus::Layout self, ...)
880 CODE:
881{
882 PangoAttrList *attrs = 0;
883 const char *text = pango_layout_get_text (self->pl);
884 const char *pos = text;
885 int arg = 4;
886
887 while (arg < items && (pos = strstr (pos, OBJ_STR)))
888 {
889 PangoRectangle inkrect, rect;
890 PangoAttribute *attr;
891
892 int x = SvIV (ST (arg - 3));
893 int y = SvIV (ST (arg - 2));
894 int w = SvIV (ST (arg - 1));
895 int h = SvIV (ST (arg ));
896
897 inkrect.x = 0;
898 inkrect.y = 0;
899 inkrect.width = 0;
900 inkrect.height = 0;
901
902 rect.x = x * PANGO_SCALE;
903 rect.y = y * PANGO_SCALE;
904 rect.width = w * PANGO_SCALE;
905 rect.height = h * PANGO_SCALE;
906
907 if (!attrs)
908 attrs = pango_layout_get_attributes (self->pl);
909
910 attr = pango_attr_shape_new (&inkrect, &rect);
911 attr->start_index = pos - text;
912 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
913 pango_attr_list_insert (attrs, attr);
914
915 arg += 4;
916 pos += sizeof (OBJ_STR) - 1;
917 }
918
919 if (attrs)
920 pango_layout_set_attributes (self->pl, attrs);
921}
922
923void
924get_shapes (CFPlus::Layout self)
925 PPCODE:
926{
927 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
928
929 do
930 {
931 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
932
933 if (run && shape_attr_p (run))
934 {
935 PangoRectangle extents;
936 pango_layout_iter_get_run_extents (iter, 0, &extents);
937
938 EXTEND (SP, 2);
939 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
940 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
941 }
942 }
943 while (pango_layout_iter_next_run (iter));
944
945 pango_layout_iter_free (iter);
946}
947
948int
949has_wrapped (CFPlus::Layout self)
950 CODE:
951{
952 int lines = 1;
953 const char *text = pango_layout_get_text (self->pl);
954
955 while (*text)
956 lines += *text++ == '\n';
957
958 RETVAL = lines < pango_layout_get_line_count (self->pl);
959}
960 OUTPUT:
961 RETVAL
962
788SV * 963SV *
789get_text (CFClient::Layout self) 964get_text (CFPlus::Layout self)
790 CODE: 965 CODE:
791 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 966 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792 sv_utf8_decode (RETVAL); 967 sv_utf8_decode (RETVAL);
793 OUTPUT: 968 OUTPUT:
794 RETVAL 969 RETVAL
795 970
796void 971void
797set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 972set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
798 CODE: 973 CODE:
799 self->r = r; 974 self->r = r;
800 self->g = g; 975 self->g = g;
801 self->b = b; 976 self->b = b;
802 self->a = a; 977 self->a = a;
803 978
804void 979void
805set_font (CFClient::Layout self, CFClient::Font font = 0) 980set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806 CODE: 981 CODE:
807 if (self->font != font) 982 if (self->font != font)
808 { 983 {
809 self->font = font; 984 self->font = font;
810 layout_update_font (self); 985 layout_update_font (self);
811 } 986 }
812 987
813void 988void
814set_height (CFClient::Layout self, int base_height) 989set_height (CFPlus::Layout self, int base_height)
815 CODE: 990 CODE:
816 if (self->base_height != base_height) 991 if (self->base_height != base_height)
817 { 992 {
818 self->base_height = base_height; 993 self->base_height = base_height;
819 layout_update_font (self); 994 layout_update_font (self);
820 } 995 }
821 996
822void 997void
823set_width (CFClient::Layout self, int max_width = -1) 998set_width (CFPlus::Layout self, int max_width = -1)
824 CODE: 999 CODE:
825 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1000 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
826 1001
827void 1002void
828set_indent (CFClient::Layout self, int indent) 1003set_indent (CFPlus::Layout self, int indent)
829 CODE: 1004 CODE:
830 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1005 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831 1006
832void 1007void
833set_spacing (CFClient::Layout self, int spacing) 1008set_spacing (CFPlus::Layout self, int spacing)
834 CODE: 1009 CODE:
835 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1010 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836 1011
837void 1012void
838set_ellipsise (CFClient::Layout self, int ellipsise) 1013set_ellipsise (CFPlus::Layout self, int ellipsise)
839 CODE: 1014 CODE:
840 pango_layout_set_ellipsize (self->pl, 1015 pango_layout_set_ellipsize (self->pl,
841 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1016 ellipsise == 1 ? PANGO_ELLIPSIZE_START
842 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1017 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1018 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
844 : PANGO_ELLIPSIZE_NONE 1019 : PANGO_ELLIPSIZE_NONE
845 ); 1020 );
846 1021
847void 1022void
848set_single_paragraph_mode (CFClient::Layout self, int spm) 1023set_single_paragraph_mode (CFPlus::Layout self, int spm)
849 CODE: 1024 CODE:
850 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1025 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851 1026
852void 1027void
853size (CFClient::Layout self) 1028size (CFPlus::Layout self)
854 PPCODE: 1029 PPCODE:
855{ 1030{
856 int w, h; 1031 int w, h;
857 1032
858 layout_get_pixel_size (self, &w, &h); 1033 layout_get_pixel_size (self, &w, &h);
861 PUSHs (sv_2mortal (newSViv (w))); 1036 PUSHs (sv_2mortal (newSViv (w)));
862 PUSHs (sv_2mortal (newSViv (h))); 1037 PUSHs (sv_2mortal (newSViv (h)));
863} 1038}
864 1039
865int 1040int
1041descent (CFPlus::Layout self)
1042 CODE:
1043{
1044 PangoRectangle rect;
1045 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1046 pango_layout_line_get_pixel_extents (line, 0, &rect);
1047 RETVAL = PANGO_DESCENT (rect);
1048}
1049 OUTPUT:
1050 RETVAL
1051
1052int
866xy_to_index (CFClient::Layout self, int x, int y) 1053xy_to_index (CFPlus::Layout self, int x, int y)
867 CODE: 1054 CODE:
868{ 1055{
869 int index, trailing; 1056 int index, trailing;
870 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1057 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
871 RETVAL = index; 1058 RETVAL = index;
872} 1059}
873 OUTPUT: 1060 OUTPUT:
874 RETVAL 1061 RETVAL
875 1062
876void 1063void
877cursor_pos (CFClient::Layout self, int index) 1064cursor_pos (CFPlus::Layout self, int index)
878 PPCODE: 1065 PPCODE:
879{ 1066{
880 PangoRectangle strong_pos; 1067 PangoRectangle strong_pos;
881 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1068 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882 1069
885 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1072 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1073 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887} 1074}
888 1075
889void 1076void
890render (CFClient::Layout self) 1077render (CFPlus::Layout self, float x, float y, int flags = 0)
891 PPCODE: 1078 PPCODE:
892{ 1079 pango_opengl_render_layout_subpixel (
893 SV *retval; 1080 self->pl,
894 int w, h; 1081 x * PANGO_SCALE, y * PANGO_SCALE,
1082 self->r, self->g, self->b, self->a,
1083 flags
1084 );
895 1085
896 layout_get_pixel_size (self, &w, &h); 1086MODULE = CFPlus PACKAGE = CFPlus::Texture
897 1087
898 if (self->rgba) 1088void
1089pad2pot (SV *data_, SV *w_, SV *h_)
1090 CODE:
1091{
1092 int ow = SvIV (w_);
1093 int oh = SvIV (h_);
1094
1095 if (ow && oh)
899 { 1096 {
900 cairo_surface_t *surface; 1097 int nw = minpot (ow);
901 cairo_t *cairo; 1098 int nh = minpot (oh);
902 1099
903 retval = newSV (w * h * 4); 1100 if (nw != ow || nh != oh)
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 { 1101 {
921 uint32_t *p = (uint32_t *)SvPVX (retval); 1102 if (SvOK (data_))
922 uint32_t *e = p + w * h;
923
924 while (p < e)
925 { 1103 {
926 uint32_t rgba = *p; 1104 STRLEN datalen;
927 rgba = (rgba >> 24) | (rgba << 8); 1105 char *data = SvPVbyte (data_, datalen);
928#if 0 1106 int bpp = datalen / (ow * oh);
929#ifdef _WIN32 1107 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
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 1108
936 rgba = (rgba & 0xffffff00) | a; 1109 SvPOK_only (result_);
1110 SvCUR_set (result_, nw * nh * bpp);
1111
1112 memset (SvPVX (result_), 0, nw * nh * bpp);
1113 while (oh--)
1114 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1115
1116 sv_setsv (data_, result_);
937 } 1117 }
938#endif 1118
939#endif 1119 sv_setiv (w_, nw);
940 rgba = SDL_SwapBE32 (rgba); 1120 sv_setiv (h_, nh);
941 *p++ = rgba;
942 } 1121 }
943 }
944
945 EXTEND (SP, 5);
946 PUSHs (sv_2mortal (newSViv (w)));
947 PUSHs (sv_2mortal (newSViv (h)));
948 PUSHs (sv_2mortal (retval));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951 } 1122 }
952 else
953 {
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)));
973 PUSHs (sv_2mortal (newSViv (h)));
974 PUSHs (sv_2mortal (retval));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977 }
978} 1123}
979 1124
980MODULE = CFClient PACKAGE = CFClient::Texture
981
982void 1125void
983draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1126draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
984 PROTOTYPE: $$$;$$ 1127 PROTOTYPE: $$$;$$
985 ALIAS: 1128 ALIAS:
986 draw_quad_alpha = 1 1129 draw_quad_alpha = 1
987 draw_quad_alpha_premultiplied = 2 1130 draw_quad_alpha_premultiplied = 2
988 CODE: 1131 CODE:
1026 glDisable (GL_ALPHA_TEST); 1169 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1170 glDisable (GL_BLEND);
1028 } 1171 }
1029} 1172}
1030 1173
1031MODULE = CFClient PACKAGE = CFClient::Map 1174MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1175
1033CFClient::Map 1176CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1177new (SV *class, int map_width, int map_height)
1035 CODE: 1178 CODE:
1036 New (0, RETVAL, 1, struct map); 1179 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1180 RETVAL->x = 0;
1038 RETVAL->y = 0; 1181 RETVAL->y = 0;
1048 RETVAL->row = 0; 1191 RETVAL->row = 0;
1049 OUTPUT: 1192 OUTPUT:
1050 RETVAL 1193 RETVAL
1051 1194
1052void 1195void
1053DESTROY (CFClient::Map self) 1196DESTROY (CFPlus::Map self)
1054 CODE: 1197 CODE:
1055{ 1198{
1056 map_clear (self); 1199 map_clear (self);
1057 Safefree (self->face); 1200 Safefree (self->face);
1201 Safefree (self->tex);
1058 Safefree (self); 1202 Safefree (self);
1059} 1203}
1060 1204
1061void 1205void
1062clear (CFClient::Map self) 1206clear (CFPlus::Map self)
1063 CODE: 1207 CODE:
1064 map_clear (self); 1208 map_clear (self);
1065 1209
1066void 1210void
1067set_face (CFClient::Map self, int face, int texid) 1211set_face (CFPlus::Map self, int face, int texid)
1068 CODE: 1212 CODE:
1069{ 1213{
1070 while (self->faces <= face) 1214 while (self->faces <= face)
1071 { 1215 {
1072 Append (mapface, self->face, self->faces, self->faces); 1216 Append (mapface, self->face, self->faces, self->faces);
1075 1219
1076 self->face [face] = texid; 1220 self->face [face] = texid;
1077} 1221}
1078 1222
1079void 1223void
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) 1224set_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: 1225 CODE:
1082{ 1226{
1083 while (self->texs <= texid) 1227 while (self->texs <= texid)
1084 { 1228 {
1085 Append (maptex, self->tex, self->texs, self->texs); 1229 Append (maptex, self->tex, self->texs, self->texs);
1109 // from transparent color bleeding and ugly wrapping effects. 1253 // from transparent color bleeding and ugly wrapping effects.
1110 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1254 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111} 1255}
1112 1256
1113int 1257int
1114ox (CFClient::Map self) 1258ox (CFPlus::Map self)
1115 ALIAS: 1259 ALIAS:
1116 oy = 1 1260 oy = 1
1117 x = 2 1261 x = 2
1118 y = 3 1262 y = 3
1119 w = 4 1263 w = 4
1130 } 1274 }
1131 OUTPUT: 1275 OUTPUT:
1132 RETVAL 1276 RETVAL
1133 1277
1134void 1278void
1135scroll (CFClient::Map self, int dx, int dy) 1279scroll (CFPlus::Map self, int dx, int dy)
1136 CODE: 1280 CODE:
1137{ 1281{
1138 if (dx > 0) 1282 if (dx > 0)
1139 map_blank (self, self->x, self->y, dx - 1, self->h); 1283 map_blank (self, self->x, self->y, dx, self->h);
1140 else if (dx < 0) 1284 else if (dx < 0)
1141 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1285 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1142 1286
1143 if (dy > 0) 1287 if (dy > 0)
1144 map_blank (self, self->x, self->y, self->w, dy - 1); 1288 map_blank (self, self->x, self->y, self->w, dy);
1145 else if (dy < 0) 1289 else if (dy < 0)
1146 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1290 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1147 1291
1148 self->ox += dx; self->x += dx; 1292 self->ox += dx; self->x += dx;
1149 self->oy += dy; self->y += dy; 1293 self->oy += dy; self->y += dy;
1150 1294
1151 while (self->y < 0) 1295 while (self->y < 0)
1156 self->y += MAP_EXTEND_Y; 1300 self->y += MAP_EXTEND_Y;
1157 } 1301 }
1158} 1302}
1159 1303
1160void 1304void
1161map1a_update (CFClient::Map self, SV *data_) 1305map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162 CODE: 1306 CODE:
1163{ 1307{
1164 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1308 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165 uint8_t *data_end = (uint8_t *)SvEND (data_); 1309 uint8_t *data_end = (uint8_t *)SvEND (data_);
1166 mapcell *cell; 1310 mapcell *cell;
1167 int x, y, flags; 1311 int x, y, flags;
1168 1312
1169 while (data < data_end) 1313 while (data < data_end - 1)
1170 { 1314 {
1171 flags = (data [0] << 8) + data [1]; data += 2; 1315 flags = (data [0] << 8) + data [1]; data += 2;
1172 1316
1173 x = ((flags >> 10) & 63) + self->x; 1317 x = self->x + ((flags >> 10) & 63);
1174 y = ((flags >> 4) & 63) + self->y; 1318 y = self->y + ((flags >> 4) & 63);
1175 1319
1176 cell = map_get_cell (self, x, y); 1320 cell = map_get_cell (self, x, y);
1177 1321
1178 if (flags & 15) 1322 if (flags & 15)
1179 { 1323 {
1180 if (cell->darkness < 0) 1324 if (!cell->darkness)
1181 { 1325 {
1326 memset (cell, 0, sizeof (*cell));
1182 cell->darkness = 0; 1327 cell->darkness = 256;
1183 cell->face [0] = 0;
1184 cell->face [1] = 0;
1185 cell->face [2] = 0;
1186 } 1328 }
1187 1329
1188 cell->darkness = flags & 8 ? *data++ : 255;
1189
1190 //TODO: don't trust server data to be in-range(!) 1330 //TODO: don't trust server data to be in-range(!)
1331
1332 if (flags & 8)
1333 {
1334 if (extmap)
1335 {
1336 uint8_t ext, cmd;
1337
1338 do
1339 {
1340 ext = *data++;
1341 cmd = ext & 0x3f;
1342
1343 if (cmd < 4)
1344 cell->darkness = 255 - ext * 64 + 1;
1345 else if (cmd == 5) // health
1346 {
1347 cell->stat_width = 1;
1348 cell->stat_hp = *data++;
1349 }
1350 else if (cmd == 6) // monster width
1351 cell->stat_width = *data++ + 1;
1352 else if (cmd == 0x47) // monster width
1353 {
1354 if (*data == 4)
1355 ; // decode player tag
1356
1357 data += *data + 1;
1358 }
1359 else if (cmd == 8) // cell flags
1360 cell->flags = *data++;
1361 else if (ext & 0x40) // unknown, multibyte => skip
1362 data += *data + 1;
1363 else
1364 data++;
1365 }
1366 while (ext & 0x80);
1367 }
1368 else
1369 cell->darkness = *data++ + 1;
1370 }
1191 1371
1192 if (flags & 4) 1372 if (flags & 4)
1193 { 1373 {
1194 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1374 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1195 } 1375 }
1203 { 1383 {
1204 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1384 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1205 } 1385 }
1206 } 1386 }
1207 else 1387 else
1208 cell->darkness = -1; 1388 cell->darkness = 0;
1209 } 1389 }
1210} 1390}
1211 1391
1212SV * 1392SV *
1213mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1393mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1214 CODE: 1394 CODE:
1215{ 1395{
1216 int x1, x; 1396 int x1, x;
1217 int y1, y; 1397 int y1, y;
1218 int z; 1398 int z;
1268} 1448}
1269 OUTPUT: 1449 OUTPUT:
1270 RETVAL 1450 RETVAL
1271 1451
1272void 1452void
1273draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1453draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1274 PPCODE: 1454 CODE:
1275{ 1455{
1276 int vx, vy; 1456 int vx, vy;
1277 int x, y, z; 1457 int x, y, z;
1278 int last_name; 1458 int last_name;
1279 mapface face; 1459 mapface face;
1280 int sw4 = (sw + 3) & ~3;
1281 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283 1460
1284 memset (darkness, 255, sw4 * sh);
1285 SvPOK_only (darkness_sv);
1286 SvCUR_set (darkness_sv, sw4 * sh);
1287
1288 vx = self->x + (self->w - sw) / 2 - shift_x; 1461 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1289 vy = self->y + (self->h - sh) / 2 - shift_y; 1462 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1290 1463
1291 /* 1464 /*
1292 int vx = self->vx = self->w >= sw 1465 int vx = self->vx = self->w >= sw
1293 ? self->x + (self->w - sw) / 2 1466 ? self->x + (self->w - sw) / 2
1294 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1467 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1298 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1471 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299 */ 1472 */
1300 1473
1301 glColor4ub (255, 255, 255, 255); 1474 glColor4ub (255, 255, 255, 255);
1302 1475
1476 glEnable (GL_BLEND);
1303 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1477 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304 glEnable (GL_BLEND);
1305 glEnable (GL_TEXTURE_2D); 1478 glEnable (GL_TEXTURE_2D);
1306 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1479 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307 1480
1308 glBegin (GL_QUADS); 1481 glBegin (GL_QUADS);
1309 1482
1318 for (x = 0; x < sw; x++) 1491 for (x = 0; x < sw; x++)
1319 if (row->c0 <= x + vx && x + vx < row->c1) 1492 if (row->c0 <= x + vx && x + vx < row->c1)
1320 { 1493 {
1321 mapcell *cell = row->col + (x + vx - row->c0); 1494 mapcell *cell = row->col + (x + vx - row->c0);
1322 1495
1323 darkness[y * sw4 + x] = cell->darkness < 0
1324 ? 255 - FOW_DARKNESS
1325 : 255 - cell->darkness;
1326
1327 face = cell->face [z]; 1496 face = cell->face [z];
1328 1497
1329 if (face) 1498 if (face && face < self->texs)
1330 { 1499 {
1331 maptex tex = self->tex [face]; 1500 maptex tex = self->tex [face];
1332
1333 int px = (x + 1) * 32 - tex.w; 1501 int px = (x + 1) * 32 - tex.w;
1334 int py = (y + 1) * 32 - tex.h; 1502 int py = (y + 1) * 32 - tex.h;
1335 1503
1336 if (last_name != tex.name) 1504 if (last_name != tex.name)
1337 { 1505 {
1338 glEnd (); 1506 glEnd ();
1339 last_name = tex.name;
1340 glBindTexture (GL_TEXTURE_2D, last_name); 1507 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1341 glBegin (GL_QUADS); 1508 glBegin (GL_QUADS);
1342 } 1509 }
1343 1510
1344 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1511 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1512 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1513 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1347 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1514 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348 } 1515 }
1516
1517 if (cell->flags && z == 2)
1518 {
1519 if (cell->flags & 1)
1520 {
1521 maptex tex = self->tex [1];
1522 int px = (x + 1) * 32 - tex.w + 2;
1523 int py = (y + 1) * 32 - tex.h - 6;
1524
1525 glEnd ();
1526 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1527 glBegin (GL_QUADS);
1528
1529 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1530 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1531 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1532 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1533 }
1534 }
1349 } 1535 }
1350 } 1536 }
1351 1537
1352 glEnd (); 1538 glEnd ();
1353 1539
1354 glDisable (GL_TEXTURE_2D); 1540 glDisable (GL_TEXTURE_2D);
1355 glDisable (GL_BLEND); 1541 glDisable (GL_BLEND);
1542
1543 // top layer: overlays such as the health bar
1544 for (y = 0; y < sh; y++)
1545 if (0 <= y + vy && y + vy < self->rows)
1546 {
1547 maprow *row = self->row + (y + vy);
1548
1549 for (x = 0; x < sw; x++)
1550 if (row->c0 <= x + vx && x + vx < row->c1)
1551 {
1552 mapcell *cell = row->col + (x + vx - row->c0);
1553
1554 int px = x * 32;
1555 int py = y * 32;
1556
1557 if (cell->stat_hp)
1558 {
1559 int width = cell->stat_width * 32;
1560 int thick = sh / 28 + 1 + cell->stat_width;
1561
1562 glColor3ub (0, 0, 0);
1563 glRectf (px + 1, py - thick - 2,
1564 px + width - 1, py);
1565
1566 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1567 glRectf (px + 2,
1568 py - thick - 1,
1569 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1570 }
1571 }
1572 }
1573}
1574
1575void
1576draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1577 CODE:
1578{
1579 static float color[16][3] = {
1580 { 0.00F, 0.00F, 0.00F },
1581 { 1.00F, 1.00F, 1.00F },
1582 { 0.00F, 0.00F, 0.55F },
1583 { 1.00F, 0.00F, 0.00F },
1584
1585 { 1.00F, 0.54F, 0.00F },
1586 { 0.11F, 0.56F, 1.00F },
1587 { 0.93F, 0.46F, 0.00F },
1588 { 0.18F, 0.54F, 0.34F },
1589
1590 { 0.56F, 0.73F, 0.56F },
1591 { 0.80F, 0.80F, 0.80F },
1592 { 0.55F, 0.41F, 0.13F },
1593 { 0.99F, 0.77F, 0.26F },
1594
1595 { 0.74F, 0.65F, 0.41F },
1596
1597 { 0.00F, 1.00F, 1.00F },
1598 { 1.00F, 0.00F, 1.00F },
1599 { 1.00F, 1.00F, 0.00F },
1600 };
1601
1602 int x, y;
1603
1604 glEnable (GL_TEXTURE_2D);
1605 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1606 glEnable (GL_BLEND);
1607 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1608 glBegin (GL_QUADS);
1609
1610 for (y = 0; y < h; y++)
1611 for (x = 0; x < w; x++)
1612 {
1613 unsigned char m = data [x + y * w];
1614
1615 if (m)
1616 {
1617 float *c = color [m & 15];
1618
1619 float tx1 = m & 0x40 ? 0.5 : 0.;
1620 float tx2 = tx1 + 0.5;
1621
1622 glColor4f (c[0], c[1], c[2], 0.75);
1623 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1624 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1625 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1626 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1627 }
1628 }
1629
1630 glEnd ();
1631 glDisable (GL_BLEND);
1632 glDisable (GL_TEXTURE_2D);
1633}
1634
1635void
1636fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1637 PPCODE:
1638{
1639 int vx, vy;
1640 int x, y;
1641 int sw4 = (sw + 3) & ~3;
1642 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1643 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1644
1645 memset (darkness, 255, sw4 * sh);
1646 SvPOK_only (darkness_sv);
1647 SvCUR_set (darkness_sv, sw4 * sh);
1648
1649 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1650 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1651
1652 for (y = 0; y < sh; y++)
1653 if (0 <= y + vy && y + vy < self->rows)
1654 {
1655 maprow *row = self->row + (y + vy);
1656
1657 for (x = 0; x < sw; x++)
1658 if (row->c0 <= x + vx && x + vx < row->c1)
1659 {
1660 mapcell *cell = row->col + (x + vx - row->c0);
1661
1662 darkness[y * sw4 + x] = cell->darkness
1663 ? 255 - (cell->darkness - 1)
1664 : 255 - FOW_DARKNESS;
1665 }
1666 }
1356 1667
1357 EXTEND (SP, 3); 1668 EXTEND (SP, 3);
1358 PUSHs (sv_2mortal (newSViv (sw4))); 1669 PUSHs (sv_2mortal (newSViv (sw4)));
1359 PUSHs (sv_2mortal (newSViv (sh))); 1670 PUSHs (sv_2mortal (newSViv (sh)));
1360 PUSHs (darkness_sv); 1671 PUSHs (darkness_sv);
1361} 1672}
1362 1673
1363SV * 1674SV *
1364get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1675get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1365 CODE: 1676 CODE:
1366{ 1677{
1367 int x, y, x1, y1; 1678 int x, y, x1, y1;
1368 SV *data_sv = newSV (w * h * 7 + 5); 1679 SV *data_sv = newSV (w * h * 7 + 5);
1369 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1680 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1431} 1742}
1432 OUTPUT: 1743 OUTPUT:
1433 RETVAL 1744 RETVAL
1434 1745
1435void 1746void
1436set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1747set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1437 PPCODE: 1748 PPCODE:
1438{ 1749{
1439 int x, y, z; 1750 int x, y, z;
1440 int w, h; 1751 int w, h;
1441 int x1, y1; 1752 int x1, y1;
1473 1784
1474 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1785 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1475 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1786 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1476 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1787 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1477 1788
1478 if (cell->darkness <= 0) 1789 if (cell->darkness == 0)
1479 { 1790 {
1480 cell->darkness = -1; 1791 cell->darkness = 0;
1481 1792
1482 for (z = 0; z <= 2; z++) 1793 for (z = 0; z <= 2; z++)
1483 { 1794 {
1484 cell->face[z] = face[z]; 1795 cell->face[z] = face[z];
1485 1796
1490 } 1801 }
1491 } 1802 }
1492 } 1803 }
1493} 1804}
1494 1805
1495MODULE = CFClient PACKAGE = CFClient::MixChunk 1806MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496 1807
1497CFClient::MixChunk 1808CFPlus::MixChunk
1498new_from_file (SV *class, char *path) 1809new_from_file (SV *class, char *path)
1499 CODE: 1810 CODE:
1500 RETVAL = Mix_LoadWAV (path); 1811 RETVAL = Mix_LoadWAV (path);
1501 OUTPUT: 1812 OUTPUT:
1502 RETVAL 1813 RETVAL
1503 1814
1504void 1815void
1505DESTROY (CFClient::MixChunk self) 1816DESTROY (CFPlus::MixChunk self)
1506 CODE: 1817 CODE:
1507 Mix_FreeChunk (self); 1818 Mix_FreeChunk (self);
1508 1819
1509int 1820int
1510volume (CFClient::MixChunk self, int volume = -1) 1821volume (CFPlus::MixChunk self, int volume = -1)
1511 CODE: 1822 CODE:
1512 RETVAL = Mix_VolumeChunk (self, volume); 1823 RETVAL = Mix_VolumeChunk (self, volume);
1513 OUTPUT: 1824 OUTPUT:
1514 RETVAL 1825 RETVAL
1515 1826
1516int 1827int
1517play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1828play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1518 CODE: 1829 CODE:
1519 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1830 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520 OUTPUT: 1831 OUTPUT:
1521 RETVAL 1832 RETVAL
1522 1833
1523MODULE = CFClient PACKAGE = CFClient::MixMusic 1834MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524 1835
1525int 1836int
1526volume (int volume = -1) 1837volume (int volume = -1)
1527 CODE: 1838 CODE:
1528 RETVAL = Mix_VolumeMusic (volume); 1839 RETVAL = Mix_VolumeMusic (volume);
1529 OUTPUT: 1840 OUTPUT:
1530 RETVAL 1841 RETVAL
1531 1842
1532CFClient::MixMusic 1843CFPlus::MixMusic
1533new_from_file (SV *class, char *path) 1844new_from_file (SV *class, char *path)
1534 CODE: 1845 CODE:
1535 RETVAL = Mix_LoadMUS (path); 1846 RETVAL = Mix_LoadMUS (path);
1536 OUTPUT: 1847 OUTPUT:
1537 RETVAL 1848 RETVAL
1538 1849
1539void 1850void
1540DESTROY (CFClient::MixMusic self) 1851DESTROY (CFPlus::MixMusic self)
1541 CODE: 1852 CODE:
1542 Mix_FreeMusic (self); 1853 Mix_FreeMusic (self);
1543 1854
1544int 1855int
1545play (CFClient::MixMusic self, int loops = -1) 1856play (CFPlus::MixMusic self, int loops = -1)
1546 CODE: 1857 CODE:
1547 RETVAL = Mix_PlayMusic (self, loops); 1858 RETVAL = Mix_PlayMusic (self, loops);
1548 OUTPUT: 1859 OUTPUT:
1549 RETVAL 1860 RETVAL
1550 1861
1551MODULE = CFClient PACKAGE = CFClient::OpenGL 1862MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552 1863
1553BOOT: 1864BOOT:
1554{ 1865{
1555 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1866 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556 static const struct { 1867 static const struct {
1557 const char *name; 1868 const char *name;
1558 IV iv; 1869 IV iv;
1559 } *civ, const_iv[] = { 1870 } *civ, const_iv[] = {
1560# define const_iv(name) { # name, (IV)name } 1871# define const_iv(name) { # name, (IV)name }
1567 const_iv (GL_SCISSOR_TEST), 1878 const_iv (GL_SCISSOR_TEST),
1568 const_iv (GL_DEPTH_TEST), 1879 const_iv (GL_DEPTH_TEST),
1569 const_iv (GL_ALPHA_TEST), 1880 const_iv (GL_ALPHA_TEST),
1570 const_iv (GL_NORMALIZE), 1881 const_iv (GL_NORMALIZE),
1571 const_iv (GL_RESCALE_NORMAL), 1882 const_iv (GL_RESCALE_NORMAL),
1883 const_iv (GL_FRONT),
1884 const_iv (GL_BACK),
1572 const_iv (GL_AND), 1885 const_iv (GL_AND),
1573 const_iv (GL_ONE), 1886 const_iv (GL_ONE),
1574 const_iv (GL_ZERO), 1887 const_iv (GL_ZERO),
1575 const_iv (GL_SRC_ALPHA), 1888 const_iv (GL_SRC_ALPHA),
1576 const_iv (GL_DST_ALPHA), 1889 const_iv (GL_DST_ALPHA),
1577 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1890 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578 const_iv (GL_ONE_MINUS_DST_ALPHA), 1891 const_iv (GL_ONE_MINUS_DST_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 1892 const_iv (GL_SRC_ALPHA_SATURATE),
1580 const_iv (GL_RGB), 1893 const_iv (GL_RGB),
1581 const_iv (GL_RGBA), 1894 const_iv (GL_RGBA),
1895 const_iv (GL_RGBA4),
1896 const_iv (GL_RGBA8),
1897 const_iv (GL_RGB5_A1),
1582 const_iv (GL_UNSIGNED_BYTE), 1898 const_iv (GL_UNSIGNED_BYTE),
1583 const_iv (GL_UNSIGNED_SHORT), 1899 const_iv (GL_UNSIGNED_SHORT),
1584 const_iv (GL_UNSIGNED_INT), 1900 const_iv (GL_UNSIGNED_INT),
1585 const_iv (GL_ALPHA), 1901 const_iv (GL_ALPHA),
1586 const_iv (GL_INTENSITY), 1902 const_iv (GL_INTENSITY),
1618 const_iv (GL_SEPARABLE_2D), 1934 const_iv (GL_SEPARABLE_2D),
1619 const_iv (GL_CONVOLUTION_2D), 1935 const_iv (GL_CONVOLUTION_2D),
1620 const_iv (GL_CONVOLUTION_BORDER_MODE), 1936 const_iv (GL_CONVOLUTION_BORDER_MODE),
1621 const_iv (GL_CONSTANT_BORDER), 1937 const_iv (GL_CONSTANT_BORDER),
1622 const_iv (GL_LINES), 1938 const_iv (GL_LINES),
1939 const_iv (GL_LINE_STRIP),
1623 const_iv (GL_LINE_LOOP), 1940 const_iv (GL_LINE_LOOP),
1624 const_iv (GL_QUADS), 1941 const_iv (GL_QUADS),
1625 const_iv (GL_QUAD_STRIP), 1942 const_iv (GL_QUAD_STRIP),
1626 const_iv (GL_TRIANGLES), 1943 const_iv (GL_TRIANGLES),
1627 const_iv (GL_TRIANGLE_STRIP), 1944 const_iv (GL_TRIANGLE_STRIP),
1660 OUTPUT: 1977 OUTPUT:
1661 RETVAL 1978 RETVAL
1662 1979
1663int glGetError () 1980int glGetError ()
1664 1981
1982void glFinish ()
1983
1665void glClear (int mask) 1984void glClear (int mask)
1666 1985
1667void glClearColor (float r, float g, float b, float a = 1.0) 1986void glClearColor (float r, float g, float b, float a = 1.0)
1668 PROTOTYPE: @ 1987 PROTOTYPE: @
1669 1988
1692void glPushMatrix () 2011void glPushMatrix ()
1693 2012
1694void glPopMatrix () 2013void glPopMatrix ()
1695 2014
1696void glLoadIdentity () 2015void glLoadIdentity ()
2016
2017void glDrawBuffer (int buffer)
2018
2019void glReadBuffer (int buffer)
1697 2020
1698# near_ and far_ are due to microsofts buggy "c" compiler 2021# near_ and far_ are due to microsofts buggy "c" compiler
1699void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2022void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1700 2023
1701# near_ and far_ are due to microsofts buggy "c" compiler 2024# near_ and far_ are due to microsofts buggy "c" compiler
1731 r *= a; 2054 r *= a;
1732 g *= a; 2055 g *= a;
1733 b *= a; 2056 b *= a;
1734 } 2057 }
1735 // microsoft visual "c" rounds instead of truncating... 2058 // microsoft visual "c" rounds instead of truncating...
1736 glColor4ub (MIN ((int)(r * 256.f), 255), 2059 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 2060
1741void glInterleavedArrays (int format, int stride, char *data) 2061void glInterleavedArrays (int format, int stride, char *data)
1742 2062
1743void glDrawElements (int mode, int count, int type, char *indices) 2063void glDrawElements (int mode, int count, int type, char *indices)
1744 2064
1821 2141
1822void glEndList () 2142void glEndList ()
1823 2143
1824void glCallList (int list) 2144void glCallList (int list)
1825 2145
1826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines