ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.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);
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 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
593add_font (char *file) 686add_font (char *file)
594 CODE: 687 CODE:
595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
596#ifdef _WIN32
597 // cairo... sigh... requires win2000
598 AddFontResourceEx (file, FR_PRIVATE, 0);
599#endif
600 689
601void 690void
602load_image_inline (SV *image_) 691load_image_inline (SV *image_)
603 ALIAS: 692 ALIAS:
604 load_image_file = 1 693 load_image_file = 1
646 735
647 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
648 737
649 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
650 739
740 SDL_LockSurface (surface2);
651 EXTEND (SP, 5); 741 EXTEND (SP, 6);
652 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
653 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
654 SDL_LockSurface (surface2);
655 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 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))); 745 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
658 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
659 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
660 749
661 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
662 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
663} 752}
664 753
700 CODE: 789 CODE:
701 fprintf (stderr, "FATAL: %s\n", message); 790 fprintf (stderr, "FATAL: %s\n", message);
702#ifdef _WIN32 791#ifdef _WIN32
703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
704#endif 793#endif
705 exit (1); 794 _exit (1);
706 795
796void
797_exit (int retval = 0)
798 CODE:
799 _exit (retval);
800
707MODULE = CFClient PACKAGE = CFClient::Font 801MODULE = CFPlus PACKAGE = CFPlus::Font
708 802
709CFClient::Font 803CFPlus::Font
710new_from_file (SV *class, char *path, int id = 0) 804new_from_file (SV *class, char *path, int id = 0)
711 CODE: 805 CODE:
712{ 806{
713 int count; 807 int count;
714 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
717} 811}
718 OUTPUT: 812 OUTPUT:
719 RETVAL 813 RETVAL
720 814
721void 815void
722DESTROY (CFClient::Font self) 816DESTROY (CFPlus::Font self)
723 CODE: 817 CODE:
724 pango_font_description_free (self); 818 pango_font_description_free (self);
725 819
726void 820void
727make_default (CFClient::Font self) 821make_default (CFPlus::Font self)
728 CODE: 822 CODE:
729 default_font = self; 823 default_font = self;
730 824
731MODULE = CFClient PACKAGE = CFClient::Layout 825MODULE = CFPlus PACKAGE = CFPlus::Layout
732 826
733CFClient::Layout 827void
734new (SV *class, int rgba = 0) 828reset_glyph_cache ()
829 CODE:
830 tc_clear ();
831
832CFPlus::Layout
833new (SV *class)
735 CODE: 834 CODE:
736 New (0, RETVAL, 1, struct cf_layout); 835 New (0, RETVAL, 1, struct cf_layout);
737 836
738 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 837 RETVAL->pl = pango_layout_new (opengl_context);
739 RETVAL->rgba = rgba;
740 RETVAL->r = 1.; 838 RETVAL->r = 1.;
741 RETVAL->g = 1.; 839 RETVAL->g = 1.;
742 RETVAL->b = 1.; 840 RETVAL->b = 1.;
743 RETVAL->a = 1.; 841 RETVAL->a = 1.;
744 RETVAL->base_height = MIN_FONT_HEIGHT; 842 RETVAL->base_height = MIN_FONT_HEIGHT;
748 layout_update_font (RETVAL); 846 layout_update_font (RETVAL);
749 OUTPUT: 847 OUTPUT:
750 RETVAL 848 RETVAL
751 849
752void 850void
753DESTROY (CFClient::Layout self) 851DESTROY (CFPlus::Layout self)
754 CODE: 852 CODE:
755 g_object_unref (self->pl); 853 g_object_unref (self->pl);
756 Safefree (self); 854 Safefree (self);
757 855
758int
759is_rgba (CFClient::Layout self)
760 CODE:
761 RETVAL = self->rgba;
762 OUTPUT:
763 RETVAL
764
765void 856void
766set_text (CFClient::Layout self, SV *text_) 857set_text (CFPlus::Layout self, SV *text_)
767 CODE: 858 CODE:
768{ 859{
769 STRLEN textlen; 860 STRLEN textlen;
770 char *text = SvPVutf8 (text_, textlen); 861 char *text = SvPVutf8 (text_, textlen);
771 862
772 pango_layout_set_text (self->pl, text, textlen); 863 pango_layout_set_text (self->pl, text, textlen);
773} 864}
774 865
775void 866void
776set_markup (CFClient::Layout self, SV *text_) 867set_markup (CFPlus::Layout self, SV *text_)
777 CODE: 868 CODE:
778{ 869{
779 STRLEN textlen; 870 STRLEN textlen;
780 char *text = SvPVutf8 (text_, textlen); 871 char *text = SvPVutf8 (text_, textlen);
781 872
782 pango_layout_set_markup (self->pl, text, textlen); 873 pango_layout_set_markup (self->pl, text, textlen);
783} 874}
784 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
785SV * 961SV *
786get_text (CFClient::Layout self) 962get_text (CFPlus::Layout self)
787 CODE: 963 CODE:
788 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
789 SvUTF8_on (RETVAL); 965 sv_utf8_decode (RETVAL);
790 OUTPUT: 966 OUTPUT:
791 RETVAL 967 RETVAL
792 968
793void 969void
794set_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.)
795 CODE: 971 CODE:
796 self->r = r; 972 self->r = r;
797 self->g = g; 973 self->g = g;
798 self->b = b; 974 self->b = b;
799 self->a = a; 975 self->a = a;
800 976
801void 977void
802set_font (CFClient::Layout self, CFClient::Font font = 0) 978set_font (CFPlus::Layout self, CFPlus::Font font = 0)
803 CODE: 979 CODE:
804 if (self->font != font) 980 if (self->font != font)
805 { 981 {
806 self->font = font; 982 self->font = font;
807 layout_update_font (self); 983 layout_update_font (self);
808 } 984 }
809 985
810void 986void
811set_height (CFClient::Layout self, int base_height) 987set_height (CFPlus::Layout self, int base_height)
812 CODE: 988 CODE:
813 if (self->base_height != base_height) 989 if (self->base_height != base_height)
814 { 990 {
815 self->base_height = base_height; 991 self->base_height = base_height;
816 layout_update_font (self); 992 layout_update_font (self);
817 } 993 }
818 994
819void 995void
820set_width (CFClient::Layout self, int max_width = -1) 996set_width (CFPlus::Layout self, int max_width = -1)
821 CODE: 997 CODE:
822 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);
823 999
824void 1000void
825set_indent (CFClient::Layout self, int indent) 1001set_indent (CFPlus::Layout self, int indent)
826 CODE: 1002 CODE:
827 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
828 1004
829void 1005void
830set_spacing (CFClient::Layout self, int spacing) 1006set_spacing (CFPlus::Layout self, int spacing)
831 CODE: 1007 CODE:
832 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
833 1009
834void 1010void
835set_ellipsise (CFClient::Layout self, int ellipsise) 1011set_ellipsise (CFPlus::Layout self, int ellipsise)
836 CODE: 1012 CODE:
837 pango_layout_set_ellipsize (self->pl, 1013 pango_layout_set_ellipsize (self->pl,
838 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START
839 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
840 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
841 : PANGO_ELLIPSIZE_NONE 1017 : PANGO_ELLIPSIZE_NONE
842 ); 1018 );
843 1019
844void 1020void
845set_single_paragraph_mode (CFClient::Layout self, int spm) 1021set_single_paragraph_mode (CFPlus::Layout self, int spm)
846 CODE: 1022 CODE:
847 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
848 1024
849void 1025void
850size (CFClient::Layout self) 1026size (CFPlus::Layout self)
851 PPCODE: 1027 PPCODE:
852{ 1028{
853 int w, h; 1029 int w, h;
854 1030
855 layout_get_pixel_size (self, &w, &h); 1031 layout_get_pixel_size (self, &w, &h);
858 PUSHs (sv_2mortal (newSViv (w))); 1034 PUSHs (sv_2mortal (newSViv (w)));
859 PUSHs (sv_2mortal (newSViv (h))); 1035 PUSHs (sv_2mortal (newSViv (h)));
860} 1036}
861 1037
862int 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
863xy_to_index (CFClient::Layout self, int x, int y) 1051xy_to_index (CFPlus::Layout self, int x, int y)
864 CODE: 1052 CODE:
865{ 1053{
866 int index, trailing; 1054 int index, trailing;
867 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);
868 RETVAL = index; 1056 RETVAL = index;
869} 1057}
870 OUTPUT: 1058 OUTPUT:
871 RETVAL 1059 RETVAL
872 1060
873void 1061void
874cursor_pos (CFClient::Layout self, int index) 1062cursor_pos (CFPlus::Layout self, int index)
875 PPCODE: 1063 PPCODE:
876{ 1064{
877 PangoRectangle strong_pos; 1065 PangoRectangle strong_pos;
878 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
879 1067
882 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
883 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
884} 1072}
885 1073
886void 1074void
887render (CFClient::Layout self) 1075render (CFPlus::Layout self, float x, float y, int flags = 0)
888 PPCODE: 1076 PPCODE:
889{ 1077 pango_opengl_render_layout_subpixel (
890 SV *retval; 1078 self->pl,
891 int w, h; 1079 x * PANGO_SCALE, y * PANGO_SCALE,
1080 self->r, self->g, self->b, self->a,
1081 flags
1082 );
892 1083
893 layout_get_pixel_size (self, &w, &h); 1084MODULE = CFPlus PACKAGE = CFPlus::Texture
894 1085
895 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)
896 { 1094 {
897 cairo_surface_t *surface; 1095 int nw = minpot (ow);
898 cairo_t *cairo; 1096 int nh = minpot (oh);
899 1097
900 retval = newSV (w * h * 4); 1098 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 { 1099 {
918 uint32_t *p = (uint32_t *)SvPVX (retval); 1100 if (SvOK (data_))
919 uint32_t *e = p + w * h;
920
921 while (p < e)
922 { 1101 {
923 uint32_t rgba = *p; 1102 STRLEN datalen;
924 rgba = (rgba >> 24) | (rgba << 8); 1103 char *data = SvPVbyte (data_, datalen);
925#if 0 1104 int bpp = datalen / (ow * oh);
926#ifdef _WIN32 1105 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 1106
933 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_);
934 } 1115 }
935#endif 1116
936#endif 1117 sv_setiv (w_, nw);
937 rgba = SDL_SwapBE32 (rgba); 1118 sv_setiv (h_, nh);
938 *p++ = rgba;
939 } 1119 }
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 } 1120 }
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} 1121}
976 1122
977MODULE = CFClient PACKAGE = CFClient::Texture
978
979void 1123void
980draw_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.)
981 PROTOTYPE: $$$;$$ 1125 PROTOTYPE: $$$;$$
982 ALIAS: 1126 ALIAS:
983 draw_quad_alpha = 1 1127 draw_quad_alpha = 1
984 draw_quad_alpha_premultiplied = 2 1128 draw_quad_alpha_premultiplied = 2
985 CODE: 1129 CODE:
1023 glDisable (GL_ALPHA_TEST); 1167 glDisable (GL_ALPHA_TEST);
1024 glDisable (GL_BLEND); 1168 glDisable (GL_BLEND);
1025 } 1169 }
1026} 1170}
1027 1171
1028MODULE = CFClient PACKAGE = CFClient::Map 1172MODULE = CFPlus PACKAGE = CFPlus::Map
1029 1173
1030CFClient::Map 1174CFPlus::Map
1031new (SV *class, int map_width, int map_height) 1175new (SV *class, int map_width, int map_height)
1032 CODE: 1176 CODE:
1033 New (0, RETVAL, 1, struct map); 1177 New (0, RETVAL, 1, struct map);
1034 RETVAL->x = 0; 1178 RETVAL->x = 0;
1035 RETVAL->y = 0; 1179 RETVAL->y = 0;
1045 RETVAL->row = 0; 1189 RETVAL->row = 0;
1046 OUTPUT: 1190 OUTPUT:
1047 RETVAL 1191 RETVAL
1048 1192
1049void 1193void
1050DESTROY (CFClient::Map self) 1194DESTROY (CFPlus::Map self)
1051 CODE: 1195 CODE:
1052{ 1196{
1053 map_clear (self); 1197 map_clear (self);
1054 Safefree (self->face); 1198 Safefree (self->face);
1199 Safefree (self->tex);
1055 Safefree (self); 1200 Safefree (self);
1056} 1201}
1057 1202
1058void 1203void
1059clear (CFClient::Map self) 1204clear (CFPlus::Map self)
1060 CODE: 1205 CODE:
1061 map_clear (self); 1206 map_clear (self);
1062 1207
1063void 1208void
1064set_face (CFClient::Map self, int face, int texid) 1209set_face (CFPlus::Map self, int face, int texid)
1065 CODE: 1210 CODE:
1066{ 1211{
1067 while (self->faces <= face) 1212 while (self->faces <= face)
1068 { 1213 {
1069 Append (mapface, self->face, self->faces, self->faces); 1214 Append (mapface, self->face, self->faces, self->faces);
1072 1217
1073 self->face [face] = texid; 1218 self->face [face] = texid;
1074} 1219}
1075 1220
1076void 1221void
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) 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)
1078 CODE: 1223 CODE:
1079{ 1224{
1080 while (self->texs <= texid) 1225 while (self->texs <= texid)
1081 { 1226 {
1082 Append (maptex, self->tex, self->texs, self->texs); 1227 Append (maptex, self->tex, self->texs, self->texs);
1106 // from transparent color bleeding and ugly wrapping effects. 1251 // from transparent color bleeding and ugly wrapping effects.
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108} 1253}
1109 1254
1110int 1255int
1111ox (CFClient::Map self) 1256ox (CFPlus::Map self)
1112 ALIAS: 1257 ALIAS:
1113 oy = 1 1258 oy = 1
1114 x = 2 1259 x = 2
1115 y = 3 1260 y = 3
1116 w = 4 1261 w = 4
1127 } 1272 }
1128 OUTPUT: 1273 OUTPUT:
1129 RETVAL 1274 RETVAL
1130 1275
1131void 1276void
1132scroll (CFClient::Map self, int dx, int dy) 1277scroll (CFPlus::Map self, int dx, int dy)
1133 CODE: 1278 CODE:
1134{ 1279{
1135 if (dx > 0) 1280 if (dx > 0)
1136 map_blank (self, self->x, self->y, dx - 1, self->h); 1281 map_blank (self, self->x, self->y, dx, self->h);
1137 else if (dx < 0) 1282 else if (dx < 0)
1138 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);
1139 1284
1140 if (dy > 0) 1285 if (dy > 0)
1141 map_blank (self, self->x, self->y, self->w, dy - 1); 1286 map_blank (self, self->x, self->y, self->w, dy);
1142 else if (dy < 0) 1287 else if (dy < 0)
1143 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);
1144 1289
1145 self->ox += dx; self->x += dx; 1290 self->ox += dx; self->x += dx;
1146 self->oy += dy; self->y += dy; 1291 self->oy += dy; self->y += dy;
1147 1292
1148 while (self->y < 0) 1293 while (self->y < 0)
1153 self->y += MAP_EXTEND_Y; 1298 self->y += MAP_EXTEND_Y;
1154 } 1299 }
1155} 1300}
1156 1301
1157void 1302void
1158map1a_update (CFClient::Map self, SV *data_) 1303map1a_update (CFPlus::Map self, SV *data_, int extmap)
1159 CODE: 1304 CODE:
1160{ 1305{
1161 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1162 uint8_t *data_end = (uint8_t *)SvEND (data_); 1307 uint8_t *data_end = (uint8_t *)SvEND (data_);
1163 mapcell *cell; 1308 mapcell *cell;
1164 int x, y, flags; 1309 int x, y, flags;
1165 1310
1166 while (data < data_end) 1311 while (data < data_end - 1)
1167 { 1312 {
1168 flags = (data [0] << 8) + data [1]; data += 2; 1313 flags = (data [0] << 8) + data [1]; data += 2;
1169 1314
1170 x = ((flags >> 10) & 63) + self->x; 1315 x = self->x + ((flags >> 10) & 63);
1171 y = ((flags >> 4) & 63) + self->y; 1316 y = self->y + ((flags >> 4) & 63);
1172 1317
1173 cell = map_get_cell (self, x, y); 1318 cell = map_get_cell (self, x, y);
1174 1319
1175 if (flags & 15) 1320 if (flags & 15)
1176 { 1321 {
1177 if (cell->darkness < 0) 1322 if (!cell->darkness)
1178 { 1323 {
1324 memset (cell, 0, sizeof (*cell));
1179 cell->darkness = 0; 1325 cell->darkness = 256;
1180 cell->face [0] = 0;
1181 cell->face [1] = 0;
1182 cell->face [2] = 0;
1183 } 1326 }
1184 1327
1185 cell->darkness = flags & 8 ? *data++ : 255;
1186
1187 //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 }
1188 1369
1189 if (flags & 4) 1370 if (flags & 4)
1190 { 1371 {
1191 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;
1192 } 1373 }
1200 { 1381 {
1201 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;
1202 } 1383 }
1203 } 1384 }
1204 else 1385 else
1205 cell->darkness = -1; 1386 cell->darkness = 0;
1206 } 1387 }
1207} 1388}
1208 1389
1209SV * 1390SV *
1210mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1211 CODE: 1392 CODE:
1212{ 1393{
1213 int x1, x; 1394 int x1, x;
1214 int y1, y; 1395 int y1, y;
1215 int z; 1396 int z;
1265} 1446}
1266 OUTPUT: 1447 OUTPUT:
1267 RETVAL 1448 RETVAL
1268 1449
1269void 1450void
1270draw (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)
1271 PPCODE: 1452 CODE:
1272{ 1453{
1273 int vx, vy; 1454 int vx, vy;
1274 int x, y, z; 1455 int x, y, z;
1275 int last_name; 1456 int last_name;
1276 mapface face; 1457 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 1458
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; 1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1286 vy = self->y + (self->h - sh) / 2 - shift_y; 1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1287 1461
1288 /* 1462 /*
1289 int vx = self->vx = self->w >= sw 1463 int vx = self->vx = self->w >= sw
1290 ? self->x + (self->w - sw) / 2 1464 ? self->x + (self->w - sw) / 2
1291 : 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));
1295 : 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));
1296 */ 1470 */
1297 1471
1298 glColor4ub (255, 255, 255, 255); 1472 glColor4ub (255, 255, 255, 255);
1299 1473
1474 glEnable (GL_BLEND);
1300 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1301 glEnable (GL_BLEND);
1302 glEnable (GL_TEXTURE_2D); 1476 glEnable (GL_TEXTURE_2D);
1303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1304 1478
1305 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1306 1480
1315 for (x = 0; x < sw; x++) 1489 for (x = 0; x < sw; x++)
1316 if (row->c0 <= x + vx && x + vx < row->c1) 1490 if (row->c0 <= x + vx && x + vx < row->c1)
1317 { 1491 {
1318 mapcell *cell = row->col + (x + vx - row->c0); 1492 mapcell *cell = row->col + (x + vx - row->c0);
1319 1493
1320 darkness[y * sw4 + x] = cell->darkness < 0
1321 ? 255 - FOW_DARKNESS
1322 : 255 - cell->darkness;
1323
1324 face = cell->face [z]; 1494 face = cell->face [z];
1325 1495
1326 if (face) 1496 if (face && face < self->texs)
1327 { 1497 {
1328 maptex tex = self->tex [face]; 1498 maptex tex = self->tex [face];
1329
1330 int px = (x + 1) * 32 - tex.w; 1499 int px = (x + 1) * 32 - tex.w;
1331 int py = (y + 1) * 32 - tex.h; 1500 int py = (y + 1) * 32 - tex.h;
1332 1501
1333 if (last_name != tex.name) 1502 if (last_name != tex.name)
1334 { 1503 {
1335 glEnd (); 1504 glEnd ();
1336 last_name = tex.name;
1337 glBindTexture (GL_TEXTURE_2D, last_name); 1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1338 glBegin (GL_QUADS); 1506 glBegin (GL_QUADS);
1339 } 1507 }
1340 1508
1341 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1342 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1343 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);
1344 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1345 } 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 }
1346 } 1533 }
1347 } 1534 }
1348 1535
1349 glEnd (); 1536 glEnd ();
1350 1537
1351 glDisable (GL_TEXTURE_2D); 1538 glDisable (GL_TEXTURE_2D);
1352 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 }
1353 1665
1354 EXTEND (SP, 3); 1666 EXTEND (SP, 3);
1355 PUSHs (sv_2mortal (newSViv (sw4))); 1667 PUSHs (sv_2mortal (newSViv (sw4)));
1356 PUSHs (sv_2mortal (newSViv (sh))); 1668 PUSHs (sv_2mortal (newSViv (sh)));
1357 PUSHs (darkness_sv); 1669 PUSHs (darkness_sv);
1358} 1670}
1359 1671
1360SV * 1672SV *
1361get_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)
1362 CODE: 1674 CODE:
1363{ 1675{
1364 int x, y, x1, y1; 1676 int x, y, x1, y1;
1365 SV *data_sv = newSV (w * h * 7 + 5); 1677 SV *data_sv = newSV (w * h * 7 + 5);
1366 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1428} 1740}
1429 OUTPUT: 1741 OUTPUT:
1430 RETVAL 1742 RETVAL
1431 1743
1432void 1744void
1433set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1434 PPCODE: 1746 PPCODE:
1435{ 1747{
1436 int x, y, z; 1748 int x, y, z;
1437 int w, h; 1749 int w, h;
1438 int x1, y1; 1750 int x1, y1;
1470 1782
1471 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1472 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1473 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1474 1786
1475 if (cell->darkness <= 0) 1787 if (cell->darkness == 0)
1476 { 1788 {
1477 cell->darkness = -1; 1789 cell->darkness = 0;
1478 1790
1479 for (z = 0; z <= 2; z++) 1791 for (z = 0; z <= 2; z++)
1480 { 1792 {
1481 cell->face[z] = face[z]; 1793 cell->face[z] = face[z];
1482 1794
1487 } 1799 }
1488 } 1800 }
1489 } 1801 }
1490} 1802}
1491 1803
1492MODULE = CFClient PACKAGE = CFClient::MixChunk 1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1493 1805
1494CFClient::MixChunk 1806CFPlus::MixChunk
1495new_from_file (SV *class, char *path) 1807new_from_file (SV *class, char *path)
1496 CODE: 1808 CODE:
1497 RETVAL = Mix_LoadWAV (path); 1809 RETVAL = Mix_LoadWAV (path);
1498 OUTPUT: 1810 OUTPUT:
1499 RETVAL 1811 RETVAL
1500 1812
1501void 1813void
1502DESTROY (CFClient::MixChunk self) 1814DESTROY (CFPlus::MixChunk self)
1503 CODE: 1815 CODE:
1504 Mix_FreeChunk (self); 1816 Mix_FreeChunk (self);
1505 1817
1506int 1818int
1507volume (CFClient::MixChunk self, int volume = -1) 1819volume (CFPlus::MixChunk self, int volume = -1)
1508 CODE: 1820 CODE:
1509 RETVAL = Mix_VolumeChunk (self, volume); 1821 RETVAL = Mix_VolumeChunk (self, volume);
1510 OUTPUT: 1822 OUTPUT:
1511 RETVAL 1823 RETVAL
1512 1824
1513int 1825int
1514play (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)
1515 CODE: 1827 CODE:
1516 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1828 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1517 OUTPUT: 1829 OUTPUT:
1518 RETVAL 1830 RETVAL
1519 1831
1520MODULE = CFClient PACKAGE = CFClient::MixMusic 1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1521 1833
1522int 1834int
1523volume (int volume = -1) 1835volume (int volume = -1)
1524 CODE: 1836 CODE:
1525 RETVAL = Mix_VolumeMusic (volume); 1837 RETVAL = Mix_VolumeMusic (volume);
1526 OUTPUT: 1838 OUTPUT:
1527 RETVAL 1839 RETVAL
1528 1840
1529CFClient::MixMusic 1841CFPlus::MixMusic
1530new_from_file (SV *class, char *path) 1842new_from_file (SV *class, char *path)
1531 CODE: 1843 CODE:
1532 RETVAL = Mix_LoadMUS (path); 1844 RETVAL = Mix_LoadMUS (path);
1533 OUTPUT: 1845 OUTPUT:
1534 RETVAL 1846 RETVAL
1535 1847
1536void 1848void
1537DESTROY (CFClient::MixMusic self) 1849DESTROY (CFPlus::MixMusic self)
1538 CODE: 1850 CODE:
1539 Mix_FreeMusic (self); 1851 Mix_FreeMusic (self);
1540 1852
1541int 1853int
1542play (CFClient::MixMusic self, int loops = -1) 1854play (CFPlus::MixMusic self, int loops = -1)
1543 CODE: 1855 CODE:
1544 RETVAL = Mix_PlayMusic (self, loops); 1856 RETVAL = Mix_PlayMusic (self, loops);
1545 OUTPUT: 1857 OUTPUT:
1546 RETVAL 1858 RETVAL
1547 1859
1548MODULE = CFClient PACKAGE = CFClient::OpenGL 1860MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1549 1861
1550BOOT: 1862BOOT:
1551{ 1863{
1552 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1553 static const struct { 1865 static const struct {
1554 const char *name; 1866 const char *name;
1555 IV iv; 1867 IV iv;
1556 } *civ, const_iv[] = { 1868 } *civ, const_iv[] = {
1557# define const_iv(name) { # name, (IV)name } 1869# define const_iv(name) { # name, (IV)name }
1564 const_iv (GL_SCISSOR_TEST), 1876 const_iv (GL_SCISSOR_TEST),
1565 const_iv (GL_DEPTH_TEST), 1877 const_iv (GL_DEPTH_TEST),
1566 const_iv (GL_ALPHA_TEST), 1878 const_iv (GL_ALPHA_TEST),
1567 const_iv (GL_NORMALIZE), 1879 const_iv (GL_NORMALIZE),
1568 const_iv (GL_RESCALE_NORMAL), 1880 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT),
1882 const_iv (GL_BACK),
1569 const_iv (GL_AND), 1883 const_iv (GL_AND),
1570 const_iv (GL_ONE), 1884 const_iv (GL_ONE),
1571 const_iv (GL_ZERO), 1885 const_iv (GL_ZERO),
1572 const_iv (GL_SRC_ALPHA), 1886 const_iv (GL_SRC_ALPHA),
1573 const_iv (GL_DST_ALPHA), 1887 const_iv (GL_DST_ALPHA),
1574 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1888 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575 const_iv (GL_ONE_MINUS_DST_ALPHA), 1889 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE), 1890 const_iv (GL_SRC_ALPHA_SATURATE),
1577 const_iv (GL_RGB), 1891 const_iv (GL_RGB),
1578 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),
1579 const_iv (GL_UNSIGNED_BYTE), 1896 const_iv (GL_UNSIGNED_BYTE),
1580 const_iv (GL_UNSIGNED_SHORT), 1897 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT), 1898 const_iv (GL_UNSIGNED_INT),
1582 const_iv (GL_ALPHA), 1899 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY), 1900 const_iv (GL_INTENSITY),
1615 const_iv (GL_SEPARABLE_2D), 1932 const_iv (GL_SEPARABLE_2D),
1616 const_iv (GL_CONVOLUTION_2D), 1933 const_iv (GL_CONVOLUTION_2D),
1617 const_iv (GL_CONVOLUTION_BORDER_MODE), 1934 const_iv (GL_CONVOLUTION_BORDER_MODE),
1618 const_iv (GL_CONSTANT_BORDER), 1935 const_iv (GL_CONSTANT_BORDER),
1619 const_iv (GL_LINES), 1936 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP),
1620 const_iv (GL_LINE_LOOP), 1938 const_iv (GL_LINE_LOOP),
1621 const_iv (GL_QUADS), 1939 const_iv (GL_QUADS),
1622 const_iv (GL_QUAD_STRIP), 1940 const_iv (GL_QUAD_STRIP),
1623 const_iv (GL_TRIANGLES), 1941 const_iv (GL_TRIANGLES),
1624 const_iv (GL_TRIANGLE_STRIP), 1942 const_iv (GL_TRIANGLE_STRIP),
1657 OUTPUT: 1975 OUTPUT:
1658 RETVAL 1976 RETVAL
1659 1977
1660int glGetError () 1978int glGetError ()
1661 1979
1980void glFinish ()
1981
1662void glClear (int mask) 1982void glClear (int mask)
1663 1983
1664void glClearColor (float r, float g, float b, float a = 1.0) 1984void glClearColor (float r, float g, float b, float a = 1.0)
1665 PROTOTYPE: @ 1985 PROTOTYPE: @
1666 1986
1689void glPushMatrix () 2009void glPushMatrix ()
1690 2010
1691void glPopMatrix () 2011void glPopMatrix ()
1692 2012
1693void glLoadIdentity () 2013void glLoadIdentity ()
2014
2015void glDrawBuffer (int buffer)
2016
2017void glReadBuffer (int buffer)
1694 2018
1695# near_ and far_ are due to microsofts buggy "c" compiler 2019# near_ and far_ are due to microsofts buggy "c" compiler
1696void 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_)
1697 2021
1698# near_ and far_ are due to microsofts buggy "c" compiler 2022# near_ and far_ are due to microsofts buggy "c" compiler
1728 r *= a; 2052 r *= a;
1729 g *= a; 2053 g *= a;
1730 b *= a; 2054 b *= a;
1731 } 2055 }
1732 // microsoft visual "c" rounds instead of truncating... 2056 // microsoft visual "c" rounds instead of truncating...
1733 glColor4ub (MIN ((int)(r * 256.f), 255), 2057 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 2058
1738void glInterleavedArrays (int format, int stride, char *data) 2059void glInterleavedArrays (int format, int stride, char *data)
1739 2060
1740void glDrawElements (int mode, int count, int type, char *indices) 2061void glDrawElements (int mode, int count, int type, char *indices)
1741 2062
1818 2139
1819void glEndList () 2140void glEndList ()
1820 2141
1821void glCallList (int list) 2142void glCallList (int list)
1822 2143
1823

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines