Merge pull request #94 from dictoon/master

Add presets, templates to .mod, rename aetemplate
appleseedhq · Nov 28, 2017 · d63eb32 · d63eb32
2 parents 8857e26 + dde6f7b
commit d63eb32
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 5 deletions.
diff --git a/deploy/appleseed-maya.package.py b/deploy/appleseed-maya.package.py
@@ -319,6 +319,10 @@ def do_generate_module_file(self, maya_platform_id):
             f.write("PATH +:= bin\n")
             f.write("PYTHONPATH +:= scripts\n")
             f.write("APPLESEED_SEARCHPATH +:= shaders\n")
+            f.write("MAYA_PRESET_PATH +:= presets\n")
+            f.write("MAYA_CUSTOM_TEMPLATE_PATH +:= scripts/appleseedMaya/AETemplates\n")
+            f.write("MAYA_SHELF_PATH +:= prefs/shelves\n")
+            f.write("XBMLANGPATH +:= icons/%B\n")
 
     def copy_binaries(self):
         bin_dir = os.path.join(self.settings.package_output_path, "bin")

diff --git a/prefs/shelves/.gitkeep b/prefs/shelves/.gitkeep
diff --git a/...aetemplate/NEasColorTransformTemplate.xml → ...ETemplates/NEasColorTransformTemplate.xml b/...aetemplate/NEasColorTransformTemplate.xml → ...ETemplates/NEasColorTransformTemplate.xml
diff --git a/...Maya/aetemplate/NEasLuminanceTemplate.xml → ...aya/AETemplates/NEasLuminanceTemplate.xml b/...Maya/aetemplate/NEasLuminanceTemplate.xml → ...aya/AETemplates/NEasLuminanceTemplate.xml
diff --git a/...edMaya/aetemplate/NEasNoise2DTemplate.xml → ...dMaya/AETemplates/NEasNoise2DTemplate.xml b/...edMaya/aetemplate/NEasNoise2DTemplate.xml → ...dMaya/AETemplates/NEasNoise2DTemplate.xml
diff --git a/...edMaya/aetemplate/NEasNoise3DTemplate.xml → ...dMaya/AETemplates/NEasNoise3DTemplate.xml b/...edMaya/aetemplate/NEasNoise3DTemplate.xml → ...dMaya/AETemplates/NEasNoise3DTemplate.xml
diff --git a/...etemplate/NEasStandardSurfaceTemplate.xml → ...Templates/NEasStandardSurfaceTemplate.xml b/...etemplate/NEasStandardSurfaceTemplate.xml → ...Templates/NEasStandardSurfaceTemplate.xml
diff --git a/...Maya/aetemplate/NEasVoronoi2DTemplate.xml → ...aya/AETemplates/NEasVoronoi2DTemplate.xml b/...Maya/aetemplate/NEasVoronoi2DTemplate.xml → ...aya/AETemplates/NEasVoronoi2DTemplate.xml
diff --git a/...Maya/aetemplate/NEasVoronoi3DTemplate.xml → ...aya/AETemplates/NEasVoronoi3DTemplate.xml b/...Maya/aetemplate/NEasVoronoi3DTemplate.xml → ...aya/AETemplates/NEasVoronoi3DTemplate.xml
diff --git a/scripts/appleseedMaya/aetemplate/__init__.py → ...pts/appleseedMaya/AETemplates/__init__.py b/scripts/appleseedMaya/aetemplate/__init__.py → ...pts/appleseedMaya/AETemplates/__init__.py
@@ -57,7 +57,7 @@ def meshAlphaMapCreateNew(node, attr):
 
     def __meshAlphaCreateNewPyCmd(self, attr):
         (nodeName, attrName) = attr.split('.')
-        thisClass = 'appleseedMaya.aetemplate.AEappleseedNodeTemplate'
+        thisClass = 'appleseedMaya.AETemplates.AEappleseedNodeTemplate'
         return "%s.meshAlphaMapCreateNew('%s', '%s')" % (thisClass, nodeName, attrName)
 
     def meshAlphaMapNew(self, attr):

diff --git a/...a/aetemplate/appleseedalphamaptemplate.py → .../AETemplates/appleseedAlphaMapTemplate.py b/...a/aetemplate/appleseedalphamaptemplate.py → .../AETemplates/appleseedAlphaMapTemplate.py
diff --git a/...late/appleseedphysicalskylighttemplate.py → ...ates/appleseedPhysicalSkyLightTemplate.py b/...late/appleseedphysicalskylighttemplate.py → ...ates/appleseedPhysicalSkyLightTemplate.py
diff --git a/...template/appleseedskydomelighttemplate.py → ...emplates/appleseedSkyDomeLightTemplate.py b/...template/appleseedskydomelighttemplate.py → ...emplates/appleseedSkyDomeLightTemplate.py
diff --git a/scripts/appleseedMaya/register.py b/scripts/appleseedMaya/register.py
@@ -37,7 +37,7 @@
 import maya.OpenMaya as om
 
 # appleseedMaya imports.
-from aetemplate import appleseedAETemplateCallback
+from AETemplates import appleseedAETemplateCallback
 from hypershadeCallbacks import *
 from logger import logger
 from menu import createMenu, deleteMenu
@@ -115,14 +115,14 @@ def register():
         hook="AETemplateCustomContent",
         owner="appleseed")
 
-    # Manually load templates in aetemplate folder.
-    templatesDir = os.path.join(thisDir, "aetemplate")
+    # Manually load templates in AETemplates folder.
+    templatesDir = os.path.join(thisDir, "AETemplates")
     logger.debug("Registering AETemplates in %s" % templatesDir)
     for file in os.listdir(templatesDir):
         if fnmatch.fnmatch(file, '*template.py'):
             templateModule = file.replace(".py", "")
             logger.debug("Registering AE template %s" % templateModule)
-            mel.eval('python("import appleseedMaya.aetemplate.%s")' % templateModule)
+            mel.eval('python("import appleseedMaya.AETemplates.%s")' % templateModule)
 
     # Hypershade callbacks
     asHypershadeCallbacks = [