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.5 by root, Fri Apr 7 20:13:13 2006 UTC vs.
Revision 1.26 by root, Wed Apr 12 02:00:06 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}
… …
53 79
54 open CFG, ">$file" 80 open CFG, ">$file"
55 or return; 81 or return;
56 82
57 { 83 {
84 require Data::Dumper;
58 local $Data::Dumper::Purity = 1; 85 local $Data::Dumper::Purity = 1;
59 $::CFG->{VERSION} = $::VERSION; 86 $::CFG->{VERSION} = $::VERSION;
60 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 87 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
61 } 88 }
62 89
63 close CFG; 90 close CFG;
64} 91}
65 92
66package Crossfire::Client::Texture; 93package CFClient::Texture;
94
95use strict;
67 96
68use Scalar::Util; 97use Scalar::Util;
69 98
70use SDL::OpenGL; 99use SDL::OpenGL;
71 100
72my @textures; 101my @textures;
73 102
74sub _new { 103sub new {
75 my ($class, %data) = @_; 104 my ($class, %data) = @_;
76 105
77 my $self = bless \%data, $class; 106 my $self = bless {
107 internalformat => GL_RGBA,
108 format => GL_RGBA,
109 %data,
110 }, $class;
78 111
79 push @textures, $self; 112 push @textures, $self;
80 Scalar::Util::weaken $textures[-1]; 113 Scalar::Util::weaken $textures[-1];
81 114
82 $self->upload; 115 $self->upload;
… …
85} 118}
86 119
87sub new_from_image { 120sub new_from_image {
88 my ($class, $image) = @_; 121 my ($class, $image) = @_;
89 122
90 $class->_new (image => $image) 123 $class->new (image => $image)
91} 124}
92 125
93sub new_from_file { 126sub new_from_file {
94 my ($class, $path) = @_; 127 my ($class, $path) = @_;
95 128
… …
98 131
99 local $/; 132 local $/;
100 $class->new_from_image (<$fh>) 133 $class->new_from_image (<$fh>)
101} 134}
102 135
103sub new_from_surface { 136#sub new_from_surface {
104 my ($class, $surface) = @_; 137# my ($class, $surface) = @_;
105 138#
106 $surface->rgba; 139# $surface->rgba;
107 140#
108 $class->_new ( 141# $class->new (
109 data => $surface->pixels, 142# data => $surface->pixels,
110 width => $surface->width, 143# w => $surface->width,
111 height => $surface->height, 144# h => $surface->height,
145# )
146#}
147
148sub new_from_layout {
149 my ($class, $layout) = @_;
150
151 my ($w, $h, $data) = $layout->render;
152
153 $class->new (
154 w => $w,
155 h => $h,
156 data => $data,
157 internalformat => GL_ALPHA4,
158 format => GL_ALPHA,
112 ) 159 )
160}
161
162sub new_from_opengl {
163 my ($class, $w, $h, $cb) = @_;
164
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]
113} 170}
114 171
115sub upload { 172sub upload {
116 my ($self) = @_; 173 my ($self) = @_;
117 174
118 return unless $SDL::App::USING_OPENGL; 175 return unless $SDL::App::USING_OPENGL;
119 176
120 my ($data, $width, $height); 177 my $data;
121 178
122 if (exists $self->{data}) { 179 if (exists $self->{data}) {
123 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 180 $data = $self->{data};
181
182 } elsif (exists $self->{render_cb}) {
183 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
185 glMatrixMode GL_PROJECTION;
186 glLoadIdentity;
187 glMatrixMode GL_MODELVIEW;
188 glLoadIdentity;
189 glClear GL_COLOR_BUFFER_BIT;
190 $self->{render_cb}->($self, $self->{w}, $self->{h});
191
124 } else { 192 } else {
125 my $pb = new Gtk2::Gdk::PixbufLoader; 193 my $pb = new Gtk2::Gdk::PixbufLoader;
126 $pb->write ($self->{image}); 194 $pb->write ($self->{image});
127 $pb->close; 195 $pb->close;
128 196
129 $pb = $pb->get_pixbuf; 197 $pb = $pb->get_pixbuf;
130 $pb = $pb->add_alpha (0, 0, 0, 0); 198 $pb = $pb->add_alpha (0, 0, 0, 0);
131 199
132 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); 200 $self->{w} = $pb->get_width;
133 } 201 $self->{h} = $pb->get_height;
134 202
203 $data = $pb->get_pixels;
204 }
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
135 ($self->{name}) = @{glGenTextures 1}; 229 $self->{name} ||= (glGenTextures 1)->[0];
136 230
137 glBindTexture GL_TEXTURE_2D, $self->{name}; 231 glBindTexture GL_TEXTURE_2D, $self->{name};
138 232
139 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 233 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
140 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 234 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
141 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 235 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
142 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 236 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
143 237
238 if (defined $data) {
144 glTexImage2D GL_TEXTURE_2D, 0, 239 glTexImage2D GL_TEXTURE_2D, 0,
145 GL_RGBA8, 240 $self->{internalformat},
146 $width, $height, 241 $tw, $th, # need to pad texture first
147 0, 242 0,
148 GL_RGBA, 243 $self->{format},
149 GL_UNSIGNED_BYTE, 244 GL_UNSIGNED_BYTE,
150 $data; 245 $data;
246 glGetError and die;
247 } else {
248 glCopyTexImage2D GL_TEXTURE_2D, 0,
249 $self->{internalformat},
250 0, 0,
251 $tw, $th,
252 0;
253 glGetError and die;
254 }
151} 255}
152 256
153sub DESTROY { 257sub DESTROY {
154 my ($self) = @_; 258 my ($self) = @_;
155 259
156 return unless exists $self->{name}; 260 return unless exists $self->{name};
157 261
158 glDeleteTextures delete $self->{name}; 262 glDeleteTextures delete $self->{name};
159} 263}
160 264
161push @::GLINIT, sub { 265sub restore_state{
162 $_->upload 266 $_->upload
163 for grep $_, @textures; 267 for grep $_, @textures;
164}; 268};
165 269
1661; 2701;

Diff Legend

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