Skip to content

Editor: Incorrect multiple error messages on during fresh import #1204 #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Dec 20, 2025
Merged

Editor: Incorrect multiple error messages on during fresh import #1204 #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions engine/includes/adapters/handlers/defaultfilehandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ class DefaultFileHandler : public FileHandler {

protected:
void listFilesRecursive(StringList &list, const std::filesystem::path &path) {
try {
for(const auto &entry : std::filesystem::recursive_directory_iterator(path)) {
list.push_back(TString(entry.path().string()).replace('\\', '/'));
}
} catch (const std::filesystem::filesystem_error &ex) {
aError() << "Error:" << ex.what();
for(const auto &entry : std::filesystem::recursive_directory_iterator(path)) {
list.push_back(TString(entry.path().string()).replace('\\', '/'));
}
}

Expand Down
2 changes: 2 additions & 0 deletions engine/includes/editor/assetmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ protected slots:

QTimer *m_timer;

bool m_force;

protected:
void dumpBundle();

Expand Down
33 changes: 18 additions & 15 deletions engine/src/editor/assetmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ AssetManager::AssetManager() :
m_assetProvider(new BaseAssetProvider),
m_indices(Engine::resourceSystem()->indices()),
m_projectManager(ProjectSettings::instance()),
m_timer(new QTimer(this)) {
m_timer(new QTimer(this)),
m_force(false) {

connect(m_timer, SIGNAL(timeout()), this, SLOT(onPerform()));
}
Expand Down Expand Up @@ -118,30 +119,30 @@ void AssetManager::checkImportSettings(AssetConverterSettings *settings) {
}

void AssetManager::rescan() {
bool force = false;
m_force = false;

TString target = m_projectManager->targetPath();
if(target.isEmpty()) {
force |= !Engine::reloadBundle();
force |= m_projectManager->projectSdk() != SDK_VERSION;
m_force |= !Engine::reloadBundle();
m_force |= m_projectManager->projectSdk() != SDK_VERSION;

m_assetProvider->init();
} else {
force = true;
m_force = true;
}

m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/materials").data(),force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/textures").data(), force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/meshes").data(), force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/pipelines").data(),force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/fonts").data(), force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/materials").data(),m_force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/textures").data(), m_force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/meshes").data(), m_force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/pipelines").data(),m_force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/fonts").data(), m_force);
#ifndef BUILDER
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/materials").data(),force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/gizmos").data(), force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/meshes").data(), force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/textures").data(), force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/materials").data(),m_force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/gizmos").data(), m_force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/meshes").data(), m_force);
m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/textures").data(), m_force);
#endif
m_assetProvider->onDirectoryChangedForce(m_projectManager->contentPath().data(), force);
m_assetProvider->onDirectoryChangedForce(m_projectManager->contentPath().data(), m_force);

emit directoryChanged(m_projectManager->contentPath().data());

Expand Down Expand Up @@ -492,6 +493,7 @@ void AssetManager::onPerform() {
result = true;

if(!it->buildProject()) {
m_force = false;
m_timer->stop();
emit importFinished();
}
Expand Down Expand Up @@ -521,6 +523,7 @@ void AssetManager::onPerform() {
return;
}

m_force = false;
m_timer->stop();
emit importFinished();
}
Expand Down
4 changes: 2 additions & 2 deletions engine/src/systems/resourcesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void ResourceSystem::setResource(Resource *object, const TString &uuid) {
Resource *ResourceSystem::loadResource(const TString &path) {
PROFILE_FUNCTION();

if(!path.isEmpty()) {
if(!path.isEmpty() && !m_indexMap.empty()) {
TString uuid = path;

Resource *object = resource(uuid);
Expand Down Expand Up @@ -131,7 +131,7 @@ Resource *ResourceSystem::loadResource(const TString &path) {
}

Resource *ResourceSystem::loadResourceAsync(const TString &path) {
if(!path.isEmpty()) {
if(!path.isEmpty() && !m_indexMap.empty()) {
ResourceInfo info;

auto indexIt = m_indexMap.find(path);
Expand Down
8 changes: 4 additions & 4 deletions modules/editor/particletools/converter/effectbuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,20 @@ AssetConverter::ReturnCode EffectBuilder::convertFile(AssetConverterSettings *se

Variant variant = m_graph.object();

uint32_t uuid = 0;
if(settings->info().id == 0) {
settings->info().id = Engine::generateUUID();
}
VariantList objects = variant.value<VariantList>();
for(auto &it : objects) {
VariantList o = it.value<VariantList>();
if(o.size() >= 5) {
auto i = o.begin();
i++;
uuid = static_cast<uint32_t>((*i).toInt());
*i = settings->info().id;
break;
}
}

settings->info().id = uuid;

return settings->saveBinary(variant, settings->absoluteDestination());
}

Expand Down
2 changes: 1 addition & 1 deletion modules/editor/particletools/converter/effectgraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Variant EffectGraph::object() const {
VariantList object;

object.push_back(VisualEffect::metaClass()->name()); // type
object.push_back(Engine::generateUUID()); // id
object.push_back(0); // id
object.push_back(0); // parent
object.push_back(""); // name

Expand Down
Loading