Skip to content

Commit bb4722e

Browse files
committed
Updated Pipe
1 parent 8a4cf1e commit bb4722e

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

Libs/AST/Include/AST/Utils/ModuleFileIterator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
namespace rift::ast
1111
{
12-
class ModuleFileIterator : public p::LambdaFileIterator<p::RecursivePathIterator>
12+
class ModuleFileIterator : public p::LambdaFileIterator<p::RecursiveDirectoryIterator>
1313
{
14-
using Super = p::LambdaFileIterator<p::RecursivePathIterator>;
14+
using Super = p::LambdaFileIterator<p::RecursiveDirectoryIterator>;
1515

1616
public:
1717
using Super::Super;

Libs/AST/Include/AST/Utils/TypeIterator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
namespace rift::ast
1111
{
12-
class TypeIterator : public p::LambdaFileIterator<p::RecursivePathIterator>
12+
class TypeIterator : public p::LambdaFileIterator<p::RecursiveDirectoryIterator>
1313
{
14-
using Super = p::LambdaFileIterator<p::RecursivePathIterator>;
14+
using Super = p::LambdaFileIterator<p::RecursiveDirectoryIterator>;
1515

1616
public:
1717
using Super::Super;

Libs/Bindings/Native/Compiler/Include/HeaderIterator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
namespace rift
1111
{
12-
class HeaderIterator : public p::LambdaFileIterator<p::RecursivePathIterator>
12+
class HeaderIterator : public p::LambdaFileIterator<p::RecursiveDirectoryIterator>
1313
{
14-
using Super = p::LambdaFileIterator<p::RecursivePathIterator>;
14+
using Super = p::LambdaFileIterator<p::RecursiveDirectoryIterator>;
1515

1616
public:
1717
using Super::Super;

Libs/Editor/Include/Editor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace rift::editor
2222
p::FileWatcher fileWatcher;
2323

2424
public:
25-
bool bFilesDirty = true;
25+
bool filesDirty = true;
2626
#if P_DEBUG
2727
bool showDemo = false;
2828
bool showMetrics = false;

Libs/Editor/Src/Editor.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace rift::editor
5959

6060
int Editor::Run(StringView projectPath)
6161
{
62-
fileWatcher.StartAsync();
62+
fileWatcher.StartWatchingAsync();
6363

6464
// Setup window
6565
p::Info("Initializing editor...");
@@ -108,10 +108,10 @@ namespace rift::editor
108108
ast::FunctionsSystem::ClearAddedTags(ast);
109109
ast::TransactionSystem::ClearTags(ast);
110110

111-
if (bFilesDirty)
111+
if (filesDirty)
112112
{
113113
ast::LoadSystem::Run(ast);
114-
bFilesDirty = false;
114+
filesDirty = false;
115115
}
116116
ast::FunctionsSystem::ResolveCallFunctionIds(ast);
117117
ast::TypeSystem::ResolveExprTypeIds(ast);
@@ -172,9 +172,9 @@ namespace rift::editor
172172

173173
// Start watching the project folder for file changes
174174
ast.Add(GetProjectId(ast), fileWatcher.ListenPath(projectPath, true,
175-
[](StringView path, StringView filename,
175+
[](FileWatchId id, StringView path, StringView filename,
176176
FileWatchAction action, StringView oldFilename) {
177-
Editor::Get().bFilesDirty = true;
177+
Editor::Get().filesDirty = true;
178178
}));
179179

180180

@@ -189,9 +189,9 @@ namespace rift::editor
189189
void Editor::CloseProject()
190190
{
191191
Id id = GetProjectId(ast);
192-
if (ast.IsValid(id) && ast.Has<p::FileListenerId>(id))
192+
if (ast.IsValid(id) && ast.Has<p::FileWatchId>(id))
193193
{
194-
fileWatcher.StopListening(ast.Get<p::FileListenerId>(id));
194+
fileWatcher.StopListening(ast.Get<p::FileWatchId>(id));
195195
}
196196
ast::CloseProject(ast);
197197
}

0 commit comments

Comments
 (0)