X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTexture.cc;h=5341af33d32085632d605029705fa21b4d1c3b7e;hp=22d3f15e92cab597259673d86c08cd2f4692d292;hb=987971a961454d97082c6448fdc0bbeb540281bb;hpb=b357615aba1dbde81e3c6999366604e6001010a7

diff --git a/src/Moof/Texture.cc b/src/Moof/Texture.cc
index 22d3f15..5341af3 100644
--- a/src/Moof/Texture.cc
+++ b/src/Moof/Texture.cc
@@ -32,13 +32,14 @@
 #include <boost/bind.hpp>
 
 #include "Dispatch.hh"
-#include "Engine.hh"
-#include "Exception.hh"
+#include "Core.hh"
+#include "Error.hh"
 #include "Image.hh"
 #include "Library.hh"
 #include "Log.hh"
 #include "OpenGL.hh"
 #include "Texture.hh"
+#include "Video.hh"
 
 
 namespace Mf {
@@ -121,13 +122,11 @@ public:
 		mWrapT(GL_CLAMP),
 		mObject(0)
 	{
-		// make sure the engine is initialized
-		Engine& engine = Engine::getInstance();
-		VideoP video = engine.getVideo();
-		ASSERT(video && "cannot load textures without a current video context");
+		// make sure we have a video context
+		//ASSERT(video && "cannot load textures without a current video context");
 
 		// we want to know when the GL context is recreated
-		mDispatchHandler = engine.addHandler("video.newcontext",
+		mDispatchHandler = core.addHandler("video.newcontext",
 				boost::bind(&Impl::contextRecreated, this));
 
 		loadFromFile();
@@ -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();