From: Mikko Rasa Date: Mon, 3 Jun 2019 16:43:41 +0000 (+0300) Subject: Update deprecated things X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=abb4e50bdbb6d62d7e6ee249d52353ccf22762a4;p=libs%2Fgl.git Update deprecated things --- diff --git a/demos/desertpillars.cpp b/demos/desertpillars.cpp index 2f141898..cb06cd00 100644 --- a/demos/desertpillars.cpp +++ b/demos/desertpillars.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include using namespace std; diff --git a/demos/shaders.cpp b/demos/shaders.cpp index 88ad06da..44d0b440 100644 --- a/demos/shaders.cpp +++ b/demos/shaders.cpp @@ -16,8 +16,8 @@ #include #include #include +#include #include -#include using namespace std; using namespace Msp; diff --git a/source/animation.cpp b/source/animation.cpp index e82a92a8..ab9d6e60 100644 --- a/source/animation.cpp +++ b/source/animation.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include "animation.h" #include "animationeventobserver.h" #include "armature.h" diff --git a/source/resources.cpp b/source/resources.cpp index fe59860d..03e10e2d 100644 --- a/source/resources.cpp +++ b/source/resources.cpp @@ -95,7 +95,7 @@ Mesh *Resources::create_mesh(const string &name) if(!resource_manager) return 0; - if(RefPtr io = open_from_sources(name)) + if(RefPtr io = open_raw(name)) { RefPtr 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 = open_from_sources(name)) + if(RefPtr 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 = open_from_sources(name)) + if(RefPtr io = open_raw(name)) { ProgramCompiler compiler; compiler.compile(*io, this, name);