WIP
This commit is contained in:
committed by
Jérôme Leclercq
parent
b379518479
commit
292ca60592
@@ -24,6 +24,7 @@ namespace Nz
|
||||
m_directories.push_back(std::filesystem::absolute(directoryPath));
|
||||
}
|
||||
|
||||
#ifndef NAZARA_PLUGINS_STATIC
|
||||
GenericPlugin PluginLoader::Load(const std::filesystem::path& pluginPath, bool activate)
|
||||
{
|
||||
std::filesystem::path path = pluginPath;
|
||||
@@ -60,6 +61,7 @@ namespace Nz
|
||||
|
||||
return GenericPlugin(std::move(library), std::move(pluginInterface), activate);
|
||||
}
|
||||
#endif
|
||||
|
||||
void PluginLoader::RemoveSearchDirectory(const std::filesystem::path& directoryPath)
|
||||
{
|
||||
|
||||
@@ -80,7 +80,7 @@ fn main(input: FragIn) -> FragOut
|
||||
let color = settings.BaseColor;
|
||||
|
||||
const if (HasUV)
|
||||
color *= TextureOverlay.Sample(input.uv);
|
||||
color *= TextureOverlay.Sample(input.uv).rrra;
|
||||
|
||||
const if (HasColor)
|
||||
color *= input.color;
|
||||
|
||||
@@ -129,7 +129,7 @@ fn main(input: VertToFrag) -> FragOut
|
||||
let color = settings.BaseColor;
|
||||
|
||||
const if (HasUV)
|
||||
color *= TextureOverlay.Sample(input.uv);
|
||||
color *= TextureOverlay.Sample(input.uv).rrra;
|
||||
|
||||
const if (HasColor)
|
||||
color *= input.color;
|
||||
|
||||
@@ -115,7 +115,7 @@ fn main(input: VertToFrag) -> FragOut
|
||||
let color = settings.BaseColor;
|
||||
|
||||
const if (HasUV)
|
||||
color *= TextureOverlay.Sample(input.uv);
|
||||
color *= TextureOverlay.Sample(input.uv).rrra;
|
||||
|
||||
const if (HasColor)
|
||||
color *= input.color;
|
||||
|
||||
@@ -10,13 +10,16 @@
|
||||
#include <Nazara/Utils/Endianness.hpp>
|
||||
#include <frozen/string.h>
|
||||
#include <frozen/unordered_set.h>
|
||||
|
||||
#define STB_IMAGE_STATIC
|
||||
#define STB_IMAGE_IMPLEMENTATION
|
||||
#include <stb_image.h>
|
||||
|
||||
#include <Nazara/Utility/Debug.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
namespace
|
||||
namespace NAZARA_ANONYMOUS_NAMESPACE
|
||||
{
|
||||
int StbiEof(void* userdata)
|
||||
{
|
||||
@@ -98,6 +101,8 @@ namespace Nz
|
||||
{
|
||||
ImageLoader::Entry GetImageLoader_STB()
|
||||
{
|
||||
NAZARA_USE_ANONYMOUS_NAMESPACE
|
||||
|
||||
ImageLoader::Entry loaderEntry;
|
||||
loaderEntry.extensionSupport = IsSTBSupported;
|
||||
loaderEntry.streamLoader = LoadSTB;
|
||||
|
||||
Reference in New Issue
Block a user