From 9036f24e1665d92b5139678ed924e959cffcf17c Mon Sep 17 00:00:00 2001
From: Lava Block <the@lava-block.com>
Date: Sun, 11 Oct 2020 11:41:40 +0200
Subject: [PATCH] rename
---
liblava/file/file_system.cpp | 8 ++++----
liblava/file/file_system.hpp | 2 +-
liblava/resource/mesh.cpp | 2 +-
liblava/resource/mesh.hpp | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/liblava/file/file_system.cpp b/liblava/file/file_system.cpp
index c6605f53..50b799e1 100644
--- a/liblava/file/file_system.cpp
+++ b/liblava/file/file_system.cpp
@@ -27,7 +27,7 @@ namespace lava {
return PHYSFS_getPrefDir(instance().org, instance().app);
}
- string file_system::get_res_dir() {
+ string file_system::get_res_dir_str() {
string res_dir = get_base_dir();
res_dir += instance().res_path;
string_ref const_res_dir = res_dir;
@@ -100,13 +100,13 @@ namespace lava {
res_path = "res/";
#endif
- if (fs::exists(str(get_res_dir())))
+ if (fs::exists(str(get_res_dir_str())))
if (file_system::mount(str(res_path)))
- log()->debug("mount {}", str(get_res_dir()));
+ log()->debug("mount {}", str(get_res_dir_str()));
auto cwd_res_dir = fs::current_path().append("res/").lexically_normal().string();
- if (fs::exists(cwd_res_dir) && (cwd_res_dir != get_res_dir()))
+ if (fs::exists(cwd_res_dir) && (cwd_res_dir != get_res_dir_str()))
if (file_system::mount(cwd_res_dir))
log()->debug("mount {}", str(cwd_res_dir));
diff --git a/liblava/file/file_system.hpp b/liblava/file/file_system.hpp
index 89cfb806..5e5a8032 100644
--- a/liblava/file/file_system.hpp
+++ b/liblava/file/file_system.hpp
@@ -24,7 +24,7 @@ namespace lava {
static name get_base_dir();
static string get_base_dir_str();
static name get_pref_dir();
- static string get_res_dir();
+ static string get_res_dir_str();
static bool mount(string_ref path);
static bool mount(name base_dir_path);
diff --git a/liblava/resource/mesh.cpp b/liblava/resource/mesh.cpp
index 8f0a8020..bb6793aa 100644
--- a/liblava/resource/mesh.cpp
+++ b/liblava/resource/mesh.cpp
@@ -173,7 +173,7 @@ lava::mesh::ptr lava::load_mesh(device_ptr device, name filename) {
return nullptr;
}
-lava::mesh::ptr lava::load_mesh(device_ptr device, mesh_type type) {
+lava::mesh::ptr lava::create_mesh(device_ptr device, mesh_type type) {
switch (type) {
case mesh_type::cube: {
auto cube = make_mesh();
diff --git a/liblava/resource/mesh.hpp b/liblava/resource/mesh.hpp
index 5ed09b0b..c4b5b5c6 100644
--- a/liblava/resource/mesh.hpp
+++ b/liblava/resource/mesh.hpp
@@ -128,7 +128,7 @@ namespace lava {
quad
};
- mesh::ptr load_mesh(device_ptr device, mesh_type type);
+ mesh::ptr create_mesh(device_ptr device, mesh_type type);
struct mesh_meta {
string filename; // empty -> type
--
GitLab