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.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
6# pragma warning(disable:4244)
3#endif 7#endif
4 8
5#include "EXTERN.h" 9#include "EXTERN.h"
6#include "perl.h" 10#include "perl.h"
7#include "XSUB.h" 11#include "XSUB.h"
8 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
17#include <math.h>
9#include <string.h> 18#include <string.h>
10#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
11 21
12#include <SDL.h> 22#include <SDL.h>
23#include <SDL_endian.h>
13#include <SDL_image.h> 24#include <SDL_image.h>
14#include <SDL_mixer.h> 25#include <SDL_mixer.h>
15#include <SDL_opengl.h> 26#include <SDL_opengl.h>
16 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
17#include <glib/gmacros.h> 31#include <glib/gmacros.h>
18 32
19#include <pango/pango.h> 33#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 34
23#ifndef _WIN32 35#ifndef _WIN32
24# include <sys/types.h> 36# include <sys/types.h>
25# include <sys/socket.h> 37# include <sys/socket.h>
26# include <netinet/in.h> 38# include <netinet/in.h>
33 typedef signed char int8_t; 45 typedef signed char int8_t;
34 typedef signed short int16_t; 46 typedef signed short int16_t;
35 typedef signed int int32_t; 47 typedef signed int int32_t;
36#endif 48#endif
37 49
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
51
38#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
39 53
40#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
42 56
57#define MIN_FONT_HEIGHT 10
58
59#if 0
60# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else
62# define PARACHUTE 0
63#endif
64
65static struct
66{
67#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h"
69#undef GL_FUNC
70} gl;
71
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{
74 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else
79 glBlendFunc (sa, da);
80}
81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
43typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
45 90
46static PangoContext *context; 91typedef PangoFontDescription *CFPlus__Font;
47static PangoFontMap *fontmap; 92
93static int
94shape_attr_p (PangoLayoutRun *run)
95{
96 GSList *attrs = run->item->analysis.extra_attrs;
97
98 while (attrs)
99 {
100 PangoAttribute *attr = attrs->data;
101
102 if (attr->klass->type == PANGO_ATTR_SHAPE)
103 return 1;
104
105 attrs = attrs->next;
106 }
107
108 return 0;
109}
48 110
49typedef struct cf_layout { 111typedef struct cf_layout {
50 PangoLayout *pl; 112 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode
51 int base_height; 114 int base_height;
115 CFPlus__Font font;
52} *CFClient__Layout; 116} *CFPlus__Layout;
117
118static CFPlus__Font default_font;
119static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap;
53 121
54static void 122static void
55substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
56{ 124{
57 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
126#ifdef FC_HINT_STYLE
127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
128#endif
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59} 130}
60 131
61static void 132static void
62layout_update (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
63{ 134{
64 /* use a random scale factor to account for unknown descenders, 0.8 works 135 /* use a random scale factor to account for unknown descenders, 0.8 works
65 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
66 */ 137 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 138 PangoFontDescription *font = self->font ? self->font : default_font;
68 139
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 140 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 141 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 142
143 pango_layout_set_font_description (self->pl, font);
76} 144}
77 145
78static void 146static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
80{ 148{
81 layout_update (self); 149 PangoRectangle rect;
82 150
151 // get_pixel_* wrongly rounds down
83 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
84 153
85 *w = (*w + 3) & ~3; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
86 if (!*w) *w = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
87 if (!*h) *h = 1; 156
157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
88} 162}
89 163
90typedef uint16_t mapface; 164typedef uint16_t mapface;
91 165
92typedef struct { 166typedef struct {
115 int texs; 189 int texs;
116 maptex *tex; 190 maptex *tex;
117 191
118 int32_t rows; 192 int32_t rows;
119 maprow *row; 193 maprow *row;
120} *CFClient__Map; 194} *CFPlus__Map;
121 195
122static char * 196static char *
123prepend (char *ptr, int sze, int inc) 197prepend (char *ptr, int sze, int inc)
124{ 198{
125 char *p; 199 char *p;
143 217
144#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 218#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
145#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
146 220
147static maprow * 221static maprow *
148map_get_row (CFClient__Map self, int y) 222map_get_row (CFPlus__Map self, int y)
149{ 223{
150 if (0 > y) 224 if (0 > y)
151 { 225 {
152 int extend = - y + MAP_EXTEND_Y; 226 int extend = - y + MAP_EXTEND_Y;
153 Prepend (maprow, self->row, self->rows, extend); 227 Prepend (maprow, self->row, self->rows, extend);
191 265
192 return row->col + (x - row->c0); 266 return row->col + (x - row->c0);
193} 267}
194 268
195static mapcell * 269static mapcell *
196map_get_cell (CFClient__Map self, int x, int y) 270map_get_cell (CFPlus__Map self, int x, int y)
197{ 271{
198 return row_get_cell (map_get_row (self, y), x); 272 return row_get_cell (map_get_row (self, y), x);
199} 273}
200 274
201static void 275static void
202map_clear (CFClient__Map self) 276map_clear (CFPlus__Map self)
203{ 277{
204 int r; 278 int r;
205 279
206 for (r = 0; r < self->rows; r++) 280 for (r = 0; r < self->rows; r++)
207 Safefree (self->row[r].col); 281 Safefree (self->row[r].col);
215 self->row = 0; 289 self->row = 0;
216 self->rows = 0; 290 self->rows = 0;
217} 291}
218 292
219static void 293static void
220map_blank (CFClient__Map self, int x0, int y0, int w, int h) 294map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
221{ 295{
222 int x, y; 296 int x, y;
223 maprow *row; 297 maprow *row;
224 298
225 for (y = y0; y < y0 + h; y++) 299 for (y = y0; y < y0 + h; y++)
240 } 314 }
241 } 315 }
242} 316}
243 317
244static void 318static void
245music_finished () 319music_finished (void)
246{ 320{
247 SDL_UserEvent ev; 321 SDL_UserEvent ev;
248 322
249 ev.type = SDL_USEREVENT; 323 ev.type = SDL_USEREVENT;
250 ev.code = 0; 324 ev.code = 0;
251 ev.data1 = 0; 325 ev.data1 = 0;
252 ev.data2 = 0; 326 ev.data2 = 0;
253 327
328 SDL_PushEvent ((SDL_Event *)&ev);
329}
330
331static void
332channel_finished (int channel)
333{
254 SDL_PushEvent (&ev); 334 SDL_UserEvent ev;
255}
256 335
336 ev.type = SDL_USEREVENT;
337 ev.code = 1;
338 ev.data1 = (void *)(long)channel;
339 ev.data2 = 0;
340
341 SDL_PushEvent ((SDL_Event *)&ev);
342}
343
344static unsigned int
345minpot (unsigned int n)
346{
347 if (!n)
348 return 0;
349
350 --n;
351
352 n |= n >> 1;
353 n |= n >> 2;
354 n |= n >> 4;
355 n |= n >> 8;
356 n |= n >> 16;
357
358 return n + 1;
359}
360
257MODULE = CFClient PACKAGE = CFClient 361MODULE = CFPlus PACKAGE = CFPlus
258 362
259PROTOTYPES: ENABLE 363PROTOTYPES: ENABLE
260 364
261BOOT: 365BOOT:
262{ 366{
263 HV *stash = gv_stashpv ("CFClient", 1); 367 HV *stash = gv_stashpv ("CFPlus", 1);
264 static const struct { 368 static const struct {
265 const char *name; 369 const char *name;
266 IV iv; 370 IV iv;
267 } *civ, const_iv[] = { 371 } *civ, const_iv[] = {
268# define const_iv(name) { # name, (IV)name } 372# define const_iv(name) { # name, (IV)name }
367# undef const_iv 471# undef const_iv
368 }; 472 };
369 473
370 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 474 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
371 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 475 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
372
373 fontmap = pango_ft2_font_map_new ();
374 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
375 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
376} 476}
377 477
378int 478int
479in_destruct ()
480 CODE:
481 RETVAL = PL_main_cv == Nullcv;
482 OUTPUT:
483 RETVAL
484
485NV floor (NV x)
486
487NV ceil (NV x)
488
489void
490pango_init ()
491 CODE:
492{
493 opengl_fontmap = pango_opengl_font_map_new ();
494 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
495 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
496}
497
498int
379SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 499SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
380 500
381void 501void
382SDL_Quit () 502SDL_Quit ()
383 503
384void 504void
390 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 510 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
391 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 511 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
392 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
393 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 513 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
394 514
515 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
516 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
517
395 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 518 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
396 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
397 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
398 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
399 522
400 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 523 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
524#if SDL_VERSION_ATLEAST(1,2,10)
401 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 525 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
402 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
527#endif
403 528
404 SDL_EnableUNICODE (1); 529 SDL_EnableUNICODE (1);
405 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 530 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
406 531
407 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 532 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
416 541
417 ++m; 542 ++m;
418 } 543 }
419} 544}
420 545
546char *
547SDL_GetError ()
548
421int 549int
422SDL_SetVideoMode (int w, int h, int fullscreen) 550SDL_SetVideoMode (int w, int h, int fullscreen)
423 CODE: 551 CODE:
424 RETVAL = !!SDL_SetVideoMode ( 552 RETVAL = !!SDL_SetVideoMode (
425 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 553 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
426 ); 554 );
555 if (RETVAL)
556 {
427 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 557 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
558# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
559# include "glfunc.h"
560# undef GL_FUNC
561 }
428 OUTPUT: 562 OUTPUT:
429 RETVAL 563 RETVAL
430 564
431void 565void
432SDL_GL_SwapBuffers () 566SDL_GL_SwapBuffers ()
567
568char *
569SDL_GetKeyName (int sym)
433 570
434void 571void
435SDL_PollEvent () 572SDL_PollEvent ()
436 PPCODE: 573 PPCODE:
437{ 574{
439 576
440 while (SDL_PollEvent (&ev)) 577 while (SDL_PollEvent (&ev))
441 { 578 {
442 HV *hv = newHV (); 579 HV *hv = newHV ();
443 hv_store (hv, "type", 4, newSViv (ev.type), 0); 580 hv_store (hv, "type", 4, newSViv (ev.type), 0);
581
444 switch (ev.type) 582 switch (ev.type)
445 { 583 {
446 case SDL_KEYDOWN: 584 case SDL_KEYDOWN:
447 case SDL_KEYUP: 585 case SDL_KEYUP:
448 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 586 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
455 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 593 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
456 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 594 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
457 break; 595 break;
458 596
459 case SDL_MOUSEMOTION: 597 case SDL_MOUSEMOTION:
598 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
599
460 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 600 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
461 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 601 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
462 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 602 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
463 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 603 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
464 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 604 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
465 break; 605 break;
466 606
467 case SDL_MOUSEBUTTONDOWN: 607 case SDL_MOUSEBUTTONDOWN:
468 case SDL_MOUSEBUTTONUP: 608 case SDL_MOUSEBUTTONUP:
609 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
610
469 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 611 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
470 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
471 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 613 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
472 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 614 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
615 break;
616
617 case SDL_USEREVENT:
618 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
619 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
620 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
621 break;
473 } 622 }
474 623
475 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 624 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
476 } 625 }
477} 626}
478 627
479int 628int
480Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 629Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
481 POSTCALL: 630 POSTCALL:
482 Mix_HookMusicFinished (music_finished); 631 Mix_HookMusicFinished (music_finished);
632 Mix_ChannelFinished (channel_finished);
483 633
484void 634void
485Mix_CloseAudio () 635Mix_CloseAudio ()
486 636
487int 637int
492 CODE: 642 CODE:
493#ifndef _WIN32 643#ifndef _WIN32
494 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 644 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
495#endif 645#endif
496 646
497char *
498gl_version ()
499 CODE:
500 RETVAL = (char *)glGetString (GL_VERSION);
501 OUTPUT:
502 RETVAL
503
504char *
505gl_extensions ()
506 CODE:
507 RETVAL = (char *)glGetString (GL_EXTENSIONS);
508 OUTPUT:
509 RETVAL
510
511void 647void
512add_font (char *file) 648add_font (char *file)
513 CODE: 649 CODE:
514 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 650 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
515
516void
517set_font (char *file)
518 CODE:
519{
520 int count;
521 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
522 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
523 FcPatternDestroy (pattern);
524 pango_context_set_font_description (context, font);
525}
526 651
527void 652void
528load_image_inline (SV *image_) 653load_image_inline (SV *image_)
529 ALIAS: 654 ALIAS:
530 load_image_file = 1 655 load_image_file = 1
572 697
573 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 698 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
574 699
575 assert (surface2->pitch == surface2->w * 4); 700 assert (surface2->pitch == surface2->w * 4);
576 701
702 SDL_LockSurface (surface2);
577 EXTEND (SP, 5); 703 EXTEND (SP, 6);
578 PUSHs (sv_2mortal (newSViv (surface2->w))); 704 PUSHs (sv_2mortal (newSViv (surface2->w)));
579 PUSHs (sv_2mortal (newSViv (surface2->h))); 705 PUSHs (sv_2mortal (newSViv (surface2->h)));
580 SDL_LockSurface (surface2);
581 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 706 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
582 SDL_UnlockSurface (surface2);
583 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 707 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
584 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 708 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
585 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 709 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
710 SDL_UnlockSurface (surface2);
586 711
587 SDL_FreeSurface (surface); 712 SDL_FreeSurface (surface);
588 SDL_FreeSurface (surface2); 713 SDL_FreeSurface (surface2);
589} 714}
590 715
612 PUSHs (sv_2mortal (newSViv (b / y))); 737 PUSHs (sv_2mortal (newSViv (b / y)));
613 PUSHs (sv_2mortal (newSViv (a / y))); 738 PUSHs (sv_2mortal (newSViv (a / y)));
614} 739}
615 740
616void 741void
742error (char *message)
743 CODE:
744 fprintf (stderr, "ERROR: %s\n", message);
745#ifdef _WIN32
746 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
747#endif
748
749void
617fatal (char *message) 750fatal (char *message)
618 CODE: 751 CODE:
752 fprintf (stderr, "FATAL: %s\n", message);
619#ifdef _WIN32 753#ifdef _WIN32
620 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 754 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
621#else
622 fprintf (stderr, "FATAL: %s\n", message);
623#endif 755#endif
624 exit (1); 756 _exit (1);
625 757
758void
759_exit (int retval)
760 CODE:
761 _exit (retval);
762
763MODULE = CFPlus PACKAGE = CFPlus::Font
764
765CFPlus::Font
766new_from_file (SV *class, char *path, int id = 0)
767 CODE:
768{
769 int count;
770 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
771 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
772 FcPatternDestroy (pattern);
773}
774 OUTPUT:
775 RETVAL
776
777void
778DESTROY (CFPlus::Font self)
779 CODE:
780 pango_font_description_free (self);
781
782void
783make_default (CFPlus::Font self)
784 CODE:
785 default_font = self;
786
626MODULE = CFClient PACKAGE = CFClient::Layout 787MODULE = CFPlus PACKAGE = CFPlus::Layout
627 788
628CFClient::Layout 789void
629new (SV *class, int base_height = 10) 790reset_glyph_cache ()
791 CODE:
792 tc_clear ();
793
794CFPlus::Layout
795new (SV *class)
630 CODE: 796 CODE:
631 New (0, RETVAL, 1, struct cf_layout); 797 New (0, RETVAL, 1, struct cf_layout);
632 RETVAL->base_height = base_height; 798
633 RETVAL->pl = pango_layout_new (context); 799 RETVAL->pl = pango_layout_new (opengl_context);
800 RETVAL->r = 1.;
801 RETVAL->g = 1.;
802 RETVAL->b = 1.;
803 RETVAL->a = 1.;
804 RETVAL->base_height = MIN_FONT_HEIGHT;
805 RETVAL->font = 0;
806
634 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 807 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
808 layout_update_font (RETVAL);
635 OUTPUT: 809 OUTPUT:
636 RETVAL 810 RETVAL
637 811
638void 812void
639DESTROY (CFClient::Layout self) 813DESTROY (CFPlus::Layout self)
640 CODE: 814 CODE:
641 g_object_unref (self->pl); 815 g_object_unref (self->pl);
642 Safefree (self); 816 Safefree (self);
643 817
644void 818void
645set_text (CFClient::Layout self, SV *text_) 819set_text (CFPlus::Layout self, SV *text_)
646 CODE: 820 CODE:
647{ 821{
648 STRLEN textlen; 822 STRLEN textlen;
649 char *text = SvPVutf8 (text_, textlen); 823 char *text = SvPVutf8 (text_, textlen);
650 824
651 pango_layout_set_text (self->pl, text, textlen); 825 pango_layout_set_text (self->pl, text, textlen);
652} 826}
653 827
654void 828void
655set_markup (CFClient::Layout self, SV *text_) 829set_markup (CFPlus::Layout self, SV *text_)
656 CODE: 830 CODE:
657{ 831{
658 STRLEN textlen; 832 STRLEN textlen;
659 char *text = SvPVutf8 (text_, textlen); 833 char *text = SvPVutf8 (text_, textlen);
660 834
661 pango_layout_set_markup (self->pl, text, textlen); 835 pango_layout_set_markup (self->pl, text, textlen);
662} 836}
663 837
838void
839set_shapes (CFPlus::Layout self, ...)
840 CODE:
841{
842 PangoAttrList *attrs = 0;
843 const char *text = pango_layout_get_text (self->pl);
844 const char *pos = text;
845 int arg = 4;
846
847 while (arg < items && (pos = strstr (pos, OBJ_STR)))
848 {
849 PangoRectangle inkrect, rect;
850 PangoAttribute *attr;
851
852 int x = SvIV (ST (arg - 3));
853 int y = SvIV (ST (arg - 2));
854 int w = SvIV (ST (arg - 1));
855 int h = SvIV (ST (arg ));
856
857 inkrect.x = 0;
858 inkrect.y = 0;
859 inkrect.width = 0;
860 inkrect.height = 0;
861
862 rect.x = x * PANGO_SCALE;
863 rect.y = y * PANGO_SCALE;
864 rect.width = w * PANGO_SCALE;
865 rect.height = h * PANGO_SCALE;
866
867 if (!attrs)
868 attrs = pango_layout_get_attributes (self->pl);
869
870 attr = pango_attr_shape_new (&inkrect, &rect);
871 attr->start_index = pos - text;
872 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
873 pango_attr_list_insert (attrs, attr);
874
875 arg += 4;
876 pos += sizeof (OBJ_STR) - 1;
877 }
878
879 if (attrs)
880 pango_layout_set_attributes (self->pl, attrs);
881}
882
883void
884get_shapes (CFPlus::Layout self)
885 PPCODE:
886{
887 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
888
889 do
890 {
891 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
892
893 if (run && shape_attr_p (run))
894 {
895 PangoRectangle extents;
896 pango_layout_iter_get_run_extents (iter, 0, &extents);
897
898 EXTEND (SP, 2);
899 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
901 }
902 }
903 while (pango_layout_iter_next_run (iter));
904
905 pango_layout_iter_free (iter);
906}
907
908int
909has_wrapped (CFPlus::Layout self)
910 CODE:
911{
912 int lines = 1;
913 const char *text = pango_layout_get_text (self->pl);
914
915 while (*text)
916 lines += *text++ == '\n';
917
918 RETVAL = lines < pango_layout_get_line_count (self->pl);
919}
920 OUTPUT:
921 RETVAL
922
664SV * 923SV *
665get_text (CFClient::Layout self) 924get_text (CFPlus::Layout self)
666 CODE: 925 CODE:
667 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 926 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
668 SvUTF8_on (RETVAL); 927 sv_utf8_decode (RETVAL);
669 OUTPUT: 928 OUTPUT:
670 RETVAL 929 RETVAL
671 930
672void 931void
932set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
933 CODE:
934 self->r = r;
935 self->g = g;
936 self->b = b;
937 self->a = a;
938
939void
940set_font (CFPlus::Layout self, CFPlus::Font font = 0)
941 CODE:
942 if (self->font != font)
943 {
944 self->font = font;
945 layout_update_font (self);
946 }
947
948void
673set_height (CFClient::Layout self, int base_height) 949set_height (CFPlus::Layout self, int base_height)
674 CODE: 950 CODE:
951 if (self->base_height != base_height)
952 {
675 self->base_height = base_height; 953 self->base_height = base_height;
954 layout_update_font (self);
955 }
676 956
677void 957void
678set_width (CFClient::Layout self, int max_width = -1) 958set_width (CFPlus::Layout self, int max_width = -1)
679 CODE: 959 CODE:
680 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 960 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
681 961
682void 962void
963set_indent (CFPlus::Layout self, int indent)
964 CODE:
965 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
966
967void
968set_spacing (CFPlus::Layout self, int spacing)
969 CODE:
970 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
971
972void
973set_ellipsise (CFPlus::Layout self, int ellipsise)
974 CODE:
975 pango_layout_set_ellipsize (self->pl,
976 ellipsise == 1 ? PANGO_ELLIPSIZE_START
977 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
978 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
979 : PANGO_ELLIPSIZE_NONE
980 );
981
982void
983set_single_paragraph_mode (CFPlus::Layout self, int spm)
984 CODE:
985 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
986
987void
683size (CFClient::Layout self) 988size (CFPlus::Layout self)
684 PPCODE: 989 PPCODE:
685{ 990{
686 int w, h; 991 int w, h;
687 992
688 layout_update (self);
689 layout_get_pixel_size (self, &w, &h); 993 layout_get_pixel_size (self, &w, &h);
690 994
691 EXTEND (SP, 2); 995 EXTEND (SP, 2);
692 PUSHs (sv_2mortal (newSViv (w))); 996 PUSHs (sv_2mortal (newSViv (w)));
693 PUSHs (sv_2mortal (newSViv (h))); 997 PUSHs (sv_2mortal (newSViv (h)));
694} 998}
695 999
696int 1000int
1001descent (CFPlus::Layout self)
1002 CODE:
1003{
1004 PangoRectangle rect;
1005 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1006 pango_layout_line_get_pixel_extents (line, 0, &rect);
1007 RETVAL = PANGO_DESCENT (rect);
1008}
1009 OUTPUT:
1010 RETVAL
1011
1012int
697xy_to_index (CFClient::Layout self, int x, int y) 1013xy_to_index (CFPlus::Layout self, int x, int y)
698 CODE: 1014 CODE:
699{ 1015{
700 int index, trailing; 1016 int index, trailing;
701
702 layout_update (self);
703 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1017 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
704
705 RETVAL = index; 1018 RETVAL = index;
706} 1019}
707 OUTPUT: 1020 OUTPUT:
708 RETVAL 1021 RETVAL
709 1022
710void 1023void
711cursor_pos (CFClient::Layout self, int index) 1024cursor_pos (CFPlus::Layout self, int index)
712 PPCODE: 1025 PPCODE:
713{ 1026{
714 PangoRectangle strong_pos; 1027 PangoRectangle strong_pos;
715 layout_update (self);
716 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1028 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
717 1029
718 EXTEND (SP, 3); 1030 EXTEND (SP, 3);
719 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1031 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
720 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1032 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
721 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
722} 1034}
723 1035
724void 1036void
725render (CFClient::Layout self) 1037render (CFPlus::Layout self, float x, float y, int flags = 0)
726 PPCODE: 1038 PPCODE:
727{ 1039 pango_opengl_render_layout_subpixel (
728 SV *retval; 1040 self->pl,
729 int w, h; 1041 x * PANGO_SCALE, y * PANGO_SCALE,
730 FT_Bitmap bitmap; 1042 self->r, self->g, self->b, self->a,
1043 flags
1044 );
731 1045
732 layout_update (self); 1046MODULE = CFPlus PACKAGE = CFPlus::Texture
733 layout_get_pixel_size (self, &w, &h);
734 1047
735 retval = newSV (w * h); 1048void
736 SvPOK_only (retval); 1049pad2pot (SV *data_, SV *w_, SV *h_)
737 SvCUR_set (retval, w * h); 1050 CODE:
1051{
1052 int ow = SvIV (w_);
1053 int oh = SvIV (h_);
738 1054
739 bitmap.rows = h; 1055 if (ow && oh)
740 bitmap.width = w; 1056 {
741 bitmap.pitch = w; 1057 int nw = minpot (ow);
742 bitmap.buffer = (unsigned char*)SvPVX (retval); 1058 int nh = minpot (oh);
743 bitmap.num_grays = 256;
744 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
745 1059
746 memset (bitmap.buffer, 0, w * h); 1060 if (nw != ow || nh != oh)
747 1061 {
748 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 1062 if (SvOK (data_))
1063 {
1064 STRLEN datalen;
1065 char *data = SvPVbyte (data_, datalen);
1066 int bpp = datalen / (ow * oh);
1067 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
749 1068
750 EXTEND (SP, 3); 1069 SvPOK_only (result_);
751 PUSHs (sv_2mortal (newSViv (w))); 1070 SvCUR_set (result_, nw * nh * bpp);
752 PUSHs (sv_2mortal (newSViv (h)));
753 PUSHs (sv_2mortal (retval));
754}
755 1071
756MODULE = CFClient PACKAGE = CFClient::Texture 1072 memset (SvPVX (result_), 0, nw * nh * bpp);
1073 while (oh--)
1074 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
757 1075
1076 sv_setsv (data_, result_);
1077 }
1078
1079 sv_setiv (w_, nw);
1080 sv_setiv (h_, nh);
1081 }
1082 }
1083}
1084
758void 1085void
759draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1086draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
760 PROTOTYPE: $$$;$$ 1087 PROTOTYPE: $$$;$$
1088 ALIAS:
1089 draw_quad_alpha = 1
1090 draw_quad_alpha_premultiplied = 2
761 CODE: 1091 CODE:
762{ 1092{
763 HV *hv = (HV *)SvRV (self); 1093 HV *hv = (HV *)SvRV (self);
764 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1094 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
765 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1095 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
766 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1096 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
767 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
768 1097
769 if (items < 5) 1098 if (items < 5)
770 { 1099 {
771 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1100 w = SvNV (*hv_fetch (hv, "w", 1, 1));
772 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1101 h = SvNV (*hv_fetch (hv, "h", 1, 1));
773 } 1102 }
774 1103
1104 if (ix)
1105 {
1106 glEnable (GL_BLEND);
1107
1108 if (ix == 2)
1109 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1110 else
1111 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1112 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1113
1114 glEnable (GL_ALPHA_TEST);
1115 glAlphaFunc (GL_GREATER, 0.01f);
1116 }
1117
775 glBindTexture (GL_TEXTURE_2D, name); 1118 glBindTexture (GL_TEXTURE_2D, name);
776 if (wrap_mode) { 1119
777 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
778 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
779 }
780 glBegin (GL_QUADS); 1120 glBegin (GL_QUADS);
781 glTexCoord2f (0, 0); glVertex2f (x , y ); 1121 glTexCoord2f (0, 0); glVertex2f (x , y );
782 glTexCoord2f (0, t); glVertex2f (x , y + h); 1122 glTexCoord2f (0, t); glVertex2f (x , y + h);
783 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1123 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
784 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1124 glTexCoord2f (s, 0); glVertex2f (x + w, y );
785 glEnd (); 1125 glEnd ();
786}
787 1126
1127 if (ix)
1128 {
1129 glDisable (GL_ALPHA_TEST);
1130 glDisable (GL_BLEND);
1131 }
1132}
1133
788MODULE = CFClient PACKAGE = CFClient::Map 1134MODULE = CFPlus PACKAGE = CFPlus::Map
789 1135
790CFClient::Map 1136CFPlus::Map
791new (SV *class, int map_width, int map_height) 1137new (SV *class, int map_width, int map_height)
792 CODE: 1138 CODE:
793 New (0, RETVAL, 1, struct map); 1139 New (0, RETVAL, 1, struct map);
794 RETVAL->x = 0; 1140 RETVAL->x = 0;
795 RETVAL->y = 0; 1141 RETVAL->y = 0;
805 RETVAL->row = 0; 1151 RETVAL->row = 0;
806 OUTPUT: 1152 OUTPUT:
807 RETVAL 1153 RETVAL
808 1154
809void 1155void
810DESTROY (CFClient::Map self) 1156DESTROY (CFPlus::Map self)
811 CODE: 1157 CODE:
812{ 1158{
813 map_clear (self); 1159 map_clear (self);
814 Safefree (self->face); 1160 Safefree (self->face);
1161 Safefree (self->tex);
815 Safefree (self); 1162 Safefree (self);
816} 1163}
817 1164
818void 1165void
819clear (CFClient::Map self) 1166clear (CFPlus::Map self)
820 CODE: 1167 CODE:
821 map_clear (self); 1168 map_clear (self);
822 1169
823void 1170void
824set_face (CFClient::Map self, int face, int texid) 1171set_face (CFPlus::Map self, int face, int texid)
825 CODE: 1172 CODE:
826{ 1173{
827 while (self->faces <= face) 1174 while (self->faces <= face)
828 { 1175 {
829 Append (mapface, self->face, self->faces, self->faces); 1176 Append (mapface, self->face, self->faces, self->faces);
832 1179
833 self->face [face] = texid; 1180 self->face [face] = texid;
834} 1181}
835 1182
836void 1183void
837set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1184set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
838 CODE: 1185 CODE:
839{ 1186{
840 while (self->texs <= texid) 1187 while (self->texs <= texid)
841 { 1188 {
842 Append (maptex, self->tex, self->texs, self->texs); 1189 Append (maptex, self->tex, self->texs, self->texs);
854 tex->r = r; 1201 tex->r = r;
855 tex->g = g; 1202 tex->g = g;
856 tex->b = b; 1203 tex->b = b;
857 tex->a = a; 1204 tex->a = a;
858 } 1205 }
1206
1207 // somewhat hackish, but for textures that require it, it really
1208 // improves the look, and most others don't suffer.
1209 glBindTexture (GL_TEXTURE_2D, name);
1210 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1211 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1212 // use uglier nearest interpolation because linear suffers
1213 // from transparent color bleeding and ugly wrapping effects.
1214 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
859} 1215}
860 1216
861int 1217int
862ox (CFClient::Map self) 1218ox (CFPlus::Map self)
863 ALIAS: 1219 ALIAS:
864 oy = 1 1220 oy = 1
1221 x = 2
1222 y = 3
1223 w = 4
1224 h = 5
865 CODE: 1225 CODE:
866 switch (ix) 1226 switch (ix)
867 { 1227 {
868 case 0: RETVAL = self->ox; break; 1228 case 0: RETVAL = self->ox; break;
869 case 1: RETVAL = self->oy; break; 1229 case 1: RETVAL = self->oy; break;
1230 case 2: RETVAL = self->x; break;
1231 case 3: RETVAL = self->y; break;
1232 case 4: RETVAL = self->w; break;
1233 case 5: RETVAL = self->h; break;
870 } 1234 }
871 OUTPUT: 1235 OUTPUT:
872 RETVAL 1236 RETVAL
873 1237
874void 1238void
875scroll (CFClient::Map self, int dx, int dy) 1239scroll (CFPlus::Map self, int dx, int dy)
876 CODE: 1240 CODE:
877{ 1241{
878 if (dx > 0) 1242 if (dx > 0)
879 map_blank (self, self->x, self->y, dx - 1, self->h); 1243 map_blank (self, self->x, self->y, dx - 1, self->h);
880 else if (dx < 0) 1244 else if (dx < 0)
896 self->y += MAP_EXTEND_Y; 1260 self->y += MAP_EXTEND_Y;
897 } 1261 }
898} 1262}
899 1263
900void 1264void
901map1a_update (CFClient::Map self, SV *data_) 1265map1a_update (CFPlus::Map self, SV *data_, int extmap)
902 CODE: 1266 CODE:
903{ 1267{
904 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1268 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
905 uint8_t *data_end = (uint8_t *)SvEND (data_); 1269 uint8_t *data_end = (uint8_t *)SvEND (data_);
906 mapcell *cell; 1270 mapcell *cell;
908 1272
909 while (data < data_end) 1273 while (data < data_end)
910 { 1274 {
911 flags = (data [0] << 8) + data [1]; data += 2; 1275 flags = (data [0] << 8) + data [1]; data += 2;
912 1276
913 x = ((flags >> 10) & 63) + self->x; 1277 x = self->x + ((flags >> 10) & 63);
914 y = ((flags >> 4) & 63) + self->y; 1278 y = self->y + ((flags >> 4) & 63);
915 1279
916 cell = map_get_cell (self, x, y); 1280 cell = map_get_cell (self, x, y);
917 1281
918 if (flags & 15) 1282 if (flags & 15)
919 { 1283 {
923 cell->face [0] = 0; 1287 cell->face [0] = 0;
924 cell->face [1] = 0; 1288 cell->face [1] = 0;
925 cell->face [2] = 0; 1289 cell->face [2] = 0;
926 } 1290 }
927 1291
1292 if (flags & 8)
1293 {
1294 fprintf (stderr, "oi\n");//D
1295 if (extmap)
1296 {
1297 uint8_t ext, cmd;
1298
1299 do
1300 {
1301
1302 ext = *data++;
1303 cmd = ext & 0x7f;
1304
1305 fprintf (stderr, "extcmd = %x\n", ext);//D
1306
1307 if (ext < 4)
1308 cell->darkness = 255 - ext * 64;
1309 }
1310 while (cmd & 0x80);
1311 }
1312 else
928 cell->darkness = flags & 8 ? *data++ : 255; 1313 cell->darkness = flags & 8 ? *data++ : 255;
1314 }
929 1315
930 //TODO: don't trust server data to be in-range(!) 1316 //TODO: don't trust server data to be in-range(!)
931 1317
932 if (flags & 4) 1318 if (flags & 4)
933 { 1319 {
948 cell->darkness = -1; 1334 cell->darkness = -1;
949 } 1335 }
950} 1336}
951 1337
952SV * 1338SV *
953mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1339mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
954 CODE: 1340 CODE:
955{ 1341{
956 int x1, x; 1342 int x1, x;
957 int y1, y; 1343 int y1, y;
958 int z; 1344 int z;
1008} 1394}
1009 OUTPUT: 1395 OUTPUT:
1010 RETVAL 1396 RETVAL
1011 1397
1012void 1398void
1013draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1399draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1014 PPCODE: 1400 CODE:
1015{ 1401{
1016 int vx, vy; 1402 int vx, vy;
1017 int x, y, z; 1403 int x, y, z;
1018 int last_name; 1404 int last_name;
1019 mapface face; 1405 mapface face;
1020 int sw4 = (sw + 3) & ~3;
1021 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1022 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1023 1406
1024 memset (darkness, 255, sw4 * sh);
1025 SvPOK_only (darkness_sv);
1026 SvCUR_set (darkness_sv, sw4 * sh);
1027
1028 vx = self->x + (self->w - sw) / 2 - shift_x; 1407 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1029 vy = self->y + (self->h - sh) / 2 - shift_y; 1408 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1030 1409
1031 /* 1410 /*
1032 int vx = self->vx = self->w >= sw 1411 int vx = self->vx = self->w >= sw
1033 ? self->x + (self->w - sw) / 2 1412 ? self->x + (self->w - sw) / 2
1034 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1413 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1038 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1417 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1039 */ 1418 */
1040 1419
1041 glColor4ub (255, 255, 255, 255); 1420 glColor4ub (255, 255, 255, 255);
1042 1421
1422 glEnable (GL_BLEND);
1043 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1423 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1044 glEnable (GL_BLEND);
1045 glEnable (GL_TEXTURE_2D); 1424 glEnable (GL_TEXTURE_2D);
1046 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1425 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1047 1426
1048 glBegin (GL_QUADS); 1427 glBegin (GL_QUADS);
1049 1428
1057 1436
1058 for (x = 0; x < sw; x++) 1437 for (x = 0; x < sw; x++)
1059 if (row->c0 <= x + vx && x + vx < row->c1) 1438 if (row->c0 <= x + vx && x + vx < row->c1)
1060 { 1439 {
1061 mapcell *cell = row->col + (x + vx - row->c0); 1440 mapcell *cell = row->col + (x + vx - row->c0);
1062
1063 darkness[y * sw4 + x] = cell->darkness < 0
1064 ? 255 - FOW_DARKNESS
1065 : 255 - cell->darkness;
1066 1441
1067 face = cell->face [z]; 1442 face = cell->face [z];
1068 1443
1069 if (face) 1444 if (face)
1070 { 1445 {
1091 1466
1092 glEnd (); 1467 glEnd ();
1093 1468
1094 glDisable (GL_TEXTURE_2D); 1469 glDisable (GL_TEXTURE_2D);
1095 glDisable (GL_BLEND); 1470 glDisable (GL_BLEND);
1471}
1472
1473void
1474draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1475 CODE:
1476{
1477 static float color[16][3] = {
1478 { 0.00F, 0.00F, 0.00F },
1479 { 1.00F, 1.00F, 1.00F },
1480 { 0.00F, 0.00F, 0.55F },
1481 { 1.00F, 0.00F, 0.00F },
1482
1483 { 1.00F, 0.54F, 0.00F },
1484 { 0.11F, 0.56F, 1.00F },
1485 { 0.93F, 0.46F, 0.00F },
1486 { 0.18F, 0.54F, 0.34F },
1487
1488 { 0.56F, 0.73F, 0.56F },
1489 { 0.80F, 0.80F, 0.80F },
1490 { 0.55F, 0.41F, 0.13F },
1491 { 0.99F, 0.77F, 0.26F },
1492
1493 { 0.74F, 0.65F, 0.41F },
1494
1495 { 0.00F, 1.00F, 1.00F },
1496 { 1.00F, 0.00F, 1.00F },
1497 { 1.00F, 1.00F, 0.00F },
1498 };
1499
1500 int x, y;
1501
1502 glEnable (GL_TEXTURE_2D);
1503 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1504 glEnable (GL_BLEND);
1505 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1506 glBegin (GL_QUADS);
1507
1508 for (y = 0; y < h; y++)
1509 for (x = 0; x < w; x++)
1510 {
1511 unsigned char m = data [x + y * w];
1512
1513 if (m)
1514 {
1515 float *c = color [m & 15];
1516
1517 float tx1 = m & 0x40 ? 0.5 : 0.;
1518 float tx2 = tx1 + 0.5;
1519
1520 glColor4f (c[0], c[1], c[2], 0.75);
1521 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1522 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1523 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1524 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1525 }
1526 }
1527
1528 glEnd ();
1529 glDisable (GL_BLEND);
1530 glDisable (GL_TEXTURE_2D);
1531}
1532
1533void
1534fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1535 PPCODE:
1536{
1537 int vx, vy;
1538 int x, y;
1539 int sw4 = (sw + 3) & ~3;
1540 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1541 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1542
1543 memset (darkness, 255, sw4 * sh);
1544 SvPOK_only (darkness_sv);
1545 SvCUR_set (darkness_sv, sw4 * sh);
1546
1547 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1548 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1549
1550 for (y = 0; y < sh; y++)
1551 if (0 <= y + vy && y + vy < self->rows)
1552 {
1553 maprow *row = self->row + (y + vy);
1554
1555 for (x = 0; x < sw; x++)
1556 if (row->c0 <= x + vx && x + vx < row->c1)
1557 {
1558 mapcell *cell = row->col + (x + vx - row->c0);
1559
1560 darkness[y * sw4 + x] = cell->darkness < 0
1561 ? 255 - FOW_DARKNESS
1562 : 255 - cell->darkness;
1563 }
1564 }
1096 1565
1097 EXTEND (SP, 3); 1566 EXTEND (SP, 3);
1098 PUSHs (sv_2mortal (newSViv (sw4))); 1567 PUSHs (sv_2mortal (newSViv (sw4)));
1099 PUSHs (sv_2mortal (newSViv (sh))); 1568 PUSHs (sv_2mortal (newSViv (sh)));
1100 PUSHs (darkness_sv); 1569 PUSHs (darkness_sv);
1101} 1570}
1102 1571
1103SV * 1572SV *
1104get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1573get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1105 CODE: 1574 CODE:
1106{ 1575{
1107 int x, y, x1, y1; 1576 int x, y, x1, y1;
1108 SV *data_sv = newSV (w * h * 7 + 5); 1577 SV *data_sv = newSV (w * h * 7 + 5);
1109 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1578 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1171} 1640}
1172 OUTPUT: 1641 OUTPUT:
1173 RETVAL 1642 RETVAL
1174 1643
1175void 1644void
1176set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1645set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1177 PPCODE: 1646 PPCODE:
1178{ 1647{
1179 int x, y, z; 1648 int x, y, z;
1180 int w, h; 1649 int w, h;
1181 int x1, y1; 1650 int x1, y1;
1230 } 1699 }
1231 } 1700 }
1232 } 1701 }
1233} 1702}
1234 1703
1235MODULE = CFClient PACKAGE = CFClient::MixChunk 1704MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1236 1705
1237CFClient::MixChunk 1706CFPlus::MixChunk
1238new_from_file (SV *class, char *path) 1707new_from_file (SV *class, char *path)
1239 CODE: 1708 CODE:
1240 RETVAL = Mix_LoadWAV (path); 1709 RETVAL = Mix_LoadWAV (path);
1241 OUTPUT: 1710 OUTPUT:
1242 RETVAL 1711 RETVAL
1243 1712
1244void 1713void
1245DESTROY (CFClient::MixChunk self) 1714DESTROY (CFPlus::MixChunk self)
1246 CODE: 1715 CODE:
1247 Mix_FreeChunk (self); 1716 Mix_FreeChunk (self);
1248 1717
1249int 1718int
1250volume (CFClient::MixChunk self, int volume = -1) 1719volume (CFPlus::MixChunk self, int volume = -1)
1251 CODE: 1720 CODE:
1252 RETVAL = Mix_VolumeChunk (self, volume); 1721 RETVAL = Mix_VolumeChunk (self, volume);
1253 OUTPUT: 1722 OUTPUT:
1254 RETVAL 1723 RETVAL
1255 1724
1256int 1725int
1257play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1726play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1258 CODE: 1727 CODE:
1259 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1728 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1260 OUTPUT: 1729 OUTPUT:
1261 RETVAL 1730 RETVAL
1262 1731
1263MODULE = CFClient PACKAGE = CFClient::MixMusic 1732MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1264 1733
1265int 1734int
1266volume (int volume = -1) 1735volume (int volume = -1)
1267 CODE: 1736 CODE:
1268 RETVAL = Mix_VolumeMusic (volume); 1737 RETVAL = Mix_VolumeMusic (volume);
1269 OUTPUT: 1738 OUTPUT:
1270 RETVAL 1739 RETVAL
1271 1740
1272CFClient::MixMusic 1741CFPlus::MixMusic
1273new_from_file (SV *class, char *path) 1742new_from_file (SV *class, char *path)
1274 CODE: 1743 CODE:
1275 RETVAL = Mix_LoadMUS (path); 1744 RETVAL = Mix_LoadMUS (path);
1276 OUTPUT: 1745 OUTPUT:
1277 RETVAL 1746 RETVAL
1278 1747
1279void 1748void
1280DESTROY (CFClient::MixMusic self) 1749DESTROY (CFPlus::MixMusic self)
1281 CODE: 1750 CODE:
1282 Mix_FreeMusic (self); 1751 Mix_FreeMusic (self);
1283 1752
1284int 1753int
1285play (CFClient::MixMusic self, int loops = -1) 1754play (CFPlus::MixMusic self, int loops = -1)
1286 CODE: 1755 CODE:
1287 RETVAL = Mix_PlayMusic (self, loops); 1756 RETVAL = Mix_PlayMusic (self, loops);
1288 OUTPUT: 1757 OUTPUT:
1289 RETVAL 1758 RETVAL
1290 1759
1291MODULE = CFClient PACKAGE = CFClient::OpenGL 1760MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1292 1761
1293BOOT: 1762BOOT:
1294{ 1763{
1295 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1764 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1296 static const struct { 1765 static const struct {
1297 const char *name; 1766 const char *name;
1298 IV iv; 1767 IV iv;
1299 } *civ, const_iv[] = { 1768 } *civ, const_iv[] = {
1300# define const_iv(name) { # name, (IV)name } 1769# define const_iv(name) { # name, (IV)name }
1301 const_iv (GL_COLOR_MATERIAL), 1770 const_iv (GL_COLOR_MATERIAL),
1302 const_iv (GL_SMOOTH), 1771 const_iv (GL_SMOOTH),
1303 const_iv (GL_FLAT), 1772 const_iv (GL_FLAT),
1773 const_iv (GL_DITHER),
1304 const_iv (GL_BLEND), 1774 const_iv (GL_BLEND),
1775 const_iv (GL_CULL_FACE),
1776 const_iv (GL_SCISSOR_TEST),
1777 const_iv (GL_DEPTH_TEST),
1778 const_iv (GL_ALPHA_TEST),
1779 const_iv (GL_NORMALIZE),
1780 const_iv (GL_RESCALE_NORMAL),
1781 const_iv (GL_FRONT),
1782 const_iv (GL_BACK),
1305 const_iv (GL_AND), 1783 const_iv (GL_AND),
1784 const_iv (GL_ONE),
1785 const_iv (GL_ZERO),
1306 const_iv (GL_SRC_ALPHA), 1786 const_iv (GL_SRC_ALPHA),
1787 const_iv (GL_DST_ALPHA),
1307 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1788 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1789 const_iv (GL_ONE_MINUS_DST_ALPHA),
1790 const_iv (GL_SRC_ALPHA_SATURATE),
1308 const_iv (GL_RGB), 1791 const_iv (GL_RGB),
1309 const_iv (GL_RGBA), 1792 const_iv (GL_RGBA),
1793 const_iv (GL_RGBA4),
1794 const_iv (GL_RGBA8),
1795 const_iv (GL_RGB5_A1),
1310 const_iv (GL_UNSIGNED_BYTE), 1796 const_iv (GL_UNSIGNED_BYTE),
1311 const_iv (GL_ALPHA4), 1797 const_iv (GL_UNSIGNED_SHORT),
1798 const_iv (GL_UNSIGNED_INT),
1312 const_iv (GL_ALPHA), 1799 const_iv (GL_ALPHA),
1800 const_iv (GL_INTENSITY),
1801 const_iv (GL_LUMINANCE),
1802 const_iv (GL_LUMINANCE_ALPHA),
1313 const_iv (GL_FLOAT), 1803 const_iv (GL_FLOAT),
1314 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1804 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1315 const_iv (GL_COMPILE), 1805 const_iv (GL_COMPILE),
1316 const_iv (GL_TEXTURE_1D), 1806 const_iv (GL_TEXTURE_1D),
1317 const_iv (GL_TEXTURE_2D), 1807 const_iv (GL_TEXTURE_2D),
1319 const_iv (GL_TEXTURE_MAG_FILTER), 1809 const_iv (GL_TEXTURE_MAG_FILTER),
1320 const_iv (GL_TEXTURE_MIN_FILTER), 1810 const_iv (GL_TEXTURE_MIN_FILTER),
1321 const_iv (GL_TEXTURE_ENV_MODE), 1811 const_iv (GL_TEXTURE_ENV_MODE),
1322 const_iv (GL_TEXTURE_WRAP_S), 1812 const_iv (GL_TEXTURE_WRAP_S),
1323 const_iv (GL_TEXTURE_WRAP_T), 1813 const_iv (GL_TEXTURE_WRAP_T),
1814 const_iv (GL_REPEAT),
1324 const_iv (GL_CLAMP), 1815 const_iv (GL_CLAMP),
1325 const_iv (GL_REPEAT), 1816 const_iv (GL_CLAMP_TO_EDGE),
1326 const_iv (GL_NEAREST), 1817 const_iv (GL_NEAREST),
1327 const_iv (GL_LINEAR), 1818 const_iv (GL_LINEAR),
1819 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1820 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1821 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1822 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1823 const_iv (GL_GENERATE_MIPMAP),
1328 const_iv (GL_MODULATE), 1824 const_iv (GL_MODULATE),
1825 const_iv (GL_DECAL),
1329 const_iv (GL_REPLACE), 1826 const_iv (GL_REPLACE),
1827 const_iv (GL_DEPTH_BUFFER_BIT),
1330 const_iv (GL_COLOR_BUFFER_BIT), 1828 const_iv (GL_COLOR_BUFFER_BIT),
1331 const_iv (GL_PROJECTION), 1829 const_iv (GL_PROJECTION),
1332 const_iv (GL_MODELVIEW), 1830 const_iv (GL_MODELVIEW),
1333 const_iv (GL_COLOR_LOGIC_OP), 1831 const_iv (GL_COLOR_LOGIC_OP),
1832 const_iv (GL_SEPARABLE_2D),
1334 const_iv (GL_CONVOLUTION_2D), 1833 const_iv (GL_CONVOLUTION_2D),
1335 const_iv (GL_CONVOLUTION_BORDER_MODE), 1834 const_iv (GL_CONVOLUTION_BORDER_MODE),
1336 const_iv (GL_CONSTANT_BORDER), 1835 const_iv (GL_CONSTANT_BORDER),
1337 const_iv (GL_LINES), 1836 const_iv (GL_LINES),
1837 const_iv (GL_LINE_STRIP),
1838 const_iv (GL_LINE_LOOP),
1338 const_iv (GL_QUADS), 1839 const_iv (GL_QUADS),
1339 const_iv (GL_LINE_LOOP), 1840 const_iv (GL_QUAD_STRIP),
1841 const_iv (GL_TRIANGLES),
1842 const_iv (GL_TRIANGLE_STRIP),
1843 const_iv (GL_TRIANGLE_FAN),
1340 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1844 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1341 const_iv (GL_FASTEST), 1845 const_iv (GL_FASTEST),
1846 const_iv (GL_V2F),
1847 const_iv (GL_V3F),
1848 const_iv (GL_T2F_V3F),
1849 const_iv (GL_T2F_N3F_V3F),
1342# undef const_iv 1850# undef const_iv
1343 }; 1851 };
1344 1852
1345 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1853 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1346 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1854 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1347} 1855}
1348 1856
1857char *
1858gl_vendor ()
1859 CODE:
1860 RETVAL = (char *)glGetString (GL_VENDOR);
1861 OUTPUT:
1862 RETVAL
1863
1864char *
1865gl_version ()
1866 CODE:
1867 RETVAL = (char *)glGetString (GL_VERSION);
1868 OUTPUT:
1869 RETVAL
1870
1871char *
1872gl_extensions ()
1873 CODE:
1874 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1875 OUTPUT:
1876 RETVAL
1877
1349int glGetError () 1878int glGetError ()
1879
1880void glFinish ()
1350 1881
1351void glClear (int mask) 1882void glClear (int mask)
1352 1883
1353void glClearColor (float r, float g, float b, float a = 1.0) 1884void glClearColor (float r, float g, float b, float a = 1.0)
1354 PROTOTYPE: @ 1885 PROTOTYPE: @
1361 1892
1362void glHint (int target, int mode) 1893void glHint (int target, int mode)
1363 1894
1364void glBlendFunc (int sfactor, int dfactor) 1895void glBlendFunc (int sfactor, int dfactor)
1365 1896
1897void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1898 CODE:
1899 gl_BlendFuncSeparate (sa, da, saa, daa);
1900
1901void glDepthMask (int flag)
1902
1366void glLogicOp (int opcode) 1903void glLogicOp (int opcode)
1367 1904
1905void glColorMask (int red, int green, int blue, int alpha)
1906
1368void glMatrixMode (int mode) 1907void glMatrixMode (int mode)
1369 1908
1370void glPushMatrix () 1909void glPushMatrix ()
1371 1910
1372void glPopMatrix () 1911void glPopMatrix ()
1373 1912
1374void glLoadIdentity () 1913void glLoadIdentity ()
1375 1914
1915void glDrawBuffer (int buffer)
1916
1917void glReadBuffer (int buffer)
1918
1919# near_ and far_ are due to microsofts buggy "c" compiler
1920void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1921
1922# near_ and far_ are due to microsofts buggy "c" compiler
1376void glOrtho (double left, double right, double bottom, double top, double near, double far) 1923void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1377 1924
1378void glViewport (int x, int y, int width, int height) 1925void glViewport (int x, int y, int width, int height)
1926
1927void glScissor (int x, int y, int width, int height)
1379 1928
1380void glTranslate (float x, float y, float z = 0.) 1929void glTranslate (float x, float y, float z = 0.)
1381 CODE: 1930 CODE:
1382 glTranslatef (x, y, z); 1931 glTranslatef (x, y, z);
1383 1932
1384void glScale (float x, float y, float z) 1933void glScale (float x, float y, float z = 1.)
1385 CODE: 1934 CODE:
1386 glScalef (x, y, z); 1935 glScalef (x, y, z);
1387 1936
1388void glRotate (float angle, float x, float y, float z) 1937void glRotate (float angle, float x, float y, float z)
1389 CODE: 1938 CODE:
1393 1942
1394void glEnd () 1943void glEnd ()
1395 1944
1396void glColor (float r, float g, float b, float a = 1.0) 1945void glColor (float r, float g, float b, float a = 1.0)
1397 PROTOTYPE: @ 1946 PROTOTYPE: @
1947 ALIAS:
1948 glColor_premultiply = 1
1398 CODE: 1949 CODE:
1950 if (ix)
1951 {
1952 r *= a;
1953 g *= a;
1954 b *= a;
1955 }
1956 // microsoft visual "c" rounds instead of truncating...
1399 glColor4f (r, g, b, a); 1957 glColor4f (r, g, b, a);
1958
1959void glInterleavedArrays (int format, int stride, char *data)
1960
1961void glDrawElements (int mode, int count, int type, char *indices)
1962
1963# 1.2 void glDrawRangeElements (int mode, int start, int end
1964
1965void glRasterPos (float x, float y, float z = 0.)
1966 CODE:
1967 glRasterPos3f (0, 0, z);
1968 glBitmap (0, 0, 0, 0, x, y, 0);
1400 1969
1401void glVertex (float x, float y, float z = 0.) 1970void glVertex (float x, float y, float z = 0.)
1402 CODE: 1971 CODE:
1403 glVertex3f (x, y, z); 1972 glVertex3f (x, y, z);
1404 1973
1416 1985
1417void glBindTexture (int target, int name) 1986void glBindTexture (int target, int name)
1418 1987
1419void glConvolutionParameter (int target, int pname, float params) 1988void glConvolutionParameter (int target, int pname, float params)
1420 CODE: 1989 CODE:
1990 if (gl.ConvolutionParameterf)
1421 glConvolutionParameterf (target, pname, params); 1991 gl.ConvolutionParameterf (target, pname, params);
1422 1992
1423void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1993void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1994 CODE:
1995 if (gl.ConvolutionFilter2D)
1996 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1997
1998void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1999 CODE:
2000 if (gl.SeparableFilter2D)
2001 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1424 2002
1425void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2003void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1426 2004
1427void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2005void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2006
2007void glDrawPixels (int width, int height, int format, int type, char *pixels)
2008
2009void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1428 2010
1429int glGenTexture () 2011int glGenTexture ()
1430 CODE: 2012 CODE:
1431{ 2013{
1432 GLuint name; 2014 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines