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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines