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.15 by root, Sun Apr 9 00:12:58 2006 UTC vs.
Revision 1.27 by root, Wed Apr 12 18:09:21 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire::Client - undocumented utility garbage for our crossfire client 3CFClient - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use Crossfire::Client; 7 use CFClient;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package Crossfire::Client; 15package CFClient;
16 16
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "Crossfire::Client", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22}
23
24use SDL::OpenGL;
25
26our %GL_EXT;
27our $GL_VERSION;
28
29our $GL_NPOT;
30
31sub gl_init {
32 $GL_VERSION = gl_version * 1;
33 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
34
35 $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
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;
46
47 CFClient::Texture::restore_state ();
22} 48}
23 49
24sub find_rcfile($) { 50sub find_rcfile($) {
25 my $path; 51 my $path;
26 52
27 for (@INC) { 53 for (@INC) {
28 $path = "$_/Crossfire/resources/$_[0]"; 54 $path = "$_/CFClient/resources/$_[0]";
29 return $path if -r $path; 55 return $path if -r $path;
30 } 56 }
31 57
32 die "FATAL: can't find required file $_[0]\n"; 58 die "FATAL: can't find required file $_[0]\n";
33} 59}
… …
62 } 88 }
63 89
64 close CFG; 90 close CFG;
65} 91}
66 92
67package Crossfire::Client::Texture; 93package CFClient::Texture;
94
95use strict;
68 96
69use Scalar::Util; 97use Scalar::Util;
70 98
71use SDL::OpenGL; 99use SDL::OpenGL;
72 100
… …
110# 138#
111# $surface->rgba; 139# $surface->rgba;
112# 140#
113# $class->new ( 141# $class->new (
114# data => $surface->pixels, 142# data => $surface->pixels,
115# width => $surface->width, 143# w => $surface->width,
116# height => $surface->height, 144# h => $surface->height,
117# ) 145# )
118#} 146#}
119 147
120sub new_from_text { 148sub new_from_layout {
121 my ($class, $text, $height) = @_; 149 my ($class, $layout) = @_;
122 150
123 my ($w, $h, $data) = Crossfire::Client::font_render $text, $height; 151 my ($w, $h, $data) = $layout->render;
124 152
125 $class->new ( 153 $class->new (
126 width => $w, 154 w => $w,
127 height => $h, 155 h => $h,
128 data => $data, 156 data => $data,
129 internalformat => GL_ALPHA8, 157 internalformat => GL_ALPHA4,
130 format => GL_ALPHA, 158 format => GL_ALPHA,
131 ) 159 )
132} 160}
133 161
134sub new_from_opengl { 162sub new_from_opengl {
135 my ($class, $w, $h, $cb) = @_; 163 my ($class, $w, $h, $cb) = @_;
136 164
137 $class->new (width => $w, height => $h, rendercb => $cb) 165 $class->new (w => $w, h => $h, render_cb => $cb)
166}
167
168sub topot {
169 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
138} 170}
139 171
140sub upload { 172sub upload {
141 my ($self) = @_; 173 my ($self) = @_;
142 174
143 return unless $SDL::App::USING_OPENGL; 175 return unless $GL_VERSION;
144 176
145 my $data; 177 my $data;
146 178
147 if (exists $self->{data}) { 179 if (exists $self->{data}) {
148 $data = $self->{data}; 180 $data = $self->{data};
181
149 } elsif (exists $self->{rendercb}) { 182 } elsif (exists $self->{render_cb}) {
150 glViewport 0, 0, $self->{width}, $self->{height}; 183 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
151 glMatrixMode GL_PROJECTION; 185 glMatrixMode GL_PROJECTION;
152 glLoadIdentity; 186 glLoadIdentity;
153 glOrtho 0, $self->{width}, 0, $self->{height}, -100, 100;
154 glMatrixMode GL_MODELVIEW; 187 glMatrixMode GL_MODELVIEW;
155 glPushmatrix;
156 glLoadIdentity; 188 glLoadIdentity;
157 glClear GL_COLOR_BUFFER_BIT; 189 glClear GL_COLOR_BUFFER_BIT;
158
159 $self->{rendercb}->($self, $self->{width}, $self->{height}); 190 $self->{render_cb}->($self, $self->{w}, $self->{h});
191
160 } else { 192 } else {
161 my $pb = new Gtk2::Gdk::PixbufLoader; 193 my $pb = new Gtk2::Gdk::PixbufLoader;
162 $pb->write ($self->{image}); 194 $pb->write ($self->{image});
163 $pb->close; 195 $pb->close;
164 196
165 $pb = $pb->get_pixbuf; 197 $pb = $pb->get_pixbuf;
166 $pb = $pb->add_alpha (0, 0, 0, 0); 198 $pb = $pb->add_alpha (0, 0, 0, 0);
167 199
168 $self->{width} = $pb->get_width; 200 $self->{w} = $pb->get_width;
169 $self->{height} = $pb->get_height; 201 $self->{h} = $pb->get_height;
170 202
171 $data = $pb->get_pixels; 203 $data = $pb->get_pixels;
172 } 204 }
173 205
206 my ($tw, $th) = @$self{qw(w h)};
207
208 unless ($tw && $th) {
209 $tw = $th = 1;
210 $data = "\x00" x 64;
211 }
212
213 unless ($GL_NPOT) {
214 # TODO: does not work for zero-sized textures
215 $tw = topot $tw;
216 $th = topot $th;
217
218 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
219 my $bpp = (length $data) / ($self->{w} * $self->{h});
220 $data = pack "(a" . ($tw * $bpp) . ")*",
221 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
222 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
223 }
224 }
225
226 $self->{s} = $self->{w} / $tw;
227 $self->{t} = $self->{h} / $th;
228
174 ($self->{name}) = @{glGenTextures 1}; 229 $self->{name} ||= (glGenTextures 1)->[0];
175 230
176 glBindTexture GL_TEXTURE_2D, $self->{name}; 231 glBindTexture GL_TEXTURE_2D, $self->{name};
177 232
178 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 233 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
179 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;#_MIPMAP_LINEAR; 234 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
180 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 235 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
181 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 236 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
182 237
183 if (defined $data) { 238 if (defined $data) {
184 glTexImage2D GL_TEXTURE_2D, 0, 239 glTexImage2D GL_TEXTURE_2D, 0,
185 $self->{internalformat}, 240 $self->{internalformat},
186 $self->{width}, $self->{height}, 241 $tw, $th, # need to pad texture first
187 0, 242 0,
188 $self->{format}, 243 $self->{format},
189 GL_UNSIGNED_BYTE, 244 GL_UNSIGNED_BYTE,
190 $data; 245 $data;
246 glGetError and die;
191 } else { 247 } else {
192 glCopyTexImage2D GL_TEXTURE_2D, 0, 248 glCopyTexImage2D GL_TEXTURE_2D, 0,
193 $self->{internalformat}, 249 $self->{internalformat},
194 0, 0, 250 0, 0,
195 $self->{width}, $self->{height}, 251 $tw, $th,
196 0; 252 0;
197 glPopmatrix; 253 glGetError and die;
198 #SDL::GLSwapBuffers;
199 #sleep 1;
200 } 254 }
201} 255}
202 256
203sub DESTROY { 257sub DESTROY {
204 my ($self) = @_; 258 my ($self) = @_;
… …
206 return unless exists $self->{name}; 260 return unless exists $self->{name};
207 261
208 glDeleteTextures delete $self->{name}; 262 glDeleteTextures delete $self->{name};
209} 263}
210 264
211push @::GLINIT, sub { 265sub restore_state{
212 $_->upload 266 $_->upload
213 for grep $_, @textures; 267 for grep $_, @textures;
214}; 268};
215 269
2161; 2701;

Diff Legend

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