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.106 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines