INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-09 22:38:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Load vertex decl asset

Browse Source
This commit is contained in:
Jan
2022-04-10 19:39:26 +02:00
parent e0bcf7aff0
commit 99c7ebbe9b
9 changed files with 174 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ObjLoading/Techset/Parsing/Sequence/TechniqueNoScopeSequences.cpp
View File

@ -26,10 +26,7 @@ namespace techset
assert(state->m_in_pass == false);
state->m_in_pass = true;
if (state->m_before_first_pass)
state->m_before_first_pass = false;
else
state->m_acceptor->AcceptNextPass();
state->m_acceptor->AcceptNextPass();
}
};
}

9
src/ObjLoading/Techset/Parsing/Sequence/TechniquePassScopeSequences.cpp
View File

@ -11,13 +11,15 @@ namespace techset
{
class SequenceEndPass final : public TechniqueParser::sequence_t
{
static constexpr auto CAPTURE_FIRST_TOKEN = 1;
public:
SequenceEndPass()
{
const SimpleMatcherFactory create(this);
AddMatchers({
create.Char('}')
create.Char('}').Capture(CAPTURE_FIRST_TOKEN)
});
}
@ -25,6 +27,11 @@ namespace techset
void ProcessMatch(TechniqueParserState* state, SequenceResult<SimpleParserValue>& result) const override
{
assert(state->m_in_pass == true);
std::string errorMessage;
if(!state->m_acceptor->AcceptEndPass(errorMessage))
throw ParsingException(result.NextCapture(CAPTURE_FIRST_TOKEN).GetPos(), errorMessage);
state->m_in_pass = false;
}
};

1
src/ObjLoading/Techset/Parsing/TechniqueFileParserState.cpp
View File

@ -6,7 +6,6 @@ using namespace techset;
TechniqueParserState::TechniqueParserState(ITechniqueDefinitionAcceptor* acceptor)
: m_acceptor(acceptor),
m_before_first_pass(true),
m_in_pass(false),
m_in_shader(false),
m_current_shader(ShaderSelector::VERTEX_SHADER)

3
src/ObjLoading/Techset/Parsing/TechniqueFileParserState.h
View File

@ -8,8 +8,7 @@ namespace techset
{
public:
ITechniqueDefinitionAcceptor* const m_acceptor;
bool m_before_first_pass;
bool m_in_pass;
bool m_in_shader;
ShaderSelector m_current_shader;

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

@ -74,6 +74,7 @@ namespace techset
ITechniqueDefinitionAcceptor& operator=(ITechniqueDefinitionAcceptor&& other) noexcept = default;
virtual void AcceptNextPass() = 0;
virtual bool AcceptEndPass(std::string& errorMessage) = 0;
virtual void AcceptStateMap(const std::string& stateMapName) = 0;