nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

large refactor

Browse Source
This commit is contained in:
Turanszki Janos
2019-12-12 22:15:16 +00:00
parent c495ce0088
commit fa267b0e7d
115 changed files with 1348 additions and 1739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/ModelImporter_OBJ.cpp
+6 -6
View File
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "wiSceneSystem.h"
#include "wiScene.h"
#include "ModelImporter.h"
#define TINYOBJLOADER_IMPLEMENTATION
@@ -9,7 +9,7 @@
using namespace std;
using namespace wiGraphics;
using namespace wiSceneSystem;
using namespace wiScene;
using namespace wiECS;
// Transform the data from OBJ space to engine-space:
@@ -66,19 +66,19 @@ void ImportModel_OBJ(const std::string& fileName, Scene& scene)
if (!material.surfaceMapName.empty())
{
material.surfaceMap = (Texture*)wiResourceManager::GetGlobal().add(directory + material.surfaceMapName);
material.surfaceMap = wiResourceManager::Load(directory + material.surfaceMapName);
}
if (!material.baseColorMapName.empty())
{
material.baseColorMap = (Texture*)wiResourceManager::GetGlobal().add(directory + material.baseColorMapName);
material.baseColorMap = wiResourceManager::Load(directory + material.baseColorMapName);
}
if (!material.normalMapName.empty())
{
material.normalMap = (Texture*)wiResourceManager::GetGlobal().add(directory + material.normalMapName);
material.normalMap = wiResourceManager::Load(directory + material.normalMapName);
}
if (!material.displacementMapName.empty())
{
material.displacementMap = (Texture*)wiResourceManager::GetGlobal().add(directory + material.displacementMapName);
material.displacementMap = wiResourceManager::Load(directory + material.displacementMapName);
}
materialLibrary.push_back(materialEntity); // for subset-indexing...