FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Mathias Froehlich, "I have today built svn trunk on HP-UX and Solaris8.

Browse Source 
I had to do two small changes to src/osgWidget/Input.cpp and
src/osgAnimation/Animation.cpp mainly because of name lookup problems.
"
This commit is contained in:
Robert Osfield
2009-01-28 11:59:06 +00:00
parent 84f300fdaf
commit f0a044ee77
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgAnimation/Animation.cpp
View File

@@ -112,7 +112,7 @@ bool Animation::update (float time)
if (!_duration)
t = _startTime;
else if (t > _duration)
t = fmodf(t, _duration);
t = fmod(t, (float)_duration);
// std::cout << "t " << t << " duration " << _duration << std::endl;
break;
case PPONG:
@@ -121,7 +121,7 @@ bool Animation::update (float time)
else
{
int tt = (int) (t / _duration);
t = fmodf(t, _duration);
t = fmod(t, (float)_duration);
if (tt%2)
t = _duration - t;
}

2
src/osgWidget/Input.cpp
View File

@@ -175,7 +175,7 @@ unsigned int Input::calculateBestYOffset(const std::string& s) {
for(osgText::String::iterator i = utf.begin(); i != utf.end(); i++) {
osgText::Font* font = const_cast<osgText::Font*>(_text->getFont());
osgText::Font::Glyph* glyph = font->getGlyph(fr, *i);
unsigned int d = abs(glyph->getHorizontalBearing().y());
unsigned int d = abs((int)glyph->getHorizontalBearing().y());
if(d > descent) descent = d;
}