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.29 by root, Wed Apr 12 20:42:52 2006 UTC vs.
Revision 1.42 by root, Fri Apr 21 07:09:10 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 AnyEvent;
25use BerkeleyDB;
26use CFClient::OpenGL;
25 27
26our %GL_EXT; 28our %GL_EXT;
27our $GL_VERSION; 29our $GL_VERSION;
28 30
29our $GL_NPOT; 31our $GL_NPOT;
… …
31sub gl_init { 33sub gl_init {
32 $GL_VERSION = gl_version * 1; 34 $GL_VERSION = gl_version * 1;
33 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
34 36
35 $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;
36
37 glClearColor 0.45, 0.45, 0.45, 1;
38 38
39 glEnable GL_TEXTURE_2D; 39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL; 40 glEnable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT; 41 glShadeModel GL_FLAT;
42 glDisable GL_DEPTH_TEST; 42 glDisable GL_DEPTH_TEST;
… …
88 } 88 }
89 89
90 close CFG; 90 close CFG;
91} 91}
92 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
93package CFClient::Texture; 140package CFClient::Texture;
94 141
95use strict; 142use strict;
96 143
97use Scalar::Util; 144use Scalar::Util;
98 145
99use SDL::OpenGL; 146use CFClient::OpenGL;
100 147
101my @textures; 148my %TEXTURES;
102 149
103sub new { 150sub new {
104 my ($class, %data) = @_; 151 my ($class, %data) = @_;
105 152
106 my $self = bless { 153 my $self = bless {
… …
108 format => GL_RGBA, 155 format => GL_RGBA,
109 type => GL_UNSIGNED_BYTE, 156 type => GL_UNSIGNED_BYTE,
110 %data, 157 %data,
111 }, $class; 158 }, $class;
112 159
113 push @textures, $self; 160 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
114 Scalar::Util::weaken $textures[-1];
115 161
116 $self->upload; 162 $self->upload;
117 163
118 $self 164 $self
119} 165}
120 166
121sub new_from_image { 167sub new_from_image {
122 my ($class, $image) = @_; 168 my ($class, $image, %arg) = @_;
123 169
124 $class->new (image => $image) 170 $class->new (image => $image, %arg)
125} 171}
126 172
127sub new_from_file { 173sub new_from_file {
128 my ($class, $path) = @_; 174 my ($class, $path, %arg) = @_;
129 175
130 open my $fh, "<:raw", $path 176 open my $fh, "<:raw", $path
131 or die "$path: $!"; 177 or die "$path: $!";
132 178
133 local $/; 179 local $/;
134 $class->new_from_image (<$fh>) 180 $class->new_from_image (<$fh>, %arg)
135} 181}
136 182
137#sub new_from_surface { 183#sub new_from_surface {
138# my ($class, $surface) = @_; 184# my ($class, $surface) = @_;
139# 185#
… …
145# h => $surface->height, 191# h => $surface->height,
146# ) 192# )
147#} 193#}
148 194
149sub new_from_layout { 195sub new_from_layout {
150 my ($class, $layout) = @_; 196 my ($class, $layout, %arg) = @_;
151 197
152 my ($w, $h, $data) = $layout->render; 198 my ($w, $h, $data) = $layout->render;
153 199
154 $class->new ( 200 $class->new (
155 w => $w, 201 w => $w,
156 h => $h, 202 h => $h,
157 data => $data, 203 data => $data,
158 internalformat => GL_ALPHA4, 204 internalformat => GL_ALPHA4,
159 format => GL_ALPHA, 205 format => GL_ALPHA,
160 type => GL_UNSIGNED_BYTE, 206 type => GL_UNSIGNED_BYTE,
207 %arg,
161 ) 208 )
162} 209}
163 210
164sub new_from_opengl { 211sub new_from_opengl {
165 my ($class, $w, $h, $cb) = @_; 212 my ($class, $w, $h, $cb) = @_;
… …
181 if (exists $self->{data}) { 228 if (exists $self->{data}) {
182 $data = $self->{data}; 229 $data = $self->{data};
183 230
184 } elsif (exists $self->{render_cb}) { 231 } elsif (exists $self->{render_cb}) {
185 glViewport 0, 0, $self->{w}, $self->{h}; 232 glViewport 0, 0, $self->{w}, $self->{h};
186 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
187 glMatrixMode GL_PROJECTION; 233 glMatrixMode GL_PROJECTION;
188 glLoadIdentity; 234 glLoadIdentity;
235 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
189 glMatrixMode GL_MODELVIEW; 236 glMatrixMode GL_MODELVIEW;
190 glLoadIdentity; 237 glLoadIdentity;
191 glClear GL_COLOR_BUFFER_BIT;
192 $self->{render_cb}->($self, $self->{w}, $self->{h}); 238 $self->{render_cb}->($self, $self->{w}, $self->{h});
193 239
194 } else { 240 } else {
195 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 241 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
196 = CFClient::load_image_inline $self->{image}; 242 = CFClient::load_image_inline $self->{image};
… …
200 246
201 unless ($tw && $th) { 247 unless ($tw && $th) {
202 $tw = $th = 1; 248 $tw = $th = 1;
203 $data = "\x00" x 64; 249 $data = "\x00" x 64;
204 } 250 }
251
252 $self->{minified} = [CFClient::average $tw, $th, $data]
253 if $self->{minify};
205 254
206 unless ($GL_NPOT) { 255 unless ($GL_NPOT) {
207 # TODO: does not work for zero-sized textures 256 # TODO: does not work for zero-sized textures
208 $tw = topot $tw; 257 $tw = topot $tw;
209 $th = topot $th; 258 $th = topot $th;
… …
217 } 266 }
218 267
219 $self->{s} = $self->{w} / $tw; 268 $self->{s} = $self->{w} / $tw;
220 $self->{t} = $self->{h} / $th; 269 $self->{t} = $self->{h} / $th;
221 270
271 glGetError;
272
222 $self->{name} ||= (glGenTextures 1)->[0]; 273 $self->{name} ||= glGenTexture;
223 274
224 glBindTexture GL_TEXTURE_2D, $self->{name}; 275 glBindTexture GL_TEXTURE_2D, $self->{name};
225 276
226 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
227 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
228 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
229 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279
280 if ($::FAST) {
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
283 } else {
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;
287 }
230 288
231 if (defined $data) { 289 if (defined $data) {
232 glTexImage2D GL_TEXTURE_2D, 0, 290 glTexImage2D GL_TEXTURE_2D, 0,
233 $self->{internalformat}, 291 $self->{internalformat},
234 $tw, $th, # need to pad texture first 292 $tw, $th, # need to pad texture first
235 0, 293 0,
236 $self->{format}, 294 $self->{format},
237 $self->{type}, 295 $self->{type},
238 $data; 296 $data;
239 glGetError and die; 297 if (my $error = glGetError) {
298 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
299 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300 }
240 } else { 301 } else {
241 glCopyTexImage2D GL_TEXTURE_2D, 0, 302 glCopyTexImage2D GL_TEXTURE_2D, 0,
242 $self->{internalformat}, 303 $self->{internalformat},
243 0, 0, 304 0, 0,
244 $tw, $th, 305 $tw, $th,
245 0; 306 0;
246 glGetError and die; 307 glGetError and die "glCopyTexImage2D $tw,$th";
247 } 308 }
248} 309}
249 310
250sub DESTROY { 311sub DESTROY {
251 my ($self) = @_; 312 my ($self) = @_;
252 313
253 return unless exists $self->{name}; 314 delete $TEXTURES{$self+0};
254 315
255 glDeleteTextures delete $self->{name}; 316 glDeleteTexture delete $self->{name}
317 if $self->{name};
256} 318}
257 319
258sub restore_state{ 320sub restore_state{
259 $_->upload 321 $_->upload
260 for grep $_, @textures; 322 for values %TEXTURES;
261}; 323};
262 324
2631; 3251;
264 326
265=back 327=back

Diff Legend

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