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.37 by root, Sun Apr 16 07:25:29 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) = @_;
106
107 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108
105 new CFClient::Database 109 new CFClient::Database
106 -Env => $DB_ENV, 110 -Env => $DB_ENV,
111 -Filename => $table,
107 -Filename => "database", 112# -Filename => "database",
108 -Subname => $_[0], 113# -Subname => $table,
109 -Flags => DB_CREATE | DB_UPGRADE, 114 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
111} 116}
112 117
113package CFClient::Database; 118package CFClient::Database;
… …
136 141
137use strict; 142use strict;
138 143
139use Scalar::Util; 144use Scalar::Util;
140 145
141use SDL::OpenGL; 146use CFClient::OpenGL;
142 147
143my %TEXTURES; 148my %TEXTURES;
144 149
145sub new { 150sub new {
146 my ($class, %data) = @_; 151 my ($class, %data) = @_;
… …
164 169
165 $class->new (image => $image, %arg) 170 $class->new (image => $image, %arg)
166} 171}
167 172
168sub new_from_file { 173sub new_from_file {
169 my ($class, $path) = @_; 174 my ($class, $path, %arg) = @_;
170 175
171 open my $fh, "<:raw", $path 176 open my $fh, "<:raw", $path
172 or die "$path: $!"; 177 or die "$path: $!";
173 178
174 local $/; 179 local $/;
175 $class->new_from_image (<$fh>) 180 $class->new_from_image (<$fh>, %arg)
176} 181}
177 182
178#sub new_from_surface { 183#sub new_from_surface {
179# my ($class, $surface) = @_; 184# my ($class, $surface) = @_;
180# 185#
… …
186# h => $surface->height, 191# h => $surface->height,
187# ) 192# )
188#} 193#}
189 194
190sub new_from_layout { 195sub new_from_layout {
191 my ($class, $layout) = @_; 196 my ($class, $layout, %arg) = @_;
192 197
193 my ($w, $h, $data) = $layout->render; 198 my ($w, $h, $data) = $layout->render;
194 199
195 $class->new ( 200 $class->new (
196 w => $w, 201 w => $w,
197 h => $h, 202 h => $h,
198 data => $data, 203 data => $data,
199 internalformat => GL_ALPHA4, 204 internalformat => GL_ALPHA4,
200 format => GL_ALPHA, 205 format => GL_ALPHA,
201 type => GL_UNSIGNED_BYTE, 206 type => GL_UNSIGNED_BYTE,
207 %arg,
202 ) 208 )
203} 209}
204 210
205sub new_from_opengl { 211sub new_from_opengl {
206 my ($class, $w, $h, $cb) = @_; 212 my ($class, $w, $h, $cb) = @_;
… …
260 } 266 }
261 267
262 $self->{s} = $self->{w} / $tw; 268 $self->{s} = $self->{w} / $tw;
263 $self->{t} = $self->{h} / $th; 269 $self->{t} = $self->{h} / $th;
264 270
271 glGetError;
272
265 $self->{name} ||= (glGenTextures 1)->[0]; 273 $self->{name} ||= glGenTexture;
266 274
267 glBindTexture GL_TEXTURE_2D, $self->{name}; 275 glBindTexture GL_TEXTURE_2D, $self->{name};
268 276
269 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
270 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
272 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 }
273 288
274 if (defined $data) { 289 if (defined $data) {
275 glTexImage2D GL_TEXTURE_2D, 0, 290 glTexImage2D GL_TEXTURE_2D, 0,
276 $self->{internalformat}, 291 $self->{internalformat},
277 $tw, $th, # need to pad texture first 292 $tw, $th, # need to pad texture first
278 0, 293 0,
279 $self->{format}, 294 $self->{format},
280 $self->{type}, 295 $self->{type},
281 $data; 296 $data;
282 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 }
283 } else { 301 } else {
284 glCopyTexImage2D GL_TEXTURE_2D, 0, 302 glCopyTexImage2D GL_TEXTURE_2D, 0,
285 $self->{internalformat}, 303 $self->{internalformat},
286 0, 0, 304 0, 0,
287 $tw, $th, 305 $tw, $th,
… …
293sub DESTROY { 311sub DESTROY {
294 my ($self) = @_; 312 my ($self) = @_;
295 313
296 delete $TEXTURES{$self+0}; 314 delete $TEXTURES{$self+0};
297 315
298 glDeleteTextures delete $self->{name} 316 glDeleteTexture delete $self->{name}
299 if $self->{name}; 317 if $self->{name};
300} 318}
301 319
302sub restore_state{ 320sub restore_state{
303 $_->upload 321 $_->upload

Diff Legend

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