--- deliantra/Deliantra-Client/DC.pm 2006/04/07 20:55:32 1.7 +++ deliantra/Deliantra-Client/DC.pm 2006/04/08 13:36:25 1.8 @@ -123,6 +123,12 @@ $class->new_from_surface (bless \$surface, SDL::Surface::) } +sub new_from_opengl { + my ($class, $w, $h, $cb) = @_; + + $class->_new (width => $w, height => $h, render => $cb) +} + sub upload { my ($self) = @_; @@ -132,6 +138,11 @@ if (exists $self->{data}) { $data = $self->{data}; + } elsif (exists $self->{rendercb}) { + glViewport 0, 0, $self->{width}, $self->{height}; + glClear GL_COLOR_BUFFER_BIT; + + $self->{rendercb}->($self, $self->{width}, $self->{height}); } else { my $pb = new Gtk2::Gdk::PixbufLoader; $pb->write ($self->{image}); @@ -155,13 +166,21 @@ glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; - glTexImage2D GL_TEXTURE_2D, 0, - GL_RGBA8, - $self->{width}, $self->{height}, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - $data; + if (defined $data) { + glTexImage2D GL_TEXTURE_2D, 0, + GL_RGBA8, + $self->{width}, $self->{height}, + 0, + GL_RGBA, + GL_UNSIGNED_BYTE, + $data; + } else { + glCopyTexImage2D GL_TEXTURE_2D, 0, + GL_RGBA8, + 0, 0, + $self->{width}, $self->{height}, + 0; + } } sub DESTROY {