aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-10 01:09:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix object viewer include issue

Browse source
This commit is contained in:
kaetemi 2015-07-10 07:54:34 +02:00
parent 80d4e91d74
commit 04ce449901
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/src/3d/font_generator.cpp
View file

@ -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

9
code/nel/tools/3d/object_viewer/object_viewer.cpp
View file

@ -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

1
code/nel/tools/3d/object_viewer/particle_dlg.cpp
View file

@ -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"