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.30 by root, Thu Apr 13 23:07:56 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
… …
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
155 mapcell *cell = row->col + (x - row->c0);
102 row->col[x].darkness = -1; 156 cell->darkness = -1;
157 cell->face [2] = 0;
103 } 158 }
104 } 159 }
105} 160}
106 161
107MODULE = CFClient PACKAGE = CFClient 162MODULE = CFClient PACKAGE = CFClient
108 163
109PROTOTYPES: ENABLE 164PROTOTYPES: ENABLE
… …
286 PPCODE: 341 PPCODE:
287{ 342{
288 PangoRectangle strong_pos; 343 PangoRectangle strong_pos;
289 layout_update (self); 344 layout_update (self);
290 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 345 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
346
291 EXTEND (SP, 3); 347 EXTEND (SP, 3);
292 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 348 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
293 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 349 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
294 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 350 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
295} 351}
… …
361 New (0, RETVAL, 1, struct map); 417 New (0, RETVAL, 1, struct map);
362 RETVAL->x = 0; 418 RETVAL->x = 0;
363 RETVAL->y = 0; 419 RETVAL->y = 0;
364 RETVAL->w = map_width; 420 RETVAL->w = map_width;
365 RETVAL->h = map_height; 421 RETVAL->h = map_height;
422 RETVAL->vx = 0;
423 RETVAL->vy = 0;
366 RETVAL->faces = 1; 424 RETVAL->faces = 8192;
367 Newz (0, RETVAL->face, 1, GLint); 425 Newz (0, RETVAL->face, RETVAL->faces, mapface);
368 RETVAL->rows = 0; 426 RETVAL->rows = 0;
369 RETVAL->row = 0; 427 RETVAL->row = 0;
370 printf ("new map %d,%d\n", map_width, map_height);//D
371 OUTPUT: 428 OUTPUT:
372 RETVAL 429 RETVAL
373 430
374void 431void
375DESTROY (CFClient::Map self) 432DESTROY (CFClient::Map self)
376 CODE: 433 CODE:
377{ 434{
378 int r, c; 435 map_clear (self);
379
380 printf ("detroy map\n");//D
381 Safefree (self->face); 436 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); 437 Safefree (self);
388} 438}
389 439
390void 440void
391set_face (CFClient::Map self, int facenum, int face) 441clear (CFClient::Map self)
392 CODE: 442 CODE:
443 map_clear (self);
444
445void
446set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t)
447 CODE:
393{ 448{
394 while (self->faces < facenum) 449 while (self->faces < face)
395 { 450 {
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); 451 Append (mapface, self->face, self->faces, self->faces);
399 self->faces *= 2; 452 self->faces *= 2;
400 } 453 }
401 454
402 self->face [facenum] = face; 455 self->face [face].name = name;
456 self->face [face].w = w;
457 self->face [face].h = h;
458 self->face [face].s = s;
459 self->face [face].t = t;
403} 460}
404 461
405void 462void
406scroll (CFClient::Map self, int dx, int dy) 463scroll (CFClient::Map self, int dx, int dy)
407 CODE: 464 CODE:
408{ 465{
409 printf ("map_scroll %d,%d\n", dx, dy);//D
410 if (dx > 0) 466 if (dx > 0)
411 map_blank (self, self->x, self->y, dx - 1, self->h); 467 map_blank (self, self->x, self->y, dx - 1, self->h);
412 else if (dx < 0) 468 else if (dx < 0)
413 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 469 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
414 470
… …
420 self->x += dx; 476 self->x += dx;
421 self->y += dy; 477 self->y += dy;
422 478
423 while (self->y < 0) 479 while (self->y < 0)
424 { 480 {
425 maprow *row; 481 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 482
431 self->rows += MAP_EXTEND_Y; 483 self->rows += MAP_EXTEND_Y;
432 self->y += MAP_EXTEND_Y; 484 self->y += MAP_EXTEND_Y;
433 self->row = row;
434 } 485 }
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} 486}
448 487
449void 488void
450map1a_update (CFClient::Map self, SV *data_) 489map1a_update (CFClient::Map self, SV *data_)
451 CODE: 490 CODE:
452{ 491{
453 uint8_t *data = (uint8_t *)SvPVbytes_nolen (data_); 492 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
454 uint8_t *data_end = (uint8_t *)SvEND (data_) + 1; 493 uint8_t *data_end = (uint8_t *)SvEND (data_);
455 494
456 while (data < data_end) 495 while (data < data_end)
457 { 496 {
458 int flags = (data [0] << 8) + data [1]; data += 2; 497 int flags = (data [0] << 8) + data [1]; data += 2;
498
459 int x = ((flags >> 10) & 63) + self->x; 499 int x = ((flags >> 10) & 63) + self->x;
460 int y = ((flags >> 4) & 63) + self->y; 500 int y = ((flags >> 4) & 63) + self->y;
461 501
462 while (y >= self->rows) 502 while (y >= self->rows)
463 { 503 {
464 Renew (self->row, self->rows + MAP_EXTEND_Y, maprow);
465 Zero (self->row + self->rows, MAP_EXTEND_Y, maprow); 504 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
466 505
467 self->rows += MAP_EXTEND_Y; 506 self->rows += MAP_EXTEND_Y;
468 } 507 }
469
470 assert (y < self->rows);//D
471 508
472 maprow *row = self->row + y; 509 maprow *row = self->row + y;
473 510
474 if (!row->col) 511 if (!row->col)
475 { 512 {
… …
479 } 516 }
480 517
481 if (row->c0 > x) 518 if (row->c0 > x)
482 { 519 {
483 int extend = row->c0 - x + MAP_EXTEND_X; 520 int extend = row->c0 - x + MAP_EXTEND_X;
484 mapcell *col; 521 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; 522 row->c0 -= extend;
492 } 523 }
493 else if (x >= row->c1) 524 else if (x >= row->c1)
494 { 525 {
495 int extend = x - row->c1 + MAP_EXTEND_X; 526 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); 527 Append (mapcell, row->col, row->c1 - row->c0, extend);
499
500 row->c1 += extend; 528 row->c1 += extend;
501 } 529 }
502 530
531 assert (y >= 0);
532 assert (y < self->rows);
503 assert (x >= row->c0);//D 533 assert (x >= row->c0);
504 assert (x < row->c1);//D 534 assert (x < row->c1);
505 mapcell *cell = row->col + (x - row->c0); 535 mapcell *cell = row->col + (x - row->c0);
506 536
507 if (flags & 15) 537 if (flags & 15)
508 { 538 {
509 if (cell->darkness < 0) 539 if (cell->darkness < 0 && x < self->w && y < self->h)
510 { 540 {
511 cell->darkness = 0; 541 cell->darkness = 0;
512 cell->face [0] = 0; 542 cell->face [0] = 0;
513 cell->face [1] = 0; 543 cell->face [1] = 0;
514 cell->face [2] = 0; 544 cell->face [2] = 0;
… …
530 { 560 {
531 cell->face [2] = (data [0] << 8) + data [1]; data += 2; 561 cell->face [2] = (data [0] << 8) + data [1]; data += 2;
532 } 562 }
533 } 563 }
534 else 564 else
565 {
535 cell->darkness = -1; 566 cell->darkness = -1;
567 cell->face [2] = 0;
568 }
536 } 569 }
537} 570}
538 571
572void
573draw (CFClient::Map self, int x0, int y0, int sw, int sh)
574 CODE:
575{
576 int vx = self->vx = self->w >= sw
577 ? self->x + (self->w - sw) / 2
578 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
579
580 int vy = self->vy = self->h >= sh
581 ? self->y + (self->h - sh) / 2
582 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
583
584 glColor4ub (255, 255, 255, 255);
585
586 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
587 glEnable (GL_BLEND);
588 glEnable (GL_TEXTURE_2D);
589 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
590
591 int x, y, z;
592
593 int last_name = 0;
594
595 glBegin (GL_QUADS);
596
597 for (z = 0; z < 3; z++)
598 for (y = 0; y < sh; y++)
599 if (0 <= y + vy && y + vy < self->rows)
600 {
601 maprow *row = self->row + (y + vy);
602
603 for (x = 0; x < sw; x++)
604 if (row->c0 <= x + vx && x + vx < row->c1)
605 {
606 mapcell *cell = row->col + (x + vx - row->c0);
607 uint16_t face = cell->face [z];
608
609 if (face)
610 {
611 mapface tex = self->face [face];
612
613 int px = (x + 1) * 32 - tex.w;
614 int py = (y + 1) * 32 - tex.h;
615
616 if (last_name != tex.name)
617 {
618 glEnd ();
619 last_name = tex.name;
620 glBindTexture (GL_TEXTURE_2D, last_name);
621 glBegin (GL_QUADS);
622 }
623
624 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
625 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
626 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
627 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
628 }
629 }
630 }
631
632 glEnd ();
633}
634

Diff Legend

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