Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

saving work.

Browse source
This commit is contained in:
Dante Ruiz 2018-04-11 10:24:01 -07:00
parent d8f0cfa89a
commit 67ec766af2
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/image/src/image/Image.cpp
View file

@ -37,7 +37,7 @@ bool DEV_DECIMATE_TEXTURES = false;
std::atomic<size_t> DECIMATED_TEXTURE_COUNT{ 0 }; std::atomic<size_t> DECIMATED_TEXTURE_COUNT{ 0 };
std::atomic<size_t> RECTIFIED_TEXTURE_COUNT{ 0 }; std::atomic<size_t> RECTIFIED_TEXTURE_COUNT{ 0 };
static const auto HDR_FORMAT = gpu::Element::COLOR_R11G11B10; static const auto& HDR_FORMAT = gpu::Element::COLOR_R11G11B10;
static std::atomic<bool> compressColorTextures { false }; static std::atomic<bool> compressColorTextures { false };
static std::atomic<bool> compressNormalTextures { false }; static std::atomic<bool> compressNormalTextures { false };

16
tools/bake-tools/bake.py
View file

@ -44,26 +44,34 @@ def groupKTXFiles(directory, filePath):
originalFilePath.strip() originalFilePath.strip()
shutil.move(originalFilePath, newFilePath) shutil.move(originalFilePath, newFilePath)
def bakeFile(filePath, outputDirectory): def bakeFile(filePath, outputDirectory, fileType):
createDirectory(outputDirectory) createDirectory(outputDirectory)
cmd = EXE + ' -i ' + filePath + ' -o ' + outputDirectory + ' -t fbx' cmd = EXE + ' -i ' + filePath + ' -o ' + outputDirectory + ' -t ' + fileType
args = shlex.split(cmd) args = shlex.split(cmd)
process = subprocess.Popen(cmd, stdout=False, stderr=False) process = subprocess.Popen(cmd, stdout=False, stderr=False)
process.wait() process.wait()
bakedFile = os.path.splitext(filePath)[0] bakedFile = os.path.splitext(filePath)[0]
groupKTXFiles(outputDirectory, bakedFile) if fileType == 'fbx':
groupKTXFiles(outputDirectory, bakedFile)
def bakeFilesInDirectory(directory, outputDirectory): def bakeFilesInDirectory(directory, outputDirectory):
rootDirectory = os.path.basename(os.path.normpath(directory)) rootDirectory = os.path.basename(os.path.normpath(directory))
for root, subFolders, filenames in os.walk(directory): for root, subFolders, filenames in os.walk(directory):
for filename in filenames: for filename in filenames:
appendPath = getRelativePath(directory, root, rootDirectory); appendPath = getRelativePath(directory, root, rootDirectory);
name, ext = os.path.splitext('file.txt')
if filename.endswith('.fbx'): if filename.endswith('.fbx'):
filePath = os.sep.join([root, filename]) filePath = os.sep.join([root, filename])
absFilePath = os.path.abspath(filePath) absFilePath = os.path.abspath(filePath)
outputFolder = os.path.join(outputDirectory, appendPath) outputFolder = os.path.join(outputDirectory, appendPath)
print "Baking file: " + filename print "Baking file: " + filename
bakeFile(absFilePath, outputFolder) bakeFile(absFilePath, outputFolder, 'fbx')
elif os.path.basename(root) == 'skyboxes':
filePath = os.sep.join([root, filename])
absFilePath = os.path.abspath(filePath)
outputFolder = os.path.join(outputDirectory, appendPath)
print "Baking file: " + filename
bakeFile(absFilePath, outputFolder, 'png')
else: else:
filePath = os.sep.join([root, filename]) filePath = os.sep.join([root, filename])
absFilePath = os.path.abspath(filePath) absFilePath = os.path.abspath(filePath)

9
tools/bake-tools/convertToRelativePaths.py
View file

@ -65,6 +65,15 @@ def main():
except: except:
value = handleURL(value) value = handleURL(value)
if prop == "ambientLight":
for index in value:
value[index] = handleURL(value[index])
if prop == "skybox":
for index in value:
value[index] = handleURL(value[index])
if prop == "serverScripts": if prop == "serverScripts":
value = handleURL(value) value = handleURL(value)