Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1193 Added menu entry change camera mode.

Browse source
This commit is contained in:
dnk-88 2011-01-21 21:17:25 +02:00
parent 30ba3ecb3d
commit 0716d6fdba
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
code/nel/tools/3d/object_viewer_qt/src/main_window.cpp
View file

@ -63,7 +63,8 @@ CMainWindow::CMainWindow(QWidget *parent)
_isLandscapeInitialized(false), _isLandscapeInitialized(false),
_isLandscapeEnabled(false), _isLandscapeEnabled(false),
_GraphicsViewport(NULL), _GraphicsViewport(NULL),
_lastDir(".") _lastDir("."),
_mouseMode(NL3D::U3dMouseListener::edit3d)
{ {
nldebug("CMainWindow::CMainWindow:"); nldebug("CMainWindow::CMainWindow:");
setObjectName("CMainWindow"); setObjectName("CMainWindow");
@ -227,7 +228,18 @@ void CMainWindow::resetCamera()
} }
void CMainWindow::changeCameraMode() void CMainWindow::changeCameraMode()
{ {
switch (_mouseMode)
{
case NL3D::U3dMouseListener::edit3d:
Modules::objView().get3dMouseListener()->setMouseMode(NL3D::U3dMouseListener::firstPerson);
_mouseMode = NL3D::U3dMouseListener::firstPerson;
break;
case NL3D::U3dMouseListener::firstPerson:
_mouseMode = NL3D::U3dMouseListener::edit3d;
Modules::objView().get3dMouseListener()->setMouseMode(NL3D::U3dMouseListener::edit3d);
break;
}
} }
void CMainWindow::reloadTextures() void CMainWindow::reloadTextures()
@ -378,10 +390,19 @@ void CMainWindow::createActions()
_renderModeAction->setStatusTip(tr("Change render mode (Line, Point, Filled)")); _renderModeAction->setStatusTip(tr("Change render mode (Line, Point, Filled)"));
connect(_renderModeAction, SIGNAL(triggered()), this, SLOT(changeRenderMode())); connect(_renderModeAction, SIGNAL(triggered()), this, SLOT(changeRenderMode()));
_cameraModeAction = new QAction("Change camera mode", this);
_cameraModeAction->setShortcut(tr("Ctrl+W"));
_cameraModeAction->setStatusTip(tr("Change camera mode (edit3d, firstPerson)"));
connect(_cameraModeAction, SIGNAL(triggered()), this, SLOT(changeCameraMode()));
_resetSceneAction = new QAction(tr("&Reset scene"), this); _resetSceneAction = new QAction(tr("&Reset scene"), this);
_resetSceneAction->setStatusTip(tr("Reset current scene")); _resetSceneAction->setStatusTip(tr("Reset current scene"));
connect(_resetSceneAction, SIGNAL(triggered()), this, SLOT(resetScene())); connect(_resetSceneAction, SIGNAL(triggered()), this, SLOT(resetScene()));
_reloadTexturesAction = new QAction(tr("Reload textures"), this);
_reloadTexturesAction->setStatusTip(tr("Reload textures"));
connect(_reloadTexturesAction, SIGNAL(triggered()), this, SLOT(reloadTextures()));
_saveScreenshotAction = _GraphicsViewport->createSaveScreenshotAction(this); _saveScreenshotAction = _GraphicsViewport->createSaveScreenshotAction(this);
_saveScreenshotAction->setText(tr("Save &Screenshot")); _saveScreenshotAction->setText(tr("Save &Screenshot"));
_saveScreenshotAction->setStatusTip(tr("Make a screenshot of the current viewport and save")); _saveScreenshotAction->setStatusTip(tr("Make a screenshot of the current viewport and save"));
@ -411,13 +432,15 @@ void CMainWindow::createMenus()
_viewMenu = menuBar()->addMenu(tr("&View")); _viewMenu = menuBar()->addMenu(tr("&View"));
_viewMenu->setObjectName("ovqt.Menu.View"); _viewMenu->setObjectName("ovqt.Menu.View");
_viewMenu->addAction(_setBackColorAction); _viewMenu->addAction(_setBackColorAction);
_viewMenu->addAction(_renderModeAction);
_viewMenu->addAction(_resetCameraAction); _viewMenu->addAction(_resetCameraAction);
_viewMenu->addAction(_renderModeAction);
_viewMenu->addAction(_cameraModeAction);
_viewMenu->addAction(_SetupFog->toggleViewAction()); _viewMenu->addAction(_SetupFog->toggleViewAction());
_sceneMenu = menuBar()->addMenu(tr("&Scene")); _sceneMenu = menuBar()->addMenu(tr("&Scene"));
_sceneMenu->setObjectName("ovqt.Menu.Scene"); _sceneMenu->setObjectName("ovqt.Menu.Scene");
_sceneMenu->addAction(_resetSceneAction); _sceneMenu->addAction(_resetSceneAction);
_sceneMenu->addAction(_reloadTexturesAction);
_sceneMenu->addAction(_saveScreenshotAction); _sceneMenu->addAction(_saveScreenshotAction);
_toolsMenu = menuBar()->addMenu(tr("&Tools")); _toolsMenu = menuBar()->addMenu(tr("&Tools"));

1
code/nel/tools/3d/object_viewer_qt/src/main_window.h
View file

@ -155,6 +155,7 @@ private:
float _fps; float _fps;
uint _numTri; uint _numTri;
float _texMem; float _texMem;
sint _mouseMode;
};/* class CMainWindow */ };/* class CMainWindow */
} /* namespace NLQT */ } /* namespace NLQT */