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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.106 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC

… …
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
… …
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 86static PangoFontMap *ft2_fontmap, *cairo_fontmap;
86 87
87static void 88static void
88substitute_func (FcPattern *pattern, gpointer data) 89substitute_func (FcPattern *pattern, gpointer data)
89{ 90{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 91 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif
91#ifdef _WIN32 95#ifdef _WIN32
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93#else 97#else
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 98 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif 99#endif
… …
296 ev.code = 1; 300 ev.code = 1;
297 ev.data1 = (void *)(long)channel; 301 ev.data1 = (void *)(long)channel;
298 ev.data2 = 0; 302 ev.data2 = 0;
299 303
300 SDL_PushEvent ((SDL_Event *)&ev); 304 SDL_PushEvent ((SDL_Event *)&ev);
305}
306
307static unsigned int
308minpot (unsigned int n)
309{
310 if (!n)
311 return 0;
312
313 --n;
314
315 n |= n >> 1;
316 n |= n >> 2;
317 n |= n >> 4;
318 n |= n >> 8;
319 n |= n >> 16;
320
321 return n + 1;
301} 322}
302 323
303MODULE = CFClient PACKAGE = CFClient 324MODULE = CFClient PACKAGE = CFClient
304 325
305PROTOTYPES: ENABLE 326PROTOTYPES: ENABLE
… …
415 436
416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418} 439}
419 440
441NV floor (NV x)
442
443NV ceil (NV x)
444
420void 445void
421pango_init () 446pango_init ()
422 CODE: 447 CODE:
423 // delayed, so it can pick up new fonts added by AddFontResourceEx 448 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{ 449{
… …
460 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 485 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
461 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 486 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
462 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 487 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
463 488
464 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 489 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 490 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
466 491
467 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 492 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
468 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
469 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
700 CODE: 725 CODE:
701 fprintf (stderr, "FATAL: %s\n", message); 726 fprintf (stderr, "FATAL: %s\n", message);
702#ifdef _WIN32 727#ifdef _WIN32
703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
704#endif 729#endif
705 exit (1); 730 _exit (1);
731
732void
733_exit (int retval)
734 CODE:
735 _exit (retval);
706 736
707MODULE = CFClient PACKAGE = CFClient::Font 737MODULE = CFClient PACKAGE = CFClient::Font
708 738
709CFClient::Font 739CFClient::Font
710new_from_file (SV *class, char *path, int id = 0) 740new_from_file (SV *class, char *path, int id = 0)
… …
784 814
785SV * 815SV *
786get_text (CFClient::Layout self) 816get_text (CFClient::Layout self)
787 CODE: 817 CODE:
788 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 818 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
789 SvUTF8_on (RETVAL); 819 sv_utf8_decode (RETVAL);
790 OUTPUT: 820 OUTPUT:
791 RETVAL 821 RETVAL
792 822
793void 823void
794set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 824set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
… …
975} 1005}
976 1006
977MODULE = CFClient PACKAGE = CFClient::Texture 1007MODULE = CFClient PACKAGE = CFClient::Texture
978 1008
979void 1009void
1010pad2pot (SV *data_, SV *w_, SV *h_)
1011 CODE:
1012{
1013 int ow = SvIV (w_);
1014 int oh = SvIV (h_);
1015
1016 if (ow && oh)
1017 {
1018 int nw = minpot (ow);
1019 int nh = minpot (oh);
1020
1021 if (nw != ow || nh != oh)
1022 {
1023 if (SvOK (data_))
1024 {
1025 STRLEN datalen;
1026 char *data = SvPVbyte (data_, datalen);
1027 int bpp = datalen / (ow * oh);
1028 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1029
1030 SvPOK_only (result_);
1031 SvCUR_set (result_, nw * nh * bpp);
1032
1033 memset (SvPVX (result_), 0, nw * nh * bpp);
1034 while (oh--)
1035 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1036
1037 sv_setsv (data_, result_);
1038 }
1039
1040 sv_setiv (w_, nw);
1041 sv_setiv (h_, nh);
1042 }
1043 }
1044}
1045
1046void
980draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1047draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
981 PROTOTYPE: $$$;$$ 1048 PROTOTYPE: $$$;$$
982 ALIAS: 1049 ALIAS:
983 draw_quad_alpha = 1 1050 draw_quad_alpha = 1
984 draw_quad_alpha_premultiplied = 2 1051 draw_quad_alpha_premultiplied = 2
985 CODE: 1052 CODE:
… …
1050DESTROY (CFClient::Map self) 1117DESTROY (CFClient::Map self)
1051 CODE: 1118 CODE:
1052{ 1119{
1053 map_clear (self); 1120 map_clear (self);
1054 Safefree (self->face); 1121 Safefree (self->face);
1122 Safefree (self->tex);
1055 Safefree (self); 1123 Safefree (self);
1056} 1124}
1057 1125
1058void 1126void
1059clear (CFClient::Map self) 1127clear (CFClient::Map self)
… …
1266 OUTPUT: 1334 OUTPUT:
1267 RETVAL 1335 RETVAL
1268 1336
1269void 1337void
1270draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1338draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1271 PPCODE: 1339 CODE:
1272{ 1340{
1273 int vx, vy; 1341 int vx, vy;
1274 int x, y, z; 1342 int x, y, z;
1275 int last_name; 1343 int last_name;
1276 mapface face; 1344 mapface face;
1277 int sw4 = (sw + 3) & ~3;
1278 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1279 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1280 1345
1281 memset (darkness, 255, sw4 * sh);
1282 SvPOK_only (darkness_sv);
1283 SvCUR_set (darkness_sv, sw4 * sh);
1284
1285 vx = self->x + (self->w - sw) / 2 - shift_x; 1346 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1286 vy = self->y + (self->h - sh) / 2 - shift_y; 1347 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1287 1348
1288 /* 1349 /*
1289 int vx = self->vx = self->w >= sw 1350 int vx = self->vx = self->w >= sw
1290 ? self->x + (self->w - sw) / 2 1351 ? self->x + (self->w - sw) / 2
1291 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1352 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
… …
1314 1375
1315 for (x = 0; x < sw; x++) 1376 for (x = 0; x < sw; x++)
1316 if (row->c0 <= x + vx && x + vx < row->c1) 1377 if (row->c0 <= x + vx && x + vx < row->c1)
1317 { 1378 {
1318 mapcell *cell = row->col + (x + vx - row->c0); 1379 mapcell *cell = row->col + (x + vx - row->c0);
1319
1320 darkness[y * sw4 + x] = cell->darkness < 0
1321 ? 255 - FOW_DARKNESS
1322 : 255 - cell->darkness;
1323 1380
1324 face = cell->face [z]; 1381 face = cell->face [z];
1325 1382
1326 if (face) 1383 if (face)
1327 { 1384 {
… …
1348 1405
1349 glEnd (); 1406 glEnd ();
1350 1407
1351 glDisable (GL_TEXTURE_2D); 1408 glDisable (GL_TEXTURE_2D);
1352 glDisable (GL_BLEND); 1409 glDisable (GL_BLEND);
1410}
1411
1412void
1413fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1414 PPCODE:
1415{
1416 int vx, vy;
1417 int x, y;
1418 int sw4 = (sw + 3) & ~3;
1419 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1420 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1421
1422 memset (darkness, 255, sw4 * sh);
1423 SvPOK_only (darkness_sv);
1424 SvCUR_set (darkness_sv, sw4 * sh);
1425
1426 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1427 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1428
1429 for (y = 0; y < sh; y++)
1430 if (0 <= y + vy && y + vy < self->rows)
1431 {
1432 maprow *row = self->row + (y + vy);
1433
1434 for (x = 0; x < sw; x++)
1435 if (row->c0 <= x + vx && x + vx < row->c1)
1436 {
1437 mapcell *cell = row->col + (x + vx - row->c0);
1438
1439 darkness[y * sw4 + x] = cell->darkness < 0
1440 ? 255 - FOW_DARKNESS
1441 : 255 - cell->darkness;
1442 }
1443 }
1353 1444
1354 EXTEND (SP, 3); 1445 EXTEND (SP, 3);
1355 PUSHs (sv_2mortal (newSViv (sw4))); 1446 PUSHs (sv_2mortal (newSViv (sw4)));
1356 PUSHs (sv_2mortal (newSViv (sh))); 1447 PUSHs (sv_2mortal (newSViv (sh)));
1357 PUSHs (darkness_sv); 1448 PUSHs (darkness_sv);
… …
1574 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1665 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575 const_iv (GL_ONE_MINUS_DST_ALPHA), 1666 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE), 1667 const_iv (GL_SRC_ALPHA_SATURATE),
1577 const_iv (GL_RGB), 1668 const_iv (GL_RGB),
1578 const_iv (GL_RGBA), 1669 const_iv (GL_RGBA),
1670 const_iv (GL_RGBA4),
1671 const_iv (GL_RGBA8),
1672 const_iv (GL_RGB5_A1),
1579 const_iv (GL_UNSIGNED_BYTE), 1673 const_iv (GL_UNSIGNED_BYTE),
1580 const_iv (GL_UNSIGNED_SHORT), 1674 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT), 1675 const_iv (GL_UNSIGNED_INT),
1582 const_iv (GL_ALPHA), 1676 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY), 1677 const_iv (GL_INTENSITY),
… …
1657 OUTPUT: 1751 OUTPUT:
1658 RETVAL 1752 RETVAL
1659 1753
1660int glGetError () 1754int glGetError ()
1661 1755
1756void glFinish ()
1757
1662void glClear (int mask) 1758void glClear (int mask)
1663 1759
1664void glClearColor (float r, float g, float b, float a = 1.0) 1760void glClearColor (float r, float g, float b, float a = 1.0)
1665 PROTOTYPE: @ 1761 PROTOTYPE: @
1666 1762

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines