libretro/scenewalker-libretro
1
0
Fork 0
mirror of https://github.com/libretro/scenewalker-libretro.git synced 2024-11-27 01:50:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace more namespace references to shared_ptr to std1::

Browse Source
This commit is contained in:
twinaphex 2013-05-11 23:56:30 +02:00
parent 69800ea44c
commit 5e4860c95c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretro.cpp
View File

@ -23,7 +23,7 @@ static unsigned height = BASE_HEIGHT;
static struct retro_hw_render_callback hw_render;
static string mesh_path;
static vector<shared_ptr<Mesh> > meshes;
static vector<std1::shared_ptr<Mesh> > meshes;
void retro_init(void)
{}
@ -245,7 +245,7 @@ static void init_mesh(const string& path)
" gl_FragColor = vec4(diffuse + ambient, colorDiffuse.a);\n"
"}";
shared_ptr<Shader> shader(new Shader(vertex_shader, fragment_shader));
std1::shared_ptr<Shader> shader(new Shader(vertex_shader, fragment_shader));
meshes = OBJ::load_from_file(path);
mat4 projection = scale(mat4(1.0), vec3(1, -1, 1)) * perspective(45.0f, 640.0f / 480.0f, 1.0f, 100.0f);

6
mesh.cpp
View File

@ -30,7 +30,7 @@ namespace GL
void Mesh::set_vertices(vector<Vertex> vertex)
{
set_vertices(shared_ptr<vector<Vertex> >(new vector<Vertex>(vertex)));
set_vertices(std1::shared_ptr<vector<Vertex> >(new vector<Vertex>(vertex)));
}
void Mesh::set_vertex_type(GLenum type)
@ -38,7 +38,7 @@ namespace GL
vertex_type = type;
}
void Mesh::set_vertices(const shared_ptr<vector<Vertex> >& vertex)
void Mesh::set_vertices(const std1::shared_ptr<vector<Vertex> >& vertex)
{
this->vertex = vertex;
@ -53,7 +53,7 @@ namespace GL
this->material = material;
}
void Mesh::set_shader(const shared_ptr<Shader>& shader)
void Mesh::set_shader(const std1::shared_ptr<Shader>& shader)
{
this->shader = shader;
}

2
object.hpp
View File

@ -9,7 +9,7 @@
namespace OBJ
{
std::vector<std::tr1::shared_ptr<GL::Mesh> > load_from_file(const std::string& path);
std::vector<std1::shared_ptr<GL::Mesh> > load_from_file(const std::string& path);
}
#endif