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

Diff Legend

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