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

From David Callu, warning fixes

Browse Source
This commit is contained in:
Robert Osfield
2007-09-07 15:03:56 +00:00
parent 18e688ea5f
commit 8e7e6529be
26 changed files with 90 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgViewer/ViewerEventHandlers.cpp
View File

@@ -142,11 +142,11 @@ void WindowSizeHandler::toggleFullscreen(osgViewer::GraphicsWindow *window)
int x;
int y;
int width;
int height;
int height;
window->getWindowRectangle(x, y, width, height);
bool isFullScreen = x == 0 && y == 0 && width == screenWidth && height == screenHeight;
bool isFullScreen = x == 0 && y == 0 && width == (int)screenWidth && height == (int)screenHeight;
if (isFullScreen)
{
@@ -188,11 +188,11 @@ void WindowSizeHandler::changeWindowedResolution(osgViewer::GraphicsWindow *wind
int x;
int y;
int width;
int height;
int height;
window->getWindowRectangle(x, y, width, height);
bool isFullScreen = x == 0 && y == 0 && width == screenWidth && height == screenHeight;
bool isFullScreen = x == 0 && y == 0 && width == (int)screenWidth && height == (int)screenHeight;
if (window->getWindowDecoration() == true || isFullScreen == false)
{
@@ -356,8 +356,8 @@ RecordCameraPathHandler::RecordCameraPathHandler(const std::string& filename):
_currentlyRecording(false),
_currentlyPlaying(false),
_delta(0.0f),
_lastFrameTime(osg::Timer::instance()->tick()),
_animStartTime(0)
_animStartTime(0),
_lastFrameTime(osg::Timer::instance()->tick())
{
_animPath = new osg::AnimationPath();