Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@nem0
nem0 committed Jul 31, 2023
1 parent fb37abf commit 182f750
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 80 deletions.
5 changes: 4 additions & 1 deletion src/lua_script/editor/lua_script_plugins.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ struct AssetPlugin : AssetBrowser::Plugin, AssetCompiler::IPlugin
return m_app.getAssetCompiler().copyCompile(src);
}


bool onGUI(Span<AssetBrowser::ResourceView*> resources) override
{
if (resources.length() > 1) return false;
Expand Down Expand Up @@ -104,6 +103,10 @@ struct AssetPlugin : AssetBrowser::Plugin, AssetCompiler::IPlugin

const char* getDefaultExtension() const override { return "lua"; }

void onResourceDoubleClicked(const Path& path) override {
m_app.getAssetBrowser().openInExternalEditor(path);
}

StudioApp& m_app;
char m_text_buffer[8192];
bool m_too_long = false;
Expand Down
98 changes: 19 additions & 79 deletions src/renderer/editor/particle_editor.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "particle_editor.h"
#include "editor/asset_browser.h"
#include "editor/asset_compiler.h"
#include "editor/editor_asset.h"
#include "editor/settings.h"
#include "editor/studio_app.h"
#include "editor/utils.h"
Expand Down Expand Up @@ -2735,57 +2736,16 @@ struct ParticleSystemPlugin final : AssetBrowser::Plugin, AssetCompiler::IPlugin
ParticleEditor* m_particle_editor;
};

struct FunctionCompilerPlugin : AssetCompiler::IPlugin {
FunctionCompilerPlugin(ParticleEditor& editor) : m_editor(editor) {}

void addSubresources(AssetCompiler& compiler, const char* path) override;
bool compile(const Path& src) override { return true; }
void listLoaded() override;

ParticleEditor& m_editor;
};

