From 67ec766af2a5161c9ffd9ec7af8291cf84342b98 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 11 Apr 2018 10:24:01 -0700
Subject: [PATCH] saving work.

---
 libraries/image/src/image/Image.cpp        |  2 +-
 tools/bake-tools/bake.py                   | 16 ++++++++++++----
 tools/bake-tools/convertToRelativePaths.py |  9 +++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/libraries/image/src/image/Image.cpp b/libraries/image/src/image/Image.cpp
index 696e311495..0b4acb29c4 100644
--- a/libraries/image/src/image/Image.cpp
+++ b/libraries/image/src/image/Image.cpp
@@ -37,7 +37,7 @@ bool DEV_DECIMATE_TEXTURES = false;
 std::atomic<size_t> DECIMATED_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> compressNormalTextures { false };
diff --git a/tools/bake-tools/bake.py b/tools/bake-tools/bake.py
index cad638c911..4051b7a7ca 100644
--- a/tools/bake-tools/bake.py
+++ b/tools/bake-tools/bake.py
@@ -44,26 +44,34 @@ def groupKTXFiles(directory, filePath):
         originalFilePath.strip()
         shutil.move(originalFilePath, newFilePath)
 
-def bakeFile(filePath, outputDirectory):
+def bakeFile(filePath, outputDirectory, fileType):
     createDirectory(outputDirectory)
-    cmd = EXE + ' -i ' + filePath + ' -o ' + outputDirectory + ' -t fbx'
+    cmd = EXE + ' -i ' + filePath + ' -o ' + outputDirectory + ' -t ' + fileType
     args = shlex.split(cmd)
     process = subprocess.Popen(cmd, stdout=False, stderr=False)
     process.wait()
     bakedFile = os.path.splitext(filePath)[0]
-    groupKTXFiles(outputDirectory, bakedFile)
+    if fileType == 'fbx':
+        groupKTXFiles(outputDirectory, bakedFile)
 
 def bakeFilesInDirectory(directory, outputDirectory):
     rootDirectory = os.path.basename(os.path.normpath(directory))
     for root, subFolders, filenames in os.walk(directory):
         for filename in filenames:
             appendPath = getRelativePath(directory, root, rootDirectory);
+            name, ext = os.path.splitext('file.txt')
             if filename.endswith('.fbx'):
                 filePath = os.sep.join([root, filename])
                 absFilePath = os.path.abspath(filePath)
                 outputFolder = os.path.join(outputDirectory, appendPath)
                 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:
                 filePath = os.sep.join([root, filename])
                 absFilePath = os.path.abspath(filePath)
diff --git a/tools/bake-tools/convertToRelativePaths.py b/tools/bake-tools/convertToRelativePaths.py
index 27a7b7ac02..2798e2849f 100644
--- a/tools/bake-tools/convertToRelativePaths.py
+++ b/tools/bake-tools/convertToRelativePaths.py
@@ -65,6 +65,15 @@ def main():
                     except:
                         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":
                     value = handleURL(value)