Now supporting multiple material per mesh. Simon changed glDrawElementsBaseVertex to glDrawElements in DrawFinalPass.cpp Hallelulijah!

2016-01-19 17:40:34 +01:00
parent 2a3009212a
commit 3826142e94
15 changed files with 359 additions and 230 deletions
@@ -95,10 +95,10 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs, World
            model = ResourceManager::Load<::Model, true>(resource);
        } catch (const Resource::StillLoadingException&) {
            //continue;
-            model = ResourceManager::Load<::Model>("Models/coolCube.mesh");
+            model = ResourceManager::Load<::Model>("Models/coolCube");
        } catch (const std::exception&) {
            try {
-                model = ResourceManager::Load<::Model>("Models/coolCube.mesh");
+                model = ResourceManager::Load<::Model>("Models/coolCube");
            } catch (const std::exception&) {
                continue;
            }