Fix object viewer include issue
--HG-- branch : develop
This commit is contained in:
parent
96116c6eba
commit
7d53552979
3 changed files with 11 additions and 4 deletions
|
@ -76,7 +76,10 @@ const char *CFontGenerator::getFT2Error(FT_Error fte)
|
||||||
return ukn;
|
return ukn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CFontGenerator *newCFontGenerator(const std::string &fontFileName)
|
||||||
|
{
|
||||||
|
return new CFontGenerator(fontFileName);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Constructor
|
* Constructor
|
||||||
|
|
|
@ -36,7 +36,6 @@
|
||||||
#include "nel/3d/scene_group.h"
|
#include "nel/3d/scene_group.h"
|
||||||
#include "nel/3d/animation_playlist.h"
|
#include "nel/3d/animation_playlist.h"
|
||||||
#include "nel/3d/track_keyframer.h"
|
#include "nel/3d/track_keyframer.h"
|
||||||
#include "nel/3d/font_generator.h"
|
|
||||||
#include "nel/3d/register_3d.h"
|
#include "nel/3d/register_3d.h"
|
||||||
#include "nel/3d/seg_remanence.h"
|
#include "nel/3d/seg_remanence.h"
|
||||||
|
|
||||||
|
@ -592,6 +591,12 @@ void CObjectViewer::initCamera ()
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
|
|
||||||
|
namespace NL3D {
|
||||||
|
CFontGenerator *newCFontGenerator(const std::string &fontFileName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ***************************************************************************
|
||||||
|
|
||||||
bool CObjectViewer::initUI (HWND parent)
|
bool CObjectViewer::initUI (HWND parent)
|
||||||
{
|
{
|
||||||
AFX_MANAGE_STATE(AfxGetStaticModuleState());
|
AFX_MANAGE_STATE(AfxGetStaticModuleState());
|
||||||
|
@ -616,7 +621,7 @@ bool CObjectViewer::initUI (HWND parent)
|
||||||
_FontPath+="\\fonts\\arial.ttf";
|
_FontPath+="\\fonts\\arial.ttf";
|
||||||
|
|
||||||
// The font generator
|
// The font generator
|
||||||
_FontGenerator = new NL3D::CFontGenerator ( _FontPath );
|
_FontGenerator = NL3D::newCFontGenerator ( _FontPath );
|
||||||
delete[] wd;
|
delete[] wd;
|
||||||
|
|
||||||
// The viewport
|
// The viewport
|
||||||
|
|
|
@ -44,7 +44,6 @@
|
||||||
#include "nel/3d/texture_grouped.h"
|
#include "nel/3d/texture_grouped.h"
|
||||||
#include "nel/3d/nelu.h"
|
#include "nel/3d/nelu.h"
|
||||||
#include "nel/3d/font_manager.h"
|
#include "nel/3d/font_manager.h"
|
||||||
#include "nel/3d/font_generator.h"
|
|
||||||
//
|
//
|
||||||
#include "nel/misc/file.h"
|
#include "nel/misc/file.h"
|
||||||
#include "start_stop_particle_system.h"
|
#include "start_stop_particle_system.h"
|
||||||
|
|
Loading…
Reference in a new issue