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.35 by root, Sat Apr 15 22:55:59 2006 UTC vs.
Revision 1.41 by root, Wed Apr 19 23:37:48 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;
… …
117sub get($$) { 122sub get($$) {
118 my $data; 123 my $data;
119 124
120 $_[0]->db_get ($_[1], $data) == 0 125 $_[0]->db_get ($_[1], $data) == 0
121 ? $data 126 ? $data
122 : (); 127 : ()
123} 128}
124 129
125my %DB_SYNC; 130my %DB_SYNC;
126 131
127sub put($$$) { 132sub put($$$) {
128 my ($db, $key, $data) = @_; 133 my ($db, $key, $data) = @_;
129 134
130 $db->db_put ($key => $data);
131
132 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 135 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
133 136
137 $db->db_put ($key => $data)
134} 138}
135 139
136package CFClient::Texture; 140package CFClient::Texture;
137 141
138use strict; 142use strict;
139 143
140use Scalar::Util; 144use Scalar::Util;
141 145
142use SDL::OpenGL; 146use CFClient::OpenGL;
143 147
144my %TEXTURES; 148my %TEXTURES;
145my @NAMES;
146 149
147sub new { 150sub new {
148 my ($class, %data) = @_; 151 my ($class, %data) = @_;
149 152
150 my $self = bless { 153 my $self = bless {
… …
262 } 265 }
263 266
264 $self->{s} = $self->{w} / $tw; 267 $self->{s} = $self->{w} / $tw;
265 $self->{t} = $self->{h} / $th; 268 $self->{t} = $self->{h} / $th;
266 269
267 $self->{name} ||= (pop @NAMES) || (glGenTextures 1)->[0]; 270 glGetError;
271
272 $self->{name} ||= glGenTexture;
268 273
269 glBindTexture GL_TEXTURE_2D, $self->{name}; 274 glBindTexture GL_TEXTURE_2D, $self->{name};
270 275
271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR; 276 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR; 277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
… …
279 $tw, $th, # need to pad texture first 284 $tw, $th, # need to pad texture first
280 0, 285 0,
281 $self->{format}, 286 $self->{format},
282 $self->{type}, 287 $self->{type},
283 $data; 288 $data;
284 glGetError and die; 289 if (my $error = glGetError) {
290 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
291 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
292 }
285 } else { 293 } else {
286 glCopyTexImage2D GL_TEXTURE_2D, 0, 294 glCopyTexImage2D GL_TEXTURE_2D, 0,
287 $self->{internalformat}, 295 $self->{internalformat},
288 0, 0, 296 0, 0,
289 $tw, $th, 297 $tw, $th,
… …
295sub DESTROY { 303sub DESTROY {
296 my ($self) = @_; 304 my ($self) = @_;
297 305
298 delete $TEXTURES{$self+0}; 306 delete $TEXTURES{$self+0};
299 307
300 if (my $name = delete $self->{name}) { 308 glDeleteTexture delete $self->{name}
301 glDeleteTextures $name; 309 if $self->{name};
302 push @NAMES, $name;
303 }
304
305} 310}
306 311
307sub restore_state{ 312sub restore_state{
308 $_->upload 313 $_->upload
309 for grep $_, values %TEXTURES; 314 for values %TEXTURES;
310}; 315};
311 316
3121; 3171;
313 318
314=back 319=back

Diff Legend

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