Skip to content
Snippets Groups Projects
Commit eb46c51d authored by aboensch's avatar aboensch
Browse files

FIX: extern declaration for non-static variable default_resource_search_paths for cpplint

parent 27743686
Branches
Tags
1 merge request!135Feature/#458 custom materials
...@@ -34,6 +34,14 @@ ...@@ -34,6 +34,14 @@
#include "phx/resources_path.hpp" #include "phx/resources_path.hpp"
namespace phx { namespace phx {
namespace {
std::vector<std::string> default_resource_search_paths = {
{std::string("./"), resources_root}};
}
std::vector<std::string> ResourceUtils::resource_search_paths_{
default_resource_search_paths};
ResourceDeclaration ResourceUtils::GenericMaterialDeclaration( ResourceDeclaration ResourceUtils::GenericMaterialDeclaration(
const std::string& material_name, glm::vec3 diffuse_color, const std::string& material_name, glm::vec3 diffuse_color,
glm::vec3 specular_color, glm::vec3 ambient_color, float shininess) { glm::vec3 specular_color, glm::vec3 ambient_color, float shininess) {
...@@ -50,12 +58,6 @@ ResourceDeclaration ResourceUtils::GenericMaterialDeclaration( ...@@ -50,12 +58,6 @@ ResourceDeclaration ResourceUtils::GenericMaterialDeclaration(
return declaration; return declaration;
} }
std::vector<std::string> default_resource_search_paths = {
{std::string("./"), resources_root}};
std::vector<std::string> ResourceUtils::resource_search_paths_{
default_resource_search_paths};
void ResourceUtils::AddResourceSearchPath(const std::string& path_to_add) { void ResourceUtils::AddResourceSearchPath(const std::string& path_to_add) {
assert(!path_to_add.empty()); assert(!path_to_add.empty());
auto p = (path_to_add.back() == '/' ? path_to_add auto p = (path_to_add.back() == '/' ? path_to_add
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment