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.24 by root, Tue Apr 11 18:06:52 2006 UTC vs.
Revision 1.49 by root, Sun Apr 30 08:09:44 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 ();
25use AnyEvent;
26use BerkeleyDB;
27use CFClient::OpenGL;
28
24our %GL_EXT; 29our %GL_EXT;
25our $GL_VERSION; 30our $GL_VERSION;
26 31
27our $GL_NPOT; 32our $GL_NPOT;
33our $GL_DEBUG = 1;
28 34
29sub gl_init { 35sub gl_init {
30 $GL_VERSION = gl_version * 1; 36 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32 38
33 $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;
34 40
41 glDisable GL_COLOR_MATERIAL;
42 glShadeModel GL_FLAT;
43 glDisable GL_DITHER;
44 glDisable GL_DEPTH_TEST;
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46
35 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 }
36} 56}
37 57
38sub find_rcfile($) { 58sub find_rcfile($) {
39 my $path; 59 my $path;
40 60
41 for (@INC) { 61 for (grep !ref, @INC) {
42 $path = "$_/CFClient/resources/$_[0]"; 62 $path = "$_/CFClient/resources/$_[0]";
43 return $path if -r $path; 63 return $path if -r $path;
44 } 64 }
45 65
46 die "FATAL: can't find required file $_[0]\n"; 66 die "FATAL: can't find required file $_[0]\n";
… …
76 } 96 }
77 97
78 close CFG; 98 close CFG;
79} 99}
80 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
81package CFClient::Texture; 148package CFClient::Texture;
82 149
150use strict;
151
83use Scalar::Util; 152use Scalar::Util;
84 153
85use SDL::OpenGL; 154use CFClient::OpenGL;
86 155
87my @textures; 156my %TEXTURES;
88 157
89sub new { 158sub new {
90 my ($class, %data) = @_; 159 my ($class, %data) = @_;
91 160
92 my $self = bless { 161 my $self = bless {
93 internalformat => GL_RGBA, 162 internalformat => GL_RGBA,
94 format => GL_RGBA, 163 format => GL_RGBA,
164 type => GL_UNSIGNED_BYTE,
95 %data, 165 %data,
96 }, $class; 166 }, $class;
97 167
98 push @textures, $self; 168 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
99 Scalar::Util::weaken $textures[-1];
100 169
101 $self->upload; 170 $self->upload;
102 171
103 $self 172 $self
104} 173}
105 174
106sub new_from_image { 175sub new_from_image {
107 my ($class, $image) = @_; 176 my ($class, $image, %arg) = @_;
108 177
109 $class->new (image => $image) 178 $class->new (image => $image, %arg)
110} 179}
111 180
112sub new_from_file { 181sub new_from_file {
113 my ($class, $path) = @_; 182 my ($class, $path, %arg) = @_;
114 183
115 open my $fh, "<:raw", $path 184 open my $fh, "<:raw", $path
116 or die "$path: $!"; 185 or die "$path: $!";
117 186
118 local $/; 187 local $/;
119 $class->new_from_image (<$fh>) 188 $class->new_from_image (<$fh>, %arg)
120} 189}
121 190
122#sub new_from_surface { 191#sub new_from_surface {
123# my ($class, $surface) = @_; 192# my ($class, $surface) = @_;
124# 193#
… …
130# h => $surface->height, 199# h => $surface->height,
131# ) 200# )
132#} 201#}
133 202
134sub new_from_layout { 203sub new_from_layout {
135 my ($class, $layout) = @_; 204 my ($class, $layout, %arg) = @_;
136 205
137 my ($w, $h, $data) = $layout->render; 206 my ($w, $h, $data) = $layout->render;
138 207
139 $class->new ( 208 $class->new (
140 w => $w, 209 w => $w,
141 h => $h, 210 h => $h,
142 data => $data, 211 data => $data,
143 internalformat => GL_ALPHA4,
144 format => GL_ALPHA, 212 format => GL_ALPHA,
213 internalformat => GL_ALPHA,
214 type => GL_UNSIGNED_BYTE,
215 %arg,
145 ) 216 )
146} 217}
147 218
148sub new_from_opengl { 219sub new_from_opengl {
149 my ($class, $w, $h, $cb) = @_; 220 my ($class, $w, $h, $cb) = @_;
150 221
151 $class->new (w => $w, h => $h, render_cb => $cb) 222 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
152} 223}
153 224
154sub topot { 225sub topot {
155 (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]
156} 227}
157 228
158sub upload { 229sub upload {
159 my ($self) = @_; 230 my ($self) = @_;
160 231
161 return unless $SDL::App::USING_OPENGL; 232 return unless $GL_VERSION;
162 233
163 my $data; 234 my $data;
164 235
165 if (exists $self->{data}) { 236 if (exists $self->{data}) {
166 $data = $self->{data}; 237 $data = $self->{data};
238
167 } elsif (exists $self->{render_cb}) { 239 } elsif (exists $self->{render_cb}) {
168 glViewport 0, 0, $self->{w}, $self->{h}; 240 glViewport 0, 0, $self->{w}, $self->{h};
169 glMatrixMode GL_PROJECTION; 241 glMatrixMode GL_PROJECTION;
170 glLoadIdentity; 242 glLoadIdentity;
171 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000; 243 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
172 glMatrixMode GL_MODELVIEW; 244 glMatrixMode GL_MODELVIEW;
173 glPushmatrix;
174 glLoadIdentity; 245 glLoadIdentity;
175 glClear GL_COLOR_BUFFER_BIT;
176
177 $self->{render_cb}->($self, $self->{w}, $self->{h}); 246 $self->{render_cb}->($self, $self->{w}, $self->{h});
247
178 } else { 248 } else {
179 my $pb = new Gtk2::Gdk::PixbufLoader; 249 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
180 $pb->write ($self->{image}); 250 = CFClient::load_image_inline $self->{image};
181 $pb->close;
182
183 $pb = $pb->get_pixbuf;
184 $pb = $pb->add_alpha (0, 0, 0, 0);
185
186 $self->{w} = $pb->get_width;
187 $self->{h} = $pb->get_height;
188
189 $data = $pb->get_pixels;
190 } 251 }
191 252
192 my ($tw, $th) = @$self{qw(w h)}; 253 my ($tw, $th) = @$self{qw(w h)};
193 254
194 unless ($tw || $th) { 255 unless ($tw > 0 && $th > 0) {
195 $tw = $th = 1; 256 $tw = $th = 1;
196 $data = "\x00" x 64; 257 $data = "\x00" x 64;
197 } 258 }
259
260 $self->{minified} = [CFClient::average $tw, $th, $data]
261 if $self->{minify};
198 262
199 unless ($GL_NPOT) { 263 unless ($GL_NPOT) {
200 # TODO: does not work for zero-sized textures 264 # TODO: does not work for zero-sized textures
201 $tw = topot $tw; 265 $tw = topot $tw;
202 $th = topot $th; 266 $th = topot $th;
203 267
204 if (defined $data) { 268 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
205 my $bpp = (length $data) / ($self->{w} * $self->{h}); 269 my $bpp = (length $data) / ($self->{w} * $self->{h});
206 $data = pack "(a" . ($tw * $bpp) . ")*", 270 $data = pack "(a" . ($tw * $bpp) . ")*",
207 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 271 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
208 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 272 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
209 } 273 }
210 } 274 }
211 275
212 $self->{s} = $self->{w} / $tw; 276 $self->{s} = $self->{w} / $tw;
213 $self->{t} = $self->{h} / $th; 277 $self->{t} = $self->{h} / $th;
214 278
215 $self->{name} ||= (glGenTextures 1)->[0]; 279 $self->{name} ||= glGenTexture;
216 280
217 glBindTexture GL_TEXTURE_2D, $self->{name}; 281 glBindTexture GL_TEXTURE_2D, $self->{name};
218 282
219 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
220 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
221 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 283 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
222 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 }
223 299
224 glGetError; 300 glGetError;
301
225 if (defined $data) { 302 if (defined $data) {
226 glTexImage2D GL_TEXTURE_2D, 0, 303 glTexImage2D GL_TEXTURE_2D, 0,
227 $self->{internalformat}, 304 $self->{internalformat},
228 $tw, $th, # need to pad texture first 305 $tw, $th, # need to pad texture first
229 0, 306 0,
230 $self->{format}, 307 $self->{format},
231 GL_UNSIGNED_BYTE, 308 $self->{type},
232 $data; 309 $data;
233 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};
234 } else { 312 } else {
235 glCopyTexImage2D GL_TEXTURE_2D, 0, 313 glCopyTexImage2D GL_TEXTURE_2D, 0,
236 $self->{internalformat}, 314 $self->{internalformat},
237 0, 0, 315 0, 0,
238 $tw, $th, 316 $tw, $th,
239 0; 317 0;
240 glPopmatrix; 318 CFClient::gl_check "copying to texture %dx%d if=%x",
319 $tw, $th, $self->{internalformat};
241 } 320 }
242} 321}
243 322
244sub DESTROY { 323sub DESTROY {
245 my ($self) = @_; 324 my ($self) = @_;
246 325
247 return unless exists $self->{name}; 326 delete $TEXTURES{$self+0};
248 327
249 glDeleteTextures delete $self->{name}; 328 glDeleteTexture delete $self->{name}
329 if $self->{name};
250} 330}
251 331
252sub restore_state{ 332sub restore_state{
253 $_->upload 333 $_->upload
254 for grep $_, @textures; 334 for values %TEXTURES;
255}; 335};
256 336
2571; 3371;
258 338
259=back 339=back

Diff Legend

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