Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failed connection

Browse source
This commit is contained in:
Atlante45 2017-08-25 16:13:29 -07:00
parent eaa2b9fda8
commit a36ddf7b6d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/assets/AssetServer.cpp
View file

@ -1049,7 +1049,7 @@ QString getBakeMapping(const AssetHash& hash, const QString& relativeFilePath) {
return HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" + relativeFilePath;
}
void AssetServer::handleCompletedBake(AssetPath originalAssetPath, AssetHash originalAssetHash, QVector<QString> bakedFilePaths) {
void AssetServer::handleCompletedBake(QString originalAssetPath, QString originalAssetHash, QVector<QString> bakedFilePaths) {
bool errorCompletingBake { false };
qDebug() << "Completing bake for " << originalAssetHash;

4
assignment-client/src/assets/AssetServer.h
View file

@ -32,7 +32,7 @@ public:
void run() override;
signals:
void bakeComplete(AssetHash assetHash, AssetPath assetPath, QVector<QString> outputFiles);
void bakeComplete(QString assetHash, QString assetPath, QVector<QString> outputFiles);
private:
std::atomic<bool> _isBaking { false };
@ -99,7 +99,7 @@ private:
void bakeAsset(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath);
/// Move baked content for asset to baked directory and update baked status
void handleCompletedBake(AssetPath assetPath, AssetHash originalAssetHash, QVector<QString> bakedFilePaths);
void handleCompletedBake(QString assetPath, QString originalAssetHash, QVector<QString> bakedFilePaths);
/// Create meta file to describe baked content for original asset
bool createMetaFile(AssetHash originalAssetHash);