kuhyx/testsAndMisc
1
0
Fork 0
mirror of https://github.com/kuhyx/testsAndMisc.git synced 2026-07-04 14:43:01 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat: Added shader loading in resources

Browse Source
This commit is contained in:
PolishPigeon 2022-01-22 11:53:03 +01:00 committed by KRZYSZTOF RUDNICKI
parent 64e6c043df
commit 4a8e139daa
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SFMLEngine/makingAGameTick/resources.hpp
View File

@ -16,6 +16,9 @@ class ResourceHolder
void load(Identifier id, const std::string& filename);
Resource& get(Identifier id);
const Resource& get(Identifier id) const;
template <typename Parameter>
void load(Identifier id, const std::string& filename, const Parameter& secondParameter);
// Second parameter can be of sf::Shader::Type or std::string&
private:
std::map< Identifier, std::unique_ptr<Resource> > mResourceMap;
// unique_ptr are class templates that act like pointers, this allows us to work with heavyweight objects without copying them all the time, or we can store classes that are non-cpyable like sf::Shader

28
SFMLEngine/makingAGameTick/resources.inl
View File

@ -5,28 +5,42 @@ template <typename Resource, typename Identifier>
void ResourceHolder<Resource, Identifier>::load(Identifier id, const std::string& filename)
// Function to load a resource, it takes one parameter for filename and one for identifier
{
std::unique_ptr<Resource> texture(new Resource()); // Create sf:Texture and store it in the unique pointer
if(!texture -> loadFromFile(filename))// Load the texture from the filename
std::unique_ptr<Resource> resource(new Resource()); // Create sf:Texture and store it in the unique pointer
if(!resource -> loadFromFile(filename))// Load the resource from the filename
{
throw std::runtime_error(TEXTURE_LOAD_ERROR + filename);
}
auto inserted = mResourceMap.insert(std::make_pair(id, std::move(texture))); // Insert texture into map mResourceMap, std::move used to take ownership from texture variable and transfer it to std::make_pair(), std::move moves the resource into a new place and removes it from earlier place https://en.cppreference.com/w/cpp/utility/move
auto inserted = mResourceMap.insert(std::make_pair(id, std::move(resource))); // Insert resource into map mResourceMap, std::move used to take ownership from resource variable and transfer it to std::make_pair(), std::move moves the resource into a new place and removes it from earlier place https://en.cppreference.com/w/cpp/utility/move
assert(inserted.second);
}
template <typename Resource, typename Identifier>
Resource& ResourceHolder<Resource, Identifier>::get(Identifier id) // returns a reference to a texture
Resource& ResourceHolder<Resource, Identifier>::get(Identifier id) // returns a reference to a resource
{
auto found = mResourceMap.find(id); // find returns an iterator to the found element or end() if nothing was found
assert(found != mResourceMap.end());
return *found -> second; // We have to access the second member of the pointer, then we deference it and get a texture
return *found -> second; // We have to access the second member of the pointer, then we deference it and get a resource
}
template <typename Resource, typename Identifier>
const Resource& ResourceHolder<Resource, Identifier>::get(Identifier id) const // we need to be able to invoke get() also if we only have a pointer/reference to the const ResourceHolder<Resource, Identifier>, it returns const Resource so the texture cannot be changed by caller
const Resource& ResourceHolder<Resource, Identifier>::get(Identifier id) const // we need to be able to invoke get() also if we only have a pointer/reference to the const ResourceHolder<Resource, Identifier>, it returns const Resource so the resource cannot be changed by caller
{
auto found = mResourceMap.find(id); // find returns an iterator to the found element or end() if nothing was found
return *found -> second; // We have to access the second member of the pointer, then we deference it and get a texture
assert(found != mResourceMap.end());
return *found -> second; // We have to access the second member of the pointer, then we deference it and get a resource
}
template <typename Resource, typename Identifier>
template <typename Parameter>
void ResourceHolder<Resource, Identifier>::load(Identifier id, const std::string& filename, const Parameter& secondParameter) // loads Shaders
{
std::unique_ptr<Resource> resource(new Resource()); // Create sf:Texture and store it in the unique pointer
if(!resource -> loadFromFile(filename, secondParameter))// Load the resource from the filename
{
throw std::runtime_error(TEXTURE_LOAD_ERROR + filename);
}
auto inserted = mResourceMap.insert(std::make_pair(id, std::move(resource))); // Insert resource into map mResourceMap, std::move used to take ownership from resource variable and transfer it to std::make_pair(), std::move moves the resource into a new place and removes it from earlier place https://en.cppreference.com/w/cpp/utility/move
assert(inserted.second);
}
#endif // RESOURCES_INL