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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines