X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ffadeoverlay.cpp;h=e54ccf9f96d64a5282f9fa2154d220453bdf8cc1;hb=HEAD;hp=ab069c3477e79e69a339ca916cb62749eb94ead2;hpb=423a982cb00a9ec74fc154d729cbf88518adc6d8;p=libs%2Fdemoscene.git

diff --git a/source/fadeoverlay.cpp b/source/fadeoverlay.cpp
index ab069c3..e54ccf9 100644
--- a/source/fadeoverlay.cpp
+++ b/source/fadeoverlay.cpp
@@ -3,13 +3,16 @@
 #include <msp/gl/texture2d.h>
 #include "demo.h"
 #include "fadeoverlay.h"
+#include "resources.h"
 
-using namespace Msp;
 using namespace std;
 
-FadeOverlay::FadeOverlay(DataFile::Collection &resources):
+namespace Msp {
+namespace DemoScene {
+
+FadeOverlay::FadeOverlay():
 	mesh(get_fullscreen_quad()),
-	shprog(resources.get<GL::Program>("fade.glsl")),
+	shprog(Resources::get_builtins().get<GL::Program>("fade.glsl")),
 	color(0.0f, 0.0f, 0.0f, 0.0f)
 {
 	shdata.uniform("color", color);
@@ -63,3 +66,6 @@ void FadeOverlay::Fade::Loader::color(float r, float g, float b, float a)
 {
 	obj.end_color = GL::Color(r, g, b, a);
 }
+
+} // namespace DemoScene
+} // namespace Msp