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.108 by root, Wed Jun 7 23:28:12 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"
11 13
14#ifdef _WIN32
15# undef pipe
16#endif
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>
21#include <stdlib.h>
15 22
16#include <SDL.h> 23#include <SDL.h>
17#include <SDL_endian.h> 24#include <SDL_endian.h>
18#include <SDL_image.h> 25#include <SDL_image.h>
19#include <SDL_mixer.h> 26#include <SDL_mixer.h>
20#include <SDL_opengl.h> 27#include <SDL_opengl.h>
21 28
29#define PANGO_ENABLE_BACKEND
30#define G_DISABLE_CAST_CHECKS
31
22#include <glib/gmacros.h> 32#include <glib/gmacros.h>
23 33
24#include <pango/pango.h> 34#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 35
29#ifndef _WIN32 36#ifndef _WIN32
30# include <sys/types.h> 37# include <sys/types.h>
31# include <sys/socket.h> 38# include <sys/socket.h>
32# include <netinet/in.h> 39# include <netinet/in.h>
39 typedef signed char int8_t; 46 typedef signed char int8_t;
40 typedef signed short int16_t; 47 typedef signed short int16_t;
41 typedef signed int int32_t; 48 typedef signed int int32_t;
42#endif 49#endif
43 50
44#include "glext.h" 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45 52
46#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
47 54
48#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
50 57
51#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
52 65
53static struct 66static struct
54{ 67{
55#define GL_FUNC(ptr,name) ptr name; 68#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 69#include "glfunc.h"
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 78 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 79 else
67 glBlendFunc (sa, da); 80 glBlendFunc (sa, da);
68} 81}
69 82
83#include "texcache.c"
84
85#include "pango-font.c"
86#include "pango-fontmap.c"
87#include "pango-render.c"
88
70typedef Mix_Chunk *CFClient__MixChunk; 89typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 90typedef Mix_Music *CFPlus__MixMusic;
72 91
73typedef 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}
74 111
75typedef struct cf_layout { 112typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 113 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 114 float r, g, b, a; // default color for rgba mode
79 int base_height; 115 int base_height;
80 CFClient__Font font; 116 CFPlus__Font font;
81} *CFClient__Layout; 117} *CFPlus__Layout;
82 118
83static CFClient__Font default_font; 119static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 120static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 121static PangoFontMap *opengl_fontmap;
86 122
87static void 123static void
88substitute_func (FcPattern *pattern, gpointer data) 124substitute_func (FcPattern *pattern, gpointer data)
89{ 125{
90 FcPatternAddBool (pattern, FC_HINTING, 1); 126 FcPatternAddBool (pattern, FC_HINTING, 1);
127#ifdef FC_HINT_STYLE
91 FcPatternAddBool (pattern, FC_HINTSTYLE, FC_HINT_FULL); 128 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
92#ifdef _WIN32 129#endif
93 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
94#else
95 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 130 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
96#endif
97} 131}
98 132
99static void 133static void
100layout_update_font (CFClient__Layout self) 134layout_update_font (CFPlus__Layout self)
101{ 135{
102 /* 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
103 * reasonably well with bitstream vera 137 * reasonably well with bitstream vera
104 */ 138 */
105 PangoFontDescription *font = self->font ? self->font : default_font; 139 PangoFontDescription *font = self->font ? self->font : default_font;
109 143
110 pango_layout_set_font_description (self->pl, font); 144 pango_layout_set_font_description (self->pl, font);
111} 145}
112 146
113static void 147static void
114layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 148layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
115{ 149{
150 PangoRectangle rect;
151
152 // get_pixel_* wrongly rounds down
116 pango_layout_get_pixel_size (self->pl, w, h); 153 pango_layout_get_extents (self->pl, 0, &rect);
117 154
118 if (!*w) *w = 1; 155 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
119 if (!*h) *h = 1; 156 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
120 157
121 *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;
122} 163}
123 164
124typedef uint16_t mapface; 165typedef uint16_t mapface;
125 166
126typedef struct { 167typedef struct {
129 float s, t; 170 float s, t;
130 uint8_t r, g, b, a; 171 uint8_t r, g, b, a;
131} maptex; 172} maptex;
132 173
133typedef struct { 174typedef struct {
134 int16_t darkness; 175 uint32_t player;
135 mapface face[3]; 176 mapface face[3];
177 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags;
136} mapcell; 179} mapcell;
137 180
138typedef struct { 181typedef struct {
139 int32_t c0, c1; 182 int32_t c0, c1;
140 mapcell *col; 183 mapcell *col;
149 int texs; 192 int texs;
150 maptex *tex; 193 maptex *tex;
151 194
152 int32_t rows; 195 int32_t rows;
153 maprow *row; 196 maprow *row;
154} *CFClient__Map; 197} *CFPlus__Map;
155 198
156static char * 199static char *
157prepend (char *ptr, int sze, int inc) 200prepend (char *ptr, int sze, int inc)
158{ 201{
159 char *p; 202 char *p;
177 220
178#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))
179#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))
180 223
181static maprow * 224static maprow *
182map_get_row (CFClient__Map self, int y) 225map_get_row (CFPlus__Map self, int y)
183{ 226{
184 if (0 > y) 227 if (0 > y)
185 { 228 {
186 int extend = - y + MAP_EXTEND_Y; 229 int extend = - y + MAP_EXTEND_Y;
187 Prepend (maprow, self->row, self->rows, extend); 230 Prepend (maprow, self->row, self->rows, extend);
225 268
226 return row->col + (x - row->c0); 269 return row->col + (x - row->c0);
227} 270}
228 271
229static mapcell * 272static mapcell *
230map_get_cell (CFClient__Map self, int x, int y) 273map_get_cell (CFPlus__Map self, int x, int y)
231{ 274{
232 return row_get_cell (map_get_row (self, y), x); 275 return row_get_cell (map_get_row (self, y), x);
233} 276}
234 277
235static void 278static void
236map_clear (CFClient__Map self) 279map_clear (CFPlus__Map self)
237{ 280{
238 int r; 281 int r;
239 282
240 for (r = 0; r < self->rows; r++) 283 for (r = 0; r < self->rows; r++)
241 Safefree (self->row[r].col); 284 Safefree (self->row[r].col);
249 self->row = 0; 292 self->row = 0;
250 self->rows = 0; 293 self->rows = 0;
251} 294}
252 295
253static void 296static void
254map_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)
255{ 298{
256 int x, y; 299 int x, y;
257 maprow *row; 300 maprow *row;
301 mapcell *cell;
258 302
259 for (y = y0; y < y0 + h; y++) 303 for (y = y0; y < y0 + h; y++)
260 if (y >= 0) 304 if (y >= 0)
261 { 305 {
262 if (y >= self->rows) 306 if (y >= self->rows)
268 if (x >= row->c0) 312 if (x >= row->c0)
269 { 313 {
270 if (x >= row->c1) 314 if (x >= row->c1)
271 break; 315 break;
272 316
273 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;
274 } 323 }
275 } 324 }
276} 325}
277 326
278static void 327static void
299 ev.data2 = 0; 348 ev.data2 = 0;
300 349
301 SDL_PushEvent ((SDL_Event *)&ev); 350 SDL_PushEvent ((SDL_Event *)&ev);
302} 351}
303 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
304MODULE = CFClient PACKAGE = CFClient 370MODULE = CFPlus PACKAGE = CFPlus
305 371
306PROTOTYPES: ENABLE 372PROTOTYPES: ENABLE
307 373
308BOOT: 374BOOT:
309{ 375{
310 HV *stash = gv_stashpv ("CFClient", 1); 376 HV *stash = gv_stashpv ("CFPlus", 1);
311 static const struct { 377 static const struct {
312 const char *name; 378 const char *name;
313 IV iv; 379 IV iv;
314 } *civ, const_iv[] = { 380 } *civ, const_iv[] = {
315# define const_iv(name) { # name, (IV)name } 381# define const_iv(name) { # name, (IV)name }
416 482
417 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; )
418 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
419} 485}
420 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
421void 498void
422pango_init () 499pango_init ()
423 CODE: 500 CODE:
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425{ 501{
426 {
427 ft2_fontmap = pango_ft2_font_map_new (); 502 opengl_fontmap = pango_opengl_font_map_new ();
428 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);
429 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 504 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
430 }
431 {
432 cairo_font_options_t *fopt = cairo_font_options_create ();
433 cairo_fontmap = pango_cairo_font_map_get_default ();
434 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
435#ifdef _WIN32
436 // cairo looks like shit eaten twice on windows
437 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
438#else
439 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
440#endif
441 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
442 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
443 pango_cairo_context_set_font_options (cairo_context, fopt);
444 cairo_font_options_destroy (fopt);
445 }
446} 505}
447 506
448int 507int
449SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 508SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
450 509
451void 510void
452SDL_Quit () 511SDL_Quit ()
453 512
454void 513void
461 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 520 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
462 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 521 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
463 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 522 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
464 523
465 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 524 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
466 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 525 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
467 526
468 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
469 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
472 531
473 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
474 537
475 SDL_EnableUNICODE (1); 538 SDL_EnableUNICODE (1);
476 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
477 540
478 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
565 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 628 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
566 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 629 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
567 break; 630 break;
568 } 631 }
569 632
570 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 633 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
571 } 634 }
572} 635}
573 636
574int 637int
575Mix_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)
589#ifndef _WIN32 652#ifndef _WIN32
590 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
591#endif 654#endif
592 655
593void 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
594add_font (char *file) 686add_font (char *file)
595 CODE: 687 CODE:
596 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
597#ifdef _WIN32
598 // cairo... sigh... requires win2000
599 AddFontResourceEx (file, FR_PRIVATE, 0);
600#endif
601 689
602void 690void
603load_image_inline (SV *image_) 691load_image_inline (SV *image_)
604 ALIAS: 692 ALIAS:
605 load_image_file = 1 693 load_image_file = 1
647 735
648 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
649 737
650 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
651 739
740 SDL_LockSurface (surface2);
652 EXTEND (SP, 5); 741 EXTEND (SP, 6);
653 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
654 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
655 SDL_LockSurface (surface2);
656 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
657 SDL_UnlockSurface (surface2);
658 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)));
659 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
660 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
661 749
662 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
663 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
664} 752}
665 753
701 CODE: 789 CODE:
702 fprintf (stderr, "FATAL: %s\n", message); 790 fprintf (stderr, "FATAL: %s\n", message);
703#ifdef _WIN32 791#ifdef _WIN32
704 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
705#endif 793#endif
706 exit (1); 794 _exit (1);
707 795
796void
797_exit (int retval = 0)
798 CODE:
799 _exit (retval);
800
708MODULE = CFClient PACKAGE = CFClient::Font 801MODULE = CFPlus PACKAGE = CFPlus::Font
709 802
710CFClient::Font 803CFPlus::Font
711new_from_file (SV *class, char *path, int id = 0) 804new_from_file (SV *class, char *path, int id = 0)
712 CODE: 805 CODE:
713{ 806{
714 int count; 807 int count;
715 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
718} 811}
719 OUTPUT: 812 OUTPUT:
720 RETVAL 813 RETVAL
721 814
722void 815void
723DESTROY (CFClient::Font self) 816DESTROY (CFPlus::Font self)
724 CODE: 817 CODE:
725 pango_font_description_free (self); 818 pango_font_description_free (self);
726 819
727void 820void
728make_default (CFClient::Font self) 821make_default (CFPlus::Font self)
729 CODE: 822 CODE:
730 default_font = self; 823 default_font = self;
731 824
732MODULE = CFClient PACKAGE = CFClient::Layout 825MODULE = CFPlus PACKAGE = CFPlus::Layout
733 826
734CFClient::Layout 827void
735new (SV *class, int rgba = 0) 828reset_glyph_cache ()
829 CODE:
830 tc_clear ();
831
832CFPlus::Layout
833new (SV *class)
736 CODE: 834 CODE:
737 New (0, RETVAL, 1, struct cf_layout); 835 New (0, RETVAL, 1, struct cf_layout);
738 836
739 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 837 RETVAL->pl = pango_layout_new (opengl_context);
740 RETVAL->rgba = rgba;
741 RETVAL->r = 1.; 838 RETVAL->r = 1.;
742 RETVAL->g = 1.; 839 RETVAL->g = 1.;
743 RETVAL->b = 1.; 840 RETVAL->b = 1.;
744 RETVAL->a = 1.; 841 RETVAL->a = 1.;
745 RETVAL->base_height = MIN_FONT_HEIGHT; 842 RETVAL->base_height = MIN_FONT_HEIGHT;
749 layout_update_font (RETVAL); 846 layout_update_font (RETVAL);
750 OUTPUT: 847 OUTPUT:
751 RETVAL 848 RETVAL
752 849
753void 850void
754DESTROY (CFClient::Layout self) 851DESTROY (CFPlus::Layout self)
755 CODE: 852 CODE:
756 g_object_unref (self->pl); 853 g_object_unref (self->pl);
757 Safefree (self); 854 Safefree (self);
758 855
759int
760is_rgba (CFClient::Layout self)
761 CODE:
762 RETVAL = self->rgba;
763 OUTPUT:
764 RETVAL
765
766void 856void
767set_text (CFClient::Layout self, SV *text_) 857set_text (CFPlus::Layout self, SV *text_)
768 CODE: 858 CODE:
769{ 859{
770 STRLEN textlen; 860 STRLEN textlen;
771 char *text = SvPVutf8 (text_, textlen); 861 char *text = SvPVutf8 (text_, textlen);
772 862
773 pango_layout_set_text (self->pl, text, textlen); 863 pango_layout_set_text (self->pl, text, textlen);
774} 864}
775 865
776void 866void
777set_markup (CFClient::Layout self, SV *text_) 867set_markup (CFPlus::Layout self, SV *text_)
778 CODE: 868 CODE:
779{ 869{
780 STRLEN textlen; 870 STRLEN textlen;
781 char *text = SvPVutf8 (text_, textlen); 871 char *text = SvPVutf8 (text_, textlen);
782 872
783 pango_layout_set_markup (self->pl, text, textlen); 873 pango_layout_set_markup (self->pl, text, textlen);
784} 874}
785 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
786SV * 961SV *
787get_text (CFClient::Layout self) 962get_text (CFPlus::Layout self)
788 CODE: 963 CODE:
789 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
790 sv_utf8_decode (RETVAL); 965 sv_utf8_decode (RETVAL);
791 OUTPUT: 966 OUTPUT:
792 RETVAL 967 RETVAL
793 968
794void 969void
795set_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.)
796 CODE: 971 CODE:
797 self->r = r; 972 self->r = r;
798 self->g = g; 973 self->g = g;
799 self->b = b; 974 self->b = b;
800 self->a = a; 975 self->a = a;
801 976
802void 977void
803set_font (CFClient::Layout self, CFClient::Font font = 0) 978set_font (CFPlus::Layout self, CFPlus::Font font = 0)
804 CODE: 979 CODE:
805 if (self->font != font) 980 if (self->font != font)
806 { 981 {
807 self->font = font; 982 self->font = font;
808 layout_update_font (self); 983 layout_update_font (self);
809 } 984 }
810 985
811void 986void
812set_height (CFClient::Layout self, int base_height) 987set_height (CFPlus::Layout self, int base_height)
813 CODE: 988 CODE:
814 if (self->base_height != base_height) 989 if (self->base_height != base_height)
815 { 990 {
816 self->base_height = base_height; 991 self->base_height = base_height;
817 layout_update_font (self); 992 layout_update_font (self);
818 } 993 }
819 994
820void 995void
821set_width (CFClient::Layout self, int max_width = -1) 996set_width (CFPlus::Layout self, int max_width = -1)
822 CODE: 997 CODE:
823 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);
824 999
825void 1000void
826set_indent (CFClient::Layout self, int indent) 1001set_indent (CFPlus::Layout self, int indent)
827 CODE: 1002 CODE:
828 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
829 1004
830void 1005void
831set_spacing (CFClient::Layout self, int spacing) 1006set_spacing (CFPlus::Layout self, int spacing)
832 CODE: 1007 CODE:
833 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
834 1009
835void 1010void
836set_ellipsise (CFClient::Layout self, int ellipsise) 1011set_ellipsise (CFPlus::Layout self, int ellipsise)
837 CODE: 1012 CODE:
838 pango_layout_set_ellipsize (self->pl, 1013 pango_layout_set_ellipsize (self->pl,
839 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START
840 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
841 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
842 : PANGO_ELLIPSIZE_NONE 1017 : PANGO_ELLIPSIZE_NONE
843 ); 1018 );
844 1019
845void 1020void
846set_single_paragraph_mode (CFClient::Layout self, int spm) 1021set_single_paragraph_mode (CFPlus::Layout self, int spm)
847 CODE: 1022 CODE:
848 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
849 1024
850void 1025void
851size (CFClient::Layout self) 1026size (CFPlus::Layout self)
852 PPCODE: 1027 PPCODE:
853{ 1028{
854 int w, h; 1029 int w, h;
855 1030
856 layout_get_pixel_size (self, &w, &h); 1031 layout_get_pixel_size (self, &w, &h);
859 PUSHs (sv_2mortal (newSViv (w))); 1034 PUSHs (sv_2mortal (newSViv (w)));
860 PUSHs (sv_2mortal (newSViv (h))); 1035 PUSHs (sv_2mortal (newSViv (h)));
861} 1036}
862 1037
863int 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
864xy_to_index (CFClient::Layout self, int x, int y) 1051xy_to_index (CFPlus::Layout self, int x, int y)
865 CODE: 1052 CODE:
866{ 1053{
867 int index, trailing; 1054 int index, trailing;
868 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);
869 RETVAL = index; 1056 RETVAL = index;
870} 1057}
871 OUTPUT: 1058 OUTPUT:
872 RETVAL 1059 RETVAL
873 1060
874void 1061void
875cursor_pos (CFClient::Layout self, int index) 1062cursor_pos (CFPlus::Layout self, int index)
876 PPCODE: 1063 PPCODE:
877{ 1064{
878 PangoRectangle strong_pos; 1065 PangoRectangle strong_pos;
879 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
880 1067
883 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
884 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
885} 1072}
886 1073
887void 1074void
888render (CFClient::Layout self) 1075render (CFPlus::Layout self, float x, float y, int flags = 0)
889 PPCODE: 1076 PPCODE:
890{ 1077 pango_opengl_render_layout_subpixel (
891 SV *retval; 1078 self->pl,
892 int w, h; 1079 x * PANGO_SCALE, y * PANGO_SCALE,
1080 self->r, self->g, self->b, self->a,
1081 flags
1082 );
893 1083
894 layout_get_pixel_size (self, &w, &h); 1084MODULE = CFPlus PACKAGE = CFPlus::Texture
895 1085
896 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)
897 { 1094 {
898 cairo_surface_t *surface; 1095 int nw = minpot (ow);
899 cairo_t *cairo; 1096 int nh = minpot (oh);
900 1097
901 retval = newSV (w * h * 4); 1098 if (nw != ow || nh != oh)
902 SvPOK_only (retval);
903 SvCUR_set (retval, w * h * 4);
904
905 memset (SvPVX (retval), 0, w * h * 4);
906
907 surface = cairo_image_surface_create_for_data (
908 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
909 cairo = cairo_create (surface);
910 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
911
912 pango_cairo_show_layout (cairo, self->pl);
913
914 cairo_destroy (cairo);
915 cairo_surface_destroy (surface);
916
917 // what a mess, and its premultiplied, too :(
918 { 1099 {
919 uint32_t *p = (uint32_t *)SvPVX (retval); 1100 if (SvOK (data_))
920 uint32_t *e = p + w * h;
921
922 while (p < e)
923 { 1101 {
924 uint32_t rgba = *p; 1102 STRLEN datalen;
925 rgba = (rgba >> 24) | (rgba << 8); 1103 char *data = SvPVbyte (data_, datalen);
926#if 0 1104 int bpp = datalen / (ow * oh);
927#ifdef _WIN32 1105 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
928 {//D
929 uint8_t r = rgba >> 24;
930 uint8_t g = rgba >> 16;
931 uint8_t b = rgba >> 8;
932 uint8_t a = rgba >> 0;
933 1106
934 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_);
935 } 1115 }
936#endif 1116
937#endif 1117 sv_setiv (w_, nw);
938 rgba = SDL_SwapBE32 (rgba); 1118 sv_setiv (h_, nh);
939 *p++ = rgba;
940 } 1119 }
941 }
942
943 EXTEND (SP, 5);
944 PUSHs (sv_2mortal (newSViv (w)));
945 PUSHs (sv_2mortal (newSViv (h)));
946 PUSHs (sv_2mortal (retval));
947 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
948 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949 } 1120 }
950 else
951 {
952 FT_Bitmap bitmap;
953
954 retval = newSV (w * h);
955 SvPOK_only (retval);
956 SvCUR_set (retval, w * h);
957
958 bitmap.rows = h;
959 bitmap.width = w;
960 bitmap.pitch = w;
961 bitmap.buffer = (unsigned char*)SvPVX (retval);
962 bitmap.num_grays = 256;
963 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
964
965 memset (bitmap.buffer, 0, w * h);
966
967 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
968
969 EXTEND (SP, 5);
970 PUSHs (sv_2mortal (newSViv (w)));
971 PUSHs (sv_2mortal (newSViv (h)));
972 PUSHs (sv_2mortal (retval));
973 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 }
976} 1121}
977 1122
978MODULE = CFClient PACKAGE = CFClient::Texture
979
980void 1123void
981draw_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.)
982 PROTOTYPE: $$$;$$ 1125 PROTOTYPE: $$$;$$
983 ALIAS: 1126 ALIAS:
984 draw_quad_alpha = 1 1127 draw_quad_alpha = 1
985 draw_quad_alpha_premultiplied = 2 1128 draw_quad_alpha_premultiplied = 2
986 CODE: 1129 CODE:
1024 glDisable (GL_ALPHA_TEST); 1167 glDisable (GL_ALPHA_TEST);
1025 glDisable (GL_BLEND); 1168 glDisable (GL_BLEND);
1026 } 1169 }
1027} 1170}
1028 1171
1029MODULE = CFClient PACKAGE = CFClient::Map 1172MODULE = CFPlus PACKAGE = CFPlus::Map
1030 1173
1031CFClient::Map 1174CFPlus::Map
1032new (SV *class, int map_width, int map_height) 1175new (SV *class, int map_width, int map_height)
1033 CODE: 1176 CODE:
1034 New (0, RETVAL, 1, struct map); 1177 New (0, RETVAL, 1, struct map);
1035 RETVAL->x = 0; 1178 RETVAL->x = 0;
1036 RETVAL->y = 0; 1179 RETVAL->y = 0;
1046 RETVAL->row = 0; 1189 RETVAL->row = 0;
1047 OUTPUT: 1190 OUTPUT:
1048 RETVAL 1191 RETVAL
1049 1192
1050void 1193void
1051DESTROY (CFClient::Map self) 1194DESTROY (CFPlus::Map self)
1052 CODE: 1195 CODE:
1053{ 1196{
1054 map_clear (self); 1197 map_clear (self);
1055 Safefree (self->face); 1198 Safefree (self->face);
1199 Safefree (self->tex);
1056 Safefree (self); 1200 Safefree (self);
1057} 1201}
1058 1202
1059void 1203void
1060clear (CFClient::Map self) 1204clear (CFPlus::Map self)
1061 CODE: 1205 CODE:
1062 map_clear (self); 1206 map_clear (self);
1063 1207
1064void 1208void
1065set_face (CFClient::Map self, int face, int texid) 1209set_face (CFPlus::Map self, int face, int texid)
1066 CODE: 1210 CODE:
1067{ 1211{
1068 while (self->faces <= face) 1212 while (self->faces <= face)
1069 { 1213 {
1070 Append (mapface, self->face, self->faces, self->faces); 1214 Append (mapface, self->face, self->faces, self->faces);
1073 1217
1074 self->face [face] = texid; 1218 self->face [face] = texid;
1075} 1219}
1076 1220
1077void 1221void
1078set_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)
1079 CODE: 1223 CODE:
1080{ 1224{
1081 while (self->texs <= texid) 1225 while (self->texs <= texid)
1082 { 1226 {
1083 Append (maptex, self->tex, self->texs, self->texs); 1227 Append (maptex, self->tex, self->texs, self->texs);
1107 // from transparent color bleeding and ugly wrapping effects. 1251 // from transparent color bleeding and ugly wrapping effects.
1108 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1109} 1253}
1110 1254
1111int 1255int
1112ox (CFClient::Map self) 1256ox (CFPlus::Map self)
1113 ALIAS: 1257 ALIAS:
1114 oy = 1 1258 oy = 1
1115 x = 2 1259 x = 2
1116 y = 3 1260 y = 3
1117 w = 4 1261 w = 4
1128 } 1272 }
1129 OUTPUT: 1273 OUTPUT:
1130 RETVAL 1274 RETVAL
1131 1275
1132void 1276void
1133scroll (CFClient::Map self, int dx, int dy) 1277scroll (CFPlus::Map self, int dx, int dy)
1134 CODE: 1278 CODE:
1135{ 1279{
1136 if (dx > 0) 1280 if (dx > 0)
1137 map_blank (self, self->x, self->y, dx - 1, self->h); 1281 map_blank (self, self->x, self->y, dx, self->h);
1138 else if (dx < 0) 1282 else if (dx < 0)
1139 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);
1140 1284
1141 if (dy > 0) 1285 if (dy > 0)
1142 map_blank (self, self->x, self->y, self->w, dy - 1); 1286 map_blank (self, self->x, self->y, self->w, dy);
1143 else if (dy < 0) 1287 else if (dy < 0)
1144 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);
1145 1289
1146 self->ox += dx; self->x += dx; 1290 self->ox += dx; self->x += dx;
1147 self->oy += dy; self->y += dy; 1291 self->oy += dy; self->y += dy;
1148 1292
1149 while (self->y < 0) 1293 while (self->y < 0)
1154 self->y += MAP_EXTEND_Y; 1298 self->y += MAP_EXTEND_Y;
1155 } 1299 }
1156} 1300}
1157 1301
1158void 1302void
1159map1a_update (CFClient::Map self, SV *data_) 1303map1a_update (CFPlus::Map self, SV *data_, int extmap)
1160 CODE: 1304 CODE:
1161{ 1305{
1162 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1163 uint8_t *data_end = (uint8_t *)SvEND (data_); 1307 uint8_t *data_end = (uint8_t *)SvEND (data_);
1164 mapcell *cell; 1308 mapcell *cell;
1165 int x, y, flags; 1309 int x, y, flags;
1166 1310
1167 while (data < data_end) 1311 while (data < data_end - 1)
1168 { 1312 {
1169 flags = (data [0] << 8) + data [1]; data += 2; 1313 flags = (data [0] << 8) + data [1]; data += 2;
1170 1314
1171 x = ((flags >> 10) & 63) + self->x; 1315 x = self->x + ((flags >> 10) & 63);
1172 y = ((flags >> 4) & 63) + self->y; 1316 y = self->y + ((flags >> 4) & 63);
1173 1317
1174 cell = map_get_cell (self, x, y); 1318 cell = map_get_cell (self, x, y);
1175 1319
1176 if (flags & 15) 1320 if (flags & 15)
1177 { 1321 {
1178 if (cell->darkness < 0) 1322 if (!cell->darkness)
1179 { 1323 {
1324 memset (cell, 0, sizeof (*cell));
1180 cell->darkness = 0; 1325 cell->darkness = 256;
1181 cell->face [0] = 0;
1182 cell->face [1] = 0;
1183 cell->face [2] = 0;
1184 } 1326 }
1185 1327
1186 cell->darkness = flags & 8 ? *data++ : 255;
1187
1188 //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 }
1189 1369
1190 if (flags & 4) 1370 if (flags & 4)
1191 { 1371 {
1192 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;
1193 } 1373 }
1201 { 1381 {
1202 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;
1203 } 1383 }
1204 } 1384 }
1205 else 1385 else
1206 cell->darkness = -1; 1386 cell->darkness = 0;
1207 } 1387 }
1208} 1388}
1209 1389
1210SV * 1390SV *
1211mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1212 CODE: 1392 CODE:
1213{ 1393{
1214 int x1, x; 1394 int x1, x;
1215 int y1, y; 1395 int y1, y;
1216 int z; 1396 int z;
1266} 1446}
1267 OUTPUT: 1447 OUTPUT:
1268 RETVAL 1448 RETVAL
1269 1449
1270void 1450void
1271draw (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)
1272 PPCODE: 1452 CODE:
1273{ 1453{
1274 int vx, vy; 1454 int vx, vy;
1275 int x, y, z; 1455 int x, y, z;
1276 int last_name; 1456 int last_name;
1277 mapface face; 1457 mapface face;
1278 int sw4 = (sw + 3) & ~3;
1279 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1280 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1281 1458
1282 memset (darkness, 255, sw4 * sh);
1283 SvPOK_only (darkness_sv);
1284 SvCUR_set (darkness_sv, sw4 * sh);
1285
1286 vx = self->x + (self->w - sw) / 2 - shift_x; 1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1287 vy = self->y + (self->h - sh) / 2 - shift_y; 1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1288 1461
1289 /* 1462 /*
1290 int vx = self->vx = self->w >= sw 1463 int vx = self->vx = self->w >= sw
1291 ? self->x + (self->w - sw) / 2 1464 ? self->x + (self->w - sw) / 2
1292 : 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));
1296 : 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));
1297 */ 1470 */
1298 1471
1299 glColor4ub (255, 255, 255, 255); 1472 glColor4ub (255, 255, 255, 255);
1300 1473
1474 glEnable (GL_BLEND);
1301 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1302 glEnable (GL_BLEND);
1303 glEnable (GL_TEXTURE_2D); 1476 glEnable (GL_TEXTURE_2D);
1304 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1305 1478
1306 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1307 1480
1316 for (x = 0; x < sw; x++) 1489 for (x = 0; x < sw; x++)
1317 if (row->c0 <= x + vx && x + vx < row->c1) 1490 if (row->c0 <= x + vx && x + vx < row->c1)
1318 { 1491 {
1319 mapcell *cell = row->col + (x + vx - row->c0); 1492 mapcell *cell = row->col + (x + vx - row->c0);
1320 1493
1321 darkness[y * sw4 + x] = cell->darkness < 0
1322 ? 255 - FOW_DARKNESS
1323 : 255 - cell->darkness;
1324
1325 face = cell->face [z]; 1494 face = cell->face [z];
1326 1495
1327 if (face) 1496 if (face && face < self->texs)
1328 { 1497 {
1329 maptex tex = self->tex [face]; 1498 maptex tex = self->tex [face];
1330
1331 int px = (x + 1) * 32 - tex.w; 1499 int px = (x + 1) * 32 - tex.w;
1332 int py = (y + 1) * 32 - tex.h; 1500 int py = (y + 1) * 32 - tex.h;
1333 1501
1334 if (last_name != tex.name) 1502 if (last_name != tex.name)
1335 { 1503 {
1336 glEnd (); 1504 glEnd ();
1337 last_name = tex.name;
1338 glBindTexture (GL_TEXTURE_2D, last_name); 1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1339 glBegin (GL_QUADS); 1506 glBegin (GL_QUADS);
1340 } 1507 }
1341 1508
1342 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1343 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1344 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);
1345 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1346 } 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 }
1347 } 1533 }
1348 } 1534 }
1349 1535
1350 glEnd (); 1536 glEnd ();
1351 1537
1352 glDisable (GL_TEXTURE_2D); 1538 glDisable (GL_TEXTURE_2D);
1353 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 }
1354 1665
1355 EXTEND (SP, 3); 1666 EXTEND (SP, 3);
1356 PUSHs (sv_2mortal (newSViv (sw4))); 1667 PUSHs (sv_2mortal (newSViv (sw4)));
1357 PUSHs (sv_2mortal (newSViv (sh))); 1668 PUSHs (sv_2mortal (newSViv (sh)));
1358 PUSHs (darkness_sv); 1669 PUSHs (darkness_sv);
1359} 1670}
1360 1671
1361SV * 1672SV *
1362get_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)
1363 CODE: 1674 CODE:
1364{ 1675{
1365 int x, y, x1, y1; 1676 int x, y, x1, y1;
1366 SV *data_sv = newSV (w * h * 7 + 5); 1677 SV *data_sv = newSV (w * h * 7 + 5);
1367 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1429} 1740}
1430 OUTPUT: 1741 OUTPUT:
1431 RETVAL 1742 RETVAL
1432 1743
1433void 1744void
1434set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1435 PPCODE: 1746 PPCODE:
1436{ 1747{
1437 int x, y, z; 1748 int x, y, z;
1438 int w, h; 1749 int w, h;
1439 int x1, y1; 1750 int x1, y1;
1471 1782
1472 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1473 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1474 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1475 1786
1476 if (cell->darkness <= 0) 1787 if (cell->darkness == 0)
1477 { 1788 {
1478 cell->darkness = -1; 1789 cell->darkness = 0;
1479 1790
1480 for (z = 0; z <= 2; z++) 1791 for (z = 0; z <= 2; z++)
1481 { 1792 {
1482 cell->face[z] = face[z]; 1793 cell->face[z] = face[z];
1483 1794
1488 } 1799 }
1489 } 1800 }
1490 } 1801 }
1491} 1802}
1492 1803
1493MODULE = CFClient PACKAGE = CFClient::MixChunk 1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1494 1805
1495CFClient::MixChunk 1806CFPlus::MixChunk
1496new_from_file (SV *class, char *path) 1807new_from_file (SV *class, char *path)
1497 CODE: 1808 CODE:
1498 RETVAL = Mix_LoadWAV (path); 1809 RETVAL = Mix_LoadWAV (path);
1499 OUTPUT: 1810 OUTPUT:
1500 RETVAL 1811 RETVAL
1501 1812
1502void 1813void
1503DESTROY (CFClient::MixChunk self) 1814DESTROY (CFPlus::MixChunk self)
1504 CODE: 1815 CODE:
1505 Mix_FreeChunk (self); 1816 Mix_FreeChunk (self);
1506 1817
1507int 1818int
1508volume (CFClient::MixChunk self, int volume = -1) 1819volume (CFPlus::MixChunk self, int volume = -1)
1509 CODE: 1820 CODE:
1510 RETVAL = Mix_VolumeChunk (self, volume); 1821 RETVAL = Mix_VolumeChunk (self, volume);
1511 OUTPUT: 1822 OUTPUT:
1512 RETVAL 1823 RETVAL
1513 1824
1514int 1825int
1515play (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)
1516 CODE: 1827 CODE:
1517 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1828 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1518 OUTPUT: 1829 OUTPUT:
1519 RETVAL 1830 RETVAL
1520 1831
1521MODULE = CFClient PACKAGE = CFClient::MixMusic 1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1522 1833
1523int 1834int
1524volume (int volume = -1) 1835volume (int volume = -1)
1525 CODE: 1836 CODE:
1526 RETVAL = Mix_VolumeMusic (volume); 1837 RETVAL = Mix_VolumeMusic (volume);
1527 OUTPUT: 1838 OUTPUT:
1528 RETVAL 1839 RETVAL
1529 1840
1530CFClient::MixMusic 1841CFPlus::MixMusic
1531new_from_file (SV *class, char *path) 1842new_from_file (SV *class, char *path)
1532 CODE: 1843 CODE:
1533 RETVAL = Mix_LoadMUS (path); 1844 RETVAL = Mix_LoadMUS (path);
1534 OUTPUT: 1845 OUTPUT:
1535 RETVAL 1846 RETVAL
1536 1847
1537void 1848void
1538DESTROY (CFClient::MixMusic self) 1849DESTROY (CFPlus::MixMusic self)
1539 CODE: 1850 CODE:
1540 Mix_FreeMusic (self); 1851 Mix_FreeMusic (self);
1541 1852
1542int 1853int
1543play (CFClient::MixMusic self, int loops = -1) 1854play (CFPlus::MixMusic self, int loops = -1)
1544 CODE: 1855 CODE:
1545 RETVAL = Mix_PlayMusic (self, loops); 1856 RETVAL = Mix_PlayMusic (self, loops);
1546 OUTPUT: 1857 OUTPUT:
1547 RETVAL 1858 RETVAL
1548 1859
1549MODULE = CFClient PACKAGE = CFClient::OpenGL 1860MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1550 1861
1551BOOT: 1862BOOT:
1552{ 1863{
1553 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1554 static const struct { 1865 static const struct {
1555 const char *name; 1866 const char *name;
1556 IV iv; 1867 IV iv;
1557 } *civ, const_iv[] = { 1868 } *civ, const_iv[] = {
1558# define const_iv(name) { # name, (IV)name } 1869# define const_iv(name) { # name, (IV)name }
1565 const_iv (GL_SCISSOR_TEST), 1876 const_iv (GL_SCISSOR_TEST),
1566 const_iv (GL_DEPTH_TEST), 1877 const_iv (GL_DEPTH_TEST),
1567 const_iv (GL_ALPHA_TEST), 1878 const_iv (GL_ALPHA_TEST),
1568 const_iv (GL_NORMALIZE), 1879 const_iv (GL_NORMALIZE),
1569 const_iv (GL_RESCALE_NORMAL), 1880 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT),
1882 const_iv (GL_BACK),
1570 const_iv (GL_AND), 1883 const_iv (GL_AND),
1571 const_iv (GL_ONE), 1884 const_iv (GL_ONE),
1572 const_iv (GL_ZERO), 1885 const_iv (GL_ZERO),
1573 const_iv (GL_SRC_ALPHA), 1886 const_iv (GL_SRC_ALPHA),
1574 const_iv (GL_DST_ALPHA), 1887 const_iv (GL_DST_ALPHA),
1575 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1888 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1576 const_iv (GL_ONE_MINUS_DST_ALPHA), 1889 const_iv (GL_ONE_MINUS_DST_ALPHA),
1577 const_iv (GL_SRC_ALPHA_SATURATE), 1890 const_iv (GL_SRC_ALPHA_SATURATE),
1578 const_iv (GL_RGB), 1891 const_iv (GL_RGB),
1579 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),
1580 const_iv (GL_UNSIGNED_BYTE), 1896 const_iv (GL_UNSIGNED_BYTE),
1581 const_iv (GL_UNSIGNED_SHORT), 1897 const_iv (GL_UNSIGNED_SHORT),
1582 const_iv (GL_UNSIGNED_INT), 1898 const_iv (GL_UNSIGNED_INT),
1583 const_iv (GL_ALPHA), 1899 const_iv (GL_ALPHA),
1584 const_iv (GL_INTENSITY), 1900 const_iv (GL_INTENSITY),
1616 const_iv (GL_SEPARABLE_2D), 1932 const_iv (GL_SEPARABLE_2D),
1617 const_iv (GL_CONVOLUTION_2D), 1933 const_iv (GL_CONVOLUTION_2D),
1618 const_iv (GL_CONVOLUTION_BORDER_MODE), 1934 const_iv (GL_CONVOLUTION_BORDER_MODE),
1619 const_iv (GL_CONSTANT_BORDER), 1935 const_iv (GL_CONSTANT_BORDER),
1620 const_iv (GL_LINES), 1936 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP),
1621 const_iv (GL_LINE_LOOP), 1938 const_iv (GL_LINE_LOOP),
1622 const_iv (GL_QUADS), 1939 const_iv (GL_QUADS),
1623 const_iv (GL_QUAD_STRIP), 1940 const_iv (GL_QUAD_STRIP),
1624 const_iv (GL_TRIANGLES), 1941 const_iv (GL_TRIANGLES),
1625 const_iv (GL_TRIANGLE_STRIP), 1942 const_iv (GL_TRIANGLE_STRIP),
1658 OUTPUT: 1975 OUTPUT:
1659 RETVAL 1976 RETVAL
1660 1977
1661int glGetError () 1978int glGetError ()
1662 1979
1980void glFinish ()
1981
1663void glClear (int mask) 1982void glClear (int mask)
1664 1983
1665void glClearColor (float r, float g, float b, float a = 1.0) 1984void glClearColor (float r, float g, float b, float a = 1.0)
1666 PROTOTYPE: @ 1985 PROTOTYPE: @
1667 1986
1690void glPushMatrix () 2009void glPushMatrix ()
1691 2010
1692void glPopMatrix () 2011void glPopMatrix ()
1693 2012
1694void glLoadIdentity () 2013void glLoadIdentity ()
2014
2015void glDrawBuffer (int buffer)
2016
2017void glReadBuffer (int buffer)
1695 2018
1696# near_ and far_ are due to microsofts buggy "c" compiler 2019# near_ and far_ are due to microsofts buggy "c" compiler
1697void 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_)
1698 2021
1699# near_ and far_ are due to microsofts buggy "c" compiler 2022# near_ and far_ are due to microsofts buggy "c" compiler
1729 r *= a; 2052 r *= a;
1730 g *= a; 2053 g *= a;
1731 b *= a; 2054 b *= a;
1732 } 2055 }
1733 // microsoft visual "c" rounds instead of truncating... 2056 // microsoft visual "c" rounds instead of truncating...
1734 glColor4ub (MIN ((int)(r * 256.f), 255), 2057 glColor4f (r, g, b, a);
1735 MIN ((int)(g * 256.f), 255),
1736 MIN ((int)(b * 256.f), 255),
1737 MIN ((int)(a * 256.f), 255));
1738 2058
1739void glInterleavedArrays (int format, int stride, char *data) 2059void glInterleavedArrays (int format, int stride, char *data)
1740 2060
1741void glDrawElements (int mode, int count, int type, char *indices) 2061void glDrawElements (int mode, int count, int type, char *indices)
1742 2062
1819 2139
1820void glEndList () 2140void glEndList ()
1821 2141
1822void glCallList (int list) 2142void glCallList (int list)
1823 2143
1824

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines