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.29 by root, Thu Apr 13 01:55:38 2006 UTC vs.
Revision 1.39 by root, Sat Apr 15 00:04:58 2006 UTC

… …
6#include <stdio.h> 6#include <stdio.h>
7 7
8#include <SDL.h> 8#include <SDL.h>
9#include <SDL_image.h> 9#include <SDL_image.h>
10#include <SDL_opengl.h> 10#include <SDL_opengl.h>
11
12#include <glib/gmacros.h>
11 13
12#include <pango/pango.h> 14#include <pango/pango.h>
13#include <pango/pangofc-fontmap.h> 15#include <pango/pangofc-fontmap.h>
14#include <pango/pangoft2.h> 16#include <pango/pangoft2.h>
15 17
… …
35 37
36static void 38static void
37substitute_func (FcPattern *pattern, gpointer data) 39substitute_func (FcPattern *pattern, gpointer data)
38{ 40{
39 FcPatternAddBool (pattern, FC_HINTING , 1); 41 FcPatternAddBool (pattern, FC_HINTING , 1);
40 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 42 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
41} 43}
42 44
43static void 45static void
44layout_update (CFClient__Layout self) 46layout_update (CFClient__Layout self)
45{ 47{
… …
61 if (!*w) *w = 1; 63 if (!*w) *w = 1;
62 if (!*h) *h = 1; 64 if (!*h) *h = 1;
63} 65}
64 66
65typedef struct { 67typedef struct {
68 GLint name;
69 int w, h;
70 float s, t;
71 uint8_t r, g, b, a;
72} mapface;
73
74typedef struct {
66 int16_t darkness; 75 int16_t darkness;
67 uint16_t face[3]; 76 uint16_t face[3];
68} mapcell; 77} mapcell;
69 78
70typedef struct { 79typedef struct {
71 uint32_t c0, c1; 80 int32_t c0, c1;
72 mapcell *col; 81 mapcell *col;
73} maprow; 82} maprow;
74 83
75typedef struct map { 84typedef struct map {
76 int x, y, w, h; 85 int x, y, w, h;
86 int vx, vy;
77 int faces; 87 int faces;
78 GLint *face; 88 mapface *face;
79 89
80 uint32_t rows; 90 uint32_t rows;
81 maprow *row; 91 maprow *row;
82} *CFClient__Map; 92} *CFClient__Map;
83 93
94static char *
95prepend (char *ptr, int sze, int inc)
96{
97 char *p;
98
99 New (0, p, sze + inc, char);
100 Zero (p, inc, char);
101 Move (ptr, p + inc, sze, char);
102 Safefree (ptr);
103
104 return p;
105}
106
107static char *
108append (char *ptr, int sze, int inc)
109{
110 Renew (ptr, sze + inc, char);
111 Zero (ptr + sze, inc, char);
112
113 return ptr;
114}
115
116#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
117#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
118
119static void
120map_clear (CFClient__Map self)
121{
122 int r;
123
124 for (r = 0; r < self->rows; r++)
125 Safefree (self->row[r].col);
126
127 Safefree (self->row);
128
129 self->x = 0;
130 self->y = 0;
131 self->vx = 0;
132 self->vy = 0;
133 self->row = 0;
134 self->rows = 0;
135}
136
84static void 137static void
85map_blank (CFClient__Map self, int x0, int y0, int w, int h) 138map_blank (CFClient__Map self, int x0, int y0, int w, int h)
86{ 139{
87 int x, y; 140 int x, y;
88 141
89 for (y = y0; y < y0 + h; y++) 142 for (y = y0; y < y0 + h; y++)
143 if (y >= 0)
90 { 144 {
91 if (y >= self->rows) 145 if (y >= self->rows)
92 break; 146 break;
93 147
94 maprow *row = self->row + y; 148 maprow *row = self->row + y;
95 149
96 for (x = x0; x < x0 + w; x++) 150 for (x = x0; x < x0 + w; x++)
97 if (x >= row->c0) 151 if (x >= row->c0)
98 { 152 {
99 if (x >= row->c1) 153 if (x >= row->c1)
100 break; 154 break;
101 155
102 row->col[x].darkness = -1; 156 row->col[x - row->c0].darkness = -1;
103 } 157 }
104 } 158 }
105} 159}
106 160
107MODULE = CFClient PACKAGE = CFClient 161MODULE = CFClient PACKAGE = CFClient
108 162
109PROTOTYPES: ENABLE 163PROTOTYPES: ENABLE
… …
189 fmt.colorkey = 0; 243 fmt.colorkey = 0;
190 fmt.alpha = 0; 244 fmt.alpha = 0;
191 245
192 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 246 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
193 247
248 assert (surface2->pitch == surface2->w * 4);
249
194 EXTEND (SP, 5); 250 EXTEND (SP, 5);
195 PUSHs (sv_2mortal (newSViv (surface2->w))); 251 PUSHs (sv_2mortal (newSViv (surface2->w)));
196 PUSHs (sv_2mortal (newSViv (surface2->h))); 252 PUSHs (sv_2mortal (newSViv (surface2->h)));
197 SDL_LockSurface (surface2); 253 SDL_LockSurface (surface2);
198 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 254 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
… …
204 SDL_FreeSurface (surface); 260 SDL_FreeSurface (surface);
205 SDL_FreeSurface (surface2); 261 SDL_FreeSurface (surface2);
206} 262}
207 263
208void 264void
265average (int x, int y, uint32_t *data)
266 PPCODE:
267{
268 // only good for x * y < 32768
269 uint32_t r = 0, g = 0, b = 0, a = 0;
270
271 x = y = x * y;
272
273 assert (x < 32768);
274
275 while (x--)
276 {
277 uint32_t p = *data++;
278
279 r += (p ) & 255;
280 g += (p >> 8) & 255;
281 b += (p >> 16) & 255;
282 a += (p >> 24) & 255;
283 }
284
285 EXTEND (SP, 4);
286 PUSHs (sv_2mortal (newSViv (r * 255 / y)));
287 PUSHs (sv_2mortal (newSViv (g * 255 / y)));
288 PUSHs (sv_2mortal (newSViv (b * 255 / y)));
289 PUSHs (sv_2mortal (newSViv (a * 255 / y)));
290}
291
292void
209fatal (char *message) 293fatal (char *message)
210 CODE: 294 CODE:
211#ifdef WIN32 295#ifdef WIN32
212 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 296 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
213#else 297#else
… …
232 CODE: 316 CODE:
233 g_object_unref (self->pl); 317 g_object_unref (self->pl);
234 Safefree (self); 318 Safefree (self);
235 319
236void 320void
321set_text (CFClient::Layout self, SV *text_)
322 CODE:
323{
324 STRLEN textlen;
325 char *text = SvPVutf8 (text_, textlen);
326
327 pango_layout_set_text (self->pl, text, textlen);
328}
329
330void
237set_markup (CFClient::Layout self, SV *text_) 331set_markup (CFClient::Layout self, SV *text_)
238 CODE: 332 CODE:
239{ 333{
240 STRLEN textlen; 334 STRLEN textlen;
241 char *text = SvPVutf8 (text_, textlen); 335 char *text = SvPVutf8 (text_, textlen);
… …
286 PPCODE: 380 PPCODE:
287{ 381{
288 PangoRectangle strong_pos; 382 PangoRectangle strong_pos;
289 layout_update (self); 383 layout_update (self);
290 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 384 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
385
291 EXTEND (SP, 3); 386 EXTEND (SP, 3);
292 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 387 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
293 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 388 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
294 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 389 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
295} 390}
… …
327} 422}
328 423
329MODULE = CFClient PACKAGE = CFClient::Texture 424MODULE = CFClient PACKAGE = CFClient::Texture
330 425
331void 426void
332draw_quad (SV *self, double x, double y, double w = 0, double h = 0) 427draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
333 PROTOTYPE: $$$;$$ 428 PROTOTYPE: $$$;$$
334 CODE: 429 CODE:
335{ 430{
336 HV *hv = (HV *)SvRV (self); 431 HV *hv = (HV *)SvRV (self);
337 double s = SvNV (*hv_fetch (hv, "s", 1, 1)); 432 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
338 double t = SvNV (*hv_fetch (hv, "t", 1, 1)); 433 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
339 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 434 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
435 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
340 436
341 if (items < 5) 437 if (items < 5)
342 { 438 {
343 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 439 w = SvNV (*hv_fetch (hv, "w", 1, 1));
344 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 440 h = SvNV (*hv_fetch (hv, "h", 1, 1));
345 } 441 }
346 442
347 glBindTexture (GL_TEXTURE_2D, name); 443 glBindTexture (GL_TEXTURE_2D, name);
444 if (wrap_mode) {
445 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
446 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
447 }
348 glBegin (GL_QUADS); 448 glBegin (GL_QUADS);
349 glTexCoord2d (0, 0); glVertex2d (x , y ); 449 glTexCoord2f (0, 0); glVertex2f (x , y );
350 glTexCoord2d (0, t); glVertex2d (x , y + h); 450 glTexCoord2f (0, t); glVertex2f (x , y + h);
351 glTexCoord2d (s, t); glVertex2d (x + w, y + h); 451 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
352 glTexCoord2d (s, 0); glVertex2d (x + w, y ); 452 glTexCoord2f (s, 0); glVertex2f (x + w, y );
353 glEnd (); 453 glEnd ();
354} 454}
355 455
356MODULE = CFClient PACKAGE = CFClient::Map 456MODULE = CFClient PACKAGE = CFClient::Map
357 457
… …
361 New (0, RETVAL, 1, struct map); 461 New (0, RETVAL, 1, struct map);
362 RETVAL->x = 0; 462 RETVAL->x = 0;
363 RETVAL->y = 0; 463 RETVAL->y = 0;
364 RETVAL->w = map_width; 464 RETVAL->w = map_width;
365 RETVAL->h = map_height; 465 RETVAL->h = map_height;
466 RETVAL->vx = 0;
467 RETVAL->vy = 0;
366 RETVAL->faces = 1; 468 RETVAL->faces = 8192;
367 Newz (0, RETVAL->face, 1, GLint); 469 Newz (0, RETVAL->face, RETVAL->faces, mapface);
368 RETVAL->rows = 0; 470 RETVAL->rows = 0;
369 RETVAL->row = 0; 471 RETVAL->row = 0;
370 printf ("new map %d,%d\n", map_width, map_height);//D
371 OUTPUT: 472 OUTPUT:
372 RETVAL 473 RETVAL
373 474
374void 475void
375DESTROY (CFClient::Map self) 476DESTROY (CFClient::Map self)
376 CODE: 477 CODE:
377{ 478{
378 int r, c; 479 map_clear (self);
379
380 printf ("detroy map\n");//D
381 Safefree (self->face); 480 Safefree (self->face);
382
383 for (r = 0; r < self->rows; r++)
384 Safefree (self->row[r].col);
385
386 Safefree (self->row);
387 Safefree (self); 481 Safefree (self);
388} 482}
389 483
390void 484void
391set_face (CFClient::Map self, int facenum, int face) 485clear (CFClient::Map self)
392 CODE: 486 CODE:
487 map_clear (self);
488
489void
490set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t, int r, int g, int b, int a)
491 CODE:
393{ 492{
394 while (self->faces < facenum) 493 while (self->faces < face)
395 { 494 {
396 printf ("setface %d (%d) = %d\n",facenum, self->faces, face);//D
397 Renew (self->face, self->faces * 2, GLint);
398 Zero (self->face + self->faces, self->faces, GLint); 495 Append (mapface, self->face, self->faces, self->faces);
399 self->faces *= 2; 496 self->faces *= 2;
400 } 497 }
401 498
402 self->face [facenum] = face; 499 mapface *f = self->face + face;
500
501 f->name = name;
502 f->w = w;
503 f->h = h;
504 f->s = s;
505 f->t = t;
506 f->r = r;
507 f->g = g;
508 f->b = b;
509 f->a = a;
403} 510}
404 511
405void 512void
406scroll (CFClient::Map self, int dx, int dy) 513scroll (CFClient::Map self, int dx, int dy)
407 CODE: 514 CODE:
408{ 515{
409 printf ("map_scroll %d,%d\n", dx, dy);//D
410 if (dx > 0) 516 if (dx > 0)
411 map_blank (self, self->x, self->y, dx - 1, self->h); 517 map_blank (self, self->x, self->y, dx - 1, self->h);
412 else if (dx < 0) 518 else if (dx < 0)
413 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 519 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
414 520
… …
420 self->x += dx; 526 self->x += dx;
421 self->y += dy; 527 self->y += dy;
422 528
423 while (self->y < 0) 529 while (self->y < 0)
424 { 530 {
425 maprow *row; 531 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
426
427 New (0, row, self->rows + MAP_EXTEND_Y, maprow);
428 Move (self->row, row + MAP_EXTEND_Y, self->rows, maprow);
429 Zero (row, MAP_EXTEND_Y, maprow);
430 532
431 self->rows += MAP_EXTEND_Y; 533 self->rows += MAP_EXTEND_Y;
432 self->y += MAP_EXTEND_Y; 534 self->y += MAP_EXTEND_Y;
433 self->row = row;
434 } 535 }
435
436 if (self->x < 0)
437 {
438 int y;
439 for (y = 0; y < self->rows; y++)
440 {
441 self->row[y].c0 += self->x;
442 self->row[y].c1 += self->x;
443 }
444
445 self->x = 0;
446 }
447} 536}
448 537
449void 538void
450map1a_update (CFClient::Map self, SV *data_) 539map1a_update (CFClient::Map self, SV *data_)
451 CODE: 540 CODE:
452{ 541{
453 uint8_t *data = (uint8_t *)SvPVbytes_nolen (data_); 542 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
454 uint8_t *data_end = (uint8_t *)SvEND (data_) + 1; 543 uint8_t *data_end = (uint8_t *)SvEND (data_);
455 544
456 while (data < data_end) 545 while (data < data_end)
457 { 546 {
458 int flags = (data [0] << 8) + data [1]; data += 2; 547 int flags = (data [0] << 8) + data [1]; data += 2;
548
459 int x = ((flags >> 10) & 63) + self->x; 549 int x = ((flags >> 10) & 63) + self->x;
460 int y = ((flags >> 4) & 63) + self->y; 550 int y = ((flags >> 4) & 63) + self->y;
461 551
462 while (y >= self->rows) 552 while (y >= self->rows)
463 { 553 {
464 Renew (self->row, self->rows + MAP_EXTEND_Y, maprow);
465 Zero (self->row + self->rows, MAP_EXTEND_Y, maprow); 554 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
466 555
467 self->rows += MAP_EXTEND_Y; 556 self->rows += MAP_EXTEND_Y;
468 } 557 }
469
470 assert (y < self->rows);//D
471 558
472 maprow *row = self->row + y; 559 maprow *row = self->row + y;
473 560
474 if (!row->col) 561 if (!row->col)
475 { 562 {
… …
479 } 566 }
480 567
481 if (row->c0 > x) 568 if (row->c0 > x)
482 { 569 {
483 int extend = row->c0 - x + MAP_EXTEND_X; 570 int extend = row->c0 - x + MAP_EXTEND_X;
484 mapcell *col; 571 Prepend (mapcell, row->col, row->c1 - row->c0, extend);
485
486 New (0, col, row->c1 - row->c0 + extend, mapcell);
487 Move (row->col, col + extend, row->c1 - row->c0, mapcell);
488 Zero (col, extend, mapcell);
489
490 row->col = col;
491 row->c0 -= extend; 572 row->c0 -= extend;
492 } 573 }
493 else if (x >= row->c1) 574 else if (x >= row->c1)
494 { 575 {
495 int extend = x - row->c1 + MAP_EXTEND_X; 576 int extend = x - row->c1 + MAP_EXTEND_X;
496
497 Renew (row->col, row->c1 - row->c0 + extend, mapcell);
498 Zero (row->col + row->c1 - row->c0, extend, mapcell); 577 Append (mapcell, row->col, row->c1 - row->c0, extend);
499
500 row->c1 += extend; 578 row->c1 += extend;
501 } 579 }
502 580
581 assert (y >= 0);
582 assert (y < self->rows);
503 assert (x >= row->c0);//D 583 assert (x >= row->c0);
504 assert (x < row->c1);//D 584 assert (x < row->c1);
505 mapcell *cell = row->col + (x - row->c0); 585 mapcell *cell = row->col + (x - row->c0);
506 586
507 if (flags & 15) 587 if (flags & 15)
508 { 588 {
509 if (cell->darkness < 0) 589 if (cell->darkness < 0 && x < self->w && y < self->h)
510 { 590 {
511 cell->darkness = 0; 591 cell->darkness = 0;
512 cell->face [0] = 0; 592 cell->face [0] = 0;
513 cell->face [1] = 0; 593 cell->face [1] = 0;
514 cell->face [2] = 0; 594 cell->face [2] = 0;
… …
534 else 614 else
535 cell->darkness = -1; 615 cell->darkness = -1;
536 } 616 }
537} 617}
538 618
619void
620draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
621 PPCODE:
622{
623 int sw4 = (sw + 3) & ~3;
624 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
625 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
626
627 SvPOK_only (darkness_sv);
628 SvCUR_set (darkness_sv, sw4 * sh);
629
630 int vx = self->x + (self->w - sw) / 2 - shift_x;
631 int vy = self->y + (self->h - sh) / 2 - shift_y;
632
633 if (0)
634 {
635 int vx = self->vx = self->w >= sw
636 ? self->x + (self->w - sw) / 2
637 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
638
639 int vy = self->vy = self->h >= sh
640 ? self->y + (self->h - sh) / 2
641 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
642 }
643
644 glColor4ub (255, 255, 255, 255);
645
646 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
647 glEnable (GL_BLEND);
648 glEnable (GL_TEXTURE_2D);
649 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
650
651 int x, y, z;
652
653 int last_name = 0;
654
655 glBegin (GL_QUADS);
656
657 for (z = 0; z < 3; z++)
658 for (y = 0; y < sh; y++)
659 if (0 <= y + vy && y + vy < self->rows)
660 {
661 maprow *row = self->row + (y + vy);
662
663 for (x = 0; x < sw; x++)
664 if (row->c0 <= x + vx && x + vx < row->c1)
665 {
666 mapcell *cell = row->col + (x + vx - row->c0);
667
668 darkness[y * sw4 + x] = cell->darkness < 0
669 ? 255 - FOW_DARKNESS
670 : 255 - cell->darkness;
671
672 uint16_t face = cell->face [z];
673
674 if (face)
675 {
676 mapface tex = self->face [face];
677
678 int px = (x + 1) * 32 - tex.w;
679 int py = (y + 1) * 32 - tex.h;
680
681 if (last_name != tex.name)
682 {
683 glEnd ();
684 last_name = tex.name;
685 glBindTexture (GL_TEXTURE_2D, last_name);
686 glBegin (GL_QUADS);
687 }
688
689 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
690 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
691 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
692 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
693 }
694 }
695 }
696
697 glEnd ();
698
699 glDisable (GL_TEXTURE_2D);
700 glDisable (GL_BLEND);
701
702 EXTEND (SP, 3);
703 PUSHs (sv_2mortal (newSViv (sw4)));
704 PUSHs (sv_2mortal (newSViv (sh)));
705 PUSHs (darkness_sv);
706}
707

Diff Legend

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