struct FunctionBrowserPlugin : AssetBrowser::Plugin {
FunctionBrowserPlugin(ParticleEditor& editor, StudioApp& app)
: Plugin(app.getAllocator())
struct FunctionPlugin : EditorAssetPlugin {
FunctionPlugin(ParticleEditor& editor, StudioApp& app, IAllocator& allocator)
: EditorAssetPlugin("Particle system function", "pfn", ParticleSystemEditorResource::TYPE, app, allocator)
, m_app(app)
, m_editor(editor)
{}

AssetBrowser::ResourceView& createView(const Path& path, StudioApp&) override {
struct View : AssetBrowser::ResourceView {
View(const Path& path, StudioApp& app)
: resource(path, app, app.getAllocator())
{
FileSystem& fs = app.getEngine().getFileSystem();
OutputMemoryStream content(app.getAllocator());
if (fs.getContentSync(path, content)) {
InputMemoryStream blob(content);
m_is_ready = resource.deserialize(blob);
}
}

const struct Path& getPath() override { return resource.m_path; }
struct ResourceType getType() override { return ParticleSystemEditorResource::TYPE; }
bool isEmpty() override { return false; }
bool isReady() override { return m_is_ready; }
bool isFailure() override { return !m_is_ready; }
u64 size() override { return 0; }
void destroy() override { LUMIX_DELETE(*allocator, this); }
Resource* getResource() override { ASSERT(false); return nullptr; }

ParticleSystemEditorResource resource;
IAllocator* allocator;
bool m_is_ready = false;
};

IAllocator& allocator = m_app.getAllocator();
View* view = LUMIX_NEW(allocator, View)(path, m_app);
view->allocator = &allocator;
return *view;
}

bool canCreateResource() const override { return true; }
void addSubresources(AssetCompiler& compiler, const char* path) override;
bool compile(const Path& src) override { return true; }
void listLoaded() override;

void createResource(OutputMemoryStream& blob) override {
ParticleSystemEditorResource res(Path("new particle function"), m_app, m_app.getAllocator());
Expand All @@ -2794,8 +2754,6 @@ struct FunctionBrowserPlugin : AssetBrowser::Plugin {
res.serialize(blob);
}

const char* getDefaultExtension() const override { return "pfn"; }

bool onGUI(Span<AssetBrowser::ResourceView*> resources) override {
if (resources.length() != 1) return false;

Expand All @@ -2814,11 +2772,6 @@ struct FunctionBrowserPlugin : AssetBrowser::Plugin {
return false;
}

const char* getName() const override { return "Particle function"; }
ResourceType getResourceType() const override { return ParticleSystemEditorResource::TYPE; }
void deserialize(InputMemoryStream& blob) override { ASSERT(false); }
void serialize(OutputMemoryStream& blob) override {}

StudioApp& m_app;
ParticleEditor& m_editor;
};
Expand All @@ -2828,39 +2781,26 @@ struct FunctionBrowserPlugin : AssetBrowser::Plugin {
struct ParticleEditorImpl : ParticleEditor {
ParticleEditorImpl(StudioApp& app)
: m_app(app)
, m_function_browser_plugin(*this, app)
, m_function_compiler_plugin(*this)
, m_functions(app.getAllocator())
, m_windows(app.getAllocator())
, m_allocator(app.getAllocator(), "particle editor")
, m_function_plugin(*this, app, m_allocator)
, m_functions(m_allocator)
, m_windows(m_allocator)
, m_particle_system_plugin(app)
{
m_apply_action.init("Apply", "Particle editor apply", "particle_editor_apply", "", os::Keycode::E, Action::Modifiers::CTRL, true);
app.addAction(&m_apply_action);

AssetCompiler& compiler = m_app.getAssetCompiler();
compiler.registerExtension("pfn", ParticleSystemEditorResource::TYPE);
const char* extensions[] = { "pfn", nullptr };
compiler.addPlugin(m_function_compiler_plugin, extensions);
AssetBrowser& browser = m_app.getAssetBrowser();
browser.addPlugin(m_function_browser_plugin);

const char* particle_emitter_exts[] = {"par", nullptr};
compiler.addPlugin(m_particle_system_plugin, particle_emitter_exts);
browser.addPlugin(m_particle_system_plugin);
m_app.getAssetCompiler().addPlugin(m_particle_system_plugin, particle_emitter_exts);
m_app.getAssetBrowser().addPlugin(m_particle_system_plugin);

m_particle_system_plugin.m_particle_editor = this;
}

~ParticleEditorImpl() {
m_app.removeAction(&m_apply_action);

AssetCompiler& compiler = m_app.getAssetCompiler();
compiler.removePlugin(m_function_compiler_plugin);
compiler.removePlugin(m_particle_system_plugin);

AssetBrowser& browser = m_app.getAssetBrowser();
browser.removePlugin(m_function_browser_plugin);
browser.removePlugin(m_particle_system_plugin);
m_app.getAssetCompiler().removePlugin(m_particle_system_plugin);
m_app.getAssetBrowser().removePlugin(m_particle_system_plugin);
}

void open(const char* path) override;
Expand Down Expand Up @@ -2921,11 +2861,11 @@ struct ParticleEditorImpl : ParticleEditor {
Path path;
};

TagAllocator m_allocator;
StudioApp& m_app;
Array<Function> m_functions;
ParticleSystemPlugin m_particle_system_plugin;
FunctionCompilerPlugin m_function_compiler_plugin;
FunctionBrowserPlugin m_function_browser_plugin;
FunctionPlugin m_function_plugin;
Array<struct ParticleEditorWindow*> m_windows;
Action m_apply_action;
};
Expand Down Expand Up @@ -3780,12 +3720,12 @@ void ParticleEditorImpl::open(const char* path) {
m_app.addPlugin(*win);
}

void FunctionCompilerPlugin::addSubresources(AssetCompiler& compiler, const char* path) {
void FunctionPlugin::addSubresources(AssetCompiler& compiler, const char* path) {
compiler.addResource(ParticleSystemEditorResource::TYPE, path);
((ParticleEditorImpl&)m_editor).addFunction(Path(path));
}

void FunctionCompilerPlugin::listLoaded() {
void FunctionPlugin::listLoaded() {
ParticleEditorImpl& editor = (ParticleEditorImpl&)m_editor;
AssetCompiler& compiler = editor.m_app.getAssetCompiler();
auto& resources = compiler.lockResources();
Expand Down

0 comments on commit 182f750

Please sign in to comment.