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

Diff Legend

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