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.36 by elmex, Fri Apr 14 11:32:21 2006 UTC vs.
Revision 1.38 by root, Fri Apr 14 23:32:28 2006 UTC

… …
391} 391}
392 392
393MODULE = CFClient PACKAGE = CFClient::Texture 393MODULE = CFClient PACKAGE = CFClient::Texture
394 394
395void 395void
396draw_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)
397 PROTOTYPE: $$$;$$ 397 PROTOTYPE: $$$;$$
398 CODE: 398 CODE:
399{ 399{
400 HV *hv = (HV *)SvRV (self); 400 HV *hv = (HV *)SvRV (self);
401 double s = SvNV (*hv_fetch (hv, "s", 1, 1)); 401 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
402 double t = SvNV (*hv_fetch (hv, "t", 1, 1)); 402 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
403 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)); 404 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
405 405
406 if (items < 5) 406 if (items < 5)
407 { 407 {
… …
413 if (wrap_mode) { 413 if (wrap_mode) {
414 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 414 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
415 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 415 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
416 } 416 }
417 glBegin (GL_QUADS); 417 glBegin (GL_QUADS);
418 glTexCoord2d (0, 0); glVertex2d (x , y ); 418 glTexCoord2f (0, 0); glVertex2f (x , y );
419 glTexCoord2d (0, t); glVertex2d (x , y + h); 419 glTexCoord2f (0, t); glVertex2f (x , y + h);
420 glTexCoord2d (s, t); glVertex2d (x + w, y + h); 420 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
421 glTexCoord2d (s, 0); glVertex2d (x + w, y ); 421 glTexCoord2f (s, 0); glVertex2f (x + w, y );
422 glEnd (); 422 glEnd ();
423} 423}
424 424
425MODULE = CFClient PACKAGE = CFClient::Map 425MODULE = CFClient PACKAGE = CFClient::Map
426 426
… …
578 cell->darkness = -1; 578 cell->darkness = -1;
579 } 579 }
580} 580}
581 581
582void 582void
583draw (CFClient::Map self, int x0, int y0, int sw, int sh) 583draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
584 PPCODE: 584 PPCODE:
585{ 585{
586 int sw4 = (sw + 3) & ~3; 586 int sw4 = (sw + 3) & ~3;
587 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 587 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
588 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 588 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
589 589
590 SvPOK_only (darkness_sv); 590 SvPOK_only (darkness_sv);
591 SvCUR_set (darkness_sv, sw4 * sh); 591 SvCUR_set (darkness_sv, sw4 * sh);
592 592
593 int vx = self->x + (self->w - sw) / 2 - shift_x;
594 int vy = self->y + (self->h - sh) / 2 - shift_y;
595
596 if (0)
597 {
593 int vx = self->vx = self->w >= sw 598 int vx = self->vx = self->w >= sw
594 ? self->x + (self->w - sw) / 2 599 ? self->x + (self->w - sw) / 2
595 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 600 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
596 601
597 int vy = self->vy = self->h >= sh 602 int vy = self->vy = self->h >= sh
598 ? self->y + (self->h - sh) / 2 603 ? self->y + (self->h - sh) / 2
599 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 604 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
605 }
600 606
601 glColor4ub (255, 255, 255, 255); 607 glColor4ub (255, 255, 255, 255);
602 608
603 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 609 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
604 glEnable (GL_BLEND); 610 glEnable (GL_BLEND);

Diff Legend

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