--- deliantra/Deliantra-Client/DC.pm 2006/04/07 20:55:32 1.7 +++ deliantra/Deliantra-Client/DC.pm 2006/04/08 18:48:34 1.12 @@ -55,6 +55,7 @@ or return; { + require Data::Dumper; local $Data::Dumper::Purity = 1; $::CFG->{VERSION} = $::VERSION; print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); @@ -123,6 +124,12 @@ $class->new_from_surface (bless \$surface, SDL::Surface::) } +sub new_from_opengl { + my ($class, $w, $h, $cb) = @_; + + $class->_new (width => $w, height => $h, rendercb => $cb) +} + sub upload { my ($self) = @_; @@ -132,6 +139,17 @@ if (exists $self->{data}) { $data = $self->{data}; + } elsif (exists $self->{rendercb}) { + glViewport 0, 0, $self->{width}, $self->{height}; + glMatrixMode GL_PROJECTION; + glLoadIdentity; + glOrtho 0, $self->{width}, $self->{height}, 0, -100, 100; + glMatrixMode GL_MODELVIEW; + glPushmatrix; + glLoadIdentity; + 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 +173,29 @@ 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 { + warn "I{DTEDRAW TEX: $self->{width} $self->{height} \n"; + warn "ERR: ". (glGetError). "\n"; + my ($bd, $br) = (glGet (GL_DRAW_BUFFER), glGet (GL_READ_BUFFER)); + warn "BUF:[$bd $br]\n"; + + glCopyTexImage2D GL_TEXTURE_2D, 0, + GL_RGBA8, + 0, 0, + $self->{width}, $self->{height}, + 0; + glPopmatrix; + warn "ERR: ". (glGetError). "\n"; + sleep 1; + } } sub DESTROY {