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.35 by root, Fri Apr 14 02:03:10 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 405
405 if (items < 5) 406 if (items < 5)
406 { 407 {
407 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 408 w = SvNV (*hv_fetch (hv, "w", 1, 1));
408 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 409 h = SvNV (*hv_fetch (hv, "h", 1, 1));
409 } 410 }
410 411
411 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 }
412 glBegin (GL_QUADS); 417 glBegin (GL_QUADS);
413 glTexCoord2d (0, 0); glVertex2d (x , y ); 418 glTexCoord2f (0, 0); glVertex2f (x , y );
414 glTexCoord2d (0, t); glVertex2d (x , y + h); 419 glTexCoord2f (0, t); glVertex2f (x , y + h);
415 glTexCoord2d (s, t); glVertex2d (x + w, y + h); 420 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
416 glTexCoord2d (s, 0); glVertex2d (x + w, y ); 421 glTexCoord2f (s, 0); glVertex2f (x + w, y );
417 glEnd (); 422 glEnd ();
418} 423}
419 424
420MODULE = CFClient PACKAGE = CFClient::Map 425MODULE = CFClient PACKAGE = CFClient::Map
421 426
… …
573 cell->darkness = -1; 578 cell->darkness = -1;
574 } 579 }
575} 580}
576 581
577void 582void
578draw (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)
579 PPCODE: 584 PPCODE:
580{ 585{
581 int sw4 = (sw + 3) & ~3; 586 int sw4 = (sw + 3) & ~3;
582 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 587 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
583 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 588 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
584 589
585 SvPOK_only (darkness_sv); 590 SvPOK_only (darkness_sv);
586 SvCUR_set (darkness_sv, sw4 * sh); 591 SvCUR_set (darkness_sv, sw4 * sh);
587 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 {
588 int vx = self->vx = self->w >= sw 598 int vx = self->vx = self->w >= sw
589 ? self->x + (self->w - sw) / 2 599 ? self->x + (self->w - sw) / 2
590 : 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));
591 601
592 int vy = self->vy = self->h >= sh 602 int vy = self->vy = self->h >= sh
593 ? self->y + (self->h - sh) / 2 603 ? self->y + (self->h - sh) / 2
594 : 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 }
595 606
596 glColor4ub (255, 255, 255, 255); 607 glColor4ub (255, 255, 255, 255);
597 608
598 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 609 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
599 glEnable (GL_BLEND); 610 glEnable (GL_BLEND);

Diff Legend

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