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.38 by root, Mon Apr 17 06:50:26 2006 UTC vs.
Revision 1.42 by root, Fri Apr 21 07:09:10 2006 UTC

… …
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use AnyEvent; 24use AnyEvent;
25use BerkeleyDB; 25use BerkeleyDB;
26use SDL::OpenGL; 26use CFClient::OpenGL;
27 27
28our %GL_EXT; 28our %GL_EXT;
29our $GL_VERSION; 29our $GL_VERSION;
30 30
31our $GL_NPOT; 31our $GL_NPOT;
… …
93mkdir "$Crossfire::VARDIR/pclient", 0777; 93mkdir "$Crossfire::VARDIR/pclient", 0777;
94 94
95our $DB_ENV = new BerkeleyDB::Env 95our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient", 96 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000, 97 -Cachesize => 1_000_000,
98 -ErrFile => "/proc/self/fd/2", 98 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99 -ErrPrefix => "DATABASE", 99# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 100 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 101 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103 103
104sub db_table($) { 104sub db_table($) {
105 my ($table) = @_; 105 my ($table) = @_;
106 106
… …
141 141
142use strict; 142use strict;
143 143
144use Scalar::Util; 144use Scalar::Util;
145 145
146use SDL::OpenGL; 146use CFClient::OpenGL;
147 147
148my %TEXTURES; 148my %TEXTURES;
149 149
150sub new { 150sub new {
151 my ($class, %data) = @_; 151 my ($class, %data) = @_;
… …
169 169
170 $class->new (image => $image, %arg) 170 $class->new (image => $image, %arg)
171} 171}
172 172
173sub new_from_file { 173sub new_from_file {
174 my ($class, $path) = @_; 174 my ($class, $path, %arg) = @_;
175 175
176 open my $fh, "<:raw", $path 176 open my $fh, "<:raw", $path
177 or die "$path: $!"; 177 or die "$path: $!";
178 178
179 local $/; 179 local $/;
180 $class->new_from_image (<$fh>) 180 $class->new_from_image (<$fh>, %arg)
181} 181}
182 182
183#sub new_from_surface { 183#sub new_from_surface {
184# my ($class, $surface) = @_; 184# my ($class, $surface) = @_;
185# 185#
… …
191# h => $surface->height, 191# h => $surface->height,
192# ) 192# )
193#} 193#}
194 194
195sub new_from_layout { 195sub new_from_layout {
196 my ($class, $layout) = @_; 196 my ($class, $layout, %arg) = @_;
197 197
198 my ($w, $h, $data) = $layout->render; 198 my ($w, $h, $data) = $layout->render;
199 199
200 $class->new ( 200 $class->new (
201 w => $w, 201 w => $w,
202 h => $h, 202 h => $h,
203 data => $data, 203 data => $data,
204 internalformat => GL_ALPHA4, 204 internalformat => GL_ALPHA4,
205 format => GL_ALPHA, 205 format => GL_ALPHA,
206 type => GL_UNSIGNED_BYTE, 206 type => GL_UNSIGNED_BYTE,
207 %arg,
207 ) 208 )
208} 209}
209 210
210sub new_from_opengl { 211sub new_from_opengl {
211 my ($class, $w, $h, $cb) = @_; 212 my ($class, $w, $h, $cb) = @_;
… …
265 } 266 }
266 267
267 $self->{s} = $self->{w} / $tw; 268 $self->{s} = $self->{w} / $tw;
268 $self->{t} = $self->{h} / $th; 269 $self->{t} = $self->{h} / $th;
269 270
271 glGetError;
272
270 $self->{name} ||= (glGenTextures 1)->[0]; 273 $self->{name} ||= glGenTexture;
271 274
272 glBindTexture GL_TEXTURE_2D, $self->{name}; 275 glBindTexture GL_TEXTURE_2D, $self->{name};
273 276
274 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
275 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
276 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279
280 if ($::FAST) {
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
283 } else {
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;
287 }
278 288
279 if (defined $data) { 289 if (defined $data) {
280 glTexImage2D GL_TEXTURE_2D, 0, 290 glTexImage2D GL_TEXTURE_2D, 0,
281 $self->{internalformat}, 291 $self->{internalformat},
282 $tw, $th, # need to pad texture first 292 $tw, $th, # need to pad texture first
283 0, 293 0,
284 $self->{format}, 294 $self->{format},
285 $self->{type}, 295 $self->{type},
286 $data; 296 $data;
287 glGetError and die; 297 if (my $error = glGetError) {
298 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
299 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300 }
288 } else { 301 } else {
289 glCopyTexImage2D GL_TEXTURE_2D, 0, 302 glCopyTexImage2D GL_TEXTURE_2D, 0,
290 $self->{internalformat}, 303 $self->{internalformat},
291 0, 0, 304 0, 0,
292 $tw, $th, 305 $tw, $th,
… …
298sub DESTROY { 311sub DESTROY {
299 my ($self) = @_; 312 my ($self) = @_;
300 313
301 delete $TEXTURES{$self+0}; 314 delete $TEXTURES{$self+0};
302 315
303 glDeleteTextures delete $self->{name} 316 glDeleteTexture delete $self->{name}
304 if $self->{name}; 317 if $self->{name};
305} 318}
306 319
307sub restore_state{ 320sub restore_state{
308 $_->upload 321 $_->upload

Diff Legend

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