Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2267 from ey6es/visagefix

Browse source 
Two more Visage compilation fixes.
This commit is contained in:
Andrzej Kapolka 2014-03-11 15:39:50 -07:00
commit 9798767261
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/devices/Visage.cpp
View file

@ -10,14 +10,15 @@
#include <SharedUtil.h> #include <SharedUtil.h>
#ifdef HAVE_VISAGE
#include <VisageTracker2.h>
#endif
#include "Application.h" #include "Application.h"
#include "Visage.h" #include "Visage.h"
#include "renderer/FBXReader.h" #include "renderer/FBXReader.h"
// this has to go after our normal includes, because its definition of HANDLE conflicts with Qt's
#ifdef HAVE_VISAGE
#include <VisageTracker2.h>
#endif
namespace VisageSDK { namespace VisageSDK {
#ifdef WIN32 #ifdef WIN32
void __declspec(dllimport) initializeLicenseManager(char* licenseKeyFileName); void __declspec(dllimport) initializeLicenseManager(char* licenseKeyFileName);
@ -37,9 +38,9 @@ Visage::Visage() :
_estimatedEyeYaw(0.0f) { _estimatedEyeYaw(0.0f) {
#ifdef HAVE_VISAGE #ifdef HAVE_VISAGE
QByteArray licensePath = Application::resourcesPath() + "visage/license.vlc"; QByteArray licensePath = Application::resourcesPath().toLatin1() + "visage/license.vlc";
initializeLicenseManager(licensePath.data()); initializeLicenseManager(licensePath.data());
_tracker = new VisageTracker2(Application::resourcesPath() + "visage/tracker.cfg"); _tracker = new VisageTracker2(Application::resourcesPath().toLatin1() + "visage/tracker.cfg");
if (_tracker->trackFromCam()) { if (_tracker->trackFromCam()) {
_data = new FaceData(); _data = new FaceData();