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.32 by root, Thu Apr 13 23:31:42 2006 UTC vs.
Revision 1.39 by root, Sat Apr 15 00:04:58 2006 UTC

… …
37 37
38static void 38static void
39substitute_func (FcPattern *pattern, gpointer data) 39substitute_func (FcPattern *pattern, gpointer data)
40{ 40{
41 FcPatternAddBool (pattern, FC_HINTING , 1); 41 FcPatternAddBool (pattern, FC_HINTING , 1);
42 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 42 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
43} 43}
44 44
45static void 45static void
46layout_update (CFClient__Layout self) 46layout_update (CFClient__Layout self)
47{ 47{
… …
66 66
67typedef struct { 67typedef struct {
68 GLint name; 68 GLint name;
69 int w, h; 69 int w, h;
70 float s, t; 70 float s, t;
71 uint8_t r, g, b, a;
71} mapface; 72} mapface;
72 73
73typedef struct { 74typedef struct {
74 int16_t darkness; 75 int16_t darkness;
75 uint16_t face[3]; 76 uint16_t face[3];
… …
242 fmt.colorkey = 0; 243 fmt.colorkey = 0;
243 fmt.alpha = 0; 244 fmt.alpha = 0;
244 245
245 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 246 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
246 247
248 assert (surface2->pitch == surface2->w * 4);
249
247 EXTEND (SP, 5); 250 EXTEND (SP, 5);
248 PUSHs (sv_2mortal (newSViv (surface2->w))); 251 PUSHs (sv_2mortal (newSViv (surface2->w)));
249 PUSHs (sv_2mortal (newSViv (surface2->h))); 252 PUSHs (sv_2mortal (newSViv (surface2->h)));
250 SDL_LockSurface (surface2); 253 SDL_LockSurface (surface2);
251 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 254 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
… …
257 SDL_FreeSurface (surface); 260 SDL_FreeSurface (surface);
258 SDL_FreeSurface (surface2); 261 SDL_FreeSurface (surface2);
259} 262}
260 263
261void 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
262fatal (char *message) 293fatal (char *message)
263 CODE: 294 CODE:
264#ifdef WIN32 295#ifdef WIN32
265 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);
266#else 297#else
… …
285 CODE: 316 CODE:
286 g_object_unref (self->pl); 317 g_object_unref (self->pl);
287 Safefree (self); 318 Safefree (self);
288 319
289void 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
290set_markup (CFClient::Layout self, SV *text_) 331set_markup (CFClient::Layout self, SV *text_)
291 CODE: 332 CODE:
292{ 333{
293 STRLEN textlen; 334 STRLEN textlen;
294 char *text = SvPVutf8 (text_, textlen); 335 char *text = SvPVutf8 (text_, textlen);
… …
381} 422}
382 423
383MODULE = CFClient PACKAGE = CFClient::Texture 424MODULE = CFClient PACKAGE = CFClient::Texture
384 425
385void 426void
386draw_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)
387 PROTOTYPE: $$$;$$ 428 PROTOTYPE: $$$;$$
388 CODE: 429 CODE:
389{ 430{
390 HV *hv = (HV *)SvRV (self); 431 HV *hv = (HV *)SvRV (self);
391 double s = SvNV (*hv_fetch (hv, "s", 1, 1)); 432 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
392 double t = SvNV (*hv_fetch (hv, "t", 1, 1)); 433 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
393 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));
394 436
395 if (items < 5) 437 if (items < 5)
396 { 438 {
397 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 439 w = SvNV (*hv_fetch (hv, "w", 1, 1));
398 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 440 h = SvNV (*hv_fetch (hv, "h", 1, 1));
399 } 441 }
400 442
401 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 }
402 glBegin (GL_QUADS); 448 glBegin (GL_QUADS);
403 glTexCoord2d (0, 0); glVertex2d (x , y ); 449 glTexCoord2f (0, 0); glVertex2f (x , y );
404 glTexCoord2d (0, t); glVertex2d (x , y + h); 450 glTexCoord2f (0, t); glVertex2f (x , y + h);
405 glTexCoord2d (s, t); glVertex2d (x + w, y + h); 451 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
406 glTexCoord2d (s, 0); glVertex2d (x + w, y ); 452 glTexCoord2f (s, 0); glVertex2f (x + w, y );
407 glEnd (); 453 glEnd ();
408} 454}
409 455
410MODULE = CFClient PACKAGE = CFClient::Map 456MODULE = CFClient PACKAGE = CFClient::Map
411 457
… …
439clear (CFClient::Map self) 485clear (CFClient::Map self)
440 CODE: 486 CODE:
441 map_clear (self); 487 map_clear (self);
442 488
443void 489void
444set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t) 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)
445 CODE: 491 CODE:
446{ 492{
447 while (self->faces < face) 493 while (self->faces < face)
448 { 494 {
449 Append (mapface, self->face, self->faces, self->faces); 495 Append (mapface, self->face, self->faces, self->faces);
450 self->faces *= 2; 496 self->faces *= 2;
451 } 497 }
452 498
499 mapface *f = self->face + face;
500
453 self->face [face].name = name; 501 f->name = name;
454 self->face [face].w = w; 502 f->w = w;
455 self->face [face].h = h; 503 f->h = h;
456 self->face [face].s = s; 504 f->s = s;
457 self->face [face].t = t; 505 f->t = t;
506 f->r = r;
507 f->g = g;
508 f->b = b;
509 f->a = a;
458} 510}
459 511
460void 512void
461scroll (CFClient::Map self, int dx, int dy) 513scroll (CFClient::Map self, int dx, int dy)
462 CODE: 514 CODE:
… …
563 cell->darkness = -1; 615 cell->darkness = -1;
564 } 616 }
565} 617}
566 618
567void 619void
568draw (CFClient::Map self, int x0, int y0, int sw, int sh) 620draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
569 PPCODE: 621 PPCODE:
570{ 622{
571 int sw4 = (sw + 3) & ~3; 623 int sw4 = (sw + 3) & ~3;
572 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 624 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
573 uint8_t *darkness = SvPVX (darkness_sv); 625 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
574 626
575 SvPOK_only (darkness_sv); 627 SvPOK_only (darkness_sv);
576 SvCUR_set (darkness_sv, sw4 * sh); 628 SvCUR_set (darkness_sv, sw4 * sh);
577 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 {
578 int vx = self->vx = self->w >= sw 635 int vx = self->vx = self->w >= sw
579 ? self->x + (self->w - sw) / 2 636 ? self->x + (self->w - sw) / 2
580 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 637 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
581 638
582 int vy = self->vy = self->h >= sh 639 int vy = self->vy = self->h >= sh
583 ? self->y + (self->h - sh) / 2 640 ? self->y + (self->h - sh) / 2
584 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 641 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
642 }
585 643
586 glColor4ub (255, 255, 255, 255); 644 glColor4ub (255, 255, 255, 255);
587 645
588 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 646 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
589 glEnable (GL_BLEND); 647 glEnable (GL_BLEND);
… …
606 if (row->c0 <= x + vx && x + vx < row->c1) 664 if (row->c0 <= x + vx && x + vx < row->c1)
607 { 665 {
608 mapcell *cell = row->col + (x + vx - row->c0); 666 mapcell *cell = row->col + (x + vx - row->c0);
609 667
610 darkness[y * sw4 + x] = cell->darkness < 0 668 darkness[y * sw4 + x] = cell->darkness < 0
611 ? 224 669 ? 255 - FOW_DARKNESS
612 : 255 - cell->darkness; 670 : 255 - cell->darkness;
613 671
614 uint16_t face = cell->face [z]; 672 uint16_t face = cell->face [z];
615 673
616 if (face) 674 if (face)
… …
636 } 694 }
637 } 695 }
638 696
639 glEnd (); 697 glEnd ();
640 698
699 glDisable (GL_TEXTURE_2D);
700 glDisable (GL_BLEND);
701
641 EXTEND (SP, 3); 702 EXTEND (SP, 3);
642 PUSHs (sv_2mortal (newSViv (sw4))); 703 PUSHs (sv_2mortal (newSViv (sw4)));
643 PUSHs (sv_2mortal (newSViv (sh))); 704 PUSHs (sv_2mortal (newSViv (sh)));
644 PUSHs (darkness_sv); 705 PUSHs (darkness_sv);
645
646 glDisable (GL_TEXTURE_2D);
647 glDisable (GL_BLEND);
648} 706}
649 707

Diff Legend

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