Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- warning grammar / no more texture folder content requirement for No textures assigned warning

Browse source 
- resolved partial commit issue / Fix UNIX builds by removal of unused warning
This commit is contained in:
Thijs Wenker 2019-03-06 07:20:12 +01:00
parent d985d1bff0
commit c35e4d15ab
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
interface/src/avatar/AvatarDoctor.cpp
View file

@ -168,11 +168,6 @@ void AvatarDoctor::startDiagnosing() {
_errors.push_back({ "Asymmetrical leg bones.", DEFAULT_URL });
}
}
const auto rig = new Rig();
rig->reset(avatarModel);
const float eyeHeight = rig->getUnscaledEyeHeight();
@ -241,15 +236,15 @@ void AvatarDoctor::startDiagnosing() {
}
if (!isDescendantOfJointWhenJointsExist("Spine", "Hips")) {
_errors.push_back({ "Spine is no child of Hips.", DEFAULT_URL });
_errors.push_back({ "Spine is not a child of Hips.", DEFAULT_URL });
}
if (!isDescendantOfJointWhenJointsExist("Spine1", "Spine")) {
_errors.push_back({ "Spine1 is no child of Spine.", DEFAULT_URL });
_errors.push_back({ "Spine1 is not a child of Spine.", DEFAULT_URL });
}
if (!isDescendantOfJointWhenJointsExist("Head", "Spine1")) {
_errors.push_back({ "Head is no child of Spine1.", DEFAULT_URL });
_errors.push_back({ "Head is not a child of Spine1.", DEFAULT_URL });
}
}
@ -272,7 +267,9 @@ void AvatarDoctor::startDiagnosing() {
if (materialMappingResource->isLoaded()) {
materialMappingHandled();
} else {
connect(materialMappingResource.data(), &NetworkTexture::finished, this, [materialMappingHandled](bool success) mutable {
connect(materialMappingResource.data(), &NetworkTexture::finished, this,
[materialMappingHandled](bool success) mutable {
materialMappingHandled();
});
}
@ -330,24 +327,14 @@ void AvatarDoctor::diagnoseTextures() {
foreach(const auto& materialMapping, model->getMaterialMapping()) {
foreach(const auto& networkMaterial, materialMapping.second.data()->parsedMaterials.networkMaterials) {
foreach(const auto& textureMap, networkMaterial.second->getTextureMaps()) {
texturesFound++;
}
texturesFound += (int)networkMaterial.second->getTextureMaps().size();
}
}
auto normalizedURL = DependencyManager::get<ResourceManager>()->normalizeURL(
QUrl(avatarModel.originalURL)).resolved(QUrl("textures"));
bool isTextureFolderEmpty = true;
if (normalizedURL.isLocalFile()) {
QDir texturesFolder(normalizedURL.toLocalFile());
if (texturesFolder.exists()) {
isTextureFolderEmpty = texturesFolder.isEmpty();
}
}
if (texturesFound == 0 && !isTextureFolderEmpty) {
if (texturesFound == 0) {
_errors.push_back({ tr("No textures assigned."), DEFAULT_URL });
}