Update deprecated things
authorMikko Rasa <tdb@tdb.fi>
Mon, 3 Jun 2019 16:43:41 +0000 (19:43 +0300)
committerMikko Rasa <tdb@tdb.fi>
Mon, 3 Jun 2019 16:43:41 +0000 (19:43 +0300)
demos/desertpillars.cpp
demos/shaders.cpp
source/animation.cpp
source/resources.cpp

index 2f141898ee027e63ec5f247221beba267f253298..cb06cd000bc05f32f3cb446133c08a555362e4fb 100644 (file)
@@ -30,7 +30,7 @@
 #include <msp/input/keyboard.h>
 #include <msp/input/keys.h>
 #include <msp/time/timestamp.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
 
 using namespace std;
index 88ad06daa2a3d6c68ed513801cf189d23d85dbe2..44d0b440795cad881dc8f4c6cad7916f96a070c9 100644 (file)
@@ -16,8 +16,8 @@
 #include <msp/gl/texture2d.h>
 #include <msp/gl/texturing.h>
 #include <msp/time/timestamp.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
-#include <msp/time/units.h>
 
 using namespace std;
 using namespace Msp;
index e82a92a87ce4811b3e465b345e6f5477d1c61f27..ab9d6e6085c35a36d1f430b652586411e7849047 100644 (file)
@@ -1,7 +1,6 @@
 #include <cmath>
 #include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
-#include <msp/time/units.h>
 #include "animation.h"
 #include "animationeventobserver.h"
 #include "armature.h"
index fe59860d8cbbcd6ec9017bbdc70d162e8eff669e..03e10e2dccac03e46b1fa0b904cef0b821c8db17 100644 (file)
@@ -95,7 +95,7 @@ Mesh *Resources::create_mesh(const string &name)
        if(!resource_manager)
                return 0;
 
-       if(RefPtr<IO::Seekable> io = open_from_sources(name))
+       if(RefPtr<IO::Seekable> io = open_raw(name))
        {
                RefPtr<Mesh> mesh = new Mesh(resource_manager);
                resource_manager->set_resource_location(*mesh, *this, name);
@@ -111,7 +111,7 @@ Texture2D *Resources::create_texture2d(const string &name)
        if(ext==".tex2d")
                return 0;
 
-       if(RefPtr<IO::Seekable> io = open_from_sources(name))
+       if(RefPtr<IO::Seekable> io = open_raw(name))
        {
                Graphics::Image image;
                if(!resource_manager)
@@ -145,7 +145,7 @@ Program *Resources::create_program(const string &name)
        if(ext==".shader")
                return 0;
 
-       if(RefPtr<IO::Seekable> io = open_from_sources(name))
+       if(RefPtr<IO::Seekable> io = open_raw(name))
        {
                ProgramCompiler compiler;
                compiler.compile(*io, this, name);