~ubuntu-branches/debian/sid/gource/sid

Committer: Bazaar Package Importer
Author(s): Andrew Caudwell
Date: 2011-05-16 11:30:00 UTC
mfrom: (1.2.10 upstream)
Revision ID: james.westby@ubuntu.com-20110516113000-vcqcni97y90b5eyy

Tags: 0.34-1

* New upstream release
* Changed build dependency from FTGL to Freetype 2
* Updated debian/copyright
* Bump Standards-Version to 3.9.2

files added:
data/shaders

data/shaders/bloom.frag

data/shaders/bloom.vert

data/shaders/shadow.frag

data/shaders/shadow.vert

data/shaders/text.frag

data/shaders/text.vert

src/bloom.cpp

src/bloom.h

src/core/ftgl

src/core/ftgl/FTUnicode.h

src/core/gl.h

src/core/shader.cpp

src/core/shader.h

src/core/vbo.cpp

src/core/vbo.h

files modified:
ChangeLog

INSTALL

Makefile.am

Makefile.in

README

aclocal.m4

configure

configure.ac

data/gource.1

debian/changelog

debian/control

debian/copyright

gource.win32.cbp

src/action.cpp

src/action.h

src/bzr.cpp

src/core/camera.cpp

src/core/camera.h

src/core/display.cpp

src/core/display.h

src/core/frustum.cpp

src/core/frustum.h

src/core/fxfont.cpp

src/core/fxfont.h

src/core/quadtree.cpp

src/core/resource.h

src/core/sdlapp.cpp

src/core/settings.cpp

src/core/settings.h

src/core/vectors.h

src/dirnode.cpp

src/dirnode.h

src/file.cpp

src/file.h

src/gource.cpp

src/gource.h

src/gource_settings.cpp

src/gource_settings.h

src/key.cpp

src/main.cpp

src/pawn.cpp

src/pawn.h

src/spline.cpp

src/spline.h

src/textbox.cpp

src/user.cpp

src/user.h

Show diffs side-by-side

added added

removed removed

src/textbox.cpp

if(width > rect_width) rect_width = width;

rect_height += (font.getHeight()+4);

rect_height += (font.getFontSize()+4);

content.push_back(str);

}

if(!adjust) return;

100

101

int fontheight = font.getHeight() + 4;

101

int fontheight = font.getFontSize() + 4;

102

103

corner.y -= rect_height;

104

153

std::vector<std::string>::const_iterator it;

154

for(it = content.begin(); it != content.end(); it++) {

155

font.draw((int)corner.x+2, (int)corner.y+yinc, (*it).c_str());

156

yinc += font.getHeight() + 4;

156

yinc += font.getFontSize() + 4;

157

}

158

}

Older »