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.30 by root, Wed Apr 12 21:35:10 2006 UTC vs.
Revision 1.50 by root, Thu May 11 23:41:45 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 -Flags => DB_CREATE | DB_UPGRADE,
123 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
124}
125
126package CFClient::Database;
127
128our @ISA = BerkeleyDB::Btree::;
129
130sub get($$) {
131 my $data;
132
133 $_[0]->db_get ($_[1], $data) == 0
134 ? $data
135 : ()
136}
137
138my %DB_SYNC;
139
140sub put($$$) {
141 my ($db, $key, $data) = @_;
142
143 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
144
145 $db->db_put ($key => $data)
146}
147
91package CFClient::Texture; 148package CFClient::Texture;
92 149
93use strict; 150use strict;
94 151
95use Scalar::Util; 152use Scalar::Util;
96 153
97use SDL::OpenGL; 154use CFClient::OpenGL;
98 155
99my @textures; 156my %TEXTURES;
100 157
101sub new { 158sub new {
102 my ($class, %data) = @_; 159 my ($class, %data) = @_;
103 160
104 my $self = bless { 161 my $self = bless {
… …
106 format => GL_RGBA, 163 format => GL_RGBA,
107 type => GL_UNSIGNED_BYTE, 164 type => GL_UNSIGNED_BYTE,
108 %data, 165 %data,
109 }, $class; 166 }, $class;
110 167
111 push @textures, $self; 168 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
112 Scalar::Util::weaken $textures[-1];
113 169
114 $self->upload; 170 $self->upload;
115 171
116 $self 172 $self
117} 173}
118 174
119sub new_from_image { 175sub new_from_image {
120 my ($class, $image) = @_; 176 my ($class, $image, %arg) = @_;
121 177
122 $class->new (image => $image) 178 $class->new (image => $image, %arg)
123} 179}
124 180
125sub new_from_file { 181sub new_from_file {
126 my ($class, $path) = @_; 182 my ($class, $path, %arg) = @_;
127 183
128 open my $fh, "<:raw", $path 184 open my $fh, "<:raw", $path
129 or die "$path: $!"; 185 or die "$path: $!";
130 186
131 local $/; 187 local $/;
132 $class->new_from_image (<$fh>) 188 $class->new_from_image (<$fh>, %arg)
133} 189}
134 190
135#sub new_from_surface { 191#sub new_from_surface {
136# my ($class, $surface) = @_; 192# my ($class, $surface) = @_;
137# 193#
… …
143# h => $surface->height, 199# h => $surface->height,
144# ) 200# )
145#} 201#}
146 202
147sub new_from_layout { 203sub new_from_layout {
148 my ($class, $layout) = @_; 204 my ($class, $layout, %arg) = @_;
149 205
150 my ($w, $h, $data) = $layout->render; 206 my ($w, $h, $data, $format, $internalformat) = $layout->render;
151 207
152 $class->new ( 208 $class->new (
153 w => $w, 209 w => $w,
154 h => $h, 210 h => $h,
155 data => $data, 211 data => $data,
156 internalformat => GL_ALPHA4,
157 format => GL_ALPHA, 212 format => $format,
213 internalformat => $format,
158 type => GL_UNSIGNED_BYTE, 214 type => GL_UNSIGNED_BYTE,
215 %arg,
159 ) 216 )
160} 217}
161 218
162sub new_from_opengl { 219sub new_from_opengl {
163 my ($class, $w, $h, $cb) = @_; 220 my ($class, $w, $h, $cb) = @_;
164 221
165 $class->new (w => $w, h => $h, render_cb => $cb) 222 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
166} 223}
167 224
168sub topot { 225sub topot {
169 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 226 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
170} 227}
… …
179 if (exists $self->{data}) { 236 if (exists $self->{data}) {
180 $data = $self->{data}; 237 $data = $self->{data};
181 238
182 } elsif (exists $self->{render_cb}) { 239 } elsif (exists $self->{render_cb}) {
183 glViewport 0, 0, $self->{w}, $self->{h}; 240 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
185 glMatrixMode GL_PROJECTION; 241 glMatrixMode GL_PROJECTION;
186 glLoadIdentity; 242 glLoadIdentity;
243 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
187 glMatrixMode GL_MODELVIEW; 244 glMatrixMode GL_MODELVIEW;
188 glLoadIdentity; 245 glLoadIdentity;
189 glClear GL_COLOR_BUFFER_BIT;
190 $self->{render_cb}->($self, $self->{w}, $self->{h}); 246 $self->{render_cb}->($self, $self->{w}, $self->{h});
191 247
192 } else { 248 } else {
193 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 249 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
194 = CFClient::load_image_inline $self->{image}; 250 = CFClient::load_image_inline $self->{image};
195 } 251 }
196 252
197 my ($tw, $th) = @$self{qw(w h)}; 253 my ($tw, $th) = @$self{qw(w h)};
198 254
199 unless ($tw && $th) { 255 unless ($tw > 0 && $th > 0) {
200 $tw = $th = 1; 256 $tw = $th = 1;
201 $data = "\x00" x 64; 257 $data = "\x00" x 64;
202 } 258 }
259
260 $self->{minified} = [CFClient::average $tw, $th, $data]
261 if $self->{minify};
203 262
204 unless ($GL_NPOT) { 263 unless ($GL_NPOT) {
205 # TODO: does not work for zero-sized textures 264 # TODO: does not work for zero-sized textures
206 $tw = topot $tw; 265 $tw = topot $tw;
207 $th = topot $th; 266 $th = topot $th;
208 267
209 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 268 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
210 my $bpp = (length $data) / ($self->{w} * $self->{h}); 269 my $bpp = (length $data) / ($self->{w} * $self->{h});
211 $data = pack "(a" . ($tw * $bpp) . ")*", 270 $data = pack "(a" . ($tw * $bpp) . ")*",
212 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 271 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
213 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 272 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
214 } 273 }
215 } 274 }
216 275
217 $self->{s} = $self->{w} / $tw; 276 $self->{s} = $self->{w} / $tw;
218 $self->{t} = $self->{h} / $th; 277 $self->{t} = $self->{h} / $th;
219 278
220 $self->{name} ||= (glGenTextures 1)->[0]; 279 $self->{name} ||= glGenTexture;
221 280
222 glBindTexture GL_TEXTURE_2D, $self->{name}; 281 glBindTexture GL_TEXTURE_2D, $self->{name};
223 282
224 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
225 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
226 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 283 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
227 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 284 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
285
286 if ($::FAST) {
287 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
288 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
289 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
290 # alternatively check for 0x8191
291 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
292 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
293 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
294 } else {
295 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
296 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
297 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
298 }
228 299
300 glGetError;
301
229 if (defined $data) { 302 if (defined $data) {
230 glTexImage2D GL_TEXTURE_2D, 0, 303 glTexImage2D GL_TEXTURE_2D, 0,
231 $self->{internalformat}, 304 $self->{internalformat},
232 $tw, $th, # need to pad texture first 305 $tw, $th, # need to pad texture first
233 0, 306 0,
234 $self->{format}, 307 $self->{format},
235 $self->{type}, 308 $self->{type},
236 $data; 309 $data;
237 glGetError and die; 310 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
311 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
238 } else { 312 } else {
239 glCopyTexImage2D GL_TEXTURE_2D, 0, 313 glCopyTexImage2D GL_TEXTURE_2D, 0,
240 $self->{internalformat}, 314 $self->{internalformat},
241 0, 0, 315 0, 0,
242 $tw, $th, 316 $tw, $th,
243 0; 317 0;
244 glGetError and die; 318 CFClient::gl_check "copying to texture %dx%d if=%x",
319 $tw, $th, $self->{internalformat};
245 } 320 }
246} 321}
247 322
248sub DESTROY { 323sub DESTROY {
249 my ($self) = @_; 324 my ($self) = @_;
250 325
251 return unless exists $self->{name}; 326 delete $TEXTURES{$self+0};
252 327
253 glDeleteTextures delete $self->{name}; 328 glDeleteTexture delete $self->{name}
329 if $self->{name};
254} 330}
255 331
256sub restore_state{ 332sub restore_state{
257 $_->upload 333 $_->upload
258 for grep $_, @textures; 334 for values %TEXTURES;
259}; 335};
260 336
2611; 3371;
262 338
263=back 339=back

Diff Legend

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