diff --git a/dna/dna.py b/dna/dna.py
index 7bc1919..49dd200 100644
--- a/dna/dna.py
+++ b/dna/dna.py
@@ -756,6 +756,7 @@ def collectCamera(camera):
def setCameraParameters(camera):
# Set camera parameters
+ camera.parm('far').set(0.1)
camera.parm('far').set(5000)
camera.parm('resx').set(resolution_HR[0])
camera.parm('resy').set(resolution_HR[1])
diff --git a/src/runHoudini.py b/src/runHoudini.py
index a2ad605..eb8d213 100644
--- a/src/runHoudini.py
+++ b/src/runHoudini.py
@@ -45,10 +45,14 @@ def combinePaths(listPaths):
listPaths_MTL = os.walk('{0}/lib/MATERIALS'.format(root3D)) # Material library
listPaths_LIT = os.walk('{0}/lib/LIGHTS'.format(root3D)) # Light library
+ # Global HDA library path (WIP! TBD!)
+ listPaths_LIB = os.walk('') # Global HDA (between projects)
+
# Combine paths to a string
combinePaths(listPaths_HDA)
combinePaths(listPaths_MTL)
combinePaths(listPaths_LIT)
+ # combinePaths(listPaths_LIB)
# Add Houdini standard OTLs
global pathHDA
diff --git a/tools/projectCreator.py b/tools/projectCreator.py
index 9f2c883..1372b09 100644
--- a/tools/projectCreator.py
+++ b/tools/projectCreator.py
@@ -10,6 +10,8 @@
'''
+# TODO: create Global HDA folder and set this path in wraper
+
# Common modules import
import os
import shutil
@@ -35,7 +37,7 @@
filterFiles = []
uiFile_main = '{}/ui/projectCreator_main.ui'.format(rootPipeline)
uiFile_warning = '{}/ui/projectCreator_warning.ui'.format(rootPipeline)
-houdiniBuild = '17.0.459'
+houdiniBuild = '17.5.173'
# PROJECT FOLDER STRUCTURE
# Shots structure
@@ -161,15 +163,18 @@ def __init__(self):
self.window = QtUiTools.QUiLoader().load(ui_file)
ui_file.close()
+ # SETUP WINDOW WIDGETS
self.act_docs = self.window.findChild(QAction, 'act_docs')
self.act_help = self.window.findChild(QAction, 'act_help')
self.btn_setFolder = self.window.findChild(QPushButton, 'btn_setFolder')
self.lin_name = self.window.findChild(QLineEdit, 'lin_name')
self.lab_path = self.window.findChild(QLabel, 'lab_path')
+
+ self.lab_pathHDA = self.window.findChild(QLabel, 'lab_pathHDA')
self.lin_options = self.window.findChild(QLineEdit, 'lin_options')
- self.btn_create = self.window.findChild(QPushButton, 'btn_create')
self.chb_example = self.window.findChild(QCheckBox, 'chb_example')
+ self.btn_create = self.window.findChild(QPushButton, 'btn_create')
self.lab_path.setText('C:')
self.lin_name.setText('MY_PROJECT')
@@ -271,7 +276,7 @@ def createProject_HDD(self, rootProject):
# Create nested folder structure
self.createFolders(rootProject, FOLDERS)
- # Create Houdini launcher
+ # Create Houdini LAUNCHER
launcherNamePY_SRC = '{}/src/runHoudini.py'.format(rootPipeline)
launcherNamePY_DST = '{}/PREP/PIPELINE/runHoudini.py'.format(rootProject)
launcherNameBAT_DST = '{}/PREP/PIPELINE/runHoudini.bat'.format(rootProject)
@@ -287,6 +292,10 @@ def createProject_HDD(self, rootProject):
line = "rootPipeline = '{}'\n".format(rootPipeline)
elif line.startswith('build ='):
line = "build = '{}'\n".format(self.lin_options.text())
+ elif '# Global HDA (between projects)' in line:
+ # Global HDA library setup (commented off in runHoudini: # combinePaths(listPaths_LIB))
+ pathHDA = self.lab_pathHDA.text()
+ line = line.replace("os.walk('')", "os.walk('{}')".format(pathHDA))
launcherPY_DST.write(line)
diff --git a/tools/renderFarm.py b/tools/renderFarm.py
index 78a9f1b..fe38ac7 100644
--- a/tools/renderFarm.py
+++ b/tools/renderFarm.py
@@ -63,7 +63,6 @@ def unhideShots(self):
#BR.addShots(sequenceNumber, shotNumbers)
pass
-
class CreateShotItems(QtWidgets.QWidget):
def __init__(self):
# SETUP UI WINDOW
diff --git a/ui/projectCreator_main.ui b/ui/projectCreator_main.ui
index 2bf456c..ee83b80 100644
--- a/ui/projectCreator_main.ui
+++ b/ui/projectCreator_main.ui
@@ -7,7 +7,7 @@
0
0
291
- 379
+ 397
@@ -75,6 +75,20 @@
Options
+ -
+
+
+ Set Global HDA Folder
+
+
+
+ -
+
+
+ C:/HDA
+
+
+
-