Skip to content

Resource dictionary issues fixed #709

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
Mar 24, 2024
Merged

Resource dictionary issues fixed #709

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
2 changes: 1 addition & 1 deletion engine/src/components/spriterender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ bool SpriteRender::composeMesh(Sprite *sprite, int key, Mesh *spriteMesh, Vector
return false;
}
Mesh *m = sprite->shape(key);
if(m) {
if(m && !m->isEmpty()) {
spriteMesh->setVertices(m->vertices());
spriteMesh->setIndices(m->indices());
spriteMesh->setColors(m->colors());
Expand Down
4 changes: 3 additions & 1 deletion engine/src/editor/assetconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,9 @@ bool AssetConverterSettings::loadSettings() {
item++;
if(item != array.end()) {
QJsonObject data = item->toObject();
setSubItemData(it, data);
if(!data.isEmpty()) {
setSubItemData(it, data);
}
}
}
blockSignals(false);
Expand Down
7 changes: 7 additions & 0 deletions engine/src/editor/assetmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,8 @@ void AssetManager::convert(AssetConverterSettings *settings) {
case AssetConverter::Success: {
aInfo() << "Converting:" << qPrintable(settings->source());

settings->setCurrentVersion(settings->version());

QString guid = settings->destination();
QString type = settings->typeName();
QString source = settings->source();
Expand Down Expand Up @@ -877,6 +879,11 @@ void AssetManager::registerAsset(const QFileInfo &source, const QString &guid, c
if(QFileInfo::exists(m_projectManager->importPath() + "/" + guid)) {
QString path = pathToLocal(source);

if(path.contains(".embedded/{00000000-0202-0000-0000-000000000000}/Arrow")) {
qDebug() << source;
path = path;
}

m_indices[path.toStdString()] = pair<string, string>(type.toStdString(), guid.toStdString());
m_paths[guid.toStdString()] = source.absoluteFilePath().toStdString();
m_labels.insert(type);
Expand Down
2 changes: 0 additions & 2 deletions engine/src/editor/converters/animconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ Variant AnimConverter::readJson(const string &data, AssetConverterSettings *sett
if(update) {
QFile src(settings->source());
if(src.open(QIODevice::WriteOnly)) {
settings->setCurrentVersion(settings->version());

string data = Json::save(result, 0);
src.write(data.c_str(), data.size());
src.close();
Expand Down
4 changes: 1 addition & 3 deletions engine/src/editor/converters/assimpconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,6 @@ AssetConverter::ReturnCode AssimpConverter::convertFile(AssetConverterSettings *
file.close();
}

settings->setCurrentVersion(settings->version());

return Success;
}
return InternalError;
Expand Down Expand Up @@ -319,7 +317,7 @@ Actor *importObjectHelper(const aiScene *scene, const aiNode *element, const aiM

Mesh *result = AssimpConverter::importMesh(scene, element, actor, fbxSettings);
if(result) {
uuid = fbxSettings->saveSubData(Bson::save(Engine::toVariant(result)), actor->name().c_str(), MetaType::type<Mesh *>());
uuid = fbxSettings->saveSubData(Bson::save(Engine::toVariant(result)), uuid, MetaType::type<Mesh *>());

Mesh *resource = Engine::loadResource<Mesh>(qPrintable(uuid));
if(resource == nullptr) {
Expand Down
2 changes: 0 additions & 2 deletions engine/src/editor/converters/prefabconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ Variant PrefabConverter::readJson(const string &data, AssetConverterSettings *se
if(update) {
QFile src(settings->source());
if(src.open(QIODevice::WriteOnly)) {
settings->setCurrentVersion(settings->version());

string data = Json::save(result, 0);
src.write(data.c_str(), data.size());
src.close();
Expand Down
1 change: 1 addition & 0 deletions engine/src/pipelinetasks/bloom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Bloom::Bloom() :
for(uint8_t i = 0; i < BLOOM_PASSES; i++) {
Texture *t = Engine::objectCreate<Texture>();
t->setFormat(Texture::R11G11B10Float);
t->setFiltering(Texture::Bilinear);

m_bloomPasses[i].m_downTexture = t;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/editor/pipelinetools/converter/pipelineconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ AssetConverter::ReturnCode PipelineConverter::convertFile(AssetConverterSettings
ByteArray data = Bson::save( Engine::toVariant(&pipeline) );
file.write(reinterpret_cast<const char *>(data.data()), data.size());
file.close();
settings->setCurrentVersion(settings->version());

return Success;
}

Expand Down
3 changes: 2 additions & 1 deletion modules/editor/shadertools/converter/shaderbuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,9 @@ AssetConverter::ReturnCode ShaderBuilder::convertFile(AssetConverterSettings *se
ByteArray data = Bson::save(result);
file.write(reinterpret_cast<const char *>(data.data()), data.size());
file.close();
builderSettings->setCurrentVersion(builderSettings->version());

builderSettings->setRhi(rhi);

return Success;
}

Expand Down
40 changes: 21 additions & 19 deletions modules/editor/texturetools/converter/textureconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,27 +151,31 @@ QString TextureImportSettings::defaultIcon(QString) const {
}

QJsonObject TextureImportSettings::subItemData(const QString &key) const {
QRect rect = m_elements.value(key).m_rect;
QJsonObject result;
result["type"] = 0;

QJsonObject r;
if(m_elements.contains(key)) {
QRect rect = m_elements.value(key).m_rect;

r["x"] = rect.x();
r["y"] = rect.y();
r["w"] = rect.width();
r["h"] = rect.height();
result["type"] = 0;

r["l"] = m_elements.value(key).m_borderL;
r["r"] = m_elements.value(key).m_borderR;
r["t"] = m_elements.value(key).m_borderT;
r["b"] = m_elements.value(key).m_borderB;
QJsonObject r;

Vector2 pivot = m_elements.value(key).m_pivot;
r["pivotX"] = pivot.x;
r["pivotY"] = pivot.y;
r["x"] = rect.x();
r["y"] = rect.y();
r["w"] = rect.width();
r["h"] = rect.height();

result["data"] = r;
r["l"] = m_elements.value(key).m_borderL;
r["r"] = m_elements.value(key).m_borderR;
r["t"] = m_elements.value(key).m_borderT;
r["b"] = m_elements.value(key).m_borderB;

Vector2 pivot = m_elements.value(key).m_pivot;
r["pivotX"] = pivot.x;
r["pivotY"] = pivot.y;

result["data"] = r;
}

return result;
}
Expand Down Expand Up @@ -219,8 +223,6 @@ AssetConverter::ReturnCode TextureConverter::convertFile(AssetConverterSettings
}

Engine::unloadResource(resource);

settings->setCurrentVersion(settings->version());
}

return Success;
Expand Down Expand Up @@ -328,7 +330,7 @@ void TextureConverter::convertTexture(Texture *texture, TextureImportSettings *s
}

void TextureConverter::convertSprite(Sprite *sprite, TextureImportSettings *settings) {
Texture *texture = Engine::objectCreate<Texture>((settings->destination() + "/_Page1").toStdString());
Texture *texture = Engine::objectCreate<Texture>("_Page1");
convertTexture(texture, settings);

sprite->addPage(texture);
Expand All @@ -343,7 +345,7 @@ void TextureConverter::convertSprite(Sprite *sprite, TextureImportSettings *sett

int i = 0;
for(auto &it : settings->elements().keys()) {
Mesh *mesh = Engine::objectCreate<Mesh>((settings->destination() + "/" + it).toStdString(), sprite);
Mesh *mesh = Engine::objectCreate<Mesh>(it.toStdString(), sprite);
if(mesh) {
auto value = settings->elements().value(it);

Expand Down
4 changes: 2 additions & 2 deletions modules/editor/tiledimporter/converter/tiledmapconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ AssetConverter::ReturnCode TiledMapConverter::convertFile(AssetConverterSettings
ByteArray data = Bson::save(Engine::toVariant(prefab));
file.write(reinterpret_cast<const char *>(&data[0]), data.size());
file.close();
}

return Success;
return Success;
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions modules/editor/tiledimporter/converter/tiledsetconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ AssetConverter::ReturnCode TiledSetConverter::convertFile(AssetConverterSettings
ByteArray data = Bson::save( Engine::toVariant(&tileSet) );
file.write(reinterpret_cast<const char *>(data.data()), data.size());
file.close();

return Success;
}
}
Expand Down
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/gizmos/camera.png.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"subitems": {
},
"type": 46,
"version": 7
"version": 8
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/gizmos/directlight.png.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"subitems": {
},
"type": 46,
"version": 7
"version": 8
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/gizmos/pointlight.png.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"subitems": {
},
"type": 46,
"version": 7
"version": 8
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/gizmos/postprocess.png.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"subitems": {
},
"type": 46,
"version": 7
"version": 8
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/gizmos/soundsource.png.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"subitems": {
},
"type": 46,
"version": 7
"version": 8
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/gizmos/spotlight.png.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"subitems": {
},
"type": 46,
"version": 7
"version": 8
}
4 changes: 2 additions & 2 deletions worldeditor/bin/editor/materials/debug.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"guid": "{5ee0821c-4a3f-4eeb-a3a0-1c7a7ec3f221}",
"md5": "{770f2d56-714c-30ee-65fd-d23f65ff3f34}",
"md5": "{a6a37983-e744-4264-0d64-60f382040a15}",
"settings": {
"CurrentRHI": 1
},
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/materials/gizmo.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/materials/grid.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/materials/outline.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/editor/materials/solid.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/engine/fonts/Roboto.ttf.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"subitems": {
},
"type": 56,
"version": 0
"version": 1
}
2 changes: 1 addition & 1 deletion worldeditor/bin/engine/materials/AmbientOcclusion.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/engine/materials/AreaLight.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/engine/materials/Blur.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/engine/materials/BlurOcclusion.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
2 changes: 1 addition & 1 deletion worldeditor/bin/engine/materials/CombineOcclusion.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
4 changes: 2 additions & 2 deletions worldeditor/bin/engine/materials/DefaultFont.shader.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"guid": "{3dc2e738-995a-46c9-be8b-f1e91c0bf49b}",
"md5": "{64371747-d0a2-40c1-d3f0-ee831b5ab3a1}",
"md5": "{580f3635-2079-2e24-684b-f33d4df70b44}",
"settings": {
"CurrentRHI": 1
},
"subitems": {
},
"type": 48,
"version": 9
"version": 10
}
48 changes: 24 additions & 24 deletions worldeditor/bin/engine/materials/DefaultMesh.mtl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<Graph>
<Value Name="Blend" Type="2">0</Value>
<Value Name="Depth" Type="1">true</Value>
<Value Name="DepthWrite" Type="1">true</Value>
<Value Name="Links" Type="9">
<Value Type="2" Name="Blend">0</Value>
<Value Type="1" Name="Depth">true</Value>
<Value Type="1" Name="DepthWrite">true</Value>
<Value Type="9" Name="Links">
<Value Type="8">
<Value Name="IPort" Type="2">4</Value>
<Value Name="OPort" Type="2">0</Value>
<Value Name="Receiver" Type="2">0</Value>
<Value Name="Sender" Type="2">1</Value>
<Value Type="2" Name="IPort">4</Value>
<Value Type="2" Name="OPort">0</Value>
<Value Type="2" Name="Receiver">0</Value>
<Value Type="2" Name="Sender">1</Value>
</Value>
<Value Type="8">
<Value Name="IPort" Type="2">4</Value>
<Value Name="OPort" Type="2">0</Value>
<Value Name="Receiver" Type="2">0</Value>
<Value Name="Sender" Type="2">1</Value>
<Value Type="2" Name="IPort">4</Value>
<Value Type="2" Name="OPort">0</Value>
<Value Type="2" Name="Receiver">0</Value>
<Value Type="2" Name="Sender">1</Value>
</Value>
</Value>
<Value Name="Model" Type="2">1</Value>
<Value Name="Nodes" Type="9">
<Value Type="2" Name="Model">1</Value>
<Value Type="9" Name="Nodes">
<Value Type="8">
<Value Name="Index" Type="2">1</Value>
<Value Name="Type" Type="10"><![CDATA[ConstFloat]]></Value>
<Value Name="Values" Type="8">
<Value Name="Value" Type="38">0.8999999761581421</Value>
<Value Type="2" Name="Index">1</Value>
<Value Type="10" Name="Type"><![CDATA[ConstFloat]]></Value>
<Value Type="8" Name="Values">
<Value Type="38" Name="Value">0.8999999761581421</Value>
</Value>
<Value Name="X" Type="2">-200</Value>
<Value Name="Y" Type="2">0</Value>
<Value Type="2" Name="X">-200</Value>
<Value Type="2" Name="Y">0</Value>
</Value>
</Value>
<Value Name="Side" Type="1">false</Value>
<Value Name="Type" Type="2">0</Value>
<Value Name="View" Type="1">true</Value>
<Value Name="Wireframe" Type="1">false</Value>
<Value Type="1" Name="Side">false</Value>
<Value Type="2" Name="Type">0</Value>
<Value Type="1" Name="View">true</Value>
<Value Type="1" Name="Wireframe">false</Value>
</Graph>
Loading