ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.7 by root, Fri Apr 7 20:55:32 2006 UTC vs.
Revision 1.11 by elmex, Sat Apr 8 18:18:09 2006 UTC

53 53
54 open CFG, ">$file" 54 open CFG, ">$file"
55 or return; 55 or return;
56 56
57 { 57 {
58 require Data::Dumper;
58 local $Data::Dumper::Purity = 1; 59 local $Data::Dumper::Purity = 1;
59 $::CFG->{VERSION} = $::VERSION; 60 $::CFG->{VERSION} = $::VERSION;
60 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 61 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
61 } 62 }
62 63
121 (new SDL::Color -r => 255, -g => 255, -b => 255); 122 (new SDL::Color -r => 255, -g => 255, -b => 255);
122 123
123 $class->new_from_surface (bless \$surface, SDL::Surface::) 124 $class->new_from_surface (bless \$surface, SDL::Surface::)
124} 125}
125 126
127sub new_from_opengl {
128 my ($class, $w, $h, $cb) = @_;
129
130 $class->_new (width => $w, height => $h, rendercb => $cb)
131}
132
126sub upload { 133sub upload {
127 my ($self) = @_; 134 my ($self) = @_;
128 135
129 return unless $SDL::App::USING_OPENGL; 136 return unless $SDL::App::USING_OPENGL;
130 137
131 my $data; 138 my $data;
132 139
133 if (exists $self->{data}) { 140 if (exists $self->{data}) {
134 $data = $self->{data}; 141 $data = $self->{data};
142 } elsif (exists $self->{rendercb}) {
143 glViewport 0, 0, $self->{width}, $self->{height};
144 glClear GL_COLOR_BUFFER_BIT;
145
146 $self->{rendercb}->($self, $self->{width}, $self->{height});
135 } else { 147 } else {
136 my $pb = new Gtk2::Gdk::PixbufLoader; 148 my $pb = new Gtk2::Gdk::PixbufLoader;
137 $pb->write ($self->{image}); 149 $pb->write ($self->{image});
138 $pb->close; 150 $pb->close;
139 151
153 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 165 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
154 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 166 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
155 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 167 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
156 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 168 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
157 169
170 if (defined $data) {
158 glTexImage2D GL_TEXTURE_2D, 0, 171 glTexImage2D GL_TEXTURE_2D, 0,
159 GL_RGBA8, 172 GL_RGBA8,
160 $self->{width}, $self->{height}, 173 $self->{width}, $self->{height},
161 0, 174 0,
162 GL_RGBA, 175 GL_RGBA,
163 GL_UNSIGNED_BYTE, 176 GL_UNSIGNED_BYTE,
164 $data; 177 $data;
178 } else {
179 warn "I{DTEDRAW TEX: $self->{width} $self->{height} \n";
180 warn "ERR: ". (glGetError). "\n";
181 my ($bd, $br) = (glGet (GL_DRAW_BUFFER), glGet (GL_READ_BUFFER));
182 warn "BUF:[$bd $br]\n";
183
184 glCopyTexImage2D GL_TEXTURE_2D, 0,
185 GL_RGBA8,
186 0, 0,
187 $self->{width}, $self->{height},
188 0;
189 warn "ERR: ". (glGetError). "\n";
190 }
165} 191}
166 192
167sub DESTROY { 193sub DESTROY {
168 my ($self) = @_; 194 my ($self) = @_;
169 195

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines