From 14f48d821aef41da6ec6744e6edf4be951d78272 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 9 Jan 2016 15:57:20 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- .../src/object_viewer_widget.cpp | 14 +++++++------- .../src/object_viewer_widget.h | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp index dadb2435d..328850ecd 100644 --- a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp +++ b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp @@ -95,13 +95,13 @@ namespace NLQT void CObjectViewerWidget::showEvent ( QShowEvent * event ) { - if (!_mainTimer->isActive()) + if (!_mainTimer->isActive()) { _mainTimer->start(25); } } - void CObjectViewerWidget::setNelContext(NLMISC::INelContext &nelContext) + void CObjectViewerWidget::setNelContext(NLMISC::INelContext &nelContext) { _LibContext = new CLibraryContext(nelContext); } @@ -268,7 +268,7 @@ namespace NLQT // ... // 09. Update Animations (playlists) - // - Needs to be either before or after entities, not sure, + // - Needs to be either before or after entities, not sure, // there was a problem with wrong order a while ago!!! @@ -291,7 +291,7 @@ namespace NLQT if (_isGraphicsInitialized && !getDriver()->isLost()) { - // 01. Render Driver (background color) + // 01. Render Driver (background color) renderDriver(); // clear all buffers // 02. Render Sky (sky scene) @@ -436,14 +436,14 @@ namespace NLQT bool CObjectViewerWidget::loadMesh(const std::string &meshFileName, const std::string &skelFileName) { std::string fileName = CFile::getFilenameWithoutExtension(meshFileName); - if ( _Entities.count(fileName) != 0) + if ( _Entities.count(fileName) != 0) return false; CPath::addSearchPath(CFile::getPath(meshFileName), false, false); // create instance of the mesh character UInstance Entity = _Scene->createInstance(meshFileName); - + CAABBox bbox; Entity.getShapeAABBox(bbox); setCamera(_Scene, bbox , Entity, true); @@ -464,7 +464,7 @@ namespace NLQT entity._FileNameShape = meshFileName; entity._FileNameSkeleton = skelFileName; entity._Instance = Entity; - if (!Skeleton.empty()) + if (!Skeleton.empty()) { entity._Skeleton = Skeleton; entity._Skeleton.bindSkin (entity._Instance); diff --git a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h index cb40abfd9..69629ef40 100644 --- a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h +++ b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h @@ -33,7 +33,7 @@ along with this program. If not, see . #include "entity.h" #include "interfaces.h" -namespace NL3D +namespace NL3D { class UDriver; class UScene; @@ -50,14 +50,14 @@ class QIcon; namespace NLQT @brief namespace NLQT */ -namespace NLQT +namespace NLQT { - class CObjectViewerWidget: - public QWidget, + class CObjectViewerWidget: + public QWidget, public IObjectViewer { Q_OBJECT - Q_INTERFACES(NLQT::IObjectViewer) + Q_INTERFACES(NLQT::IObjectViewer) public: /// Default constructor. @@ -113,7 +113,7 @@ namespace NLQT /// @param w - width window. /// @param h - height window. void setSizeViewport(uint16 w, uint16 h); - + void setBloomEffect(bool enabled) { _BloomEffect = enabled; } /// Select instance from the scene @@ -184,7 +184,7 @@ namespace NLQT void updateRender(); private: - + /// Update the animation time for Particle System animation. /// @param deltaTime - set the manual animation time. void updateAnimatePS(uint64 deltaTime = 0);