name change

zpelgrims · Feb 21, 2016 · 3f58245 · 3f58245
1 parent b425df3
commit 3f58245
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 2,693 deletions.
diff --git a/ae/aiZenoCameraTemplate.py → ae/aiZoicTemplate.py b/ae/aiZenoCameraTemplate.py → ae/aiZoicTemplate.py
@@ -3,7 +3,7 @@
 import maya.cmds as cmds
 import mtoa.ui.ae.utils as aeUtils
 
-class aiZenoCameraTemplate(templates.AttributeTemplate):
+class aiZoicTemplate(templates.AttributeTemplate):
 
     def filenameEdit(self, mData) :
             attr = self.nodeAttr('aiBokehPath')
@@ -41,4 +41,4 @@ def setup(self):
         self.addControl("aiUseImage", label="Enable Image based bokeh")
         self.addCustom('aiBokehPath', self.filenameNew, self.filenameReplace)
 
-templates.registerTranslatorUI(aiZenoCameraTemplate, "camera", "zenoCamera")
+templates.registerTranslatorUI(aiZoicTemplate, "camera", "zoic")
diff --git a/ae/aiZenoCameraTemplate.pyc → ae/aiZoicTemplate.pyc b/ae/aiZenoCameraTemplate.pyc → ae/aiZoicTemplate.pyc
diff --git a/bin/zenoCamera.o b/bin/zenoCamera.o
diff --git a/bin/zenoCamera.so b/bin/zenoCamera.so
diff --git a/bin/zenoCamera.mtd → bin/zoic.mtd b/bin/zenoCamera.mtd → bin/zoic.mtd
@@ -1,9 +1,9 @@
-# zenoCamera                    0x00070007
-[node zenoCamera]
+# zoic                    0x00070007
+[node zoic]
     desc STRING "Extended camera shader with added options for mage based bokeh shapes and optical vignetting."
     maya.name               STRING  "camera"
     maya.id                     INT     0x00070007
-    maya.translator         STRING  "zenoCamera"
+    maya.translator         STRING  "zoic"
 
     [attr sensorWidth]
         maya.name           STRING  "aiSensorWidth"

diff --git a/bin/zoic.so b/bin/zoic.so
diff --git a/src/arnoldCamera.pro b/src/arnoldCamera.pro
@@ -20,21 +20,15 @@ LIBS += \
 
 
 SOURCES += \
-    zenoCamera.cpp \
-    imageReader.cpp \
-    testFile.cpp \
+    zoic.cpp
 
 HEADERS += \
-    arnoldcamera.h\
-    arnoldcamera_global.h \
-    oblique_lensdistortion.h \
-    imageReader.h
 
 unix {
     target.path = /usr/lib
     INSTALLS += target
 }
 
 DISTFILES += \
-    ../z_ae/aiZenoCameraTemplate.py \
-    ../z_bin/zenoCamera.mtd
+    ../ae/aiZoicTemplate.py \
+    ../bin/zoic.mtd
diff --git a/src/arnoldcamera.h b/src/arnoldcamera.h
diff --git a/src/arnoldcamera_global.h b/src/arnoldcamera_global.h
diff --git a/src/imgs/testScene_lights.ass → src/imgs/wip/testScene_lights.ass b/src/imgs/testScene_lights.ass → src/imgs/wip/testScene_lights.ass
diff --git a/src/testScene.ass b/src/testScene.ass
diff --git a/src/testScene.exr b/src/testScene.exr
diff --git a/src/testScene.ma b/src/testScene.ma
diff --git a/src/zenoCamera.cpp → src/zoic.cpp b/src/zenoCamera.cpp → src/zoic.cpp
@@ -1,4 +1,4 @@
-// Arnold camera shader with options for image based bokeh shapes and optical vignetting.
+// ZOIC - Arnold camera shader with options for image based bokeh shapes and optical vignetting.
 
 // Special thanks to Marc-Antoine Desjardins for the help on the image sampling
 // Special thanks to Benedikt Bitterli for the information on optical vignetting
@@ -86,7 +86,8 @@ even losing samples in the middle..
 #include <cstring>
 #include <OpenImageIO/imageio.h>
 
-AI_CAMERA_NODE_EXPORT_METHODS(zenoCameraMethods)
+// Arnold thingy
+AI_CAMERA_NODE_EXPORT_METHODS(zoicMethods)
 
 bool debug = false;
 
@@ -591,7 +592,7 @@ node_parameters {
    AiParameterFLT("focalDistance", 110.0f); // distance from lens to focal point
    AiParameterFLT("opticalVignetting", 0.0f); //distance of the opticalVignetting virtual aperture
    AiParameterBOOL("useImage", true);
-   AiParameterStr("bokehPath", "/home/i7210038/qt_arnoldCamera/arnoldCamera/imgs/collected_real/bokeh_18_graded.jpg"); //bokeh shape image location
+   AiParameterStr("bokehPath", ""); //bokeh shape image location
 }
 
 
@@ -738,9 +739,9 @@ camera_create_ray {
 node_loader {
    if (i > 0)
       return false;
-   node->methods      = zenoCameraMethods;
+   node->methods      = zoicMethods;
    node->output_type  = AI_TYPE_NONE;
-   node->name         = "zenoCamera";
+   node->name         = "zoic";
    node->node_type    = AI_NODE_CAMERA;
    strcpy(node->version, AI_VERSION);
    return true;

diff --git a/src/zenoCamera.os → src/zoic.os b/src/zenoCamera.os → src/zoic.os