--- deliantra/Deliantra-Client/DC.pm 2006/04/09 00:06:09 1.14 +++ deliantra/Deliantra-Client/DC.pm 2006/04/09 21:50:21 1.17 @@ -76,8 +76,8 @@ my ($class, %data) = @_; my $self = bless { - internalFormat => GL_RGBA, - format => GL_RGBA8, + internalformat => GL_RGBA, + format => GL_RGBA, %data, }, $class; @@ -126,7 +126,7 @@ width => $w, height => $h, data => $data, - internalFormat => GL_ALPHA8, + internalformat => GL_ALPHA4, format => GL_ALPHA, ) } @@ -180,23 +180,23 @@ glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; + glGetError; if (defined $data) { glTexImage2D GL_TEXTURE_2D, 0, - $self->{internalFormat}, + $self->{internalformat}, $self->{width}, $self->{height}, 0, $self->{format}, GL_UNSIGNED_BYTE, $data; + glGetError and die; } else { glCopyTexImage2D GL_TEXTURE_2D, 0, - $self->{internalFormat}, + $self->{internalformat}, 0, 0, $self->{width}, $self->{height}, 0; glPopmatrix; - #SDL::GLSwapBuffers; - #sleep 1; } } @@ -208,7 +208,7 @@ glDeleteTextures delete $self->{name}; } -push @::GLINIT, sub { +push @::GL_INIT, sub { $_->upload for grep $_, @textures; };