Async load works, using exceptions for special resources.

2016-01-14 16:27:45 +01:00
parent 9f185a1e35
commit 71047b08ec
13 changed files with 160 additions and 181 deletions
@@ -24,7 +24,6 @@ class RawModel : public Resource

 protected:
 	RawModel(std::string fileName);
-    virtual void GlCommands() override;

 public:
 	~RawModel();
@@ -47,8 +46,11 @@ public:
 	struct MaterialGroup
 	{
 		float Shininess;
+        std::string TexturePath;
 		std::shared_ptr<::Texture> Texture;
+        std::string NormalMapPath;
 		std::shared_ptr<::Texture> NormalMap;
+        std::string SpecularMapPath;
 		std::shared_ptr<::Texture> SpecularMap;
 		unsigned int StartIndex;
 		unsigned int EndIndex;