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.32 by root, Sat Apr 15 00:04:58 2006 UTC vs.
Revision 1.40 by root, Tue Apr 18 01:51:06 2006 UTC

… …
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use AnyEvent;
25use BerkeleyDB;
24use SDL::OpenGL; 26use SDL::OpenGL;
25 27
26our %GL_EXT; 28our %GL_EXT;
27our $GL_VERSION; 29our $GL_VERSION;
28 30
… …
86 } 88 }
87 89
88 close CFG; 90 close CFG;
89} 91}
90 92
93mkdir "$Crossfire::VARDIR/pclient", 0777;
94
95our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000,
98 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99# -ErrPrefix => "DATABASE",
100 -Verbose => 1,
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";
103
104sub db_table($) {
105 my ($table) = @_;
106
107 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108
109 new CFClient::Database
110 -Env => $DB_ENV,
111 -Filename => $table,
112# -Filename => "database",
113# -Subname => $table,
114 -Flags => DB_CREATE | DB_UPGRADE,
115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
116}
117
118package CFClient::Database;
119
120our @ISA = BerkeleyDB::Btree::;
121
122sub get($$) {
123 my $data;
124
125 $_[0]->db_get ($_[1], $data) == 0
126 ? $data
127 : ()
128}
129
130my %DB_SYNC;
131
132sub put($$$) {
133 my ($db, $key, $data) = @_;
134
135 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
136
137 $db->db_put ($key => $data)
138}
139
91package CFClient::Texture; 140package CFClient::Texture;
92 141
93use strict; 142use strict;
94 143
95use Scalar::Util; 144use Scalar::Util;
96 145
97use SDL::OpenGL; 146use SDL::OpenGL;
98 147
99my @textures; 148my %TEXTURES;
100 149
101sub new { 150sub new {
102 my ($class, %data) = @_; 151 my ($class, %data) = @_;
103 152
104 my $self = bless { 153 my $self = bless {
… …
106 format => GL_RGBA, 155 format => GL_RGBA,
107 type => GL_UNSIGNED_BYTE, 156 type => GL_UNSIGNED_BYTE,
108 %data, 157 %data,
109 }, $class; 158 }, $class;
110 159
111 push @textures, $self; 160 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
112 Scalar::Util::weaken $textures[-1];
113 161
114 $self->upload; 162 $self->upload;
115 163
116 $self 164 $self
117} 165}
118 166
119sub new_from_image { 167sub new_from_image {
120 my ($class, $image) = @_; 168 my ($class, $image, %arg) = @_;
121 169
122 $class->new (image => $image) 170 $class->new (image => $image, %arg)
123} 171}
124 172
125sub new_from_file { 173sub new_from_file {
126 my ($class, $path) = @_; 174 my ($class, $path) = @_;
127 175
… …
199 $tw = $th = 1; 247 $tw = $th = 1;
200 $data = "\x00" x 64; 248 $data = "\x00" x 64;
201 } 249 }
202 250
203 $self->{minified} = [CFClient::average $tw, $th, $data] 251 $self->{minified} = [CFClient::average $tw, $th, $data]
204 if defined $data; 252 if $self->{minify};
205 253
206 unless ($GL_NPOT) { 254 unless ($GL_NPOT) {
207 # TODO: does not work for zero-sized textures 255 # TODO: does not work for zero-sized textures
208 $tw = topot $tw; 256 $tw = topot $tw;
209 $th = topot $th; 257 $th = topot $th;
… …
216 } 264 }
217 } 265 }
218 266
219 $self->{s} = $self->{w} / $tw; 267 $self->{s} = $self->{w} / $tw;
220 $self->{t} = $self->{h} / $th; 268 $self->{t} = $self->{h} / $th;
269
270 glGetError;
221 271
222 $self->{name} ||= (glGenTextures 1)->[0]; 272 $self->{name} ||= (glGenTextures 1)->[0];
223 273
224 glBindTexture GL_TEXTURE_2D, $self->{name}; 274 glBindTexture GL_TEXTURE_2D, $self->{name};
225 275
… …
234 $tw, $th, # need to pad texture first 284 $tw, $th, # need to pad texture first
235 0, 285 0,
236 $self->{format}, 286 $self->{format},
237 $self->{type}, 287 $self->{type},
238 $data; 288 $data;
239 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 }
240 } else { 293 } else {
241 glCopyTexImage2D GL_TEXTURE_2D, 0, 294 glCopyTexImage2D GL_TEXTURE_2D, 0,
242 $self->{internalformat}, 295 $self->{internalformat},
243 0, 0, 296 0, 0,
244 $tw, $th, 297 $tw, $th,
… …
248} 301}
249 302
250sub DESTROY { 303sub DESTROY {
251 my ($self) = @_; 304 my ($self) = @_;
252 305
253 return unless exists $self->{name}; 306 delete $TEXTURES{$self+0};
254 307
255 glDeleteTextures delete $self->{name}; 308 glDeleteTextures delete $self->{name}
309 if $self->{name};
256} 310}
257 311
258sub restore_state{ 312sub restore_state{
259 $_->upload 313 $_->upload
260 for grep $_, @textures; 314 for values %TEXTURES;
261}; 315};
262 316
2631; 3171;
264 318
265=back 319=back

Diff Legend

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