Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 10:17:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15348 from SamGondelman/jsbaker

Browse source 
Case 22093: Disable JSBaker for now
This commit is contained in:
Shannon Romano 2019-04-10 09:39:44 -07:00 committed by GitHub
commit 6a05b7ec23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/oven/src/BakerCLI.cpp
View file

@ -55,8 +55,9 @@ void BakerCLI::bakeFile(QUrl inputUrl, const QString& outputPath, const QString&
}
}
} else if (type == SCRIPT_EXTENSION) {
_baker = std::unique_ptr<Baker> { new JSBaker(inputUrl, outputPath) };
_baker->moveToThread(Oven::instance().getNextWorkerThread());
// FIXME: disabled for now because it breaks some scripts
//_baker = std::unique_ptr<Baker> { new JSBaker(inputUrl, outputPath) };
//_baker->moveToThread(Oven::instance().getNextWorkerThread());
} else if (type == MATERIAL_EXTENSION) {
_baker = std::unique_ptr<Baker> { new MaterialBaker(inputUrl.toDisplayString(), true, outputPath) };
_baker->moveToThread(Oven::instance().getNextWorkerThread());

3
tools/oven/src/DomainBaker.cpp
View file

@ -397,6 +397,8 @@ void DomainBaker::enumerateEntities() {
}
}
// FIXME: disabled for now because it breaks some scripts
/*
// Scripts
if (entity.contains(SCRIPT_KEY)) {
addScriptBaker(SCRIPT_KEY, entity[SCRIPT_KEY].toString(), *it);
@ -404,6 +406,7 @@ void DomainBaker::enumerateEntities() {
if (entity.contains(SERVER_SCRIPTS_KEY)) {
// TODO: serverScripts can be multiple scripts, need to handle that
}
*/
// Materials
if (entity.contains(MATERIAL_URL_KEY)) {

2
tools/oven/src/OvenCLIApplication.cpp
View file

@ -33,7 +33,7 @@ OvenCLIApplication::OvenCLIApplication(int argc, char* argv[]) :
parser.addOptions({
{ CLI_INPUT_PARAMETER, "Path to file that you would like to bake.", "input" },
{ CLI_OUTPUT_PARAMETER, "Path to folder that will be used as output.", "output" },
{ CLI_TYPE_PARAMETER, "Type of asset. [model|material|js]", "type" },
{ CLI_TYPE_PARAMETER, "Type of asset. [model|material]"/*|js]"*/, "type" },
{ CLI_DISABLE_TEXTURE_COMPRESSION_PARAMETER, "Disable texture compression." }
});