X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTexture.cc;h=6769d8887644a1924d2fdc67974b1afa4df4083d;hp=22d3f15e92cab597259673d86c08cd2f4692d292;hb=a295f8def17036c8071b56e181364f99a377cae7;hpb=b357615aba1dbde81e3c6999366604e6001010a7 diff --git a/src/Moof/Texture.cc b/src/Moof/Texture.cc index 22d3f15..6769d88 100644 --- a/src/Moof/Texture.cc +++ b/src/Moof/Texture.cc @@ -33,7 +33,7 @@ #include "Dispatch.hh" #include "Engine.hh" -#include "Exception.hh" +#include "Error.hh" #include "Image.hh" #include "Library.hh" #include "Log.hh" @@ -121,8 +121,7 @@ public: mWrapT(GL_CLAMP), mObject(0) { - // make sure the engine is initialized - Engine& engine = Engine::getInstance(); + // make sure we have a video VideoP video = engine.getVideo(); ASSERT(video && "cannot load textures without a current video context"); @@ -220,7 +219,7 @@ public: if (!mImage.isValid()) { logWarning << "texture not found: " << getName() << std::endl; - throw Exception(ErrorCode::RESOURCE_NOT_FOUND, getName()); + throw Error(Error::RESOURCE_NOT_FOUND, getName()); } mImage.flip();