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.34 by root, Sat Apr 15 21:16:49 2006 UTC vs.
Revision 1.51 by root, Sun May 14 20:51:19 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 Carp ();
24use AnyEvent; 25use AnyEvent;
25use BerkeleyDB; 26use BerkeleyDB;
26use SDL::OpenGL; 27use CFClient::OpenGL;
27 28
28our %GL_EXT; 29our %GL_EXT;
29our $GL_VERSION; 30our $GL_VERSION;
30 31
31our $GL_NPOT; 32our $GL_NPOT;
33our $GL_DEBUG = 1;
32 34
33sub gl_init { 35sub gl_init {
34 $GL_VERSION = gl_version * 1; 36 $GL_VERSION = gl_version * 1;
35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36 38
37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 39 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
38 40
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL; 41 glDisable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT; 42 glShadeModel GL_FLAT;
43 glDisable GL_DITHER;
42 glDisable GL_DEPTH_TEST; 44 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46 46
47 CFClient::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
48}
49
50sub gl_check {
51 return unless $GL_DEBUG;
52
53 if (my $error = glGetError) {
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
55 }
48} 56}
49 57
50sub find_rcfile($) { 58sub find_rcfile($) {
51 my $path; 59 my $path;
52 60
53 for (@INC) { 61 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 62 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 63 return $path if -r $path;
56 } 64 }
57 65
58 die "FATAL: can't find required file $_[0]\n"; 66 die "FATAL: can't find required file $_[0]\n";
… …
93mkdir "$Crossfire::VARDIR/pclient", 0777; 101mkdir "$Crossfire::VARDIR/pclient", 0777;
94 102
95our $DB_ENV = new BerkeleyDB::Env 103our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient", 104 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000, 105 -Cachesize => 1_000_000,
98 -ErrFile => "/proc/self/fd/2", 106 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99 -ErrPrefix => "DATABASE", 107# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 108 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 109 -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"; 110 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103 111
104sub db_table($) { 112sub db_table($) {
113 my ($table) = @_;
114
115 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
116
105 new CFClient::Database 117 new CFClient::Database
106 -Env => $DB_ENV, 118 -Env => $DB_ENV,
119 -Filename => $table,
107 -Filename => "database", 120# -Filename => "database",
108 -Subname => $_[0], 121# -Subname => $table,
122 -Property => DB_CHKSUM,
109 -Flags => DB_CREATE | DB_UPGRADE, 123 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 124 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
111} 125}
112 126
113package CFClient::Database; 127package CFClient::Database;
… …
117sub get($$) { 131sub get($$) {
118 my $data; 132 my $data;
119 133
120 $_[0]->db_get ($_[1], $data) == 0 134 $_[0]->db_get ($_[1], $data) == 0
121 ? $data 135 ? $data
122 : (); 136 : ()
123} 137}
124 138
125my %DB_SYNC; 139my %DB_SYNC;
126 140
127sub put($$$) { 141sub put($$$) {
128 my ($db, $key, $data) = @_; 142 my ($db, $key, $data) = @_;
129 143
130 $db->db_put ($key => $data);
131
132 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 144 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
133 145
146 $db->db_put ($key => $data)
134} 147}
135 148
136package CFClient::Texture; 149package CFClient::Texture;
137 150
138use strict; 151use strict;
139 152
140use Scalar::Util; 153use Scalar::Util;
141 154
142use SDL::OpenGL; 155use CFClient::OpenGL;
143 156
144my @textures; 157my %TEXTURES;
145 158
146sub new { 159sub new {
147 my ($class, %data) = @_; 160 my ($class, %data) = @_;
148 161
149 my $self = bless { 162 my $self = bless {
… …
151 format => GL_RGBA, 164 format => GL_RGBA,
152 type => GL_UNSIGNED_BYTE, 165 type => GL_UNSIGNED_BYTE,
153 %data, 166 %data,
154 }, $class; 167 }, $class;
155 168
156 push @textures, $self; 169 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
157 Scalar::Util::weaken $textures[-1];
158 170
159 $self->upload; 171 $self->upload;
160 172
161 $self 173 $self
162} 174}
… …
166 178
167 $class->new (image => $image, %arg) 179 $class->new (image => $image, %arg)
168} 180}
169 181
170sub new_from_file { 182sub new_from_file {
171 my ($class, $path) = @_; 183 my ($class, $path, %arg) = @_;
172 184
173 open my $fh, "<:raw", $path 185 open my $fh, "<:raw", $path
174 or die "$path: $!"; 186 or die "$path: $!";
175 187
176 local $/; 188 local $/;
177 $class->new_from_image (<$fh>) 189 $class->new_from_image (<$fh>, %arg)
178} 190}
179 191
180#sub new_from_surface { 192#sub new_from_surface {
181# my ($class, $surface) = @_; 193# my ($class, $surface) = @_;
182# 194#
… …
188# h => $surface->height, 200# h => $surface->height,
189# ) 201# )
190#} 202#}
191 203
192sub new_from_layout { 204sub new_from_layout {
193 my ($class, $layout) = @_; 205 my ($class, $layout, %arg) = @_;
194 206
195 my ($w, $h, $data) = $layout->render; 207 my ($w, $h, $data, $format, $internalformat) = $layout->render;
196 208
197 $class->new ( 209 $class->new (
198 w => $w, 210 w => $w,
199 h => $h, 211 h => $h,
200 data => $data, 212 data => $data,
201 internalformat => GL_ALPHA4,
202 format => GL_ALPHA, 213 format => $format,
214 internalformat => $format,
203 type => GL_UNSIGNED_BYTE, 215 type => GL_UNSIGNED_BYTE,
216 %arg,
204 ) 217 )
205} 218}
206 219
207sub new_from_opengl { 220sub new_from_opengl {
208 my ($class, $w, $h, $cb) = @_; 221 my ($class, $w, $h, $cb) = @_;
209 222
210 $class->new (w => $w, h => $h, render_cb => $cb) 223 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
211} 224}
212 225
213sub topot { 226sub topot {
214 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 227 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
215} 228}
… …
238 = CFClient::load_image_inline $self->{image}; 251 = CFClient::load_image_inline $self->{image};
239 } 252 }
240 253
241 my ($tw, $th) = @$self{qw(w h)}; 254 my ($tw, $th) = @$self{qw(w h)};
242 255
243 unless ($tw && $th) { 256 unless ($tw > 0 && $th > 0) {
244 $tw = $th = 1; 257 $tw = $th = 1;
245 $data = "\x00" x 64; 258 $data = "\x00" x 64;
246 } 259 }
247 260
248 $self->{minified} = [CFClient::average $tw, $th, $data] 261 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
251 unless ($GL_NPOT) { 264 unless ($GL_NPOT) {
252 # TODO: does not work for zero-sized textures 265 # TODO: does not work for zero-sized textures
253 $tw = topot $tw; 266 $tw = topot $tw;
254 $th = topot $th; 267 $th = topot $th;
255 268
256 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 269 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
257 my $bpp = (length $data) / ($self->{w} * $self->{h}); 270 my $bpp = (length $data) / ($self->{w} * $self->{h});
258 $data = pack "(a" . ($tw * $bpp) . ")*", 271 $data = pack "(a" . ($tw * $bpp) . ")*",
259 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 272 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
260 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 273 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
261 } 274 }
262 } 275 }
263 276
264 $self->{s} = $self->{w} / $tw; 277 $self->{s} = $self->{w} / $tw;
265 $self->{t} = $self->{h} / $th; 278 $self->{t} = $self->{h} / $th;
266 279
267 $self->{name} ||= (glGenTextures 1)->[0]; 280 $self->{name} ||= glGenTexture;
268 281
269 glBindTexture GL_TEXTURE_2D, $self->{name}; 282 glBindTexture GL_TEXTURE_2D, $self->{name};
270 283
271 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;
273 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 284 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
274 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
286
287 if ($::FAST) {
288 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
289 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
290 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
291 # alternatively check for 0x8191
292 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
293 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
294 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
295 } else {
296 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
297 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
298 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
299 }
275 300
301 glGetError;
302
276 if (defined $data) { 303 if (defined $data) {
277 glTexImage2D GL_TEXTURE_2D, 0, 304 glTexImage2D GL_TEXTURE_2D, 0,
278 $self->{internalformat}, 305 $self->{internalformat},
279 $tw, $th, # need to pad texture first 306 $tw, $th, # need to pad texture first
280 0, 307 0,
281 $self->{format}, 308 $self->{format},
282 $self->{type}, 309 $self->{type},
283 $data; 310 $data;
284 glGetError and die; 311 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
312 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
285 } else { 313 } else {
286 glCopyTexImage2D GL_TEXTURE_2D, 0, 314 glCopyTexImage2D GL_TEXTURE_2D, 0,
287 $self->{internalformat}, 315 $self->{internalformat},
288 0, 0, 316 0, 0,
289 $tw, $th, 317 $tw, $th,
290 0; 318 0;
291 glGetError and die "glCopyTexImage2D $tw,$th"; 319 CFClient::gl_check "copying to texture %dx%d if=%x",
320 $tw, $th, $self->{internalformat};
292 } 321 }
293} 322}
294 323
295sub DESTROY { 324sub DESTROY {
296 my ($self) = @_; 325 my ($self) = @_;
297 326
298 return unless exists $self->{name}; 327 delete $TEXTURES{$self+0};
299 328
300 glDeleteTextures delete $self->{name}; 329 glDeleteTexture delete $self->{name}
330 if $self->{name};
301} 331}
302 332
303sub restore_state{ 333sub restore_state{
304 $_->upload 334 $_->upload
305 for grep $_, @textures; 335 for values %TEXTURES;
306}; 336};
307 337
3081; 3381;
309 339
310=back 340=back

Diff Legend

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