zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-23 13:12:06 +00:00
Code Activity

refactor: fix x64 compilation for ObjLoading

Browse Source
This commit is contained in:
Jan
2025-04-26 10:11:28 +01:00
committed by Jan Laupetin
parent ee4301952a
commit 5d0c94e430
34 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjLoading/Techset/Parsing/Sequence/TechniqueShaderScopeSequences.cpp
View File

@@ -213,7 +213,7 @@ namespace techset
const auto& shaderArgumentIndexToken = result.NextCapture(CAPTURE_SHADER_INDEX);
if (shaderArgumentIndexToken.IntegerValue() < 0)
throw ParsingException(shaderArgumentIndexToken.GetPos(), "Index cannot be negative");
const auto index = static_cast<size_t>(shaderArgumentIndexToken.IntegerValue());
const auto index = static_cast<unsigned>(shaderArgumentIndexToken.IntegerValue());
arg = ShaderArgument(shaderArgumentNameToken.IdentifierValue(), index);
}
else

6
src/ObjLoading/Techset/TechniqueDefinitionAcceptor.cpp
View File

@@ -15,7 +15,7 @@ ShaderArgument::ShaderArgument(std::string argumentName)
{
}
ShaderArgument::ShaderArgument(std::string argumentName, const size_t argumentIndex)
ShaderArgument::ShaderArgument(std::string argumentName, const unsigned argumentIndex)
: m_argument_name(std::move(argumentName)),
m_argument_index_specified(true),
m_argument_index(argumentIndex)
@@ -35,7 +35,7 @@ ShaderArgumentCodeSource::ShaderArgumentCodeSource(std::vector<std::string> acce
{
}
ShaderArgumentCodeSource::ShaderArgumentCodeSource(std::vector<std::string> accessors, const size_t indexAccessor)
ShaderArgumentCodeSource::ShaderArgumentCodeSource(std::vector<std::string> accessors, const unsigned indexAccessor)
: m_accessors(std::move(accessors)),
m_index_accessor_specified(true),
m_index_accessor(indexAccessor)
@@ -102,7 +102,7 @@ ShaderArgumentMaterialSource::ShaderArgumentMaterialSource()
{
}
ShaderArgumentMaterialSource::ShaderArgumentMaterialSource(const size_t hash)
ShaderArgumentMaterialSource::ShaderArgumentMaterialSource(const unsigned hash)
: m_is_hash(true),
m_hash(hash)
{

18
src/ObjLoading/Techset/TechniqueDefinitionAcceptor.h
View File

@@ -16,11 +16,11 @@ namespace techset
public:
std::string m_argument_name;
bool m_argument_index_specified;
size_t m_argument_index;
unsigned m_argument_index;
ShaderArgument();
explicit ShaderArgument(std::string argumentName);
ShaderArgument(std::string argumentName, size_t argumentIndex);
ShaderArgument(std::string argumentName, unsigned argumentIndex);
};
class ShaderArgumentCodeSource
@@ -28,11 +28,11 @@ namespace techset
public:
std::vector<std::string> m_accessors;
bool m_index_accessor_specified;
size_t m_index_accessor;
unsigned m_index_accessor;
ShaderArgumentCodeSource();
explicit ShaderArgumentCodeSource(std::vector<std::string> accessors);
ShaderArgumentCodeSource(std::vector<std::string> accessors, size_t indexAccessor);
ShaderArgumentCodeSource(std::vector<std::string> accessors, unsigned indexAccessor);
};
class ShaderArgumentLiteralSource
@@ -53,13 +53,13 @@ namespace techset
class ShaderArgumentMaterialSource
{
public:
bool m_is_hash;
size_t m_hash;
std::string m_name;
ShaderArgumentMaterialSource();
explicit ShaderArgumentMaterialSource(size_t hash);
explicit ShaderArgumentMaterialSource(unsigned hash);
explicit ShaderArgumentMaterialSource(std::string name);
bool m_is_hash;
unsigned m_hash;
std::string m_name;
};
class ITechniqueDefinitionAcceptor