Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
028e2e0f49
commit
440908a103
5 changed files with 18 additions and 18 deletions
|
@ -300,7 +300,7 @@ CTextureFont::SLetterInfo* CTextureFont::getLetterInfo (SLetterKey& k)
|
|||
uint32 width, height;
|
||||
|
||||
//k.FontGenerator->getSizes (k.Char, k.Size, width, height);
|
||||
// \todo mat : Temporaire !!! Essayer de faire intervenir le cache de freetype
|
||||
// \todo mat : Temp !!! Try to use freetype cache
|
||||
uint32 nPitch, nGlyphIndex;
|
||||
sint32 nLeft, nTop, nAdvX;
|
||||
k.FontGenerator->getBitmap (k.Char, k.Size, width, height, nPitch, nLeft, nTop,
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
INCLUDE_DIRECTORIES(
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${NEL_INCLUDE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${NEL_INCLUDE_DIR}
|
||||
${QT_INCLUDES})
|
||||
|
||||
|
||||
INCLUDE( ${QT_USE_FILE} )
|
||||
|
||||
FILE(GLOB OBJECT_VIEWER_WIDGET_SRC *.cpp *.h)
|
||||
|
@ -17,12 +17,12 @@ QT4_WRAP_CPP( OBJECT_VIEWER_WIDGET_MOC_SRCS ${OBJECT_VIEWER_WIDGET_HDR} )
|
|||
|
||||
SOURCE_GROUP(QtGeneratedMocSrc FILES ${OBJECT_VIEWER_WIDGET_MOC_SRCS})
|
||||
|
||||
ADD_LIBRARY(object_viewer_widget_qt SHARED
|
||||
${OBJECT_VIEWER_WIDGET_SRC}
|
||||
ADD_LIBRARY(object_viewer_widget_qt SHARED
|
||||
${OBJECT_VIEWER_WIDGET_SRC}
|
||||
${OBJECT_VIEWER_WIDGET_MOC_SRCS})
|
||||
|
||||
TARGET_LINK_LIBRARIES(object_viewer_widget_qt
|
||||
nelmisc
|
||||
nelmisc
|
||||
nel3d
|
||||
${QT_LIBRARIES}
|
||||
${QT_QTOPENGL_LIBRARY})
|
||||
|
@ -31,7 +31,7 @@ ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
|
|||
ADD_DEFINITIONS(-DQT_PLUGIN)
|
||||
ADD_DEFINITIONS(-DQT_SHARED)
|
||||
#ADD_DEFINITIONS(-DQT_NO_DEBUG)
|
||||
|
||||
|
||||
NL_DEFAULT_PROPS(object_viewer_widget_qt "NeL, Tools, 3D: Object Viewer Qt Widget")
|
||||
#NL_ADD_RUNTIME_FLAGS(object_viewer_widget_qt)
|
||||
|
||||
|
|
|
@ -49,22 +49,22 @@ using namespace NLMISC;
|
|||
using namespace NL3D;
|
||||
using namespace std;
|
||||
|
||||
namespace NLQT
|
||||
namespace NLQT
|
||||
{
|
||||
CObjectViewerWidget *CObjectViewerWidget::_objectViewerWidget = NULL;
|
||||
|
||||
CObjectViewerWidget::CObjectViewerWidget(QWidget *parent)
|
||||
: _isGraphicsInitialized(false), _isGraphicsEnabled(false),
|
||||
: _isGraphicsInitialized(false), _isGraphicsEnabled(false),
|
||||
_Driver(NULL), _Light(0), _phi(0), _psi(0),_dist(2),
|
||||
_CameraFocal(75), _CurrentInstance(""), _BloomEffect(false),
|
||||
_Scene(0), QWidget(parent)
|
||||
_CameraFocal(75), _CurrentInstance(""), _BloomEffect(false),
|
||||
_Scene(0), QWidget(parent)
|
||||
{
|
||||
|
||||
_objectViewerWidget = this;
|
||||
|
||||
_isGraphicsEnabled = true;
|
||||
|
||||
// As a special case, a QTimer with a timeout of 0 will time out as soon as all the events in the window system's event queue have been processed.
|
||||
// As a special case, a QTimer with a timeout of 0 will time out as soon as all the events in the window system's event queue have been processed.
|
||||
// This can be used to do heavy work while providing a snappy user interface.
|
||||
_mainTimer = new QTimer(this);
|
||||
connect(_mainTimer, SIGNAL(timeout()), this, SLOT(updateRender()));
|
||||
|
|
|
@ -558,7 +558,7 @@ void CMicroLifeManager::tileAdded(const NL3D::CTileAddedInfo &infos)
|
|||
#if !FINAL_VERSION
|
||||
// for debug display, tells that it was generated dynamically
|
||||
newFX.FromIG = false;
|
||||
#endif
|
||||
#endif
|
||||
// spawn a primitive on the quad
|
||||
float weight[3];
|
||||
// compute weight values by computing some noise values around
|
||||
|
|
|
@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
using namespace std;
|
||||
using namespace NL3D;
|
||||
|
||||
namespace NLQT
|
||||
namespace NLQT
|
||||
{
|
||||
|
||||
CObjectViewerDialog::CObjectViewerDialog(QWidget *parent)
|
||||
|
@ -51,7 +51,7 @@ namespace NLQT
|
|||
_ui.gridLayout->addWidget(_nlw, 0, 0);
|
||||
}
|
||||
|
||||
CObjectViewerDialog::~CObjectViewerDialog()
|
||||
CObjectViewerDialog::~CObjectViewerDialog()
|
||||
{
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue