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.159 by root, Sun Oct 8 21:22:29 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:
714 _exit (retval); 799 _exit (retval);
715 800
716MODULE = CFClient PACKAGE = CFClient::Font 801MODULE = CFPlus PACKAGE = CFPlus::Font
717 802
718CFClient::Font 803CFPlus::Font
719new_from_file (SV *class, char *path, int id = 0) 804new_from_file (SV *class, char *path, int id = 0)
720 CODE: 805 CODE:
721{ 806{
722 int count; 807 int count;
723 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
726} 811}
727 OUTPUT: 812 OUTPUT:
728 RETVAL 813 RETVAL
729 814
730void 815void
731DESTROY (CFClient::Font self) 816DESTROY (CFPlus::Font self)
732 CODE: 817 CODE:
733 pango_font_description_free (self); 818 pango_font_description_free (self);
734 819
735void 820void
736make_default (CFClient::Font self) 821make_default (CFPlus::Font self)
737 CODE: 822 CODE:
738 default_font = self; 823 default_font = self;
739 824
740MODULE = CFClient PACKAGE = CFClient::Layout 825MODULE = CFPlus PACKAGE = CFPlus::Layout
741 826
742CFClient::Layout 827void
743new (SV *class, int rgba = 0) 828reset_glyph_cache ()
829 CODE:
830 tc_clear ();
831
832CFPlus::Layout
833new (SV *class)
744 CODE: 834 CODE:
745 New (0, RETVAL, 1, struct cf_layout); 835 New (0, RETVAL, 1, struct cf_layout);
746 836
747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 837 RETVAL->pl = pango_layout_new (opengl_context);
748 RETVAL->rgba = rgba;
749 RETVAL->r = 1.; 838 RETVAL->r = 1.;
750 RETVAL->g = 1.; 839 RETVAL->g = 1.;
751 RETVAL->b = 1.; 840 RETVAL->b = 1.;
752 RETVAL->a = 1.; 841 RETVAL->a = 1.;
753 RETVAL->base_height = MIN_FONT_HEIGHT; 842 RETVAL->base_height = MIN_FONT_HEIGHT;
757 layout_update_font (RETVAL); 846 layout_update_font (RETVAL);
758 OUTPUT: 847 OUTPUT:
759 RETVAL 848 RETVAL
760 849
761void 850void
762DESTROY (CFClient::Layout self) 851DESTROY (CFPlus::Layout self)
763 CODE: 852 CODE:
764 g_object_unref (self->pl); 853 g_object_unref (self->pl);
765 Safefree (self); 854 Safefree (self);
766 855
767int
768is_rgba (CFClient::Layout self)
769 CODE:
770 RETVAL = self->rgba;
771 OUTPUT:
772 RETVAL
773
774void 856void
775set_text (CFClient::Layout self, SV *text_) 857set_text (CFPlus::Layout self, SV *text_)
776 CODE: 858 CODE:
777{ 859{
778 STRLEN textlen; 860 STRLEN textlen;
779 char *text = SvPVutf8 (text_, textlen); 861 char *text = SvPVutf8 (text_, textlen);
780 862
781 pango_layout_set_text (self->pl, text, textlen); 863 pango_layout_set_text (self->pl, text, textlen);
782} 864}
783 865
784void 866void
785set_markup (CFClient::Layout self, SV *text_) 867set_markup (CFPlus::Layout self, SV *text_)
786 CODE: 868 CODE:
787{ 869{
788 STRLEN textlen; 870 STRLEN textlen;
789 char *text = SvPVutf8 (text_, textlen); 871 char *text = SvPVutf8 (text_, textlen);
790 872
791 pango_layout_set_markup (self->pl, text, textlen); 873 pango_layout_set_markup (self->pl, text, textlen);
792} 874}
793 875
876void
877set_shapes (CFPlus::Layout self, ...)
878 CODE:
879{
880 PangoAttrList *attrs = 0;
881 const char *text = pango_layout_get_text (self->pl);
882 const char *pos = text;
883 int arg = 4;
884
885 while (arg < items && (pos = strstr (pos, OBJ_STR)))
886 {
887 PangoRectangle inkrect, rect;
888 PangoAttribute *attr;
889
890 int x = SvIV (ST (arg - 3));
891 int y = SvIV (ST (arg - 2));
892 int w = SvIV (ST (arg - 1));
893 int h = SvIV (ST (arg ));
894
895 inkrect.x = 0;
896 inkrect.y = 0;
897 inkrect.width = 0;
898 inkrect.height = 0;
899
900 rect.x = x * PANGO_SCALE;
901 rect.y = y * PANGO_SCALE;
902 rect.width = w * PANGO_SCALE;
903 rect.height = h * PANGO_SCALE;
904
905 if (!attrs)
906 attrs = pango_layout_get_attributes (self->pl);
907
908 attr = pango_attr_shape_new (&inkrect, &rect);
909 attr->start_index = pos - text;
910 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
911 pango_attr_list_insert (attrs, attr);
912
913 arg += 4;
914 pos += sizeof (OBJ_STR) - 1;
915 }
916
917 if (attrs)
918 pango_layout_set_attributes (self->pl, attrs);
919}
920
921void
922get_shapes (CFPlus::Layout self)
923 PPCODE:
924{
925 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
926
927 do
928 {
929 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
930
931 if (run && shape_attr_p (run))
932 {
933 PangoRectangle extents;
934 pango_layout_iter_get_run_extents (iter, 0, &extents);
935
936 EXTEND (SP, 2);
937 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
938 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
939 }
940 }
941 while (pango_layout_iter_next_run (iter));
942
943 pango_layout_iter_free (iter);
944}
945
946int
947has_wrapped (CFPlus::Layout self)
948 CODE:
949{
950 int lines = 1;
951 const char *text = pango_layout_get_text (self->pl);
952
953 while (*text)
954 lines += *text++ == '\n';
955
956 RETVAL = lines < pango_layout_get_line_count (self->pl);
957}
958 OUTPUT:
959 RETVAL
960
794SV * 961SV *
795get_text (CFClient::Layout self) 962get_text (CFPlus::Layout self)
796 CODE: 963 CODE:
797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798 sv_utf8_decode (RETVAL); 965 sv_utf8_decode (RETVAL);
799 OUTPUT: 966 OUTPUT:
800 RETVAL 967 RETVAL
801 968
802void 969void
803set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 970set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
804 CODE: 971 CODE:
805 self->r = r; 972 self->r = r;
806 self->g = g; 973 self->g = g;
807 self->b = b; 974 self->b = b;
808 self->a = a; 975 self->a = a;
809 976
810void 977void
811set_font (CFClient::Layout self, CFClient::Font font = 0) 978set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812 CODE: 979 CODE:
813 if (self->font != font) 980 if (self->font != font)
814 { 981 {
815 self->font = font; 982 self->font = font;
816 layout_update_font (self); 983 layout_update_font (self);
817 } 984 }
818 985
819void 986void
820set_height (CFClient::Layout self, int base_height) 987set_height (CFPlus::Layout self, int base_height)
821 CODE: 988 CODE:
822 if (self->base_height != base_height) 989 if (self->base_height != base_height)
823 { 990 {
824 self->base_height = base_height; 991 self->base_height = base_height;
825 layout_update_font (self); 992 layout_update_font (self);
826 } 993 }
827 994
828void 995void
829set_width (CFClient::Layout self, int max_width = -1) 996set_width (CFPlus::Layout self, int max_width = -1)
830 CODE: 997 CODE:
831 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 998 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
832 999
833void 1000void
834set_indent (CFClient::Layout self, int indent) 1001set_indent (CFPlus::Layout self, int indent)
835 CODE: 1002 CODE:
836 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837 1004
838void 1005void
839set_spacing (CFClient::Layout self, int spacing) 1006set_spacing (CFPlus::Layout self, int spacing)
840 CODE: 1007 CODE:
841 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842 1009
843void 1010void
844set_ellipsise (CFClient::Layout self, int ellipsise) 1011set_ellipsise (CFPlus::Layout self, int ellipsise)
845 CODE: 1012 CODE:
846 pango_layout_set_ellipsize (self->pl, 1013 pango_layout_set_ellipsize (self->pl,
847 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START
848 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
850 : PANGO_ELLIPSIZE_NONE 1017 : PANGO_ELLIPSIZE_NONE
851 ); 1018 );
852 1019
853void 1020void
854set_single_paragraph_mode (CFClient::Layout self, int spm) 1021set_single_paragraph_mode (CFPlus::Layout self, int spm)
855 CODE: 1022 CODE:
856 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857 1024
858void 1025void
859size (CFClient::Layout self) 1026size (CFPlus::Layout self)
860 PPCODE: 1027 PPCODE:
861{ 1028{
862 int w, h; 1029 int w, h;
863 1030
864 layout_get_pixel_size (self, &w, &h); 1031 layout_get_pixel_size (self, &w, &h);
867 PUSHs (sv_2mortal (newSViv (w))); 1034 PUSHs (sv_2mortal (newSViv (w)));
868 PUSHs (sv_2mortal (newSViv (h))); 1035 PUSHs (sv_2mortal (newSViv (h)));
869} 1036}
870 1037
871int 1038int
1039descent (CFPlus::Layout self)
1040 CODE:
1041{
1042 PangoRectangle rect;
1043 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1044 pango_layout_line_get_pixel_extents (line, 0, &rect);
1045 RETVAL = PANGO_DESCENT (rect);
1046}
1047 OUTPUT:
1048 RETVAL
1049
1050int
872xy_to_index (CFClient::Layout self, int x, int y) 1051xy_to_index (CFPlus::Layout self, int x, int y)
873 CODE: 1052 CODE:
874{ 1053{
875 int index, trailing; 1054 int index, trailing;
876 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1055 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
877 RETVAL = index; 1056 RETVAL = index;
878} 1057}
879 OUTPUT: 1058 OUTPUT:
880 RETVAL 1059 RETVAL
881 1060
882void 1061void
883cursor_pos (CFClient::Layout self, int index) 1062cursor_pos (CFPlus::Layout self, int index)
884 PPCODE: 1063 PPCODE:
885{ 1064{
886 PangoRectangle strong_pos; 1065 PangoRectangle strong_pos;
887 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888 1067
891 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893} 1072}
894 1073
895void 1074void
896render (CFClient::Layout self) 1075render (CFPlus::Layout self, float x, float y, int flags = 0)
897 PPCODE: 1076 PPCODE:
898{ 1077 pango_opengl_render_layout_subpixel (
899 SV *retval; 1078 self->pl,
900 int w, h; 1079 x * PANGO_SCALE, y * PANGO_SCALE,
1080 self->r, self->g, self->b, self->a,
1081 flags
1082 );
901 1083
902 layout_get_pixel_size (self, &w, &h); 1084MODULE = CFPlus PACKAGE = CFPlus::Texture
903 1085
904 if (self->rgba) 1086void
1087pad2pot (SV *data_, SV *w_, SV *h_)
1088 CODE:
1089{
1090 int ow = SvIV (w_);
1091 int oh = SvIV (h_);
1092
1093 if (ow && oh)
905 { 1094 {
906 cairo_surface_t *surface; 1095 int nw = minpot (ow);
907 cairo_t *cairo; 1096 int nh = minpot (oh);
908 1097
909 retval = newSV (w * h * 4); 1098 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 { 1099 {
927 uint32_t *p = (uint32_t *)SvPVX (retval); 1100 if (SvOK (data_))
928 uint32_t *e = p + w * h;
929
930 while (p < e)
931 { 1101 {
932 uint32_t rgba = *p; 1102 STRLEN datalen;
933 rgba = (rgba >> 24) | (rgba << 8); 1103 char *data = SvPVbyte (data_, datalen);
934#if 0 1104 int bpp = datalen / (ow * oh);
935#ifdef _WIN32 1105 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 1106
942 rgba = (rgba & 0xffffff00) | a; 1107 SvPOK_only (result_);
1108 SvCUR_set (result_, nw * nh * bpp);
1109
1110 memset (SvPVX (result_), 0, nw * nh * bpp);
1111 while (oh--)
1112 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1113
1114 sv_setsv (data_, result_);
943 } 1115 }
944#endif 1116
945#endif 1117 sv_setiv (w_, nw);
946 rgba = SDL_SwapBE32 (rgba); 1118 sv_setiv (h_, nh);
947 *p++ = rgba;
948 } 1119 }
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 } 1120 }
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} 1121}
985 1122
986MODULE = CFClient PACKAGE = CFClient::Texture
987
988void 1123void
989draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1124draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990 PROTOTYPE: $$$;$$ 1125 PROTOTYPE: $$$;$$
991 ALIAS: 1126 ALIAS:
992 draw_quad_alpha = 1 1127 draw_quad_alpha = 1
993 draw_quad_alpha_premultiplied = 2 1128 draw_quad_alpha_premultiplied = 2
994 CODE: 1129 CODE:
1032 glDisable (GL_ALPHA_TEST); 1167 glDisable (GL_ALPHA_TEST);
1033 glDisable (GL_BLEND); 1168 glDisable (GL_BLEND);
1034 } 1169 }
1035} 1170}
1036 1171
1037MODULE = CFClient PACKAGE = CFClient::Map 1172MODULE = CFPlus PACKAGE = CFPlus::Map
1038 1173
1039CFClient::Map 1174CFPlus::Map
1040new (SV *class, int map_width, int map_height) 1175new (SV *class, int map_width, int map_height)
1041 CODE: 1176 CODE:
1042 New (0, RETVAL, 1, struct map); 1177 New (0, RETVAL, 1, struct map);
1043 RETVAL->x = 0; 1178 RETVAL->x = 0;
1044 RETVAL->y = 0; 1179 RETVAL->y = 0;
1054 RETVAL->row = 0; 1189 RETVAL->row = 0;
1055 OUTPUT: 1190 OUTPUT:
1056 RETVAL 1191 RETVAL
1057 1192
1058void 1193void
1059DESTROY (CFClient::Map self) 1194DESTROY (CFPlus::Map self)
1060 CODE: 1195 CODE:
1061{ 1196{
1062 map_clear (self); 1197 map_clear (self);
1063 Safefree (self->face); 1198 Safefree (self->face);
1064 Safefree (self->tex); 1199 Safefree (self->tex);
1065 Safefree (self); 1200 Safefree (self);
1066} 1201}
1067 1202
1068void 1203void
1069clear (CFClient::Map self) 1204clear (CFPlus::Map self)
1070 CODE: 1205 CODE:
1071 map_clear (self); 1206 map_clear (self);
1072 1207
1073void 1208void
1074set_face (CFClient::Map self, int face, int texid) 1209set_face (CFPlus::Map self, int face, int texid)
1075 CODE: 1210 CODE:
1076{ 1211{
1077 while (self->faces <= face) 1212 while (self->faces <= face)
1078 { 1213 {
1079 Append (mapface, self->face, self->faces, self->faces); 1214 Append (mapface, self->face, self->faces, self->faces);
1082 1217
1083 self->face [face] = texid; 1218 self->face [face] = texid;
1084} 1219}
1085 1220
1086void 1221void
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) 1222set_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: 1223 CODE:
1089{ 1224{
1090 while (self->texs <= texid) 1225 while (self->texs <= texid)
1091 { 1226 {
1092 Append (maptex, self->tex, self->texs, self->texs); 1227 Append (maptex, self->tex, self->texs, self->texs);
1116 // from transparent color bleeding and ugly wrapping effects. 1251 // from transparent color bleeding and ugly wrapping effects.
1117 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118} 1253}
1119 1254
1120int 1255int
1121ox (CFClient::Map self) 1256ox (CFPlus::Map self)
1122 ALIAS: 1257 ALIAS:
1123 oy = 1 1258 oy = 1
1124 x = 2 1259 x = 2
1125 y = 3 1260 y = 3
1126 w = 4 1261 w = 4
1137 } 1272 }
1138 OUTPUT: 1273 OUTPUT:
1139 RETVAL 1274 RETVAL
1140 1275
1141void 1276void
1142scroll (CFClient::Map self, int dx, int dy) 1277scroll (CFPlus::Map self, int dx, int dy)
1143 CODE: 1278 CODE:
1144{ 1279{
1145 if (dx > 0) 1280 if (dx > 0)
1146 map_blank (self, self->x, self->y, dx - 1, self->h); 1281 map_blank (self, self->x, self->y, dx, self->h);
1147 else if (dx < 0) 1282 else if (dx < 0)
1148 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1283 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1149 1284
1150 if (dy > 0) 1285 if (dy > 0)
1151 map_blank (self, self->x, self->y, self->w, dy - 1); 1286 map_blank (self, self->x, self->y, self->w, dy);
1152 else if (dy < 0) 1287 else if (dy < 0)
1153 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1288 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1154 1289
1155 self->ox += dx; self->x += dx; 1290 self->ox += dx; self->x += dx;
1156 self->oy += dy; self->y += dy; 1291 self->oy += dy; self->y += dy;
1157 1292
1158 while (self->y < 0) 1293 while (self->y < 0)
1163 self->y += MAP_EXTEND_Y; 1298 self->y += MAP_EXTEND_Y;
1164 } 1299 }
1165} 1300}
1166 1301
1167void 1302void
1168map1a_update (CFClient::Map self, SV *data_) 1303map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169 CODE: 1304 CODE:
1170{ 1305{
1171 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172 uint8_t *data_end = (uint8_t *)SvEND (data_); 1307 uint8_t *data_end = (uint8_t *)SvEND (data_);
1173 mapcell *cell; 1308 mapcell *cell;
1174 int x, y, flags; 1309 int x, y, flags;
1175 1310
1176 while (data < data_end) 1311 while (data < data_end - 1)
1177 { 1312 {
1178 flags = (data [0] << 8) + data [1]; data += 2; 1313 flags = (data [0] << 8) + data [1]; data += 2;
1179 1314
1180 x = ((flags >> 10) & 63) + self->x; 1315 x = self->x + ((flags >> 10) & 63);
1181 y = ((flags >> 4) & 63) + self->y; 1316 y = self->y + ((flags >> 4) & 63);
1182 1317
1183 cell = map_get_cell (self, x, y); 1318 cell = map_get_cell (self, x, y);
1184 1319
1185 if (flags & 15) 1320 if (flags & 15)
1186 { 1321 {
1187 if (cell->darkness < 0) 1322 if (!cell->darkness)
1188 { 1323 {
1324 memset (cell, 0, sizeof (*cell));
1189 cell->darkness = 0; 1325 cell->darkness = 256;
1190 cell->face [0] = 0;
1191 cell->face [1] = 0;
1192 cell->face [2] = 0;
1193 } 1326 }
1194 1327
1195 cell->darkness = flags & 8 ? *data++ : 255;
1196
1197 //TODO: don't trust server data to be in-range(!) 1328 //TODO: don't trust server data to be in-range(!)
1329
1330 if (flags & 8)
1331 {
1332 if (extmap)
1333 {
1334 uint8_t ext, cmd;
1335
1336 do
1337 {
1338 ext = *data++;
1339 cmd = ext & 0x3f;
1340
1341 if (cmd < 4)
1342 cell->darkness = 255 - ext * 64 + 1;
1343 else if (cmd == 5) // health
1344 {
1345 cell->stat_width = 1;
1346 cell->stat_hp = *data++;
1347 }
1348 else if (cmd == 6) // monster width
1349 cell->stat_width = *data++ + 1;
1350 else if (cmd == 0x47) // monster width
1351 {
1352 if (*data == 4)
1353 ; // decode player tag
1354
1355 data += *data + 1;
1356 }
1357 else if (cmd == 8) // cell flags
1358 cell->flags = *data++;
1359 else if (ext & 0x40) // unknown, multibyte => skip
1360 data += *data + 1;
1361 else
1362 data++;
1363 }
1364 while (ext & 0x80);
1365 }
1366 else
1367 cell->darkness = *data++ + 1;
1368 }
1198 1369
1199 if (flags & 4) 1370 if (flags & 4)
1200 { 1371 {
1201 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1372 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1202 } 1373 }
1210 { 1381 {
1211 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1382 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1212 } 1383 }
1213 } 1384 }
1214 else 1385 else
1215 cell->darkness = -1; 1386 cell->darkness = 0;
1216 } 1387 }
1217} 1388}
1218 1389
1219SV * 1390SV *
1220mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221 CODE: 1392 CODE:
1222{ 1393{
1223 int x1, x; 1394 int x1, x;
1224 int y1, y; 1395 int y1, y;
1225 int z; 1396 int z;
1275} 1446}
1276 OUTPUT: 1447 OUTPUT:
1277 RETVAL 1448 RETVAL
1278 1449
1279void 1450void
1280draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1281 PPCODE: 1452 CODE:
1282{ 1453{
1283 int vx, vy; 1454 int vx, vy;
1284 int x, y, z; 1455 int x, y, z;
1285 int last_name; 1456 int last_name;
1286 mapface face; 1457 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 1458
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; 1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1296 vy = self->y + (self->h - sh) / 2 - shift_y; 1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1297 1461
1298 /* 1462 /*
1299 int vx = self->vx = self->w >= sw 1463 int vx = self->vx = self->w >= sw
1300 ? self->x + (self->w - sw) / 2 1464 ? self->x + (self->w - sw) / 2
1301 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1465 : 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)); 1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306 */ 1470 */
1307 1471
1308 glColor4ub (255, 255, 255, 255); 1472 glColor4ub (255, 255, 255, 255);
1309 1473
1474 glEnable (GL_BLEND);
1310 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311 glEnable (GL_BLEND);
1312 glEnable (GL_TEXTURE_2D); 1476 glEnable (GL_TEXTURE_2D);
1313 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314 1478
1315 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1316 1480
1325 for (x = 0; x < sw; x++) 1489 for (x = 0; x < sw; x++)
1326 if (row->c0 <= x + vx && x + vx < row->c1) 1490 if (row->c0 <= x + vx && x + vx < row->c1)
1327 { 1491 {
1328 mapcell *cell = row->col + (x + vx - row->c0); 1492 mapcell *cell = row->col + (x + vx - row->c0);
1329 1493
1330 darkness[y * sw4 + x] = cell->darkness < 0
1331 ? 255 - FOW_DARKNESS
1332 : 255 - cell->darkness;
1333
1334 face = cell->face [z]; 1494 face = cell->face [z];
1335 1495
1336 if (face) 1496 if (face && face < self->texs)
1337 { 1497 {
1338 maptex tex = self->tex [face]; 1498 maptex tex = self->tex [face];
1339
1340 int px = (x + 1) * 32 - tex.w; 1499 int px = (x + 1) * 32 - tex.w;
1341 int py = (y + 1) * 32 - tex.h; 1500 int py = (y + 1) * 32 - tex.h;
1342 1501
1343 if (last_name != tex.name) 1502 if (last_name != tex.name)
1344 { 1503 {
1345 glEnd (); 1504 glEnd ();
1346 last_name = tex.name;
1347 glBindTexture (GL_TEXTURE_2D, last_name); 1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1348 glBegin (GL_QUADS); 1506 glBegin (GL_QUADS);
1349 } 1507 }
1350 1508
1351 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1352 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1353 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1511 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1354 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1355 } 1513 }
1514
1515 if (cell->flags && z == 2)
1516 {
1517 if (cell->flags & 1)
1518 {
1519 maptex tex = self->tex [1];
1520 int px = (x + 1) * 32 - tex.w + 2;
1521 int py = (y + 1) * 32 - tex.h - 6;
1522
1523 glEnd ();
1524 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1525 glBegin (GL_QUADS);
1526
1527 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1528 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1529 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1530 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1531 }
1532 }
1356 } 1533 }
1357 } 1534 }
1358 1535
1359 glEnd (); 1536 glEnd ();
1360 1537
1361 glDisable (GL_TEXTURE_2D); 1538 glDisable (GL_TEXTURE_2D);
1362 glDisable (GL_BLEND); 1539 glDisable (GL_BLEND);
1540
1541 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows)
1544 {
1545 maprow *row = self->row + (y + vy);
1546
1547 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1)
1549 {
1550 mapcell *cell = row->col + (x + vx - row->c0);
1551
1552 int px = x * 32;
1553 int py = y * 32;
1554
1555 if (cell->stat_hp)
1556 {
1557 int width = cell->stat_width * 32;
1558 int thick = sh / 28 + 1 + cell->stat_width;
1559
1560 glColor3ub (0, 0, 0);
1561 glRectf (px + 1, py - thick - 2,
1562 px + width - 1, py);
1563
1564 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1565 glRectf (px + 2,
1566 py - thick - 1,
1567 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1568 }
1569 }
1570 }
1571}
1572
1573void
1574draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1575 CODE:
1576{
1577 static float color[16][3] = {
1578 { 0.00F, 0.00F, 0.00F },
1579 { 1.00F, 1.00F, 1.00F },
1580 { 0.00F, 0.00F, 0.55F },
1581 { 1.00F, 0.00F, 0.00F },
1582
1583 { 1.00F, 0.54F, 0.00F },
1584 { 0.11F, 0.56F, 1.00F },
1585 { 0.93F, 0.46F, 0.00F },
1586 { 0.18F, 0.54F, 0.34F },
1587
1588 { 0.56F, 0.73F, 0.56F },
1589 { 0.80F, 0.80F, 0.80F },
1590 { 0.55F, 0.41F, 0.13F },
1591 { 0.99F, 0.77F, 0.26F },
1592
1593 { 0.74F, 0.65F, 0.41F },
1594
1595 { 0.00F, 1.00F, 1.00F },
1596 { 1.00F, 0.00F, 1.00F },
1597 { 1.00F, 1.00F, 0.00F },
1598 };
1599
1600 int x, y;
1601
1602 glEnable (GL_TEXTURE_2D);
1603 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1604 glEnable (GL_BLEND);
1605 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1606 glBegin (GL_QUADS);
1607
1608 for (y = 0; y < h; y++)
1609 for (x = 0; x < w; x++)
1610 {
1611 unsigned char m = data [x + y * w];
1612
1613 if (m)
1614 {
1615 float *c = color [m & 15];
1616
1617 float tx1 = m & 0x40 ? 0.5 : 0.;
1618 float tx2 = tx1 + 0.5;
1619
1620 glColor4f (c[0], c[1], c[2], 0.75);
1621 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1622 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1623 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1624 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1625 }
1626 }
1627
1628 glEnd ();
1629 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D);
1631}
1632
1633void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1635 PPCODE:
1636{
1637 int vx, vy;
1638 int x, y;
1639 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642
1643 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh);
1646
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1649
1650 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows)
1652 {
1653 maprow *row = self->row + (y + vy);
1654
1655 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1)
1657 {
1658 mapcell *cell = row->col + (x + vx - row->c0);
1659
1660 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS;
1663 }
1664 }
1363 1665
1364 EXTEND (SP, 3); 1666 EXTEND (SP, 3);
1365 PUSHs (sv_2mortal (newSViv (sw4))); 1667 PUSHs (sv_2mortal (newSViv (sw4)));
1366 PUSHs (sv_2mortal (newSViv (sh))); 1668 PUSHs (sv_2mortal (newSViv (sh)));
1367 PUSHs (darkness_sv); 1669 PUSHs (darkness_sv);
1368} 1670}
1369 1671
1370SV * 1672SV *
1371get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1673get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1372 CODE: 1674 CODE:
1373{ 1675{
1374 int x, y, x1, y1; 1676 int x, y, x1, y1;
1375 SV *data_sv = newSV (w * h * 7 + 5); 1677 SV *data_sv = newSV (w * h * 7 + 5);
1376 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1438} 1740}
1439 OUTPUT: 1741 OUTPUT:
1440 RETVAL 1742 RETVAL
1441 1743
1442void 1744void
1443set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444 PPCODE: 1746 PPCODE:
1445{ 1747{
1446 int x, y, z; 1748 int x, y, z;
1447 int w, h; 1749 int w, h;
1448 int x1, y1; 1750 int x1, y1;
1480 1782
1481 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1482 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1483 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1484 1786
1485 if (cell->darkness <= 0) 1787 if (cell->darkness == 0)
1486 { 1788 {
1487 cell->darkness = -1; 1789 cell->darkness = 0;
1488 1790
1489 for (z = 0; z <= 2; z++) 1791 for (z = 0; z <= 2; z++)
1490 { 1792 {
1491 cell->face[z] = face[z]; 1793 cell->face[z] = face[z];
1492 1794
1497 } 1799 }
1498 } 1800 }
1499 } 1801 }
1500} 1802}
1501 1803
1502MODULE = CFClient PACKAGE = CFClient::MixChunk 1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503 1805
1504CFClient::MixChunk 1806CFPlus::MixChunk
1505new_from_file (SV *class, char *path) 1807new_from_file (SV *class, char *path)
1506 CODE: 1808 CODE:
1507 RETVAL = Mix_LoadWAV (path); 1809 RETVAL = Mix_LoadWAV (path);
1508 OUTPUT: 1810 OUTPUT:
1509 RETVAL 1811 RETVAL
1510 1812
1511void 1813void
1512DESTROY (CFClient::MixChunk self) 1814DESTROY (CFPlus::MixChunk self)
1513 CODE: 1815 CODE:
1514 Mix_FreeChunk (self); 1816 Mix_FreeChunk (self);
1515 1817
1516int 1818int
1517volume (CFClient::MixChunk self, int volume = -1) 1819volume (CFPlus::MixChunk self, int volume = -1)
1518 CODE: 1820 CODE:
1519 RETVAL = Mix_VolumeChunk (self, volume); 1821 RETVAL = Mix_VolumeChunk (self, volume);
1520 OUTPUT: 1822 OUTPUT:
1521 RETVAL 1823 RETVAL
1522 1824
1523int 1825int
1524play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1826play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1525 CODE: 1827 CODE:
1526 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1828 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527 OUTPUT: 1829 OUTPUT:
1528 RETVAL 1830 RETVAL
1529 1831
1530MODULE = CFClient PACKAGE = CFClient::MixMusic 1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531 1833
1532int 1834int
1533volume (int volume = -1) 1835volume (int volume = -1)
1534 CODE: 1836 CODE:
1535 RETVAL = Mix_VolumeMusic (volume); 1837 RETVAL = Mix_VolumeMusic (volume);
1536 OUTPUT: 1838 OUTPUT:
1537 RETVAL 1839 RETVAL
1538 1840
1539CFClient::MixMusic 1841CFPlus::MixMusic
1540new_from_file (SV *class, char *path) 1842new_from_file (SV *class, char *path)
1541 CODE: 1843 CODE:
1542 RETVAL = Mix_LoadMUS (path); 1844 RETVAL = Mix_LoadMUS (path);
1543 OUTPUT: 1845 OUTPUT:
1544 RETVAL 1846 RETVAL
1545 1847
1546void 1848void
1547DESTROY (CFClient::MixMusic self) 1849DESTROY (CFPlus::MixMusic self)
1548 CODE: 1850 CODE:
1549 Mix_FreeMusic (self); 1851 Mix_FreeMusic (self);
1550 1852
1551int 1853int
1552play (CFClient::MixMusic self, int loops = -1) 1854play (CFPlus::MixMusic self, int loops = -1)
1553 CODE: 1855 CODE:
1554 RETVAL = Mix_PlayMusic (self, loops); 1856 RETVAL = Mix_PlayMusic (self, loops);
1555 OUTPUT: 1857 OUTPUT:
1556 RETVAL 1858 RETVAL
1557 1859
1558MODULE = CFClient PACKAGE = CFClient::OpenGL 1860MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559 1861
1560BOOT: 1862BOOT:
1561{ 1863{
1562 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563 static const struct { 1865 static const struct {
1564 const char *name; 1866 const char *name;
1565 IV iv; 1867 IV iv;
1566 } *civ, const_iv[] = { 1868 } *civ, const_iv[] = {
1567# define const_iv(name) { # name, (IV)name } 1869# define const_iv(name) { # name, (IV)name }
1574 const_iv (GL_SCISSOR_TEST), 1876 const_iv (GL_SCISSOR_TEST),
1575 const_iv (GL_DEPTH_TEST), 1877 const_iv (GL_DEPTH_TEST),
1576 const_iv (GL_ALPHA_TEST), 1878 const_iv (GL_ALPHA_TEST),
1577 const_iv (GL_NORMALIZE), 1879 const_iv (GL_NORMALIZE),
1578 const_iv (GL_RESCALE_NORMAL), 1880 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT),
1882 const_iv (GL_BACK),
1579 const_iv (GL_AND), 1883 const_iv (GL_AND),
1580 const_iv (GL_ONE), 1884 const_iv (GL_ONE),
1581 const_iv (GL_ZERO), 1885 const_iv (GL_ZERO),
1582 const_iv (GL_SRC_ALPHA), 1886 const_iv (GL_SRC_ALPHA),
1583 const_iv (GL_DST_ALPHA), 1887 const_iv (GL_DST_ALPHA),
1584 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1888 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585 const_iv (GL_ONE_MINUS_DST_ALPHA), 1889 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE), 1890 const_iv (GL_SRC_ALPHA_SATURATE),
1587 const_iv (GL_RGB), 1891 const_iv (GL_RGB),
1588 const_iv (GL_RGBA), 1892 const_iv (GL_RGBA),
1893 const_iv (GL_RGBA4),
1894 const_iv (GL_RGBA8),
1895 const_iv (GL_RGB5_A1),
1589 const_iv (GL_UNSIGNED_BYTE), 1896 const_iv (GL_UNSIGNED_BYTE),
1590 const_iv (GL_UNSIGNED_SHORT), 1897 const_iv (GL_UNSIGNED_SHORT),
1591 const_iv (GL_UNSIGNED_INT), 1898 const_iv (GL_UNSIGNED_INT),
1592 const_iv (GL_ALPHA), 1899 const_iv (GL_ALPHA),
1593 const_iv (GL_INTENSITY), 1900 const_iv (GL_INTENSITY),
1625 const_iv (GL_SEPARABLE_2D), 1932 const_iv (GL_SEPARABLE_2D),
1626 const_iv (GL_CONVOLUTION_2D), 1933 const_iv (GL_CONVOLUTION_2D),
1627 const_iv (GL_CONVOLUTION_BORDER_MODE), 1934 const_iv (GL_CONVOLUTION_BORDER_MODE),
1628 const_iv (GL_CONSTANT_BORDER), 1935 const_iv (GL_CONSTANT_BORDER),
1629 const_iv (GL_LINES), 1936 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP),
1630 const_iv (GL_LINE_LOOP), 1938 const_iv (GL_LINE_LOOP),
1631 const_iv (GL_QUADS), 1939 const_iv (GL_QUADS),
1632 const_iv (GL_QUAD_STRIP), 1940 const_iv (GL_QUAD_STRIP),
1633 const_iv (GL_TRIANGLES), 1941 const_iv (GL_TRIANGLES),
1634 const_iv (GL_TRIANGLE_STRIP), 1942 const_iv (GL_TRIANGLE_STRIP),
1667 OUTPUT: 1975 OUTPUT:
1668 RETVAL 1976 RETVAL
1669 1977
1670int glGetError () 1978int glGetError ()
1671 1979
1980void glFinish ()
1981
1672void glClear (int mask) 1982void glClear (int mask)
1673 1983
1674void glClearColor (float r, float g, float b, float a = 1.0) 1984void glClearColor (float r, float g, float b, float a = 1.0)
1675 PROTOTYPE: @ 1985 PROTOTYPE: @
1676 1986
1699void glPushMatrix () 2009void glPushMatrix ()
1700 2010
1701void glPopMatrix () 2011void glPopMatrix ()
1702 2012
1703void glLoadIdentity () 2013void glLoadIdentity ()
2014
2015void glDrawBuffer (int buffer)
2016
2017void glReadBuffer (int buffer)
1704 2018
1705# near_ and far_ are due to microsofts buggy "c" compiler 2019# near_ and far_ are due to microsofts buggy "c" compiler
1706void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2020void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707 2021
1708# near_ and far_ are due to microsofts buggy "c" compiler 2022# near_ and far_ are due to microsofts buggy "c" compiler
1738 r *= a; 2052 r *= a;
1739 g *= a; 2053 g *= a;
1740 b *= a; 2054 b *= a;
1741 } 2055 }
1742 // microsoft visual "c" rounds instead of truncating... 2056 // microsoft visual "c" rounds instead of truncating...
1743 glColor4ub (MIN ((int)(r * 256.f), 255), 2057 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 2058
1748void glInterleavedArrays (int format, int stride, char *data) 2059void glInterleavedArrays (int format, int stride, char *data)
1749 2060
1750void glDrawElements (int mode, int count, int type, char *indices) 2061void glDrawElements (int mode, int count, int type, char *indices)
1751 2062
1828 2139
1829void glEndList () 2140void glEndList ()
1830 2141
1831void glCallList (int list) 2142void glCallList (int list)
1832 2143
1833

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines