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.37 by root, Fri Apr 14 14:55:27 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} mapface;
72
73typedef struct {
66 int16_t darkness; 74 int16_t darkness;
67 uint16_t face[3]; 75 uint16_t face[3];
68} mapcell; 76} mapcell;
69 77
70typedef struct { 78typedef struct {
71 uint32_t c0, c1; 79 int32_t c0, c1;
72 mapcell *col; 80 mapcell *col;
73} maprow; 81} maprow;
74 82
75typedef struct map { 83typedef struct map {
76 int x, y, w, h; 84 int x, y, w, h;
85 int vx, vy;
77 int faces; 86 int faces;
78 GLint *face; 87 mapface *face;
79 88
80 uint32_t rows; 89 uint32_t rows;
81 maprow *row; 90 maprow *row;
82} *CFClient__Map; 91} *CFClient__Map;
83 92
93static char *
94prepend (char *ptr, int sze, int inc)
95{
96 char *p;
97
98 New (0, p, sze + inc, char);
99 Zero (p, inc, char);
100 Move (ptr, p + inc, sze, char);
101 Safefree (ptr);
102
103 return p;
104}
105
106static char *
107append (char *ptr, int sze, int inc)
108{
109 Renew (ptr, sze + inc, char);
110 Zero (ptr + sze, inc, char);
111
112 return ptr;
113}
114
115#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
116#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
117
118static void
119map_clear (CFClient__Map self)
120{
121 int r;
122
123 for (r = 0; r < self->rows; r++)
124 Safefree (self->row[r].col);
125
126 Safefree (self->row);
127
128 self->x = 0;
129 self->y = 0;
130 self->vx = 0;
131 self->vy = 0;
132 self->row = 0;
133 self->rows = 0;
134}
135
84static void 136static void
85map_blank (CFClient__Map self, int x0, int y0, int w, int h) 137map_blank (CFClient__Map self, int x0, int y0, int w, int h)
86{ 138{
87 int x, y; 139 int x, y;
88 140
89 for (y = y0; y < y0 + h; y++) 141 for (y = y0; y < y0 + h; y++)
142 if (y >= 0)
90 { 143 {
91 if (y >= self->rows) 144 if (y >= self->rows)
92 break; 145 break;
93 146
94 maprow *row = self->row + y; 147 maprow *row = self->row + y;
95 148
96 for (x = x0; x < x0 + w; x++) 149 for (x = x0; x < x0 + w; x++)
97 if (x >= row->c0) 150 if (x >= row->c0)
98 { 151 {
99 if (x >= row->c1) 152 if (x >= row->c1)
100 break; 153 break;
101 154
102 row->col[x].darkness = -1; 155 row->col[x - row->c0].darkness = -1;
103 } 156 }
104 } 157 }
105} 158}
106 159
107MODULE = CFClient PACKAGE = CFClient 160MODULE = CFClient PACKAGE = CFClient
108 161
109PROTOTYPES: ENABLE 162PROTOTYPES: ENABLE
… …
232 CODE: 285 CODE:
233 g_object_unref (self->pl); 286 g_object_unref (self->pl);
234 Safefree (self); 287 Safefree (self);
235 288
236void 289void
290set_text (CFClient::Layout self, SV *text_)
291 CODE:
292{
293 STRLEN textlen;
294 char *text = SvPVutf8 (text_, textlen);
295
296 pango_layout_set_text (self->pl, text, textlen);
297}
298
299void
237set_markup (CFClient::Layout self, SV *text_) 300set_markup (CFClient::Layout self, SV *text_)
238 CODE: 301 CODE:
239{ 302{
240 STRLEN textlen; 303 STRLEN textlen;
241 char *text = SvPVutf8 (text_, textlen); 304 char *text = SvPVutf8 (text_, textlen);
… …
286 PPCODE: 349 PPCODE:
287{ 350{
288 PangoRectangle strong_pos; 351 PangoRectangle strong_pos;
289 layout_update (self); 352 layout_update (self);
290 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 353 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
354
291 EXTEND (SP, 3); 355 EXTEND (SP, 3);
292 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 356 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
293 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 357 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
294 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 358 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
295} 359}
… …
327} 391}
328 392
329MODULE = CFClient PACKAGE = CFClient::Texture 393MODULE = CFClient PACKAGE = CFClient::Texture
330 394
331void 395void
332draw_quad (SV *self, double x, double y, double w = 0, double h = 0) 396draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
333 PROTOTYPE: $$$;$$ 397 PROTOTYPE: $$$;$$
334 CODE: 398 CODE:
335{ 399{
336 HV *hv = (HV *)SvRV (self); 400 HV *hv = (HV *)SvRV (self);
337 double s = SvNV (*hv_fetch (hv, "s", 1, 1)); 401 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
338 double t = SvNV (*hv_fetch (hv, "t", 1, 1)); 402 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
339 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 403 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
404 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
340 405
341 if (items < 5) 406 if (items < 5)
342 { 407 {
343 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 408 w = SvNV (*hv_fetch (hv, "w", 1, 1));
344 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 409 h = SvNV (*hv_fetch (hv, "h", 1, 1));
345 } 410 }
346 411
347 glBindTexture (GL_TEXTURE_2D, name); 412 glBindTexture (GL_TEXTURE_2D, name);
413 if (wrap_mode) {
414 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
415 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
416 }
348 glBegin (GL_QUADS); 417 glBegin (GL_QUADS);
349 glTexCoord2d (0, 0); glVertex2d (x , y ); 418 glTexCoord2f (0, 0); glVertex2f (x , y );
350 glTexCoord2d (0, t); glVertex2d (x , y + h); 419 glTexCoord2f (0, t); glVertex2f (x , y + h);
351 glTexCoord2d (s, t); glVertex2d (x + w, y + h); 420 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
352 glTexCoord2d (s, 0); glVertex2d (x + w, y ); 421 glTexCoord2f (s, 0); glVertex2f (x + w, y );
353 glEnd (); 422 glEnd ();
354} 423}
355 424
356MODULE = CFClient PACKAGE = CFClient::Map 425MODULE = CFClient PACKAGE = CFClient::Map
357 426
… …
361 New (0, RETVAL, 1, struct map); 430 New (0, RETVAL, 1, struct map);
362 RETVAL->x = 0; 431 RETVAL->x = 0;
363 RETVAL->y = 0; 432 RETVAL->y = 0;
364 RETVAL->w = map_width; 433 RETVAL->w = map_width;
365 RETVAL->h = map_height; 434 RETVAL->h = map_height;
435 RETVAL->vx = 0;
436 RETVAL->vy = 0;
366 RETVAL->faces = 1; 437 RETVAL->faces = 8192;
367 Newz (0, RETVAL->face, 1, GLint); 438 Newz (0, RETVAL->face, RETVAL->faces, mapface);
368 RETVAL->rows = 0; 439 RETVAL->rows = 0;
369 RETVAL->row = 0; 440 RETVAL->row = 0;
370 printf ("new map %d,%d\n", map_width, map_height);//D
371 OUTPUT: 441 OUTPUT:
372 RETVAL 442 RETVAL
373 443
374void 444void
375DESTROY (CFClient::Map self) 445DESTROY (CFClient::Map self)
376 CODE: 446 CODE:
377{ 447{
378 int r, c; 448 map_clear (self);
379
380 printf ("detroy map\n");//D
381 Safefree (self->face); 449 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); 450 Safefree (self);
388} 451}
389 452
390void 453void
391set_face (CFClient::Map self, int facenum, int face) 454clear (CFClient::Map self)
392 CODE: 455 CODE:
456 map_clear (self);
457
458void
459set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t)
460 CODE:
393{ 461{
394 while (self->faces < facenum) 462 while (self->faces < face)
395 { 463 {
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); 464 Append (mapface, self->face, self->faces, self->faces);
399 self->faces *= 2; 465 self->faces *= 2;
400 } 466 }
401 467
402 self->face [facenum] = face; 468 self->face [face].name = name;
469 self->face [face].w = w;
470 self->face [face].h = h;
471 self->face [face].s = s;
472 self->face [face].t = t;
403} 473}
404 474
405void 475void
406scroll (CFClient::Map self, int dx, int dy) 476scroll (CFClient::Map self, int dx, int dy)
407 CODE: 477 CODE:
408{ 478{
409 printf ("map_scroll %d,%d\n", dx, dy);//D
410 if (dx > 0) 479 if (dx > 0)
411 map_blank (self, self->x, self->y, dx - 1, self->h); 480 map_blank (self, self->x, self->y, dx - 1, self->h);
412 else if (dx < 0) 481 else if (dx < 0)
413 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 482 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
414 483
… …
420 self->x += dx; 489 self->x += dx;
421 self->y += dy; 490 self->y += dy;
422 491
423 while (self->y < 0) 492 while (self->y < 0)
424 { 493 {
425 maprow *row; 494 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 495
431 self->rows += MAP_EXTEND_Y; 496 self->rows += MAP_EXTEND_Y;
432 self->y += MAP_EXTEND_Y; 497 self->y += MAP_EXTEND_Y;
433 self->row = row;
434 } 498 }
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} 499}
448 500
449void 501void
450map1a_update (CFClient::Map self, SV *data_) 502map1a_update (CFClient::Map self, SV *data_)
451 CODE: 503 CODE:
452{ 504{
453 uint8_t *data = (uint8_t *)SvPVbytes_nolen (data_); 505 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
454 uint8_t *data_end = (uint8_t *)SvEND (data_) + 1; 506 uint8_t *data_end = (uint8_t *)SvEND (data_);
455 507
456 while (data < data_end) 508 while (data < data_end)
457 { 509 {
458 int flags = (data [0] << 8) + data [1]; data += 2; 510 int flags = (data [0] << 8) + data [1]; data += 2;
511
459 int x = ((flags >> 10) & 63) + self->x; 512 int x = ((flags >> 10) & 63) + self->x;
460 int y = ((flags >> 4) & 63) + self->y; 513 int y = ((flags >> 4) & 63) + self->y;
461 514
462 while (y >= self->rows) 515 while (y >= self->rows)
463 { 516 {
464 Renew (self->row, self->rows + MAP_EXTEND_Y, maprow);
465 Zero (self->row + self->rows, MAP_EXTEND_Y, maprow); 517 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
466 518
467 self->rows += MAP_EXTEND_Y; 519 self->rows += MAP_EXTEND_Y;
468 } 520 }
469
470 assert (y < self->rows);//D
471 521
472 maprow *row = self->row + y; 522 maprow *row = self->row + y;
473 523
474 if (!row->col) 524 if (!row->col)
475 { 525 {
… …
479 } 529 }
480 530
481 if (row->c0 > x) 531 if (row->c0 > x)
482 { 532 {
483 int extend = row->c0 - x + MAP_EXTEND_X; 533 int extend = row->c0 - x + MAP_EXTEND_X;
484 mapcell *col; 534 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; 535 row->c0 -= extend;
492 } 536 }
493 else if (x >= row->c1) 537 else if (x >= row->c1)
494 { 538 {
495 int extend = x - row->c1 + MAP_EXTEND_X; 539 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); 540 Append (mapcell, row->col, row->c1 - row->c0, extend);
499
500 row->c1 += extend; 541 row->c1 += extend;
501 } 542 }
502 543
544 assert (y >= 0);
545 assert (y < self->rows);
503 assert (x >= row->c0);//D 546 assert (x >= row->c0);
504 assert (x < row->c1);//D 547 assert (x < row->c1);
505 mapcell *cell = row->col + (x - row->c0); 548 mapcell *cell = row->col + (x - row->c0);
506 549
507 if (flags & 15) 550 if (flags & 15)
508 { 551 {
509 if (cell->darkness < 0) 552 if (cell->darkness < 0 && x < self->w && y < self->h)
510 { 553 {
511 cell->darkness = 0; 554 cell->darkness = 0;
512 cell->face [0] = 0; 555 cell->face [0] = 0;
513 cell->face [1] = 0; 556 cell->face [1] = 0;
514 cell->face [2] = 0; 557 cell->face [2] = 0;
… …
534 else 577 else
535 cell->darkness = -1; 578 cell->darkness = -1;
536 } 579 }
537} 580}
538 581
582void
583draw (CFClient::Map self, int x0, int y0, int sw, int sh)
584 PPCODE:
585{
586 int sw4 = (sw + 3) & ~3;
587 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
588 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
589
590 SvPOK_only (darkness_sv);
591 SvCUR_set (darkness_sv, sw4 * sh);
592
593 int vx = self->vx = self->w >= sw
594 ? self->x + (self->w - sw) / 2
595 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
596
597 int vy = self->vy = self->h >= sh
598 ? self->y + (self->h - sh) / 2
599 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
600
601 glColor4ub (255, 255, 255, 255);
602
603 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
604 glEnable (GL_BLEND);
605 glEnable (GL_TEXTURE_2D);
606 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
607
608 int x, y, z;
609
610 int last_name = 0;
611
612 glBegin (GL_QUADS);
613
614 for (z = 0; z < 3; z++)
615 for (y = 0; y < sh; y++)
616 if (0 <= y + vy && y + vy < self->rows)
617 {
618 maprow *row = self->row + (y + vy);
619
620 for (x = 0; x < sw; x++)
621 if (row->c0 <= x + vx && x + vx < row->c1)
622 {
623 mapcell *cell = row->col + (x + vx - row->c0);
624
625 darkness[y * sw4 + x] = cell->darkness < 0
626 ? 255 - FOW_DARKNESS
627 : 255 - cell->darkness;
628
629 uint16_t face = cell->face [z];
630
631 if (face)
632 {
633 mapface tex = self->face [face];
634
635 int px = (x + 1) * 32 - tex.w;
636 int py = (y + 1) * 32 - tex.h;
637
638 if (last_name != tex.name)
639 {
640 glEnd ();
641 last_name = tex.name;
642 glBindTexture (GL_TEXTURE_2D, last_name);
643 glBegin (GL_QUADS);
644 }
645
646 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
647 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
648 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
649 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
650 }
651 }
652 }
653
654 glEnd ();
655
656 glDisable (GL_TEXTURE_2D);
657 glDisable (GL_BLEND);
658
659 EXTEND (SP, 3);
660 PUSHs (sv_2mortal (newSViv (sw4)));
661 PUSHs (sv_2mortal (newSViv (sh)));
662 PUSHs (darkness_sv);
663}
664

Diff Legend

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