opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-21 14:41:58 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2079 from paroj:ovisres

Browse Source
This commit is contained in:
Alexander Alekhin
2019-04-11 15:17:43 +00:00
parent 2c32791a9c 310ca2b4a3
commit 01cfda40eb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/ovis/src/ovis.cpp
View File

@@ -22,7 +22,7 @@ const char* RESOURCEGROUP_NAME = "OVIS";
Ptr<Application> _app; Ptr<Application> _app;
static const char* RENDERSYSTEM_NAME = "OpenGL 3+ Rendering Subsystem"; static const char* RENDERSYSTEM_NAME = "OpenGL 3+ Rendering Subsystem";
static std::vector<String> _extraResourceLocations; static std::set<String> _extraResourceLocations;
// convert from OpenCV to Ogre coordinates: // convert from OpenCV to Ogre coordinates:
static Quaternion toOGRE(Degree(180), Vector3::UNIT_X); static Quaternion toOGRE(Degree(180), Vector3::UNIT_X);
@@ -245,10 +245,9 @@ struct Application : public OgreBites::ApplicationContext, public OgreBites::Inp
ResourceGroupManager& rgm = ResourceGroupManager::getSingleton(); ResourceGroupManager& rgm = ResourceGroupManager::getSingleton();
rgm.createResourceGroup(RESOURCEGROUP_NAME); rgm.createResourceGroup(RESOURCEGROUP_NAME);
for (size_t i = 0; i < _extraResourceLocations.size(); i++) for (auto loc :_extraResourceLocations)
{ {
String loc = _extraResourceLocations[i]; const char* type = StringUtil::endsWith(loc, ".zip") ? "Zip" : "FileSystem";
String type = StringUtil::endsWith(loc, ".zip") ? "Zip" : "FileSystem";
if (!FileSystemLayer::fileExists(loc)) if (!FileSystemLayer::fileExists(loc))
{ {
@@ -786,7 +785,10 @@ public:
} }
}; };
CV_EXPORTS_W void addResourceLocation(const String& path) { _extraResourceLocations.push_back(path); } CV_EXPORTS_W void addResourceLocation(const String& path)
{
_extraResourceLocations.insert(Ogre::StringUtil::normalizeFilePath(path, false));
}
Ptr<WindowScene> createWindow(const String& title, const Size& size, int flags) Ptr<WindowScene> createWindow(const String& title, const Size& size, int flags)
{ {