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.4 by root, Fri Apr 7 18:49:52 2006 UTC vs.
Revision 1.8 by root, Sat Apr 8 13:36:25 2006 UTC

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 "Crossfire::Client", $VERSION;
22}
23
24sub find_rcfile($) {
25 my $path;
26
27 for (@INC) {
28 $path = "$_/Crossfire/resources/$_[0]";
29 return $path if -r $path;
30 }
31
32 die "FATAL: can't find required file $_[0]\n";
33}
34
35sub read_cfg {
36 my ($file) = @_;
37
38 open CFG, $file
39 or return;
40
41 my $CFG;
42
43 local $/;
44 $CFG = eval <CFG>;
45
46 $::CFG = $CFG;
47
48 close CFG;
49}
50
51sub write_cfg {
52 my ($file) = @_;
53
54 open CFG, ">$file"
55 or return;
56
57 {
58 local $Data::Dumper::Purity = 1;
59 $::CFG->{VERSION} = $::VERSION;
60 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
61 }
62
63 close CFG;
22} 64}
23 65
24package Crossfire::Client::Texture; 66package Crossfire::Client::Texture;
25 67
26use Scalar::Util; 68use Scalar::Util;
68 width => $surface->width, 110 width => $surface->width,
69 height => $surface->height, 111 height => $surface->height,
70 ) 112 )
71} 113}
72 114
115sub new_from_ttf {
116 my ($class, $ttf, $text) = @_;
117
118 utf8::encode $text;
119
120 my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
121 (new SDL::Color -r => 255, -g => 255, -b => 255);
122
123 $class->new_from_surface (bless \$surface, SDL::Surface::)
124}
125
126sub new_from_opengl {
127 my ($class, $w, $h, $cb) = @_;
128
129 $class->_new (width => $w, height => $h, render => $cb)
130}
131
73sub upload { 132sub upload {
74 my ($self) = @_; 133 my ($self) = @_;
75 134
76 return unless $SDL::App::USING_OPENGL; 135 return unless $SDL::App::USING_OPENGL;
77 136
78 my ($data, $width, $height); 137 my $data;
79 138
80 if (exists $self->{data}) { 139 if (exists $self->{data}) {
81 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 140 $data = $self->{data};
141 } elsif (exists $self->{rendercb}) {
142 glViewport 0, 0, $self->{width}, $self->{height};
143 glClear GL_COLOR_BUFFER_BIT;
144
145 $self->{rendercb}->($self, $self->{width}, $self->{height});
82 } else { 146 } else {
83 my $pb = new Gtk2::Gdk::PixbufLoader; 147 my $pb = new Gtk2::Gdk::PixbufLoader;
84 $pb->write ($self->{image}); 148 $pb->write ($self->{image});
85 $pb->close; 149 $pb->close;
86 150
87 $pb = $pb->get_pixbuf; 151 $pb = $pb->get_pixbuf;
88 $pb = $pb->add_alpha (0, 0, 0, 0); 152 $pb = $pb->add_alpha (0, 0, 0, 0);
89 153
90 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); 154 $self->{width} = $pb->get_width;
155 $self->{height} = $pb->get_height;
156
157 $data = $pb->get_pixels;
91 } 158 }
92 159
93 ($self->{name}) = @{glGenTextures 1}; 160 ($self->{name}) = @{glGenTextures 1};
94 161
95 glBindTexture GL_TEXTURE_2D, $self->{name}; 162 glBindTexture GL_TEXTURE_2D, $self->{name};
97 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 164 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
98 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 165 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
99 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 166 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
100 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 167 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
101 168
169 if (defined $data) {
102 glTexImage2D GL_TEXTURE_2D, 0, 170 glTexImage2D GL_TEXTURE_2D, 0,
103 GL_RGBA8, 171 GL_RGBA8,
104 $width, $height, 172 $self->{width}, $self->{height},
105 0, 173 0,
106 GL_RGBA, 174 GL_RGBA,
107 GL_UNSIGNED_BYTE, 175 GL_UNSIGNED_BYTE,
108 $data; 176 $data;
177 } else {
178 glCopyTexImage2D GL_TEXTURE_2D, 0,
179 GL_RGBA8,
180 0, 0,
181 $self->{width}, $self->{height},
182 0;
183 }
109} 184}
110 185
111sub DESTROY { 186sub DESTROY {
112 my ($self) = @_; 187 my ($self) = @_;
113 188

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines