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.25 by root, Tue Apr 11 19:31:17 2006 UTC vs.
Revision 1.41 by root, Wed Apr 19 23:37:48 2006 UTC

… …
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23
24use AnyEvent;
25use BerkeleyDB;
26use CFClient::OpenGL;
23 27
24our %GL_EXT; 28our %GL_EXT;
25our $GL_VERSION; 29our $GL_VERSION;
26 30
27our $GL_NPOT; 31our $GL_NPOT;
… …
29sub gl_init { 33sub gl_init {
30 $GL_VERSION = gl_version * 1; 34 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32 36
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
38
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT;
42 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
34 46
35 CFClient::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
36} 48}
37 49
38sub find_rcfile($) { 50sub find_rcfile($) {
… …
76 } 88 }
77 89
78 close CFG; 90 close CFG;
79} 91}
80 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
81package CFClient::Texture; 140package CFClient::Texture;
82 141
83use strict; 142use strict;
84 143
85use Scalar::Util; 144use Scalar::Util;
86 145
87use SDL::OpenGL; 146use CFClient::OpenGL;
88 147
89my @textures; 148my %TEXTURES;
90 149
91sub new { 150sub new {
92 my ($class, %data) = @_; 151 my ($class, %data) = @_;
93 152
94 my $self = bless { 153 my $self = bless {
95 internalformat => GL_RGBA, 154 internalformat => GL_RGBA,
96 format => GL_RGBA, 155 format => GL_RGBA,
156 type => GL_UNSIGNED_BYTE,
97 %data, 157 %data,
98 }, $class; 158 }, $class;
99 159
100 push @textures, $self; 160 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
101 Scalar::Util::weaken $textures[-1];
102 161
103 $self->upload; 162 $self->upload;
104 163
105 $self 164 $self
106} 165}
107 166
108sub new_from_image { 167sub new_from_image {
109 my ($class, $image) = @_; 168 my ($class, $image, %arg) = @_;
110 169
111 $class->new (image => $image) 170 $class->new (image => $image, %arg)
112} 171}
113 172
114sub new_from_file { 173sub new_from_file {
115 my ($class, $path) = @_; 174 my ($class, $path) = @_;
116 175
… …
142 w => $w, 201 w => $w,
143 h => $h, 202 h => $h,
144 data => $data, 203 data => $data,
145 internalformat => GL_ALPHA4, 204 internalformat => GL_ALPHA4,
146 format => GL_ALPHA, 205 format => GL_ALPHA,
206 type => GL_UNSIGNED_BYTE,
147 ) 207 )
148} 208}
149 209
150sub new_from_opengl { 210sub new_from_opengl {
151 my ($class, $w, $h, $cb) = @_; 211 my ($class, $w, $h, $cb) = @_;
… …
158} 218}
159 219
160sub upload { 220sub upload {
161 my ($self) = @_; 221 my ($self) = @_;
162 222
163 return unless $SDL::App::USING_OPENGL; 223 return unless $GL_VERSION;
164 224
165 my $data; 225 my $data;
166 226
167 if (exists $self->{data}) { 227 if (exists $self->{data}) {
168 $data = $self->{data}; 228 $data = $self->{data};
169 229
170 } elsif (exists $self->{render_cb}) { 230 } elsif (exists $self->{render_cb}) {
171 glViewport 0, 0, $self->{w}, $self->{h}; 231 glViewport 0, 0, $self->{w}, $self->{h};
172 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
173 glMatrixMode GL_PROJECTION; 232 glMatrixMode GL_PROJECTION;
174 glLoadIdentity; 233 glLoadIdentity;
234 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
175 glMatrixMode GL_MODELVIEW; 235 glMatrixMode GL_MODELVIEW;
176 glLoadIdentity; 236 glLoadIdentity;
177 glClear GL_COLOR_BUFFER_BIT;
178 $self->{render_cb}->($self, $self->{w}, $self->{h}); 237 $self->{render_cb}->($self, $self->{w}, $self->{h});
179 238
180 } else { 239 } else {
181 my $pb = new Gtk2::Gdk::PixbufLoader; 240 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
182 $pb->write ($self->{image}); 241 = CFClient::load_image_inline $self->{image};
183 $pb->close;
184
185 $pb = $pb->get_pixbuf;
186 $pb = $pb->add_alpha (0, 0, 0, 0);
187
188 $self->{w} = $pb->get_width;
189 $self->{h} = $pb->get_height;
190
191 $data = $pb->get_pixels;
192 } 242 }
193 243
194 my ($tw, $th) = @$self{qw(w h)}; 244 my ($tw, $th) = @$self{qw(w h)};
195 245
196 unless ($tw && $th) { 246 unless ($tw && $th) {
197 $tw = $th = 1; 247 $tw = $th = 1;
198 $data = "\x00" x 64; 248 $data = "\x00" x 64;
199 } 249 }
250
251 $self->{minified} = [CFClient::average $tw, $th, $data]
252 if $self->{minify};
200 253
201 unless ($GL_NPOT) { 254 unless ($GL_NPOT) {
202 # TODO: does not work for zero-sized textures 255 # TODO: does not work for zero-sized textures
203 $tw = topot $tw; 256 $tw = topot $tw;
204 $th = topot $th; 257 $th = topot $th;
… …
212 } 265 }
213 266
214 $self->{s} = $self->{w} / $tw; 267 $self->{s} = $self->{w} / $tw;
215 $self->{t} = $self->{h} / $th; 268 $self->{t} = $self->{h} / $th;
216 269
270 glGetError;
271
217 $self->{name} ||= (glGenTextures 1)->[0]; 272 $self->{name} ||= glGenTexture;
218 273
219 glBindTexture GL_TEXTURE_2D, $self->{name}; 274 glBindTexture GL_TEXTURE_2D, $self->{name};
220 275
221 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 276 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
222 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
223 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
224 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 279 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
225 280
226 if (defined $data) { 281 if (defined $data) {
227 glTexImage2D GL_TEXTURE_2D, 0, 282 glTexImage2D GL_TEXTURE_2D, 0,
228 $self->{internalformat}, 283 $self->{internalformat},
229 $tw, $th, # need to pad texture first 284 $tw, $th, # need to pad texture first
230 0, 285 0,
231 $self->{format}, 286 $self->{format},
232 GL_UNSIGNED_BYTE, 287 $self->{type},
233 $data; 288 $data;
234 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 }
235 } else { 293 } else {
236 glCopyTexImage2D GL_TEXTURE_2D, 0, 294 glCopyTexImage2D GL_TEXTURE_2D, 0,
237 $self->{internalformat}, 295 $self->{internalformat},
238 0, 0, 296 0, 0,
239 $tw, $th, 297 $tw, $th,
240 0; 298 0;
241 glGetError and die; 299 glGetError and die "glCopyTexImage2D $tw,$th";
242 } 300 }
243} 301}
244 302
245sub DESTROY { 303sub DESTROY {
246 my ($self) = @_; 304 my ($self) = @_;
247 305
248 return unless exists $self->{name}; 306 delete $TEXTURES{$self+0};
249 307
250 glDeleteTextures delete $self->{name}; 308 glDeleteTexture delete $self->{name}
309 if $self->{name};
251} 310}
252 311
253sub restore_state{ 312sub restore_state{
254 $_->upload 313 $_->upload
255 for grep $_, @textures; 314 for values %TEXTURES;
256}; 315};
257 316
2581; 3171;
259 318
260=back 319=back

Diff Legend

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