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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines