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.137 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
22#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
23#include <SDL_endian.h> 32#include <SDL_endian.h>
24#include <SDL_image.h> 33#include <SDL_image.h>
25#include <SDL_mixer.h> 34#include <SDL_mixer.h>
26#include <SDL_opengl.h> 35#include <SDL_opengl.h>
27 36
36# include <sys/types.h> 45# include <sys/types.h>
37# include <sys/socket.h> 46# include <sys/socket.h>
38# include <netinet/in.h> 47# include <netinet/in.h>
39# include <netinet/tcp.h> 48# include <netinet/tcp.h>
40# include <inttypes.h> 49# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 50#endif
49 51
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 53
52#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
53 55
54#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 63#else
62# define PARACHUTE 0 64# define PARACHUTE 0
63#endif 65#endif
64 66
67static AV *texture_av;
68
65static struct 69static struct
66{ 70{
67#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 72#include "glfunc.h"
69#undef GL_FUNC 73#undef GL_FUNC
70} gl; 74} gl;
71 75
76static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 78{
74 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 83 else
79 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
80} 85}
81 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
82#include "texcache.c" 111#include "texcache.c"
83 112
84#include "pango-font.c" 113#include "pango-font.c"
85#include "pango-fontmap.c" 114#include "pango-fontmap.c"
86#include "pango-render.c" 115#include "pango-render.c"
144} 173}
145 174
146static void 175static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
150 182
151 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 185
154 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
155} 187 if (!rect.height) rect.height = 1;
156 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
157typedef uint16_t mapface; 194typedef uint16_t faceid;
158 195
159typedef struct { 196typedef struct {
160 GLint name; 197 int name;
161 int w, h; 198 int w, h;
162 float s, t; 199 float s, t;
163 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
164} maptex; 203} maptex;
165 204
166typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
167 int16_t darkness; 208 uint16_t darkness;
168 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
169} mapcell; 210} mapcell;
170 211
171typedef struct { 212typedef struct {
172 int32_t c0, c1; 213 int32_t c0, c1;
173 mapcell *col; 214 mapcell *col;
174} maprow; 215} maprow;
175 216
176typedef struct map { 217typedef struct map {
177 int x, y, w, h; 218 int x, y, w, h;
178 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
179 int faces; 220 int faces; tileid *face2tile; // [faceid]
180 mapface *face; 221 int texs; maptex *tex; // [tileid]
181
182 int texs;
183 maptex *tex;
184 222
185 int32_t rows; 223 int32_t rows;
186 maprow *row; 224 maprow *row;
187} *CFPlus__Map; 225} *CFPlus__Map;
188 226
208 return ptr; 246 return ptr;
209} 247}
210 248
211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
212#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
213 271
214static maprow * 272static maprow *
215map_get_row (CFPlus__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
216{ 274{
217 if (0 > y) 275 if (0 > y)
286static void 344static void
287map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 346{
289 int x, y; 347 int x, y;
290 maprow *row; 348 maprow *row;
349 mapcell *cell;
291 350
292 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 352 if (y >= 0)
294 { 353 {
295 if (y >= self->rows) 354 if (y >= self->rows)
301 if (x >= row->c0) 360 if (x >= row->c0)
302 { 361 {
303 if (x >= row->c1) 362 if (x >= row->c1)
304 break; 363 break;
305 364
306 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
307 } 371 }
308 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
309} 389}
310 390
311static void 391static void
312music_finished (void) 392music_finished (void)
313{ 393{
348 n |= n >> 8; 428 n |= n >> 8;
349 n |= n >> 16; 429 n |= n >> 16;
350 430
351 return n + 1; 431 return n + 1;
352} 432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
353 437
354MODULE = CFPlus PACKAGE = CFPlus 438MODULE = CFPlus PACKAGE = CFPlus
355 439
356PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
357 441
361 static const struct { 445 static const struct {
362 const char *name; 446 const char *name;
363 IV iv; 447 IV iv;
364 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
365# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
366 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
367 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
368 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
369 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
370 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
379 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
380 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
381 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
382 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
383 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
384 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
385 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
386 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
387 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
388 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
443 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
444 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
445 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
446 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
447 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
448 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
449 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
450 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
451 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
452 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
453 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
454 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
455 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
456 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
457 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
458 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
459 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
460 const_iv (KMOD_CTRL),
461 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_ALT),
463 const_iv (KMOD_META)
464# undef const_iv 557# undef const_iv
465 }; 558 };
466 559
467 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
469} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
470 572
471int 573int
472in_destruct () 574in_destruct ()
473 CODE: 575 CODE:
474 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
486 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
487 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
488 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
489} 591}
490 592
593char *
594SDL_GetError ()
595
491int 596int
492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
493 598
494void 599void
495SDL_Quit () 600SDL_Quit ()
496 601
497void 602void
498SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
499 PPCODE: 604 PPCODE:
500{ 605{
501 SDL_Rect **m; 606 SDL_Rect **m;
502 607
503 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
507 612
508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
510 615
511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 620
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif 625#endif
521 626
522 SDL_EnableUNICODE (1);
523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
524
525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
526 628
527 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
528 while (*m) 630 while (*m)
529 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
530 AV *av = newAV (); 634 AV *av = newAV ();
531 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
532 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
533 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
534 641
535 ++m; 642 ++m;
536 } 643 }
537} 644}
538 645
539char *
540SDL_GetError ()
541
542int 646int
543SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
544 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
545 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
547 ); 660 );
661
548 if (RETVAL) 662 if (RETVAL)
549 { 663 {
664 av_clear (texture_av);
665
550 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
551# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
552# include "glfunc.h" 668#include "glfunc.h"
553# undef GL_FUNC 669#undef GL_FUNC
554 } 670 }
671}
555 OUTPUT: 672 OUTPUT:
556 RETVAL 673 RETVAL
557 674
558void 675void
559SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
560 677
561char * 678char *
562SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
563 680
681int
682SDL_GetAppState ()
683
564void 684void
565SDL_PollEvent () 685poll_events ()
566 PPCODE: 686 PPCODE:
567{ 687{
568 SDL_Event ev; 688 SDL_Event ev;
569 689
570 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
571 { 692 {
572 HV *hv = newHV (); 693 HV *hv = newHV ();
573 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
574 695
575 switch (ev.type) 696 switch (ev.type)
577 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
578 case SDL_KEYUP: 699 case SDL_KEYUP:
579 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
580 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
581 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
582 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
583 break; 705 break;
584 706
585 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
588 break; 710 break;
589 711
590 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
598 break; 738 break;
599 739
600 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
601 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
631Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
632 772
633void 773void
634lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
635 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
636#ifndef _WIN32 782#ifdef _WIN32
637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
638#endif 804#endif
805}
639 806
640void 807void
641add_font (char *file) 808add_font (char *file)
642 CODE: 809 CODE:
643 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
748#endif 915#endif
749 _exit (1); 916 _exit (1);
750 917
751void 918void
752_exit (int retval) 919_exit (int retval = 0)
753 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
754 _exit (retval); 924 _exit (retval);
925#endif
926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
755 935
756MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
757 937
758CFPlus::Font 938CFPlus::Font
759new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
1006xy_to_index (CFPlus::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
1007 CODE: 1187 CODE:
1008{ 1188{
1009 int index, trailing; 1189 int index, trailing;
1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1011 RETVAL = index; 1191 RETVAL = index + trailing;
1012} 1192}
1013 OUTPUT: 1193 OUTPUT:
1014 RETVAL 1194 RETVAL
1015 1195
1016void 1196void
1022 1202
1023 EXTEND (SP, 3); 1203 EXTEND (SP, 3);
1024 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1207}
1208
1209void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1211 PPCODE:
1212{
1213 int line, x;
1214
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217
1218 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1241 else
1242 {
1243 PUSHs (sv_2mortal (newSViv (index)));
1244 PUSHs (sv_2mortal (newSViv (trailing)));
1245 }
1027} 1246}
1028 1247
1029void 1248void
1030render (CFPlus::Layout self, float x, float y, int flags = 0) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1031 PPCODE: 1250 PPCODE:
1036 flags 1255 flags
1037 ); 1256 );
1038 1257
1039MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1040 1259
1260int minpot (int n)
1261
1041void 1262void
1042pad2pot (SV *data_, SV *w_, SV *h_) 1263pad2pot (SV *data_, SV *w_, SV *h_)
1043 CODE: 1264 CODE:
1044{ 1265{
1045 int ow = SvIV (w_); 1266 int ow = SvIV (w_);
1122 glDisable (GL_ALPHA_TEST); 1343 glDisable (GL_ALPHA_TEST);
1123 glDisable (GL_BLEND); 1344 glDisable (GL_BLEND);
1124 } 1345 }
1125} 1346}
1126 1347
1348IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1349 CODE:
1350{
1351 GLint width;
1352 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1353 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1354 RETVAL = width > 0;
1355}
1356 OUTPUT:
1357 RETVAL
1358
1127MODULE = CFPlus PACKAGE = CFPlus::Map 1359MODULE = CFPlus PACKAGE = CFPlus::Map
1128 1360
1129CFPlus::Map 1361CFPlus::Map
1130new (SV *class, int map_width, int map_height) 1362new (SV *class)
1131 CODE: 1363 CODE:
1132 New (0, RETVAL, 1, struct map); 1364 New (0, RETVAL, 1, struct map);
1133 RETVAL->x = 0; 1365 RETVAL->x = 0;
1134 RETVAL->y = 0; 1366 RETVAL->y = 0;
1135 RETVAL->w = map_width; 1367 RETVAL->w = 0;
1136 RETVAL->h = map_height; 1368 RETVAL->h = 0;
1137 RETVAL->ox = 0; 1369 RETVAL->ox = 0;
1138 RETVAL->oy = 0; 1370 RETVAL->oy = 0;
1139 RETVAL->faces = 8192; 1371 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1140 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1372 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1141 RETVAL->texs = 8192;
1142 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1143 RETVAL->rows = 0; 1373 RETVAL->rows = 0;
1144 RETVAL->row = 0; 1374 RETVAL->row = 0;
1145 OUTPUT: 1375 OUTPUT:
1146 RETVAL 1376 RETVAL
1147 1377
1148void 1378void
1149DESTROY (CFPlus::Map self) 1379DESTROY (CFPlus::Map self)
1150 CODE: 1380 CODE:
1151{ 1381{
1152 map_clear (self); 1382 map_clear (self);
1153 Safefree (self->face); 1383 Safefree (self->face2tile);
1154 Safefree (self->tex); 1384 Safefree (self->tex);
1155 Safefree (self); 1385 Safefree (self);
1156} 1386}
1157 1387
1158void 1388void
1389resize (CFPlus::Map self, int map_width, int map_height)
1390 CODE:
1391 self->w = map_width;
1392 self->h = map_height;
1393
1394void
1159clear (CFPlus::Map self) 1395clear (CFPlus::Map self)
1160 CODE: 1396 CODE:
1161 map_clear (self); 1397 map_clear (self);
1162 1398
1163void 1399void
1164set_face (CFPlus::Map self, int face, int texid) 1400set_tileid (CFPlus::Map self, int face, int tile)
1165 CODE: 1401 CODE:
1166{ 1402{
1167 while (self->faces <= face) 1403 need_facenum (self, face); self->face2tile [face] = tile;
1168 { 1404 need_texid (self, tile);
1169 Append (mapface, self->face, self->faces, self->faces); 1405}
1170 self->faces *= 2;
1171 }
1172 1406
1173 self->face [face] = texid; 1407void
1408set_smooth (CFPlus::Map self, int face, int smooth, int level)
1409 CODE:
1410{
1411 tileid texid;
1412 maptex *tex;
1413
1414 if (face < 0 || face >= self->faces)
1415 return;
1416
1417 if (smooth < 0 || smooth >= self->faces)
1418 return;
1419
1420 texid = self->face2tile [face];
1421
1422 if (!texid)
1423 return;
1424
1425 tex = self->tex + texid;
1426 tex->smoothtile = self->face2tile [smooth];
1427 tex->smoothlevel = level;
1174} 1428}
1175 1429
1176void 1430void
1177set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1431set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1178 CODE: 1432 CODE:
1179{ 1433{
1180 while (self->texs <= texid) 1434 need_texid (self, texid);
1181 {
1182 Append (maptex, self->tex, self->texs, self->texs);
1183 self->texs *= 2;
1184 }
1185 1435
1186 { 1436 {
1187 maptex *tex = self->tex + texid; 1437 maptex *tex = self->tex + texid;
1188 1438
1189 tex->name = name; 1439 tex->name = name;
1231void 1481void
1232scroll (CFPlus::Map self, int dx, int dy) 1482scroll (CFPlus::Map self, int dx, int dy)
1233 CODE: 1483 CODE:
1234{ 1484{
1235 if (dx > 0) 1485 if (dx > 0)
1236 map_blank (self, self->x, self->y, dx - 1, self->h); 1486 map_blank (self, self->x, self->y, dx, self->h);
1237 else if (dx < 0) 1487 else if (dx < 0)
1238 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1488 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1239 1489
1240 if (dy > 0) 1490 if (dy > 0)
1241 map_blank (self, self->x, self->y, self->w, dy - 1); 1491 map_blank (self, self->x, self->y, self->w, dy);
1242 else if (dy < 0) 1492 else if (dy < 0)
1243 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1493 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1244 1494
1245 self->ox += dx; self->x += dx; 1495 self->ox += dx; self->x += dx;
1246 self->oy += dy; self->y += dy; 1496 self->oy += dy; self->y += dy;
1247 1497
1248 while (self->y < 0) 1498 while (self->y < 0)
1253 self->y += MAP_EXTEND_Y; 1503 self->y += MAP_EXTEND_Y;
1254 } 1504 }
1255} 1505}
1256 1506
1257void 1507void
1258map1a_update (CFPlus::Map self, SV *data_) 1508map1a_update (CFPlus::Map self, SV *data_, int extmap)
1259 CODE: 1509 CODE:
1260{ 1510{
1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1511 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1262 uint8_t *data_end = (uint8_t *)SvEND (data_); 1512 uint8_t *data_end = (uint8_t *)SvEND (data_);
1263 mapcell *cell; 1513 mapcell *cell;
1264 int x, y, flags; 1514 int x, y, flags;
1265 1515
1266 while (data < data_end) 1516 while (data < data_end - 1)
1267 { 1517 {
1268 flags = (data [0] << 8) + data [1]; data += 2; 1518 flags = (data [0] << 8) + data [1]; data += 2;
1269 1519
1270 x = self->x + ((flags >> 10) & 63); 1520 x = self->x + ((flags >> 10) & 63);
1271 y = self->y + ((flags >> 4) & 63); 1521 y = self->y + ((flags >> 4) & 63);
1272 1522
1273 cell = map_get_cell (self, x, y); 1523 cell = map_get_cell (self, x, y);
1274 1524
1275 if (flags & 15) 1525 if (flags & 15)
1276 { 1526 {
1277 if (cell->darkness < 0) 1527 if (!cell->darkness)
1278 { 1528 {
1529 memset (cell, 0, sizeof (*cell));
1279 cell->darkness = 0; 1530 cell->darkness = 256;
1280 cell->face [0] = 0;
1281 cell->face [1] = 0;
1282 cell->face [2] = 0;
1283 } 1531 }
1284 1532
1285 cell->darkness = flags & 8 ? *data++ : 255;
1286
1287 //TODO: don't trust server data to be in-range(!) 1533 //TODO: don't trust server data to be in-range(!)
1534
1535 if (flags & 8)
1536 {
1537 if (extmap)
1538 {
1539 uint8_t ext, cmd;
1540
1541 do
1542 {
1543 ext = *data++;
1544 cmd = ext & 0x3f;
1545
1546 if (cmd < 4)
1547 cell->darkness = 255 - ext * 64 + 1;
1548 else if (cmd == 5) // health
1549 {
1550 cell->stat_width = 1;
1551 cell->stat_hp = *data++;
1552 }
1553 else if (cmd == 6) // monster width
1554 cell->stat_width = *data++ + 1;
1555 else if (cmd == 0x47)
1556 {
1557 if (*data == 4)
1558 ; // decode player count
1559
1560 data += *data + 1;
1561 }
1562 else if (cmd == 8) // cell flags
1563 cell->flags = *data++;
1564 else if (ext & 0x40) // unknown, multibyte => skip
1565 data += *data + 1;
1566 else
1567 data++;
1568 }
1569 while (ext & 0x80);
1570 }
1571 else
1572 cell->darkness = *data++ + 1;
1573 }
1288 1574
1289 if (flags & 4) 1575 if (flags & 4)
1290 { 1576 {
1291 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1577 faceid face = (data [0] << 8) + data [1]; data += 2;
1578 need_facenum (self, face);
1579 cell->tile [0] = self->face2tile [face];
1292 } 1580 }
1293 1581
1294 if (flags & 2) 1582 if (flags & 2)
1295 { 1583 {
1296 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1584 faceid face = (data [0] << 8) + data [1]; data += 2;
1585 need_facenum (self, face);
1586 cell->tile [1] = self->face2tile [face];
1297 } 1587 }
1298 1588
1299 if (flags & 1) 1589 if (flags & 1)
1300 { 1590 {
1301 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1591 faceid face = (data [0] << 8) + data [1]; data += 2;
1592 need_facenum (self, face);
1593 cell->tile [2] = self->face2tile [face];
1302 } 1594 }
1303 } 1595 }
1304 else 1596 else
1305 cell->darkness = -1; 1597 cell->darkness = 0;
1306 } 1598 }
1307} 1599}
1308 1600
1309SV * 1601SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1602mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1336 { 1628 {
1337 mapcell *cell = row->col + (x - row->c0); 1629 mapcell *cell = row->col + (x - row->c0);
1338 1630
1339 for (z = 0; z <= 0; z++) 1631 for (z = 0; z <= 0; z++)
1340 { 1632 {
1341 mapface face = cell->face [z];
1342
1343 if (face)
1344 {
1345 maptex tex = self->tex [face]; 1633 maptex tex = self->tex [cell->tile [z]];
1346 int a0 = 255 - tex.a; 1634 int a0 = 255 - tex.a;
1347 int a1 = tex.a; 1635 int a1 = tex.a;
1348 1636
1349 r = (r * a0 + tex.r * a1) / 255; 1637 r = (r * a0 + tex.r * a1) / 255;
1350 g = (g * a0 + tex.g * a1) / 255; 1638 g = (g * a0 + tex.g * a1) / 255;
1351 b = (b * a0 + tex.b * a1) / 255; 1639 b = (b * a0 + tex.b * a1) / 255;
1352 a = (a * a0 + tex.a * a1) / 255; 1640 a = (a * a0 + tex.a * a1) / 255;
1353 }
1354 } 1641 }
1355 } 1642 }
1356 1643
1357 *map++ = (r ) 1644 *map++ = (r )
1358 | (g << 8) 1645 | (g << 8)
1365} 1652}
1366 OUTPUT: 1653 OUTPUT:
1367 RETVAL 1654 RETVAL
1368 1655
1369void 1656void
1370draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1657draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1371 CODE: 1658 CODE:
1372{ 1659{
1373 int vx, vy; 1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1663 smooth_key skey;
1374 int x, y, z; 1664 int x, y, z;
1375 int last_name; 1665 int last_name;
1376 mapface face;
1377 1666
1378 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1667 // thats current max. sorry.
1379 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1668 if (sw > 255) sw = 255;
1669 if (sh > 255) sh = 255;
1380 1670
1381 /* 1671 // clear key, in case of extra padding
1382 int vx = self->vx = self->w >= sw 1672 memset (&skey, 0, sizeof (skey));
1383 ? self->x + (self->w - sw) / 2
1384 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1385
1386 int vy = self->vy = self->h >= sh
1387 ? self->y + (self->h - sh) / 2
1388 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1389 */
1390 1673
1391 glColor4ub (255, 255, 255, 255); 1674 glColor4ub (255, 255, 255, 255);
1392 1675
1393 glEnable (GL_BLEND); 1676 glEnable (GL_BLEND);
1394 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1677 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1397 1680
1398 glBegin (GL_QUADS); 1681 glBegin (GL_QUADS);
1399 1682
1400 last_name = 0; 1683 last_name = 0;
1401 1684
1685 mx += self->x;
1686 my += self->y;
1687
1688 // first pass: determine smooth_max
1689 // rather ugly, if you ask me
1690 // could also be stored inside mapcell and updated on change
1691 memset (smooth_max, 0, sizeof (smooth_max));
1692
1693 for (y = 0; y < sh; y++)
1694 if (0 <= y + my && y + my < self->rows)
1695 {
1696 maprow *row = self->row + (y + my);
1697
1698 for (x = 0; x < sw; x++)
1699 if (row->c0 <= x + mx && x + mx < row->c1)
1700 {
1701 mapcell *cell = row->col + (x + mx - row->c0);
1702
1703 smooth_max[x + 1][y + 1] =
1704 MAX (self->tex [cell->tile [0]].smoothlevel,
1705 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel));
1707 }
1708 }
1709
1402 for (z = 0; z < 3; z++) 1710 for (z = 0; z <= 2; z++)
1711 {
1712 memset (smooth_level, 0, sizeof (smooth_level));
1713
1403 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1404 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1405 { 1716 {
1406 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1407 1718
1408 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1409 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1410 { 1721 {
1411 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1412
1413 face = cell->face [z]; 1723 tileid tile = cell->tile [z];
1414 1724
1415 if (face) 1725 if (tile)
1726 {
1727 maptex tex = self->tex [tile];
1728 int px = (x + 1) * T - tex.w;
1729 int py = (y + 1) * T - tex.h;
1730
1731 // suppressing texture state switches here
1732 // is only moderately effective, but worth the extra effort
1733 if (last_name != tex.name)
1734 {
1735 if (!tex.name)
1736 tex = self->tex [2]; /* missing, replace by noface */
1737
1738 glEnd ();
1739 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1740 glBegin (GL_QUADS);
1741 }
1742
1743 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1744 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1745 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1746 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1747
1748 if (cell->flags && z == 2)
1749 {
1750 if (cell->flags & 1)
1751 {
1752 maptex tex = self->tex [1];
1753 int px = x * T + T * 2 / 32;
1754 int py = y * T - T * 6 / 32;
1755
1756 glEnd ();
1757 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1758 glBegin (GL_QUADS);
1759
1760 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1761 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1762 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1763 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1764 }
1765 }
1766
1767 // update smooth hash
1768 if (tex.smoothtile)
1769 {
1770 skey.tile = tex.smoothtile;
1771 skey.level = tex.smoothlevel;
1772
1773 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1774
1775 // add bits to current tile and all neighbours. skey.x|y is
1776 // shifted +1|+1 so we always stay positive.
1777
1778 // bits is ___n cccc CCCC bbbb
1779 // n do not draw borders&corners
1780 // c draw these corners, but...
1781 // C ... not these
1782 // b draw these borders
1783
1784 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1785 // ┃· ·· ·┃ ━━
1786
1787 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1788 // ·· ·· ·┏ ┓·
1789
1790 // full tile
1791 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1792
1793 // borders
1794 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1795 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1796 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1797 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1798
1799 // corners
1800 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1801 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1802 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1803 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1804 }
1805 }
1806 }
1807 }
1808
1809 // go through all smoothlevels, lowest to highest, then draw.
1810 // this is basically counting sort
1811 {
1812 int w, b;
1813
1814 for (w = 0; w < 256 / 32; ++w)
1815 {
1816 uint32_t smask = smooth_level [w];
1817 if (smask)
1818 for (b = 0; b < 32; ++b)
1819 if (smask & (((uint32_t)1) << b))
1416 { 1820 {
1417 maptex tex = self->tex [face]; 1821 int level = (w << 5) | b;
1822 HE *he;
1418 1823
1419 int px = (x + 1) * 32 - tex.w; 1824 hv_iterinit (smooth);
1420 int py = (y + 1) * 32 - tex.h; 1825 while ((he = hv_iternext (smooth)))
1421
1422 if (last_name != tex.name)
1423 { 1826 {
1827 smooth_key *skey = (smooth_key *)HeKEY (he);
1828 IV bits = SvIVX (HeVAL (he));
1829
1830 if (!(bits & 0x1000)
1831 && skey->level == level
1832 && level > smooth_max [skey->x][skey->y])
1833 {
1834 maptex tex = self->tex [skey->tile];
1835 int px = (((int)skey->x) - 1) * T;
1836 int py = (((int)skey->y) - 1) * T;
1837 int border = bits & 15;
1838 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1839 float dx = tex.s * .0625f; // 16 images/row
1840 float dy = tex.t * .5f ; // 2 images/column
1841
1842 // this time naively avoiding texture state changes
1843 // save gobs of state changes.
1844 if (last_name != tex.name)
1845 {
1846 if (!tex.name)
1847 continue; // smoothing not yet available
1848
1424 glEnd (); 1849 glEnd ();
1425 last_name = tex.name;
1426 glBindTexture (GL_TEXTURE_2D, last_name); 1850 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1427 glBegin (GL_QUADS); 1851 glBegin (GL_QUADS);
1852 }
1853
1854 if (border)
1855 {
1856 float ox = border * dx;
1857
1858 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1859 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1860 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1861 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1862 }
1863
1864 if (corner)
1865 {
1866 float ox = corner * dx;
1867
1868 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1869 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1870 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1871 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1872 }
1873 }
1428 } 1874 }
1429
1430 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1431 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1432 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1433 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1434 } 1875 }
1435 }
1436 } 1876 }
1877 }
1878
1879 hv_clear (smooth);
1880 }
1437 1881
1438 glEnd (); 1882 glEnd ();
1439 1883
1440 glDisable (GL_TEXTURE_2D); 1884 glDisable (GL_TEXTURE_2D);
1441 glDisable (GL_BLEND); 1885 glDisable (GL_BLEND);
1886
1887 // top layer: overlays such as the health bar
1888 for (y = 0; y < sh; y++)
1889 if (0 <= y + my && y + my < self->rows)
1890 {
1891 maprow *row = self->row + (y + my);
1892
1893 for (x = 0; x < sw; x++)
1894 if (row->c0 <= x + mx && x + mx < row->c1)
1895 {
1896 mapcell *cell = row->col + (x + mx - row->c0);
1897
1898 int px = x * T;
1899 int py = y * T;
1900
1901 if (cell->stat_hp)
1902 {
1903 int width = cell->stat_width * T;
1904 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1905
1906 glColor3ub (0, 0, 0);
1907 glRectf (px + 1, py - thick - 2,
1908 px + width - 1, py);
1909
1910 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1911 glRectf (px + 2,
1912 py - thick - 1,
1913 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1914 }
1915 }
1916 }
1442} 1917}
1443 1918
1444void 1919void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1920draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE: 1921 CODE:
1500 glDisable (GL_BLEND); 1975 glDisable (GL_BLEND);
1501 glDisable (GL_TEXTURE_2D); 1976 glDisable (GL_TEXTURE_2D);
1502} 1977}
1503 1978
1504void 1979void
1505fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1506 PPCODE: 1981 PPCODE:
1507{ 1982{
1508 int vx, vy;
1509 int x, y; 1983 int x, y;
1510 int sw4 = (sw + 3) & ~3; 1984 int sw4 = (sw + 3) & ~3;
1511 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1512 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1513 1987
1514 memset (darkness, 255, sw4 * sh); 1988 memset (darkness, 255, sw4 * sh);
1515 SvPOK_only (darkness_sv); 1989 SvPOK_only (darkness_sv);
1516 SvCUR_set (darkness_sv, sw4 * sh); 1990 SvCUR_set (darkness_sv, sw4 * sh);
1517 1991
1518 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1992 mx += self->x;
1519 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1993 my += self->y;
1520 1994
1521 for (y = 0; y < sh; y++) 1995 for (y = 0; y < sh; y++)
1522 if (0 <= y + vy && y + vy < self->rows) 1996 if (0 <= y + my && y + my < self->rows)
1523 { 1997 {
1524 maprow *row = self->row + (y + vy); 1998 maprow *row = self->row + (y + my);
1525 1999
1526 for (x = 0; x < sw; x++) 2000 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 2001 if (row->c0 <= x + mx && x + mx < row->c1)
1528 { 2002 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 2003 mapcell *cell = row->col + (x + mx - row->c0);
1530 2004
1531 darkness[y * sw4 + x] = cell->darkness < 0 2005 darkness[y * sw4 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1)
1532 ? 255 - FOW_DARKNESS 2007 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 2008 }
1535 } 2009 }
2010
2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2015
2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x)
2021 {
2022 float *f = (float *)matrix;
2023 int dx, dy;
2024 float sum = 0.f;
2025
2026 for (dy = -1; dy <= 1; ++dy)
2027 for (dx = -1; dx <= 1; ++dx)
2028 {
2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
2031
2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2033 }
2034
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2036 }
2037
2038 darkness_sv = darkness2_sv;
2039 }
1536 2040
1537 EXTEND (SP, 3); 2041 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 2042 PUSHs (sv_2mortal (newSViv (sw4)));
1539 PUSHs (sv_2mortal (newSViv (sh))); 2043 PUSHs (sv_2mortal (newSViv (sh)));
1540 PUSHs (darkness_sv); 2044 PUSHs (darkness_sv);
1574 if (row && row->c0 <= x && x < row->c1) 2078 if (row && row->c0 <= x && x < row->c1)
1575 { 2079 {
1576 mapcell *cell = row->col + (x - row->c0); 2080 mapcell *cell = row->col + (x - row->c0);
1577 uint8_t flags = 0; 2081 uint8_t flags = 0;
1578 2082
1579 if (cell->face [0]) flags |= 1; 2083 if (cell->tile [0]) flags |= 1;
1580 if (cell->face [1]) flags |= 2; 2084 if (cell->tile [1]) flags |= 2;
1581 if (cell->face [2]) flags |= 4; 2085 if (cell->tile [2]) flags |= 4;
1582 2086
1583 *data++ = flags; 2087 *data++ = flags;
1584 2088
1585 if (flags & 1) 2089 if (flags & 1)
1586 { 2090 {
2091 tileid tile = cell->tile [0];
1587 *data++ = cell->face [0] >> 8; 2092 *data++ = tile >> 8;
1588 *data++ = cell->face [0]; 2093 *data++ = tile;
1589 } 2094 }
1590 2095
1591 if (flags & 2) 2096 if (flags & 2)
1592 { 2097 {
2098 tileid tile = cell->tile [1];
1593 *data++ = cell->face [1] >> 8; 2099 *data++ = tile >> 8;
1594 *data++ = cell->face [1]; 2100 *data++ = tile;
1595 } 2101 }
1596 2102
1597 if (flags & 4) 2103 if (flags & 4)
1598 { 2104 {
2105 tileid tile = cell->tile [2];
1599 *data++ = cell->face [2] >> 8; 2106 *data++ = tile >> 8;
1600 *data++ = cell->face [2]; 2107 *data++ = tile;
1601 } 2108 }
1602 } 2109 }
1603 else 2110 else
1604 *data++ = 0; 2111 *data++ = 0;
1605 } 2112 }
1645 { 2152 {
1646 uint8_t flags = *data++; 2153 uint8_t flags = *data++;
1647 2154
1648 if (flags) 2155 if (flags)
1649 { 2156 {
1650 mapface face[3] = { 0, 0, 0 };
1651
1652 mapcell *cell = row_get_cell (row, x); 2157 mapcell *cell = row_get_cell (row, x);
2158 tileid tile[3] = { 0, 0, 0 };
1653 2159
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2160 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2161 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2162 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1657 2163
1658 if (cell->darkness <= 0) 2164 if (cell->darkness == 0)
1659 { 2165 {
1660 cell->darkness = -1; 2166 cell->darkness = 0;
1661 2167
1662 for (z = 0; z <= 2; z++) 2168 for (z = 0; z <= 2; z++)
1663 { 2169 {
1664 cell->face[z] = face[z]; 2170 tileid t = tile [z];
1665 2171
1666 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2172 if (t >= self->texs || (t && !self->tex [t].name))
2173 {
1667 XPUSHs (sv_2mortal (newSViv (face[z]))); 2174 XPUSHs (sv_2mortal (newSViv (t)));
2175 need_texid (self, t);
2176 }
2177
2178 cell->tile [z] = t;
1668 } 2179 }
1669 } 2180 }
1670 } 2181 }
1671 } 2182 }
1672 } 2183 }
1707 CODE: 2218 CODE:
1708 RETVAL = Mix_VolumeMusic (volume); 2219 RETVAL = Mix_VolumeMusic (volume);
1709 OUTPUT: 2220 OUTPUT:
1710 RETVAL 2221 RETVAL
1711 2222
2223int
2224fade_out (int ms)
2225 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms);
2227 OUTPUT:
2228 RETVAL
2229
1712CFPlus::MixMusic 2230CFPlus::MixMusic
1713new_from_file (SV *class, char *path) 2231new_from_file (SV *class, char *path)
1714 CODE: 2232 CODE:
1715 RETVAL = Mix_LoadMUS (path); 2233 RETVAL = Mix_LoadMUS (path);
1716 OUTPUT: 2234 OUTPUT:
1723 2241
1724int 2242int
1725play (CFPlus::MixMusic self, int loops = -1) 2243play (CFPlus::MixMusic self, int loops = -1)
1726 CODE: 2244 CODE:
1727 RETVAL = Mix_PlayMusic (self, loops); 2245 RETVAL = Mix_PlayMusic (self, loops);
2246 OUTPUT:
2247 RETVAL
2248
2249int
2250fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2251 CODE:
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1728 OUTPUT: 2253 OUTPUT:
1729 RETVAL 2254 RETVAL
1730 2255
1731MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1732 2257
1736 static const struct { 2261 static const struct {
1737 const char *name; 2262 const char *name;
1738 IV iv; 2263 IV iv;
1739 } *civ, const_iv[] = { 2264 } *civ, const_iv[] = {
1740# define const_iv(name) { # name, (IV)name } 2265# define const_iv(name) { # name, (IV)name }
2266 const_iv (GL_VENDOR),
2267 const_iv (GL_VERSION),
2268 const_iv (GL_EXTENSIONS),
1741 const_iv (GL_COLOR_MATERIAL), 2269 const_iv (GL_COLOR_MATERIAL),
1742 const_iv (GL_SMOOTH), 2270 const_iv (GL_SMOOTH),
1743 const_iv (GL_FLAT), 2271 const_iv (GL_FLAT),
1744 const_iv (GL_DITHER), 2272 const_iv (GL_DITHER),
1745 const_iv (GL_BLEND), 2273 const_iv (GL_BLEND),
1772 const_iv (GL_LUMINANCE), 2300 const_iv (GL_LUMINANCE),
1773 const_iv (GL_LUMINANCE_ALPHA), 2301 const_iv (GL_LUMINANCE_ALPHA),
1774 const_iv (GL_FLOAT), 2302 const_iv (GL_FLOAT),
1775 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2303 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1776 const_iv (GL_COMPILE), 2304 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D),
1777 const_iv (GL_TEXTURE_1D), 2307 const_iv (GL_TEXTURE_1D),
1778 const_iv (GL_TEXTURE_2D), 2308 const_iv (GL_TEXTURE_2D),
1779 const_iv (GL_TEXTURE_ENV), 2309 const_iv (GL_TEXTURE_ENV),
1780 const_iv (GL_TEXTURE_MAG_FILTER), 2310 const_iv (GL_TEXTURE_MAG_FILTER),
1781 const_iv (GL_TEXTURE_MIN_FILTER), 2311 const_iv (GL_TEXTURE_MIN_FILTER),
1803 const_iv (GL_SEPARABLE_2D), 2333 const_iv (GL_SEPARABLE_2D),
1804 const_iv (GL_CONVOLUTION_2D), 2334 const_iv (GL_CONVOLUTION_2D),
1805 const_iv (GL_CONVOLUTION_BORDER_MODE), 2335 const_iv (GL_CONVOLUTION_BORDER_MODE),
1806 const_iv (GL_CONSTANT_BORDER), 2336 const_iv (GL_CONSTANT_BORDER),
1807 const_iv (GL_LINES), 2337 const_iv (GL_LINES),
2338 const_iv (GL_LINE_STRIP),
1808 const_iv (GL_LINE_LOOP), 2339 const_iv (GL_LINE_LOOP),
1809 const_iv (GL_QUADS), 2340 const_iv (GL_QUADS),
1810 const_iv (GL_QUAD_STRIP), 2341 const_iv (GL_QUAD_STRIP),
1811 const_iv (GL_TRIANGLES), 2342 const_iv (GL_TRIANGLES),
1812 const_iv (GL_TRIANGLE_STRIP), 2343 const_iv (GL_TRIANGLE_STRIP),
1820# undef const_iv 2351# undef const_iv
1821 }; 2352 };
1822 2353
1823 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2354 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1824 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2355 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2356
2357 texture_av = newAV ();
2358 AvREAL_off (texture_av);
1825} 2359}
1826 2360
1827char * 2361char *
1828gl_vendor () 2362gl_vendor ()
1829 CODE: 2363 CODE:
1840 2374
1841char * 2375char *
1842gl_extensions () 2376gl_extensions ()
1843 CODE: 2377 CODE:
1844 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2378 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2379 OUTPUT:
2380 RETVAL
2381
2382const char *glGetString (GLenum pname)
2383
2384GLint glGetInteger (GLenum pname)
2385 CODE:
2386 glGetIntegerv (pname, &RETVAL);
2387 OUTPUT:
2388 RETVAL
2389
2390GLdouble glGetDouble (GLenum pname)
2391 CODE:
2392 glGetDoublev (pname, &RETVAL);
1845 OUTPUT: 2393 OUTPUT:
1846 RETVAL 2394 RETVAL
1847 2395
1848int glGetError () 2396int glGetError ()
1849 2397
1974 2522
1975void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2523void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1976 2524
1977void glDrawPixels (int width, int height, int format, int type, char *pixels) 2525void glDrawPixels (int width, int height, int format, int type, char *pixels)
1978 2526
2527void glPixelZoom (float x, float y)
2528
1979void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2529void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1980 2530
1981int glGenTexture () 2531int glGenTexture ()
1982 CODE: 2532 CODE:
1983{ 2533 RETVAL = gen_texture ();
1984 GLuint name;
1985 glGenTextures (1, &name);
1986 RETVAL = name;
1987}
1988 OUTPUT: 2534 OUTPUT:
1989 RETVAL 2535 RETVAL
1990 2536
1991void glDeleteTexture (int name) 2537void glDeleteTexture (int name)
1992 CODE: 2538 CODE:
1993{
1994 GLuint name_ = name;
1995 glDeleteTextures (1, &name_); 2539 del_texture (name);
1996} 2540
1997
1998int glGenList () 2541int glGenList ()
1999 CODE: 2542 CODE:
2000 RETVAL = glGenLists (1); 2543 RETVAL = glGenLists (1);
2001 OUTPUT: 2544 OUTPUT:
2002 RETVAL 2545 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines