diff --git a/arnoldCamera/imageReader b/arnoldCamera/imageReader deleted file mode 100755 index ae747f3..0000000 Binary files a/arnoldCamera/imageReader and /dev/null differ diff --git a/arnoldCamera/imgs/circle.jpg b/arnoldCamera/imgs/circle.jpg deleted file mode 100644 index b17322a..0000000 Binary files a/arnoldCamera/imgs/circle.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/circle_small.jpg b/arnoldCamera/imgs/circle_small.jpg deleted file mode 100644 index 5ebb8f0..0000000 Binary files a/arnoldCamera/imgs/circle_small.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4428458691_26506ef52c_o.jpg b/arnoldCamera/imgs/collected_real/4428458691_26506ef52c_o.jpg deleted file mode 100644 index b8d01ce..0000000 Binary files a/arnoldCamera/imgs/collected_real/4428458691_26506ef52c_o.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4428458781_0b7a5b8444_b.jpg b/arnoldCamera/imgs/collected_real/4428458781_0b7a5b8444_b.jpg deleted file mode 100644 index f2e2cf6..0000000 Binary files a/arnoldCamera/imgs/collected_real/4428458781_0b7a5b8444_b.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4428469145_f3fc1c2649_b.jpg b/arnoldCamera/imgs/collected_real/4428469145_f3fc1c2649_b.jpg deleted file mode 100644 index a5ba797..0000000 Binary files a/arnoldCamera/imgs/collected_real/4428469145_f3fc1c2649_b.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4428469193_f5909c51f8_b.jpg b/arnoldCamera/imgs/collected_real/4428469193_f5909c51f8_b.jpg deleted file mode 100644 index 869dcd0..0000000 Binary files a/arnoldCamera/imgs/collected_real/4428469193_f5909c51f8_b.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4428472829_c74972c72a_b.jpg b/arnoldCamera/imgs/collected_real/4428472829_c74972c72a_b.jpg deleted file mode 100644 index 9dfc4ce..0000000 Binary files a/arnoldCamera/imgs/collected_real/4428472829_c74972c72a_b.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4429225238_4c56a7612c_o.jpg b/arnoldCamera/imgs/collected_real/4429225238_4c56a7612c_o.jpg deleted file mode 100644 index 19b5123..0000000 Binary files a/arnoldCamera/imgs/collected_real/4429225238_4c56a7612c_o.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4429225388_71c479bf9f_o.jpg b/arnoldCamera/imgs/collected_real/4429225388_71c479bf9f_o.jpg deleted file mode 100644 index c5513ed..0000000 Binary files a/arnoldCamera/imgs/collected_real/4429225388_71c479bf9f_o.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4429228814_c1929ca3c0_b.jpg b/arnoldCamera/imgs/collected_real/4429228814_c1929ca3c0_b.jpg deleted file mode 100644 index c272005..0000000 Binary files a/arnoldCamera/imgs/collected_real/4429228814_c1929ca3c0_b.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4429228854_6f7173ca6f_o.jpg b/arnoldCamera/imgs/collected_real/4429228854_6f7173ca6f_o.jpg deleted file mode 100644 index f5571d9..0000000 Binary files a/arnoldCamera/imgs/collected_real/4429228854_6f7173ca6f_o.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4429235724_ca6d352518_o.jpg b/arnoldCamera/imgs/collected_real/4429235724_ca6d352518_o.jpg deleted file mode 100644 index 2607ff4..0000000 Binary files a/arnoldCamera/imgs/collected_real/4429235724_ca6d352518_o.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/4429239290_e9828e4935_o.jpg b/arnoldCamera/imgs/collected_real/4429239290_e9828e4935_o.jpg deleted file mode 100644 index 490b4ce..0000000 Binary files a/arnoldCamera/imgs/collected_real/4429239290_e9828e4935_o.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/50mm14.jpg b/arnoldCamera/imgs/collected_real/50mm14.jpg deleted file mode 100644 index 9b30dac..0000000 Binary files a/arnoldCamera/imgs/collected_real/50mm14.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/50mm17.jpg b/arnoldCamera/imgs/collected_real/50mm17.jpg deleted file mode 100644 index f549b86..0000000 Binary files a/arnoldCamera/imgs/collected_real/50mm17.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/Anamo.jpg b/arnoldCamera/imgs/collected_real/Anamo.jpg deleted file mode 100644 index bd8361b..0000000 Binary files a/arnoldCamera/imgs/collected_real/Anamo.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/Anamo2.jpg b/arnoldCamera/imgs/collected_real/Anamo2.jpg deleted file mode 100644 index c291dc3..0000000 Binary files a/arnoldCamera/imgs/collected_real/Anamo2.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/DirtyD2.jpg b/arnoldCamera/imgs/collected_real/DirtyD2.jpg deleted file mode 100644 index 4322b50..0000000 Binary files a/arnoldCamera/imgs/collected_real/DirtyD2.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/DirtyD4.jpg b/arnoldCamera/imgs/collected_real/DirtyD4.jpg deleted file mode 100644 index a372232..0000000 Binary files a/arnoldCamera/imgs/collected_real/DirtyD4.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/OE_53_6_065103_f001.png b/arnoldCamera/imgs/collected_real/OE_53_6_065103_f001.png deleted file mode 100644 index b4e1037..0000000 Binary files a/arnoldCamera/imgs/collected_real/OE_53_6_065103_f001.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/PentaxDA14min.jpg b/arnoldCamera/imgs/collected_real/PentaxDA14min.jpg deleted file mode 100644 index 71f0a42..0000000 Binary files a/arnoldCamera/imgs/collected_real/PentaxDA14min.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/bokeh_highlight.jpg b/arnoldCamera/imgs/collected_real/bokeh_highlight.jpg deleted file mode 100644 index 7223caf..0000000 Binary files a/arnoldCamera/imgs/collected_real/bokeh_highlight.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_01.png b/arnoldCamera/imgs/collected_real/needs_resizing_01.png deleted file mode 100644 index ebd03c5..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_01.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_02.png b/arnoldCamera/imgs/collected_real/needs_resizing_02.png deleted file mode 100644 index a85af89..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_02.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_03.png b/arnoldCamera/imgs/collected_real/needs_resizing_03.png deleted file mode 100644 index d7c98bd..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_03.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_04.png b/arnoldCamera/imgs/collected_real/needs_resizing_04.png deleted file mode 100644 index 689f9f6..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_04.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_05.png b/arnoldCamera/imgs/collected_real/needs_resizing_05.png deleted file mode 100644 index 669d077..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_05.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_06.png b/arnoldCamera/imgs/collected_real/needs_resizing_06.png deleted file mode 100644 index ec2d8af..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_06.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_07.png b/arnoldCamera/imgs/collected_real/needs_resizing_07.png deleted file mode 100644 index 3bcd568..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_07.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_08.png b/arnoldCamera/imgs/collected_real/needs_resizing_08.png deleted file mode 100644 index 2ebc09c..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_08.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_09.png b/arnoldCamera/imgs/collected_real/needs_resizing_09.png deleted file mode 100644 index b593959..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_09.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_10.png b/arnoldCamera/imgs/collected_real/needs_resizing_10.png deleted file mode 100644 index 3ed8020..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_10.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_11.png b/arnoldCamera/imgs/collected_real/needs_resizing_11.png deleted file mode 100644 index f8c8340..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_11.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_12.png b/arnoldCamera/imgs/collected_real/needs_resizing_12.png deleted file mode 100644 index bd00097..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_12.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/needs_resizing_13.png b/arnoldCamera/imgs/collected_real/needs_resizing_13.png deleted file mode 100644 index d682f2c..0000000 Binary files a/arnoldCamera/imgs/collected_real/needs_resizing_13.png and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/onion_aspherical.jpg b/arnoldCamera/imgs/collected_real/onion_aspherical.jpg deleted file mode 100644 index 5e0c175..0000000 Binary files a/arnoldCamera/imgs/collected_real/onion_aspherical.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/collected_real/onion_unclear.jpg b/arnoldCamera/imgs/collected_real/onion_unclear.jpg deleted file mode 100644 index 3fb1843..0000000 Binary files a/arnoldCamera/imgs/collected_real/onion_unclear.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/lena2.jpg b/arnoldCamera/imgs/lena2.jpg deleted file mode 100755 index e9f13ec..0000000 Binary files a/arnoldCamera/imgs/lena2.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/lena2.ppm b/arnoldCamera/imgs/lena2.ppm deleted file mode 100755 index 528f09d..0000000 Binary files a/arnoldCamera/imgs/lena2.ppm and /dev/null differ diff --git a/arnoldCamera/imgs/lena_corrected.ppm b/arnoldCamera/imgs/lena_corrected.ppm deleted file mode 100755 index 4742c4f..0000000 --- a/arnoldCamera/imgs/lena_corrected.ppm +++ /dev/null @@ -1,5 +0,0 @@ -P6 -# Created by RPFELGUEIRAS -16 16 -255 -نw׃tCVS\bedgcgcgbf\eqr؆v؏|‡|]e{>V܄s~n?QPZ]bakq{irXbclԀxyoߥv?V5AVZm:QMYW^Zhs̩ԿĬpaiairm_e7AX3V@Q}q9PN[T^`lwѯһqxF[ʒJ#IG$MFR܄r:N]`R\boȇϟѫδЮѴ6FcwNJHTވt9M`amhfska`ɢԽâ_sY1WƊÉIU߉v8MIU~yTpT.dH)_ͫ]s<AbtȒETދzPWpQ5oA)_mIft]wւB_]5[k@\n+H{FiZD?&YY4XTjfr݉؂[na6XcnĢs/K=cN9xZ@r~XqR%H\epy{q;[h8V~|۰иc,Kn9dM=|aL,PDC>Pgsj}?EvAZ}ĩ̮g#O:$WSA^IxJ FIXjn،¼ly{~ĕuF[kToڋyB$Q2MH9rB*Xr0HWajk{y߱UdЛ~HTq=YkӉz9MA,aF2hF#KFPccnntqٙӲ[jmq{NgrMi \ No newline at end of file diff --git a/arnoldCamera/imgs/nightscape_report/nightscape_cateye.jpg b/arnoldCamera/imgs/nightscape_report/nightscape_cateye.jpg deleted file mode 100644 index edaa28a..0000000 Binary files a/arnoldCamera/imgs/nightscape_report/nightscape_cateye.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/nightscape_report/nightscape_dof.jpg b/arnoldCamera/imgs/nightscape_report/nightscape_dof.jpg deleted file mode 100644 index 4c59c7c..0000000 Binary files a/arnoldCamera/imgs/nightscape_report/nightscape_dof.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/nightscape_report/nightscape_dof_02.jpg b/arnoldCamera/imgs/nightscape_report/nightscape_dof_02.jpg deleted file mode 100644 index 29c984d..0000000 Binary files a/arnoldCamera/imgs/nightscape_report/nightscape_dof_02.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/real_01.jpg b/arnoldCamera/imgs/real_01.jpg deleted file mode 100644 index 4322b50..0000000 Binary files a/arnoldCamera/imgs/real_01.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/real_aperture.jpg b/arnoldCamera/imgs/real_aperture.jpg deleted file mode 100644 index 87dea87..0000000 Binary files a/arnoldCamera/imgs/real_aperture.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/sample_distribution_2016_02_10.png b/arnoldCamera/imgs/sample_distribution_2016_02_10.png deleted file mode 100644 index 2174446..0000000 Binary files a/arnoldCamera/imgs/sample_distribution_2016_02_10.png and /dev/null differ diff --git a/arnoldCamera/imgs/testScene.exr b/arnoldCamera/imgs/testScene.exr deleted file mode 100644 index dffd998..0000000 Binary files a/arnoldCamera/imgs/testScene.exr and /dev/null differ diff --git a/arnoldCamera/imgs/testScene.png b/arnoldCamera/imgs/testScene.png deleted file mode 100755 index 8d899a0..0000000 Binary files a/arnoldCamera/imgs/testScene.png and /dev/null differ diff --git a/arnoldCamera/imgs/testScene_DOF.png b/arnoldCamera/imgs/testScene_DOF.png deleted file mode 100755 index 1ff5d3e..0000000 Binary files a/arnoldCamera/imgs/testScene_DOF.png and /dev/null differ diff --git a/arnoldCamera/imgs/testScene_lights.exr b/arnoldCamera/imgs/testScene_lights.exr deleted file mode 100755 index 6f8049e..0000000 Binary files a/arnoldCamera/imgs/testScene_lights.exr and /dev/null differ diff --git a/arnoldCamera/imgs/testScene_noDOF.exr b/arnoldCamera/imgs/testScene_noDOF.exr deleted file mode 100755 index 5bef6ba..0000000 Binary files a/arnoldCamera/imgs/testScene_noDOF.exr and /dev/null differ diff --git a/arnoldCamera/imgs/testScene_tmp.exr b/arnoldCamera/imgs/testScene_tmp.exr deleted file mode 100644 index 5bc2ce8..0000000 Binary files a/arnoldCamera/imgs/testScene_tmp.exr and /dev/null differ diff --git a/arnoldCamera/imgs/triangle.jpg b/arnoldCamera/imgs/triangle.jpg deleted file mode 100755 index a51f317..0000000 Binary files a/arnoldCamera/imgs/triangle.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/vertical.jpg b/arnoldCamera/imgs/vertical.jpg deleted file mode 100755 index 3cb6fe5..0000000 Binary files a/arnoldCamera/imgs/vertical.jpg and /dev/null differ diff --git a/arnoldCamera/imgs/vertical.png b/arnoldCamera/imgs/vertical.png deleted file mode 100755 index 3fd8b84..0000000 Binary files a/arnoldCamera/imgs/vertical.png and /dev/null differ diff --git a/arnoldCamera/imgs/vertical.ppm b/arnoldCamera/imgs/vertical.ppm deleted file mode 100755 index 47e71fd..0000000 Binary files a/arnoldCamera/imgs/vertical.ppm and /dev/null differ diff --git a/arnoldCamera/imgs/z.jpg b/arnoldCamera/imgs/z.jpg deleted file mode 100644 index b838d83..0000000 Binary files a/arnoldCamera/imgs/z.jpg and /dev/null differ diff --git a/arnoldCamera/testFile.cpp b/arnoldCamera/testFile.cpp deleted file mode 100755 index 78bde49..0000000 --- a/arnoldCamera/testFile.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include -#include -#include -#include - -void image_read(char const *bokeh_kernel_filename, char const *bokeh_kernel_filename_out){ - - std::cerr << "READING IMAGE WITH OIIO" << std::endl; - OpenImageIO::ImageInput *in = OpenImageIO::ImageInput::open (bokeh_kernel_filename); - if (! in){ - std::cerr << "FAILED TO READ IMAGE" << std::endl; - return nullptr; - } - - const OpenImageIO::ImageSpec &spec = in->spec(); - int xres = spec.width; - int yres = spec.height; - int channels = spec.nchannels; - std::vector pixels (xres*yres*channels); - in->read_image (OpenImageIO::TypeDesc::UINT8, &pixels[0]); - in->close (); - delete in; - - std::cerr << "IMAGEWIDTH: " << xres << std::endl; - std::cerr << "IMAGEHEIGHT: " << yres << std::endl; - std::cerr << "IMAGECHANNELS: " << channels << std::endl; - - - for (int i = 0; i < xres*yres*channels; i++) - { - std::cout << (int)pixels[i] << std::endl; - } - - - float *buffer = spec.data(); - OpenImageIO::ImageBuf buf(spec, buffer); - OpenImageIO::ImageBuf out; - OpenImageIO::ImageBufAlgo::flip(out, buf); - out.write(std::string(bokeh_kernel_filename_out)); - - -} - - - -int main(){ - //image_read("vertical.png"); - image_read("imgs/vertical.png", "imgs/vertical_flipped.png"); -} - diff --git a/arnoldCamera/thinlens_tungsten.cpp b/arnoldCamera/thinlens_tungsten.cpp deleted file mode 100755 index f896208..0000000 --- a/arnoldCamera/thinlens_tungsten.cpp +++ /dev/null @@ -1,104 +0,0 @@ -#include "ThinlensCamera.hpp" -#include - -void ThinlensCamera::precompute() -{ - float planeArea = (2.0f/_planeDist)*(2.0f*_ratio/_planeDist); - _invPlaneArea = 1.0f/planeArea; -} - -float ThinlensCamera::evalApertureThroughput(Vec3f planePos, Vec2f aperturePos) const -{ - float aperture = (*_aperture)[aperturePos].x(); - - if (_catEye > 0.0f) { - aperturePos = (aperturePos*2.0f - 1.0f)*_apertureSize; - Vec3f lensPos = Vec3f(aperturePos.x(), aperturePos.y(), 0.0f); - Vec3f localDir = (planePos - lensPos).normalized(); - Vec2f diaphragmPos = lensPos.xy() - _catEye*_planeDist*localDir.xy()/localDir.z(); - if (diaphragmPos.lengthSq() > sqr(_apertureSize)) - return 0.0f; - } - return aperture/_aperture->maximum().x(); -} - - -bool ThinlensCamera::sampleDirection(PathSampleGenerator &sampler, const PositionSample &point, Vec2u pixel, - DirectionSample &sample) const -{ - float pdf; - Vec2f pixelUv = _filter.sample(sampler.next2D(), pdf); - Vec3f planePos = Vec3f( - -1.0f + (float(pixel.x()) + pixelUv.x())*2.0f*_pixelSize.x(), - _ratio - (float(pixel.y()) + pixelUv.y())*2.0f*_pixelSize.x(), - _planeDist - ); - planePos *= _focusDist/planePos.z(); - - Vec3f lensPos = _invTransform*point.p; - Vec3f localD = (planePos - lensPos).normalized(); - - if (_catEye > 0.0f) { - Vec2f diaphragmPos = lensPos.xy() - _catEye*_planeDist*localD.xy()/localD.z(); - if (diaphragmPos.lengthSq() > sqr(_apertureSize)) - return false; - } - - sample.d = _transform.transformVector(localD); - sample.weight = Vec3f(1.0f); - sample.pdf = _invPlaneArea/cube(localD.z()); - - return true; -} - - -bool ThinlensCamera::evalDirection(PathSampleGenerator &/*sampler*/, const PositionSample &point, - const DirectionSample &direction, Vec3f &weight, Vec2f &pixel) const -{ - Vec3f localLensPos = _invTransform*point.p; - Vec3f localDir = _invTransform.transformVector(direction.d); - if (localDir.z() <= 0.0f) - return false; - - Vec3f planePos = localDir*(_focusDist/localDir.z()) + localLensPos; - planePos *= _planeDist/planePos.z(); - - if (_catEye > 0.0f) { - Vec2f diaphragmPos = localLensPos.xy() - _catEye*_planeDist*localDir.xy()/localDir.z(); - if (diaphragmPos.lengthSq() > sqr(_apertureSize)) - return false; - } - - pixel.x() = (planePos.x() + 1.0f)/(2.0f*_pixelSize.x()); - pixel.y() = (_ratio - planePos.y())/(2.0f*_pixelSize.x()); - if (pixel.x() < -_filter.width() || pixel.y() < -_filter.width() || - pixel.x() >= _res.x() || pixel.y() >= _res.y()) - return false; - - weight = Vec3f(sqr(_planeDist)/(4.0f*_pixelSize.x()*_pixelSize.x()*cube(localDir.z()/localDir.length()))); - return true; -} - -float ThinlensCamera::directionPdf(const PositionSample &point, const DirectionSample &direction) const -{ - Vec3f localLensPos = _invTransform*point.p; - Vec3f localDir = _invTransform.transformVector(direction.d); - if (localDir.z() <= 0.0f) - return false; - - Vec3f planePos = localDir*(_focusDist/localDir.z()) + localLensPos; - planePos *= _planeDist/planePos.z(); - - if (_catEye > 0.0f) { - Vec2f diaphragmPos = localLensPos.xy() - _catEye*_planeDist*localDir.xy()/localDir.z(); - if (diaphragmPos.lengthSq() > sqr(_apertureSize)) - return false; - } - - float u = (planePos.x() + 1.0f)*0.5f; - float v = (1.0f - planePos.y()/_ratio)*0.5f; - if (u < 0.0f || v < 0.0f || u > 1.0f || v > 1.0f) - return 0.0f; - - return _invPlaneArea/cube(localDir.z()/localDir.length()); -} diff --git a/arnoldCamera/tungsten_cateye.cpp b/arnoldCamera/tungsten_cateye.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/arnoldCamera/tungsten_cateye.cpp.autosave b/arnoldCamera/tungsten_cateye.cpp.autosave deleted file mode 100644 index e69de29..0000000 diff --git a/arnoldCamera/zenoCamera (copy).cpp b/arnoldCamera/zenoCamera (copy).cpp deleted file mode 100755 index 6862430..0000000 --- a/arnoldCamera/zenoCamera (copy).cpp +++ /dev/null @@ -1,768 +0,0 @@ -// 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 -// Special thanks to Tom Minor for the help with C++ (it was needed!) - -// (C) Zeno Pelgrims, www.zenopelgrims.com - - -// IDEAS - -/* Shutter speed should affect motion blur and should read scene fps - - 24 fps - 1/50th speed - ideal -> 0.5 frames before and 0.5 frames after - -*/ - -/* FILTER MAP: - - From arnold website: "Weights the camera sample by a scalar amount defined by the shader linked to the filtermap. - This shader will use as an input the u,v coordinates in image-space coords [0,1) and x,y in pixel coordinates. - This allows you to darken certain regions of the image, perfect to simulate vignetting effects. - There is an optimization in place where if the filter returns pure black then the camera ray is not fired. - This can help in cases such as when rendering with the fisheye camera where, depending on its autocrop setting, parts of the frame trace no rays at all." - -*/ - -/* Physically based bloom: http://www.cs.utah.edu/~shirley/papers/spencer95.pdf - - From Mitsuba: "This fast convolution method used to implement Spencer et al’s physically-based bloom filter in the mtsutil tonemap utility. - This can be useful when rendering images where pixels are clipped because they are so bright. - Take for instance the rendering below: there are many reflections of the sun, but they are quite hard to perceive due to the limited dynamic range. - After convolving the image with an empirical point spread function of the human eye, their brightness is much more apparent." - - Not sure if this is done as a post process or not. Figure out. - -*/ - -/* SAMPLING IDEA - - Would be cool to have a function to reduce the diff/spec/etc samples in out of focus areas. - Not sure how to tackle this and not sure if this is possible withing the range of a camera shader. - -*/ - -/* SAMPLING IDEA - - To get hard edged bokeh shapes with high aperture sizes, maybe do a prepass (render image with low sampling and no dof) and then use that prepass in the same way as the bokeh sampling? - More samples for the highlights makes sense if you're defocusing. - This should be done by picking ray directions that will hit highlight areas of the image more often. - - I could also make the highlights brighter (and therefore the bokeh shapes more apparent) by adding to the weight of these rays. - -*/ - -/* CATEYE IDEA - - Cateye effect gives the inner edges of the spheres a brighter rim, so give more weight to the samples on the opposite corner of the screen. - I think I can easily do this by scaling the weight of the samples based on the relationship between the screen space coordinates. - -*/ - -/* TODO - -Need to completely clean up after myself, otherwise I get seg faults when inputting new images etc - -Make a standard for this optical vignetting thing, not just random values - -Send extra samples to edges of the image (based on gradient) // not sure if this possible since sx, sy are read only variables. - -Something wrong when I change focal length to high number, losing a lot of samples for some reason -even losing samples in the middle.. - -sometimes there's no defocussing in the y axis, probably because of an initialization to 0 i set. - -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -AI_CAMERA_NODE_EXPORT_METHODS(zenoCameraMethods) - -bool debug = false; - -#define _sensorWidth (params[0].FLT) -#define _sensorHeight (params[1].FLT) -#define _focalLength (params[2].FLT) -#define _useDof (params[3].BOOL) -#define _fStop (params[4].FLT) -#define _focalDistance (params[5].FLT) -#define _opticalVignetting (params[6].FLT) -#define _useImage (params[7].BOOL) -#define _bokehPath (params[8].STR) - - -struct imageData{ - int x, y; - int nchannels; - std::vector pixelData; - std::vector cdfRow; - std::vector cdfColumn; - std::vector summedRowValues; - std::vector normalizedValuesPerRow; - std::vector rowIndices; - std::vector columnIndices; -}; - -struct cameraData{ - float fov; - float tan_fov; - float apertureRadius; -}; - -imageData *image = nullptr; -cameraData camera; - - -// PBRT v2 source code - Concentric disk sampling (Sampling the disk in a more uniform way than with random sampling) -inline void ConcentricSampleDisk(float u1, float u2, float *dx, float *dy) { - float radius; // radius - float theta; // angle - - // Map uniform random numbers to $[-1,1]^2$ - float sx = 2.0f * u1 - 1.0f; - float sy = 2.0f * u2 - 1.0f; - - // Map square to $(r,\theta)$ - // Handle degeneracy at the origin - if (sx == 0.0f && sy == 0.0f){ - *dx=0.0f; - *dy = 0.0f; - } - if (sx >= -sy) { - if (sx > sy) { - // Handle first region of disk - radius = sx; - if (sy > 0.0f) theta = sy/radius; - else theta = 8.0f + sy/radius; - } - else { - // Handle second region of disk - radius = sy; - theta = 2.0f - sx/radius; - } - } - else { - if (sx <= sy) { - // Handle third region of disk - radius = -sx; - theta = 4.0f - sy/radius; - } - else { - // Handle fourth region of disk - radius = -sy; - theta = 6.0f + sx/radius; - } - } - - theta *= AI_PI / 4.0f; - *dx = radius * std::cos(theta); - *dy = radius * std::sin(theta); -} - -// Read bokeh image -imageData* readImage(char const *bokeh_kernel_filename){ - - imageData* img = new imageData; - - AiMsgInfo("Reading image using OpenImageIO: %s", bokeh_kernel_filename); - - //Search for an ImageIO plugin that is capable of reading the file ("foo.jpg"), first by - //trying to deduce the correct plugin from the file extension, but if that fails, by opening - //every ImageIO plugin it can find until one will open the file without error. When it finds - //the right plugin, it creates a subclass instance of ImageInput that reads the right kind of - //file format, and tries to fully open the file. - OpenImageIO::ImageInput *in = OpenImageIO::ImageInput::open (bokeh_kernel_filename); - if (! in){ - return nullptr; // Return a null pointer if we have issues - } - - const OpenImageIO::ImageSpec &spec = in->spec(); - img->x = spec.width; - img->y = spec.height; - img->nchannels = spec.nchannels; - - img->pixelData.clear(); - img->pixelData.reserve(img->x * img->y * img->nchannels); - in->read_image (OpenImageIO::TypeDesc::UINT8, &img->pixelData[0]); - in->close (); - delete in; - - AiMsgInfo("Image Width: %d", img->x); - AiMsgInfo("Image Height: %d", img->y); - AiMsgInfo("Image Channels: %d", img->nchannels); - AiMsgInfo("Total amount of pixels to process: %d", img->x * img->y); - - if (debug == true){ - // print out raw pixel data - for (int i = 0; i < img->x * img->y * img->nchannels; i++){ - int j = 0; - if(img->nchannels == 3){ - if (j == 0){ - std::cout << "["; - std::cout << (int)img->pixelData[i]; - std::cout << ", "; - j += 1; - } - if (j == 1){ - std::cout << (int)img->pixelData[i]; - std::cout << ", "; - j += 1; - } - if (j == 2){ - std::cout << (int)img->pixelData[i]; - std::cout << "], "; - j = 0; - } - } - - else if(img->nchannels == 4){ - if (j == 0){ - std::cout << "["; - std::cout << (int)img->pixelData[i]; - std::cout << ", "; - j += 1; - } - if (j == 1){ - std::cout << (int)img->pixelData[i]; - std::cout << ", "; - j += 1; - } - if (j == 2){ - std::cout << (int)img->pixelData[i]; - std::cout << ", "; - j += 1; - } - if (j == 3){ - std::cout << (int)img->pixelData[i]; - std::cout << "], "; - j = 0; - } - } - - } - - std::cout << "----------------------------------------------" << std::endl; - std::cout << "----------------------------------------------" << std::endl; - } - - return img; -} - -// Importance sampling -void bokehProbability(imageData *img){ - if(img){ - - // initialize arrays - std::vector pixelValues(img->x * img->y, 0.0f); - std::vector normalizedPixelValues(img->x * img->y, 0.0f); - - // for every pixel, stuff going wrong here - int tmpPixelCounter = 0; - for(int i=0; i < img->x * img->y; ++i){ - // store pixel value in array - // calculate luminance [Y = 0.3 R + 0.59 G + 0.11 B] - pixelValues[i] = (img->pixelData[tmpPixelCounter] * 0.3) + (img->pixelData[tmpPixelCounter+1] * 0.59) + (img->pixelData[tmpPixelCounter+2] * 0.11f); - - if (debug == true){ - // print array - std::cout << "Pixel Luminance: " << i << " -> " << pixelValues[i] << std::endl; - } - - if(img->nchannels == 3){ - tmpPixelCounter += 3; - } - else if(img->nchannels == 4){ - tmpPixelCounter += 4; - } - else if(img->nchannels == 1){ - tmpPixelCounter += 1; - } - } - - // calculate sum of all pixel values - float totalValue = 0.0f; - for(int i=0; i < img->x * img->y; ++i){ - totalValue += pixelValues[i]; - } - - if (debug == true){ - std::cout << "----------------------------------------------" << std::endl; - std::cout << "DEBUG: Total Pixel Value: " << totalValue << std::endl; - std::cout << "----------------------------------------------" << std::endl; - std::cout << "----------------------------------------------" << std::endl; - } - - - - // normalize pixel values so sum = 1 - for(int i=0; i < img->x * img->y; ++i){ - normalizedPixelValues[i] = pixelValues[i] / totalValue; - - if (debug == true){ - // print array - std::cout << "Normalized Pixel Value: " << i << ": " << normalizedPixelValues[i] << std::endl; - } - } - - - - // calculate sum of all normalized pixel values, to check - float totalNormalizedValue = 0.0f; - for(int i=0; i < img->x * img->y; ++i){ - totalNormalizedValue += normalizedPixelValues[i]; - } - - if (debug == true){ - std::cout << "----------------------------------------------" << std::endl; - std::cout << "DEBUG: Total Normalized Pixel Value: " << totalNormalizedValue << std::endl; - std::cout << "----------------------------------------------" << std::endl; - std::cout << "----------------------------------------------" << std::endl; - } - - - - // calculate sum for each row - img->summedRowValues.clear(); - img->summedRowValues.reserve(img->y); - float summedHorizontalNormalizedValues = 0.0f; - int counterRow = 0; - - for(int i=0; i < img->y; ++i){ - - summedHorizontalNormalizedValues = 0.0f; - - for(int j=0; j < img->x; ++j){ - - summedHorizontalNormalizedValues += normalizedPixelValues[counterRow]; - counterRow += 1; - } - - img->summedRowValues[i] = summedHorizontalNormalizedValues; - if (debug == true){ - std::cout << "Summed Values row [" << i << "]: " << img->summedRowValues[i] << std::endl; - } - } - - - - // calculate sum of all row values, just to debug - float totalNormalizedRowValue = 0.0f; - for(int i=0; i < img->y; ++i){ - totalNormalizedRowValue += img->summedRowValues[i]; - } - - if (debug == true){ - std::cout << "----------------------------------------------" << std::endl; - std::cout << "Debug: Summed Row Value: " << totalNormalizedRowValue << std::endl; - std::cout << "----------------------------------------------" << std::endl; - } - - - // sort row values from highest to lowest (probability density function) - // needed to make a copy of array, can't use the one in struct for some reason? - std::vector summedRowValueCopy(img->y, 0.0f); - for(int i = 0; i < img->y; i++){ - summedRowValueCopy[i] = img->summedRowValues[i]; - } - - // make array of indices - size_t summedRowValueCopyIndices[img->y]; - for(int i = 0; i < img->y; i++){ - summedRowValueCopyIndices[i] = i; - } - - std::sort(summedRowValueCopyIndices, summedRowValueCopyIndices + img->y, [&summedRowValueCopy]( size_t _lhs, size_t _rhs){ - return summedRowValueCopy[_lhs] > summedRowValueCopy[_rhs]; - }); - - if (debug == true){ - // print values - for(int i = 0; i < img->y; ++i){ - std::cout << "PDF row [" << summedRowValueCopyIndices[i] << "]: " << summedRowValueCopy[summedRowValueCopyIndices[i]] << std::endl; - } - - std::cout << "----------------------------------------------" << std::endl; - std::cout << "----------------------------------------------" << std::endl; - } - - - // For every row, add the sum of all previous row (cumulative distribution function) - // not 100% sure if clears are needed, but doing it anyway - img->cdfRow.clear(); - img->rowIndices.clear(); - img->cdfRow.reserve(img->y); - img->rowIndices.reserve(img->y); - - for (int i = 0; i < img->y; ++i){ - - if(i == 0){ - img->cdfRow[i] = img->cdfRow[i] + summedRowValueCopy[summedRowValueCopyIndices[i]]; - } - else{ - img->cdfRow[i] = img->cdfRow[i-1] + summedRowValueCopy[summedRowValueCopyIndices[i]]; - } - - img->rowIndices[i] = summedRowValueCopyIndices[i]; - - if (debug == true){ - std::cout << "CDF row [" << img->rowIndices[i] << "]: " << img->cdfRow[i] << std::endl; - } - } - - if (debug == true){ - std::cout << "----------------------------------------------" << std::endl; - std::cout << "----------------------------------------------" << std::endl; - } - - - - // divide pixel values of each pixel by the sum of the pixel values of that row (Normalize) - int rowCounter = 0; - int tmpCounter = 0; - img->normalizedValuesPerRow.clear(); - img->normalizedValuesPerRow.reserve(img->x * img->y); - - for (int i = 0; i < img->x * img->y; ++i){ - - // avoid division by 0 - if ((normalizedPixelValues[i] != 0) && (img->summedRowValues[rowCounter] != 0)){ - img->normalizedValuesPerRow[i] = normalizedPixelValues[i] / img->summedRowValues[rowCounter]; - } - else{ - img->normalizedValuesPerRow[i] = 0; - } - - tmpCounter += 1; - - // silly counter, there must be faster ways to do this but i'm not exactly a genius - if (tmpCounter == img->x){ - rowCounter += 1; - tmpCounter = 0; - } - - if (debug == true){ - std::cout << "Normalized Pixel value per row: " << i << ": " << img->normalizedValuesPerRow[i] << std::endl; - } - } - - if (debug == true){ - std::cout << "----------------------------------------------" << std::endl; - std::cout << "----------------------------------------------" << std::endl; - } - - - - // sort column values from highest to lowest per row (probability density function) - // needed to make a copy of array, can't use the one in struct for some reason? - // float summedColumnValueCopy[img->x * img->y]; - std::vector summedColumnValueCopy(img->x * img->y, 0.0f); - for(int i = 0; i < img->x * img->y; ++i){ - summedColumnValueCopy[i] = img->normalizedValuesPerRow[i]; - } - - // make array of indices - size_t summedColumnValueCopyIndices[img->x * img->y]; - for(int i = 0; i < img->x * img->y; i++){ - summedColumnValueCopyIndices[i] = i; - } - for (int i = 0; i < img->x * img->y; i+=img->x){ - std::sort(summedColumnValueCopyIndices + i, summedColumnValueCopyIndices + i + img->x, [&summedColumnValueCopy]( size_t _lhs, size_t _rhs){ - return summedColumnValueCopy[_lhs] > summedColumnValueCopy[_rhs]; - }); - } - - if (debug == true){ - // print values - for(int i = 0; i < img->x * img->y; ++i){ - std::cout << "PDF column [" << summedColumnValueCopyIndices[i] << "]: " << summedColumnValueCopy[summedColumnValueCopyIndices[i]] << std::endl; - } - std::cout << "----------------------------------------------" << std::endl; - std::cout << "----------------------------------------------" << std::endl; - } - - - // For every column per row, add the sum of all previous columns (cumulative distribution function) - img->cdfColumn.clear(); - img->columnIndices.clear(); - img->cdfColumn.reserve(img->x * img->y); - img->columnIndices.reserve(img->x * img->y); - int cdfCounter = 0; - - for (int i = 0; i < img->x * img->y; ++i){ - if (cdfCounter == img->x) { - img->cdfColumn[i] = summedColumnValueCopy[summedColumnValueCopyIndices[i]]; - cdfCounter = 0; - } - else { - img->cdfColumn[i] = img->cdfColumn[i-1] + summedColumnValueCopy[summedColumnValueCopyIndices[i]]; - } - - cdfCounter += 1; - - img->columnIndices[i] = summedColumnValueCopyIndices[i]; - - if (debug == true){ - std::cout << "CDF column [" << img->columnIndices[i] << "]: " << img->cdfColumn[i] << std::endl; - } - } - - if (debug == true){ - std::cout << "----------------------------------------------" << std::endl; - } - } -} - -// Sample image -void bokehSample(imageData *img, float randomNumberRow, float randomNumberColumn, float *dx, float *dy){ - - if (debug == true){ - // print random number between 0 and 1 - AiMsgInfo("RANDOM NUMBER ROW: %f", randomNumberRow); - // std::cout << "RANDOM NUMBER ROW: " << randomNumberRow << std::endl; - } - - // find upper bound of random number in the array - float pUpperBound = *std::upper_bound(img->cdfRow.begin(), img->cdfRow.end(), randomNumberRow); - if (debug == true){ - AiMsgInfo("UPPER BOUND: %f", pUpperBound); - } - - // find which element of the array the upper bound is - int x = std::distance(img->cdfRow.begin(), std::find(img->cdfRow.begin(), img->cdfRow.end(), pUpperBound)); - - // find actual pixel row - int actualPixelRow = img->rowIndices[x]; - - // recalculate pixel row so that the center pixel is (0,0) - might run into problems with images of dimensions like 2x2, 4x4, 6x6, etc - int recalulatedPixelRow = actualPixelRow - ((img->x - 1) / 2); - - if (debug == true){ - // print values - AiMsgInfo("INDEX IN CDF ROW: %d", x); - AiMsgInfo("ACTUAL PIXEL ROW: %d", actualPixelRow); - AiMsgInfo("RECALCULATED PIXEL ROW: %d", recalulatedPixelRow); - AiMsgInfo("---------------------------------------------- %s"); - AiMsgInfo("---------------------------------------------- %s"); - - // print random number between 0 and 1 - AiMsgInfo("RANDOM NUMBER COLUMN: %f", randomNumberColumn); - } - - int startPixel = actualPixelRow * img->x; - if (debug == true){ - AiMsgInfo("START PIXEL: %d", startPixel); - } - - - // find upper bound of random number in the array - float pUpperBoundColumn = *std::upper_bound(img->cdfColumn.begin() + startPixel, img->cdfColumn.begin() + startPixel + img->x, randomNumberColumn); - if (debug == true){ - AiMsgInfo("UPPER BOUND: %f", pUpperBoundColumn); - } - - // find which element of the array the upper bound is - int y = std::distance(img->cdfColumn.begin(), std::find(img->cdfColumn.begin() + startPixel, img->cdfColumn.begin() + startPixel + img->x, pUpperBoundColumn)); - - // find actual pixel column - int actualPixelColumn = img->columnIndices[y]; - int relativePixelColumn = actualPixelColumn - startPixel; - int recalulatedPixelColumn = relativePixelColumn - ((img->y - 1) / 2); - - if (debug == true){ - // print values - AiMsgInfo("INDEX IN CDF COLUMN: %d", y); - AiMsgInfo("ACTUAL PIXEL COLUMN: %d", actualPixelColumn); - AiMsgInfo("RELATIVE PIXEL COLUMN (starting from 0): %d", relativePixelColumn); - AiMsgInfo("RECALCULATED PIXEL COLUMN: %d", recalulatedPixelColumn); - AiMsgInfo("---------------------------------------------- %s"); - AiMsgInfo("---------------------------------------------- %s"); - } - - // to get the right image orientation, flip the x and y coordinates and then multiply the y values by -1 to flip the pixels vertically - float flippedRow = recalulatedPixelColumn; - float flippedColumn = recalulatedPixelRow * -1.0f; - - // send values back - *dx = (float)flippedRow / (float)img->x * 2.0f; - *dy = (float)flippedColumn / (float)img->y * 2.0f; -} - - - -node_parameters { - AiParameterFLT("sensorWidth", 3.6f); // 35mm film - AiParameterFLT("sensorHeight", 2.4f); // 35 mm film - AiParameterFLT("focalLength", 65.0f); // distance between sensor and lens - AiParameterBOOL("useDof", true); - AiParameterFLT("fStop", 1.4f); - 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 -} - - -node_initialize { - AiCameraInitialize(node, NULL); - -} - -node_update { - AiCameraUpdate(node, false); - - // calculate field of view (theta = 2arctan*(sensorSize/focalLength)) - camera.fov = 2.0f * atan((_sensorWidth / (2.0f * (_focalLength/10)))); // in radians - camera.tan_fov = tanf(camera.fov/ 2); - - // calculate aperture radius (apertureRadius = focalLength / 2*fStop) - camera.apertureRadius = (_focalLength/10) / (2*_fStop); - - // make probability functions of the bokeh image - if (_useImage == true){ - image = readImage(_bokehPath); - if(!image){ - AiMsgError("Couldn't open image, please check that it is RGB/RGBA."); - exit(1); - } - - bokehProbability(image); - } - -} - -node_finish { - AiCameraDestroy(node); -} - - -camera_create_ray { - // get values - const AtParamValue* params = AiNodeGetParams(node); - - AtPoint p; - p.x = input->sx * camera.tan_fov; - p.y = input->sy * camera.tan_fov; - p.z = 1; - - output->dir = AiV3Normalize(p - output->origin); - - // now looking down -Z - output->dir.z *= -1; - - // DOF CALCULATIONS - if (_useDof == true) { - // Initialize point on lens - float lensU = 0.0f; - float lensV = 0.0f; - - // sample disk with proper sample distribution, lensU & lensV (positions on lens) are updated. - if (_useImage == false){ - ConcentricSampleDisk(input->lensx, input->lensy, &lensU, &lensV); - } - else{ - // sample bokeh image - bokehSample(image, input->lensx, input->lensy, &lensU, &lensV); - } - - // this creates a square bokeh! - // lensU = input->lensx * apertureRadius; - // lensV = input->lensy * apertureRadius; - - // scale new lens coordinates by the aperture radius - lensU = lensU * camera.apertureRadius; - lensV = lensV * camera.apertureRadius; - - // Compute point on plane of focus, intersection on z axis - float intersection = std::abs(_focalDistance / output->dir.z); - AtPoint focusPoint = output->dir * intersection; - - // update arnold ray origin - output->origin.x = lensU; - output->origin.y = lensV; - output->origin.z = 0.0; - - // update arnold ray direction, normalize - output->dir = AiV3Normalize(focusPoint - output->origin); - - // Optical Vignetting (CAT EYE EFFECT) - if (_opticalVignetting > 0.0f){ - // because the first intersection point of the aperture is already known, I can just linearly scale it by the distance to the second aperture - AtPoint opticalVignetPoint; - opticalVignetPoint = output->dir * _opticalVignetting; - - // re-center point - opticalVignetPoint -= output->origin; - - // find hypotenuse of x, y points. - float pointHypotenuse = sqrt((opticalVignetPoint.x * opticalVignetPoint.x) + (opticalVignetPoint.y * opticalVignetPoint.y)); - - float opticalVignetApertureRadius = camera.apertureRadius * 1.0f; - - // if intersection point on the optical vignetting virtual aperture is within the radius of the aperture from the plane origin, kill ray - if (ABS(pointHypotenuse) > opticalVignetApertureRadius){ - // set ray weight to 0, there is an optimisation inside Arnold that doesn't send rays if they will return black anyway. - output->weight = 0.0f; - } - - // testing cateye technique, adding weight to opposite edges to get nice rim on the highlights, this will need to be more complicated - //if (input->sy < 0){ - // output->weight *= 1 + (input->sx * output->origin.x + input->sy * output->origin.y) / 2; - //} - //else{ - // output->weight *= 1 + (input->sx * output->origin.x - input->sy * output->origin.y) / 2; - //} - } - } - - - // vignetting - // float dist2 = input->sx * input->sx + input->sy * input->sy; - // output->weight = 1.0f - .5*dist2; - - - // not sure if needed, but can't hurt. Taken from solidangle website. - // ---------------------------------------------------------------------------------------------- - // scale derivatives - float dsx = input->dsx * camera.tan_fov; - float dsy = input->dsy * camera.tan_fov; - - AtVector d = p; // direction vector == point on the image plane - double d_dot_d = AiV3Dot(d, d); - double temp = 1.0 / sqrt(d_dot_d * d_dot_d * d_dot_d); - - // already initialized to 0's, only compute the non zero coordinates - output->dDdx.x = (d_dot_d * dsx - (d.x * dsx) * d.x) * temp; - output->dDdx.y = ( - (d.x * dsx) * d.y) * temp; - output->dDdx.z = ( - (d.x * dsx) * d.z) * temp; - output->dDdy.x = ( - (d.y * dsy) * d.x) * temp; - output->dDdy.y = (d_dot_d * dsy - (d.y * dsy) * d.y) * temp; - output->dDdy.z = ( - (d.y * dsy) * d.z) * temp; - // ---------------------------------------------------------------------------------------------- - -} - - -node_loader { - if (i > 0) - return false; - node->methods = zenoCameraMethods; - node->output_type = AI_TYPE_NONE; - node->name = "zenoCamera"; - node->node_type = AI_NODE_CAMERA; - strcpy(node->version, AI_VERSION); - return true; -} diff --git a/z_bin/.nfs00000000015c2b8c0000160e b/bin/.nfs00000000015c2b8c0000160e similarity index 100% rename from z_bin/.nfs00000000015c2b8c0000160e rename to bin/.nfs00000000015c2b8c0000160e diff --git a/bin/zenoCamera.mtd b/bin/zenoCamera.mtd new file mode 100755 index 0000000..bb8a8e3 --- /dev/null +++ b/bin/zenoCamera.mtd @@ -0,0 +1,71 @@ +# zenoCamera 0x00070007 +[node zenoCamera] + 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" + + [attr sensorWidth] + maya.name STRING "aiSensorWidth" + min FLOAT 0.1 + max FLOAT 10 + default FLOAT 3.6 + linkable BOOL FALSE + desc STRING "Width of the sensor in centimeters. Default value is the width of a full frame sensor." + + [attr sensorHeight] + maya.name STRING "aiSensorHeight" + min FLOAT 0.1 + max FLOAT 10 + default FLOAT 2.4 + linkable BOOL FALSE + desc STRING "Height of the sensor in centimeters. Default value is the height of a full frame sensor." + + [attr focalLength] + maya.name STRING "aiFocalLength" + min FLOAT 1 + softmin FLOAT 8 + softmax FLOAT 200 + max FLOAT 1000 + default FLOAT 35 + desc STRING "Distance between the lens and the point at which the light converges in millimeters." + + [attr useDof] + maya.name STRING "aiUseDof" + default BOOL true + desc STRING "Enable Depth of Field" + linkable BOOL FALSE + + [attr fStop] + maya.name STRING "aiFStop" + min FLOAT 0.01 + softmin FLOAT 0.7 + softmax FLOAT 32.0 + max FLOAT 100.0 + default FLOAT 2.8 + desc STRING "Ratio of the distance from the lens to the point where the focused light converges (the focal length) over the diameter of the aperture." + + [attr focalDistance] + maya.name STRING "aiFocalDistance" + min FLOAT 0.001 + max FLOAT 99999 + default FLOAT 115 + desc STRING "Distance between lens and object in focus in millimeters." + + [attr opticalVignetting] + maya.name STRING "aiOpticalVignetting" + min FLOAT 0.0 + softmax FLOAT 50.0 + max FLOAT 1000.0 + default FLOAT 0 + desc STRING "Sometimes referred to as the cat-eye effect, this is a lens imperfection that is not caused by the glass but by the outer edge of the lens, also known as the exit aperture. When the main aperture is fully open, light coming into the camera from steep angles will be blocked partially by the edge of the lens. This creates cat-eye like bokeh shapes near the edges of an image. It should be noted that this lens effect is purely mechanical and can not be confused with lens distortion." + + [attr useImage] + maya.name STRING "aiUseImage" + default BOOL false + desc STRING "Enable Image based bokeh" + + [attr bokehPath] + maya.name STRING "aiBokehPath" + default STRING "" + desc STRING "Path to bokeh image. No need to convert to .tx" diff --git a/z_bin/zenoCamera.o b/bin/zenoCamera.o similarity index 100% rename from z_bin/zenoCamera.o rename to bin/zenoCamera.o diff --git a/bin/zenoCamera.so b/bin/zenoCamera.so new file mode 100755 index 0000000..71140ee Binary files /dev/null and b/bin/zenoCamera.so differ diff --git a/arnoldCamera/arnoldCamera.pro b/src/arnoldCamera.pro similarity index 100% rename from arnoldCamera/arnoldCamera.pro rename to src/arnoldCamera.pro diff --git a/arnoldCamera/arnoldCamera.pro.user b/src/arnoldCamera.pro.user similarity index 100% rename from arnoldCamera/arnoldCamera.pro.user rename to src/arnoldCamera.pro.user diff --git a/arnoldCamera/arnoldcamera.h b/src/arnoldcamera.h similarity index 100% rename from arnoldCamera/arnoldcamera.h rename to src/arnoldcamera.h diff --git a/arnoldCamera/arnoldcamera_global.h b/src/arnoldcamera_global.h similarity index 100% rename from arnoldCamera/arnoldcamera_global.h rename to src/arnoldcamera_global.h diff --git a/arnoldCamera/imageReader.cpp b/src/imageReader.cpp similarity index 100% rename from arnoldCamera/imageReader.cpp rename to src/imageReader.cpp diff --git a/arnoldCamera/imgs/nightscape_report/nightscape_cateye.gif b/src/imgs/nightscape_report/nightscape_cateye.gif similarity index 100% rename from arnoldCamera/imgs/nightscape_report/nightscape_cateye.gif rename to src/imgs/nightscape_report/nightscape_cateye.gif diff --git a/src/imgs/nightscape_report/nightscape_cateye.jpg b/src/imgs/nightscape_report/nightscape_cateye.jpg new file mode 100644 index 0000000..ab45aac Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_cateye.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof.jpg b/src/imgs/nightscape_report/nightscape_dof.jpg new file mode 100644 index 0000000..8b67d8e Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_02.jpg b/src/imgs/nightscape_report/nightscape_dof_02.jpg new file mode 100644 index 0000000..8830f33 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_02.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_03.jpg b/src/imgs/nightscape_report/nightscape_dof_03.jpg new file mode 100644 index 0000000..3ddd1a8 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_03.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_04.jpg b/src/imgs/nightscape_report/nightscape_dof_04.jpg new file mode 100644 index 0000000..5548231 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_04.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_05.jpg b/src/imgs/nightscape_report/nightscape_dof_05.jpg new file mode 100644 index 0000000..1047396 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_05.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_06.jpg b/src/imgs/nightscape_report/nightscape_dof_06.jpg new file mode 100644 index 0000000..cdf3921 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_06.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_07.jpg b/src/imgs/nightscape_report/nightscape_dof_07.jpg new file mode 100644 index 0000000..c0ae141 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_07.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_08.jpg b/src/imgs/nightscape_report/nightscape_dof_08.jpg new file mode 100644 index 0000000..af13920 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_08.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_09.jpg b/src/imgs/nightscape_report/nightscape_dof_09.jpg new file mode 100644 index 0000000..af13920 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_09.jpg differ diff --git a/src/imgs/nightscape_report/nightscape_dof_cateye_image.jpg b/src/imgs/nightscape_report/nightscape_dof_cateye_image.jpg new file mode 100644 index 0000000..584e222 Binary files /dev/null and b/src/imgs/nightscape_report/nightscape_dof_cateye_image.jpg differ diff --git a/arnoldCamera/imgs/nightscape_report/nightscape_dof_circle.jpg b/src/imgs/nightscape_report/nightscape_dof_circle.jpg similarity index 100% rename from arnoldCamera/imgs/nightscape_report/nightscape_dof_circle.jpg rename to src/imgs/nightscape_report/nightscape_dof_circle.jpg diff --git a/arnoldCamera/imgs/report_dof_image_obvious_teapot.jpg~ b/src/imgs/report_dof_image_obvious_teapot.jpg~ similarity index 100% rename from arnoldCamera/imgs/report_dof_image_obvious_teapot.jpg~ rename to src/imgs/report_dof_image_obvious_teapot.jpg~ diff --git a/arnoldCamera/imgs/collected_real/bokeh_01.jpg b/src/imgs/shapes_library/bokeh_01.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_01.jpg rename to src/imgs/shapes_library/bokeh_01.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_02.jpg b/src/imgs/shapes_library/bokeh_02.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_02.jpg rename to src/imgs/shapes_library/bokeh_02.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_03.jpg b/src/imgs/shapes_library/bokeh_03.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_03.jpg rename to src/imgs/shapes_library/bokeh_03.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_04.jpg b/src/imgs/shapes_library/bokeh_04.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_04.jpg rename to src/imgs/shapes_library/bokeh_04.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_05.jpg b/src/imgs/shapes_library/bokeh_05.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_05.jpg rename to src/imgs/shapes_library/bokeh_05.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_06.jpg b/src/imgs/shapes_library/bokeh_06.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_06.jpg rename to src/imgs/shapes_library/bokeh_06.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_07.jpg b/src/imgs/shapes_library/bokeh_07.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_07.jpg rename to src/imgs/shapes_library/bokeh_07.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_08.jpg b/src/imgs/shapes_library/bokeh_08.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_08.jpg rename to src/imgs/shapes_library/bokeh_08.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_09.jpg b/src/imgs/shapes_library/bokeh_09.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_09.jpg rename to src/imgs/shapes_library/bokeh_09.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_10.jpg b/src/imgs/shapes_library/bokeh_10.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_10.jpg rename to src/imgs/shapes_library/bokeh_10.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_11.jpg b/src/imgs/shapes_library/bokeh_11.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_11.jpg rename to src/imgs/shapes_library/bokeh_11.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_12.jpg b/src/imgs/shapes_library/bokeh_12.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_12.jpg rename to src/imgs/shapes_library/bokeh_12.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_13.jpg b/src/imgs/shapes_library/bokeh_13.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_13.jpg rename to src/imgs/shapes_library/bokeh_13.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_14.jpg b/src/imgs/shapes_library/bokeh_14.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_14.jpg rename to src/imgs/shapes_library/bokeh_14.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_15.jpg b/src/imgs/shapes_library/bokeh_15.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_15.jpg rename to src/imgs/shapes_library/bokeh_15.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_16.jpg b/src/imgs/shapes_library/bokeh_16.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_16.jpg rename to src/imgs/shapes_library/bokeh_16.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_17.jpg b/src/imgs/shapes_library/bokeh_17.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_17.jpg rename to src/imgs/shapes_library/bokeh_17.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_18.jpg b/src/imgs/shapes_library/bokeh_18.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_18.jpg rename to src/imgs/shapes_library/bokeh_18.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_18_graded.jpg b/src/imgs/shapes_library/bokeh_18_graded.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_18_graded.jpg rename to src/imgs/shapes_library/bokeh_18_graded.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_19.jpg b/src/imgs/shapes_library/bokeh_19.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_19.jpg rename to src/imgs/shapes_library/bokeh_19.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_20.jpg b/src/imgs/shapes_library/bokeh_20.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_20.jpg rename to src/imgs/shapes_library/bokeh_20.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_21.jpg b/src/imgs/shapes_library/bokeh_21.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_21.jpg rename to src/imgs/shapes_library/bokeh_21.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_22.jpg b/src/imgs/shapes_library/bokeh_22.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_22.jpg rename to src/imgs/shapes_library/bokeh_22.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_23.jpg b/src/imgs/shapes_library/bokeh_23.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_23.jpg rename to src/imgs/shapes_library/bokeh_23.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_24.jpg b/src/imgs/shapes_library/bokeh_24.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_24.jpg rename to src/imgs/shapes_library/bokeh_24.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_25.jpg b/src/imgs/shapes_library/bokeh_25.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_25.jpg rename to src/imgs/shapes_library/bokeh_25.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_26.jpg b/src/imgs/shapes_library/bokeh_26.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_26.jpg rename to src/imgs/shapes_library/bokeh_26.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_27.jpg b/src/imgs/shapes_library/bokeh_27.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_27.jpg rename to src/imgs/shapes_library/bokeh_27.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_28.jpg b/src/imgs/shapes_library/bokeh_28.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_28.jpg rename to src/imgs/shapes_library/bokeh_28.jpg diff --git a/src/imgs/shapes_library/bokeh_28_graded.jpg b/src/imgs/shapes_library/bokeh_28_graded.jpg new file mode 100644 index 0000000..9742afa Binary files /dev/null and b/src/imgs/shapes_library/bokeh_28_graded.jpg differ diff --git a/arnoldCamera/imgs/collected_real/bokeh_29.jpg b/src/imgs/shapes_library/bokeh_29.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_29.jpg rename to src/imgs/shapes_library/bokeh_29.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_30.jpg b/src/imgs/shapes_library/bokeh_30.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_30.jpg rename to src/imgs/shapes_library/bokeh_30.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_31.jpg b/src/imgs/shapes_library/bokeh_31.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_31.jpg rename to src/imgs/shapes_library/bokeh_31.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_32.jpg b/src/imgs/shapes_library/bokeh_32.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_32.jpg rename to src/imgs/shapes_library/bokeh_32.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_33.jpg b/src/imgs/shapes_library/bokeh_33.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_33.jpg rename to src/imgs/shapes_library/bokeh_33.jpg diff --git a/arnoldCamera/imgs/collected_real/bokeh_34.jpg b/src/imgs/shapes_library/bokeh_34.jpg similarity index 100% rename from arnoldCamera/imgs/collected_real/bokeh_34.jpg rename to src/imgs/shapes_library/bokeh_34.jpg diff --git a/arnoldCamera/imgs/teapot_CDF.png~ b/src/imgs/teapot_CDF.png~ similarity index 100% rename from arnoldCamera/imgs/teapot_CDF.png~ rename to src/imgs/teapot_CDF.png~ diff --git a/arnoldCamera/imgs/teapot_PDF.png~ b/src/imgs/teapot_PDF.png~ similarity index 100% rename from arnoldCamera/imgs/teapot_PDF.png~ rename to src/imgs/teapot_PDF.png~ diff --git a/arnoldCamera/imgs/teapot_sample_distribution.png~ b/src/imgs/teapot_sample_distribution.png~ similarity index 100% rename from arnoldCamera/imgs/teapot_sample_distribution.png~ rename to src/imgs/teapot_sample_distribution.png~ diff --git a/arnoldCamera/imgs/teapot_sample_distribution_10000.png~ b/src/imgs/teapot_sample_distribution_10000.png~ similarity index 100% rename from arnoldCamera/imgs/teapot_sample_distribution_10000.png~ rename to src/imgs/teapot_sample_distribution_10000.png~ diff --git a/arnoldCamera/imgs/testScene_lights.ass b/src/imgs/testScene_lights.ass similarity index 100% rename from arnoldCamera/imgs/testScene_lights.ass rename to src/imgs/testScene_lights.ass diff --git a/arnoldCamera/imgs/ballScene_disk_cateye.png b/src/imgs/wip/ballScene_disk_cateye.png similarity index 100% rename from arnoldCamera/imgs/ballScene_disk_cateye.png rename to src/imgs/wip/ballScene_disk_cateye.png diff --git a/arnoldCamera/imgs/ballScene_f1-4_disk.png b/src/imgs/wip/ballScene_f1-4_disk.png similarity index 100% rename from arnoldCamera/imgs/ballScene_f1-4_disk.png rename to src/imgs/wip/ballScene_f1-4_disk.png diff --git a/arnoldCamera/imgs/ballScene_imageDisk.png b/src/imgs/wip/ballScene_imageDisk.png similarity index 100% rename from arnoldCamera/imgs/ballScene_imageDisk.png rename to src/imgs/wip/ballScene_imageDisk.png diff --git a/arnoldCamera/imgs/report_cateye.jpg b/src/imgs/wip/report_cateye.jpg similarity index 100% rename from arnoldCamera/imgs/report_cateye.jpg rename to src/imgs/wip/report_cateye.jpg diff --git a/arnoldCamera/imgs/report_dof.png b/src/imgs/wip/report_dof.png similarity index 100% rename from arnoldCamera/imgs/report_dof.png rename to src/imgs/wip/report_dof.png diff --git a/arnoldCamera/imgs/report_dof_image_obvious.jpg b/src/imgs/wip/report_dof_image_obvious.jpg similarity index 100% rename from arnoldCamera/imgs/report_dof_image_obvious.jpg rename to src/imgs/wip/report_dof_image_obvious.jpg diff --git a/arnoldCamera/imgs/report_dof_image_obvious_teapot.jpg b/src/imgs/wip/report_dof_image_obvious_teapot.jpg similarity index 100% rename from arnoldCamera/imgs/report_dof_image_obvious_teapot.jpg rename to src/imgs/wip/report_dof_image_obvious_teapot.jpg diff --git a/arnoldCamera/imgs/report_nodof.png b/src/imgs/wip/report_nodof.png similarity index 100% rename from arnoldCamera/imgs/report_nodof.png rename to src/imgs/wip/report_nodof.png diff --git a/arnoldCamera/imgs/shaderball.png b/src/imgs/wip/shaderball.png similarity index 100% rename from arnoldCamera/imgs/shaderball.png rename to src/imgs/wip/shaderball.png diff --git a/arnoldCamera/imgs/shaderball_sample_distribution.png b/src/imgs/wip/shaderball_sample_distribution.png similarity index 100% rename from arnoldCamera/imgs/shaderball_sample_distribution.png rename to src/imgs/wip/shaderball_sample_distribution.png diff --git a/arnoldCamera/imgs/teapot_CDF.png b/src/imgs/wip/teapot_CDF.png similarity index 100% rename from arnoldCamera/imgs/teapot_CDF.png rename to src/imgs/wip/teapot_CDF.png diff --git a/arnoldCamera/imgs/teapot_PDF.png b/src/imgs/wip/teapot_PDF.png similarity index 100% rename from arnoldCamera/imgs/teapot_PDF.png rename to src/imgs/wip/teapot_PDF.png diff --git a/arnoldCamera/imgs/teapot_sample_distribution.png b/src/imgs/wip/teapot_sample_distribution.png similarity index 100% rename from arnoldCamera/imgs/teapot_sample_distribution.png rename to src/imgs/wip/teapot_sample_distribution.png diff --git a/arnoldCamera/imgs/teapot_sample_distribution_10000.png b/src/imgs/wip/teapot_sample_distribution_10000.png similarity index 100% rename from arnoldCamera/imgs/teapot_sample_distribution_10000.png rename to src/imgs/wip/teapot_sample_distribution_10000.png diff --git a/arnoldCamera/imgs/testScene_0001.png b/src/imgs/wip/testScene_0001.png similarity index 100% rename from arnoldCamera/imgs/testScene_0001.png rename to src/imgs/wip/testScene_0001.png diff --git a/arnoldCamera/imgs/testScene_0002.png b/src/imgs/wip/testScene_0002.png similarity index 100% rename from arnoldCamera/imgs/testScene_0002.png rename to src/imgs/wip/testScene_0002.png diff --git a/arnoldCamera/testScene.ass b/src/testScene.ass similarity index 100% rename from arnoldCamera/testScene.ass rename to src/testScene.ass diff --git a/arnoldCamera/testScene.exr b/src/testScene.exr similarity index 100% rename from arnoldCamera/testScene.exr rename to src/testScene.exr diff --git a/arnoldCamera/testScene.ma b/src/testScene.ma similarity index 100% rename from arnoldCamera/testScene.ma rename to src/testScene.ma diff --git a/arnoldCamera/testScene_hdr_nightscape.ma b/src/testScene_hdr_nightscape.ma similarity index 100% rename from arnoldCamera/testScene_hdr_nightscape.ma rename to src/testScene_hdr_nightscape.ma diff --git a/arnoldCamera/testScene_lights.ma b/src/testScene_lights.ma similarity index 100% rename from arnoldCamera/testScene_lights.ma rename to src/testScene_lights.ma diff --git a/arnoldCamera/zenoCamera.os b/src/zenoCamera.os similarity index 100% rename from arnoldCamera/zenoCamera.os rename to src/zenoCamera.os diff --git a/arnoldCamera/zenoCamera.cpp b/src/zoicCamera.cpp similarity index 98% rename from arnoldCamera/zenoCamera.cpp rename to src/zoicCamera.cpp index f9a88b1..94e8ed7 100755 --- a/arnoldCamera/zenoCamera.cpp +++ b/src/zoicCamera.cpp @@ -64,8 +64,6 @@ /* TODO -Need to completely clean up after myself, otherwise I get seg faults when inputting new images etc - Make a standard for this optical vignetting thing, not just random values Send extra samples to edges of the image (based on gradient) // not sure if this possible since sx, sy are read only variables. @@ -108,7 +106,6 @@ struct imageData{ int nchannels; std::vector pixelData; std::vector cdfRow; - // float* cdfRow; std::vector cdfColumn; std::vector summedRowValues; std::vector normalizedValuesPerRow; @@ -264,7 +261,6 @@ imageData* readImage(char const *bokeh_kernel_filename){ // Importance sampling void bokehProbability(imageData *img){ if(img){ - // initialize arrays std::vector pixelValues(img->x * img->y, 0.0f); std::vector normalizedPixelValues(img->x * img->y, 0.0f); @@ -371,12 +367,8 @@ void bokehProbability(imageData *img){ } - // sort row values from highest to lowest (probability density function) - // BUG HERE!!!!! - why can't I use a vector?? - // make array of indices std::vector summedRowValueCopyIndices(img->y, 0); - //int summedRowValueCopyIndices[img->y]; for(int i = 0; i < img->y; ++i){ summedRowValueCopyIndices[i] = i; } @@ -404,7 +396,6 @@ void bokehProbability(imageData *img){ img->rowIndices.resize(img->y * img->x); for (int i = 0; i < img->y; ++i){ - if(i == 0){ img->cdfRow[i] += img->summedRowValues[summedRowValueCopyIndices[i]]; } @@ -463,7 +454,6 @@ void bokehProbability(imageData *img){ // sort column values from highest to lowest per row (probability density function) - // make array of indices int summedColumnValueCopyIndices[img->x * img->y]; for(int i = 0; i < img->x * img->y; i++){ summedColumnValueCopyIndices[i] = i; @@ -519,7 +509,6 @@ void bokehProbability(imageData *img){ // Sample image void bokehSample(imageData *img, float randomNumberRow, float randomNumberColumn, float *dx, float *dy){ - //bool debug = true; if (debug == true){ // print random number between 0 and 1 std::cout << "RANDOM NUMBER ROW: " << randomNumberRow << std::endl; diff --git a/z_ae/aiZenoCameraTemplate.py b/z_ae/aiZenoCameraTemplate.py index 5a01a99..45d9246 100755 --- a/z_ae/aiZenoCameraTemplate.py +++ b/z_ae/aiZenoCameraTemplate.py @@ -1,14 +1,44 @@ import mtoa.ui.ae.templates as templates +import pymel.core as pm +import maya.cmds as cmds +import mtoa.ui.ae.utils as aeUtils + class aiZenoCameraTemplate(templates.AttributeTemplate): + + def filenameEdit(self, mData) : + attr = self.nodeAttr('aiBokehPath') + cmds.setAttr(attr,mData,type="string") + + def LoadFilenameButtonPush(self, *args): + basicFilter = 'All Files (*.*)' + ret = cmds.fileDialog2(fileFilter=basicFilter, dialogStyle=2, cap='Load File',okc='Load',fm=4) + if ret is not None and len(ret): + self.filenameEdit(ret[0]) + cmds.textFieldButtonGrp("filenameGrp", edit=True, text=ret[0]) + + def filenameNew(self, nodeName): + path = cmds.textFieldButtonGrp("filenameGrp", label="Bokeh image location", changeCommand=self.filenameEdit, width=300) + cmds.textFieldButtonGrp(path, edit=True, text=cmds.getAttr(nodeName)) + cmds.textFieldButtonGrp(path, edit=True, buttonLabel="...", + buttonCommand=self.LoadFilenameButtonPush) + + def filenameReplace(self, nodeName): + cmds.textFieldButtonGrp("filenameGrp", edit=True, text=cmds.getAttr(nodeName) ) + + + def setup(self): - self.addControl("aiSensorWidth", label="Sensor Width") - self.addControl("aiSensorHeight") - self.addControl("aiFocalLength") + self.addControl("aiSensorWidth", label="Sensor Width (cm)") + self.addControl("aiSensorHeight", label="Sensor Height (cm)") + self.addControl("aiFocalLength", label="Focal Length (mm)") self.addSeparator() - self.addControl("aiFStop") - self.addControl("aiFocalDistance") - self.addControl("aiUseDof") - self.addControl("aiOpticalVignet", label="Optical Vignetting") - self.addControl("aiIso", label="Iso Rating") - self.addControl("aiFilterMap", label="Filter Map") + self.addControl("aiUseDof", label="Enable depth of field") + self.addControl("aiFStop", label="F-stop") + self.addControl("aiFocalDistance", label="Focus distance (cm)") + self.addSeparator() + self.addControl("aiOpticalVignetting", label="Optical Vignetting") + self.addSeparator() + self.addControl("aiUseImage", label="Enable Image based bokeh") + self.addCustom('aiBokehPath', self.filenameNew, self.filenameReplace) + templates.registerTranslatorUI(aiZenoCameraTemplate, "camera", "zenoCamera") diff --git a/z_ae/aiZenoCameraTemplate.pyc b/z_ae/aiZenoCameraTemplate.pyc old mode 100755 new mode 100644 index 52d7e21..3d8ad66 Binary files a/z_ae/aiZenoCameraTemplate.pyc and b/z_ae/aiZenoCameraTemplate.pyc differ diff --git a/z_bin/Makefile b/z_bin/Makefile deleted file mode 100755 index ae5b83e..0000000 --- a/z_bin/Makefile +++ /dev/null @@ -1,576 +0,0 @@ -############################################################################# -# Makefile for building: libarnoldCamera.so.1.0.0 -# Generated by qmake (3.0) (Qt 5.5.0) -# Project: ../arnoldCamera/arnoldCamera.pro -# Template: lib -# Command: /opt/qt/5.5/gcc_64/bin/qmake -spec linux-g++ CONFIG+=debug -o Makefile ../arnoldCamera/arnoldCamera.pro -############################################################################# - -MAKEFILE = Makefile - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DARNOLDCAMERA_LIBRARY -DQT_CORE_LIB -CFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -g -std=c++0x -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I../arnoldCamera -I. -I/home/i7210038/Dropbox/majorproject/data/solidangle/Arnold-4.2.11.0-linux/include -I/opt/qt/5.5/gcc_64/include -I/opt/qt/5.5/gcc_64/include/QtCore -I. -I/opt/qt/5.5/gcc_64/mkspecs/linux-g++ -QMAKE = /opt/qt/5.5/gcc_64/bin/qmake -DEL_FILE = rm -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -COPY = cp -f -COPY_FILE = cp -f -COPY_DIR = cp -f -R -INSTALL_FILE = install -m 644 -p -INSTALL_PROGRAM = install -m 755 -p -INSTALL_DIR = cp -f -R -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -TAR = tar -cf -COMPRESS = gzip -9f -DISTNAME = arnoldCamera1.0.0 -DISTDIR = /home/i7210038/Dropbox/personal/zpelgrims/projects/arnoldCamera/qt_arnoldCamera/z_bin/.tmp/arnoldCamera1.0.0 -LINK = g++ -LFLAGS = -Wl,-rpath,/opt/qt/5.5/gcc_64 -Wl,-rpath,/opt/qt/5.5/gcc_64/lib -shared -Wl,-soname,libarnoldCamera.so.1 -LIBS = $(SUBLIBS) -L/home/i7210038/Dropbox/majorproject/data/solidangle/Arnold-4.2.11.0-linux/bin -L/usr/lib64 /home/i7210038/Dropbox/majorproject/data/solidangle/Arnold-4.2.11.0-linux/bin/libai.so /usr/lib64/libOpenImageIO.so -L/opt/qt/5.5/gcc_64/lib -lQt5Core -lpthread -AR = ar cqs -RANLIB = -SED = sed -STRIP = strip - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = ../arnoldCamera/imageReader.cpp -OBJECTS = imageReader.o -DIST = ../z_ae/aiZenoCameraTemplate.py \ - zenoCamera.mtd \ - /opt/qt/5.5/gcc_64/mkspecs/features/spec_pre.prf \ - /opt/qt/5.5/gcc_64/mkspecs/common/unix.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/linux.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/sanitize.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/gcc-base.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/gcc-base-unix.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/g++-base.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/g++-unix.conf \ - /opt/qt/5.5/gcc_64/mkspecs/qconfig.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dcore.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dcore_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dinput.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dinput_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquick.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquick_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquickrenderer.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquickrenderer_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3drenderer.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3drenderer_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bluetooth.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bluetooth_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_clucene_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_concurrent.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_concurrent_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_core.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_core_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_dbus.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_dbus_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_declarative.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_declarative_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designer.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designer_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_enginio.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_enginio_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_gui.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_gui_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_help.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_help_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_location.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_location_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimedia.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimedia_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_network.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_network_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_nfc.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_nfc_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_opengl.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_opengl_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_openglextensions.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_positioning.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_positioning_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_printsupport.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_printsupport_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qml.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qml_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmltest.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmltest_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quick.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quick_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickwidgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickwidgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_script.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_script_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_scripttools.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_scripttools_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sensors.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sensors_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_serialport.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_serialport_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sql.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sql_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_svg.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_svg_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_testlib.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_testlib_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uiplugin.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uitools.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uitools_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webchannel.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webchannel_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webengine.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webengine_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginecore.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginecore_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginewidgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkit.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkit_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkitwidgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_websockets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_websockets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webview_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_widgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_widgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_x11extras.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_x11extras_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xml.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xml_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/features/qt_functions.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/qt_config.prf \ - /opt/qt/5.5/gcc_64/mkspecs/linux-g++/qmake.conf \ - /opt/qt/5.5/gcc_64/mkspecs/features/spec_post.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/exclusive_builds.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/default_pre.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/resolve_config.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/default_post.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/c++11.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/warn_on.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/qt.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/resources.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/moc.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/unix/thread.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/testcase_targets.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/exceptions.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/yacc.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/lex.prf \ - ../arnoldCamera/arnoldCamera.pro ../arnoldCamera/arnoldcamera.h \ - ../arnoldCamera/arnoldcamera_global.h \ - ../arnoldCamera/oblique_lensdistortion.h \ - imageReader.h ../arnoldCamera/imageReader.cpp -QMAKE_TARGET = arnoldCamera -DESTDIR = #avoid trailing-slash linebreak -TARGET = libarnoldCamera.so.1.0.0 -TARGETA = libarnoldCamera.a -TARGET0 = libarnoldCamera.so -TARGETD = libarnoldCamera.so.1.0.0 -TARGET1 = libarnoldCamera.so.1 -TARGET2 = libarnoldCamera.so.1.0 - - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -$(TARGET): $(OBJECTS) $(SUBLIBS) $(OBJCOMP) - -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP) - -ln -s $(TARGET) $(TARGET0) - -ln -s $(TARGET) $(TARGET1) - -ln -s $(TARGET) $(TARGET2) - - - -staticlib: $(TARGETA) - -$(TARGETA): $(OBJECTS) $(OBJCOMP) - -$(DEL_FILE) $(TARGETA) - $(AR) $(TARGETA) $(OBJECTS) - -Makefile: ../arnoldCamera/arnoldCamera.pro /opt/qt/5.5/gcc_64/mkspecs/linux-g++/qmake.conf /opt/qt/5.5/gcc_64/mkspecs/features/spec_pre.prf \ - /opt/qt/5.5/gcc_64/mkspecs/common/unix.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/linux.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/sanitize.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/gcc-base.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/gcc-base-unix.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/g++-base.conf \ - /opt/qt/5.5/gcc_64/mkspecs/common/g++-unix.conf \ - /opt/qt/5.5/gcc_64/mkspecs/qconfig.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dcore.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dcore_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dinput.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dinput_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquick.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquick_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquickrenderer.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquickrenderer_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3drenderer.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3drenderer_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bluetooth.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bluetooth_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_clucene_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_concurrent.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_concurrent_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_core.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_core_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_dbus.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_dbus_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_declarative.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_declarative_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designer.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designer_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_enginio.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_enginio_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_gui.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_gui_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_help.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_help_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_location.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_location_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimedia.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimedia_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_network.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_network_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_nfc.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_nfc_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_opengl.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_opengl_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_openglextensions.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_positioning.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_positioning_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_printsupport.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_printsupport_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qml.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qml_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmltest.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmltest_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quick.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quick_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickwidgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickwidgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_script.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_script_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_scripttools.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_scripttools_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sensors.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sensors_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_serialport.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_serialport_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sql.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sql_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_svg.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_svg_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_testlib.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_testlib_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uiplugin.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uitools.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uitools_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webchannel.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webchannel_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webengine.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webengine_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginecore.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginecore_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginewidgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkit.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkit_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkitwidgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_websockets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_websockets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webview_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_widgets.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_widgets_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_x11extras.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_x11extras_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xml.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xml_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /opt/qt/5.5/gcc_64/mkspecs/features/qt_functions.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/qt_config.prf \ - /opt/qt/5.5/gcc_64/mkspecs/linux-g++/qmake.conf \ - /opt/qt/5.5/gcc_64/mkspecs/features/spec_post.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/exclusive_builds.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/default_pre.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/resolve_config.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/default_post.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/c++11.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/warn_on.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/qt.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/resources.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/moc.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/unix/thread.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/testcase_targets.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/exceptions.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/yacc.prf \ - /opt/qt/5.5/gcc_64/mkspecs/features/lex.prf \ - ../arnoldCamera/arnoldCamera.pro \ - /opt/qt/5.5/gcc_64/lib/libQt5Core.prl - $(QMAKE) -spec linux-g++ CONFIG+=debug -o Makefile ../arnoldCamera/arnoldCamera.pro -/opt/qt/5.5/gcc_64/mkspecs/features/spec_pre.prf: -/opt/qt/5.5/gcc_64/mkspecs/common/unix.conf: -/opt/qt/5.5/gcc_64/mkspecs/common/linux.conf: -/opt/qt/5.5/gcc_64/mkspecs/common/sanitize.conf: -/opt/qt/5.5/gcc_64/mkspecs/common/gcc-base.conf: -/opt/qt/5.5/gcc_64/mkspecs/common/gcc-base-unix.conf: -/opt/qt/5.5/gcc_64/mkspecs/common/g++-base.conf: -/opt/qt/5.5/gcc_64/mkspecs/common/g++-unix.conf: -/opt/qt/5.5/gcc_64/mkspecs/qconfig.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dcore.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dcore_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dinput.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dinput_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquick.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquick_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquickrenderer.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3dquickrenderer_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3drenderer.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_3drenderer_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bluetooth.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bluetooth_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_bootstrap_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_clucene_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_concurrent.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_concurrent_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_core.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_core_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_dbus.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_dbus_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_declarative.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_declarative_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designer.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designer_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_designercomponents_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_enginio.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_enginio_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_gui.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_gui_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_help.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_help_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_location.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_location_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimedia.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimedia_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimediawidgets.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_multimediawidgets_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_network.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_network_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_nfc.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_nfc_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_opengl.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_opengl_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_openglextensions.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_openglextensions_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_platformsupport_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_positioning.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_positioning_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_printsupport.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_printsupport_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qml.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qml_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmldevtools_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmltest.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qmltest_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quick.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quick_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickparticles_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickwidgets.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_quickwidgets_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_script.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_script_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_scripttools.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_scripttools_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sensors.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sensors_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_serialport.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_serialport_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sql.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_sql_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_svg.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_svg_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_testlib.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_testlib_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uiplugin.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uitools.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_uitools_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webchannel.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webchannel_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webengine.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webengine_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginecore.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginecore_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginewidgets.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webenginewidgets_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkit.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkit_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkitwidgets.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webkitwidgets_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_websockets.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_websockets_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_webview_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_widgets.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_widgets_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_x11extras.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_x11extras_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xml.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xml_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xmlpatterns.pri: -/opt/qt/5.5/gcc_64/mkspecs/modules/qt_lib_xmlpatterns_private.pri: -/opt/qt/5.5/gcc_64/mkspecs/features/qt_functions.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/qt_config.prf: -/opt/qt/5.5/gcc_64/mkspecs/linux-g++/qmake.conf: -/opt/qt/5.5/gcc_64/mkspecs/features/spec_post.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/exclusive_builds.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/default_pre.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/resolve_config.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/default_post.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/c++11.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/warn_on.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/qt.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/resources.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/moc.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/unix/thread.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/testcase_targets.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/exceptions.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/yacc.prf: -/opt/qt/5.5/gcc_64/mkspecs/features/lex.prf: -../arnoldCamera/arnoldCamera.pro: -/opt/qt/5.5/gcc_64/lib/libQt5Core.prl: -qmake: FORCE - @$(QMAKE) -spec linux-g++ CONFIG+=debug -o Makefile ../arnoldCamera/arnoldCamera.pro - -qmake_all: FORCE - - -all: Makefile $(TARGET) - -dist: distdir FORCE - (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) - -distdir: FORCE - @test -d $(DISTDIR) || mkdir -p $(DISTDIR) - $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ - $(COPY_FILE) --parents ../arnoldCamera/arnoldcamera.h ../arnoldCamera/arnoldcamera_global.h ../arnoldCamera/oblique_lensdistortion.h imageReader.h $(DISTDIR)/ - $(COPY_FILE) --parents ../arnoldCamera/imageReader.cpp $(DISTDIR)/ - - -clean: compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA) - -$(DEL_FILE) Makefile - - -####### Sub-libraries - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -check: first - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_moc_header_make_all: -compiler_moc_header_clean: -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: - -####### Compile - -imageReader.o: ../arnoldCamera/imageReader.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o imageReader.o ../arnoldCamera/imageReader.cpp - -####### Install - -install_target: first FORCE - @test -d $(INSTALL_ROOT)/usr/lib || mkdir -p $(INSTALL_ROOT)/usr/lib - -$(INSTALL_PROGRAM) $(TARGET) $(INSTALL_ROOT)/usr/lib/$(TARGET) - -$(SYMLINK) $(TARGET) $(INSTALL_ROOT)/usr/lib/$(TARGET0) - -$(SYMLINK) $(TARGET) $(INSTALL_ROOT)/usr/lib/$(TARGET1) - -$(SYMLINK) $(TARGET) $(INSTALL_ROOT)/usr/lib/$(TARGET2) - -uninstall_target: FORCE - -$(DEL_FILE) $(INSTALL_ROOT)/usr/lib/$(TARGET) - -$(DEL_FILE) $(INSTALL_ROOT)/usr/lib/$(TARGET0) - -$(DEL_FILE) $(INSTALL_ROOT)/usr/lib/$(TARGET1) - -$(DEL_FILE) $(INSTALL_ROOT)/usr/lib/$(TARGET2) - -$(DEL_DIR) $(INSTALL_ROOT)/usr/lib/ - - -install: install_target FORCE - -uninstall: uninstall_target FORCE - -FORCE: - diff --git a/z_bin/imageReader.o b/z_bin/imageReader.o deleted file mode 100755 index 79b5aa0..0000000 Binary files a/z_bin/imageReader.o and /dev/null differ diff --git a/z_bin/imageReader_backup.o b/z_bin/imageReader_backup.o deleted file mode 100755 index 80cc231..0000000 Binary files a/z_bin/imageReader_backup.o and /dev/null differ diff --git a/z_bin/libarnoldCamera.so b/z_bin/libarnoldCamera.so deleted file mode 100755 index 257c420..0000000 Binary files a/z_bin/libarnoldCamera.so and /dev/null differ diff --git a/z_bin/libarnoldCamera.so.1 b/z_bin/libarnoldCamera.so.1 deleted file mode 100755 index 257c420..0000000 Binary files a/z_bin/libarnoldCamera.so.1 and /dev/null differ diff --git a/z_bin/libarnoldCamera.so.1.0 b/z_bin/libarnoldCamera.so.1.0 deleted file mode 100755 index 257c420..0000000 Binary files a/z_bin/libarnoldCamera.so.1.0 and /dev/null differ diff --git a/z_bin/libarnoldCamera.so.1.0.0 b/z_bin/libarnoldCamera.so.1.0.0 deleted file mode 100755 index 257c420..0000000 Binary files a/z_bin/libarnoldCamera.so.1.0.0 and /dev/null differ diff --git a/z_bin/zenoCamera.mtd b/z_bin/zenoCamera.mtd deleted file mode 100755 index f41356f..0000000 --- a/z_bin/zenoCamera.mtd +++ /dev/null @@ -1,59 +0,0 @@ -# zenoCamera 0x00070007 -[node zenoCamera] - maya.name STRING "camera" - maya.id INT 0x00070007 - maya.translator STRING "zenoCamera" - - [attr sensorWidth] - maya.name STRING "aiSensorWidth" - min FLOAT 0.5 - max FLOAT 50 - default FLOAT 3.6 - - [attr sensorHeight] - maya.name STRING "aiSensorHeight" - min FLOAT 0.5 - max FLOAT 50 - default FLOAT 2.4 - - [attr focalLength] - maya.name STRING "aiFocalLength" - min FLOAT 0.5 - max FLOAT 50 - default FLOAT 8.0 - - [attr fStop] - maya.name STRING "aiFStop" - min FLOAT 0.7 - max FLOAT 36 - default FLOAT 2.8 - - [attr focalDistance] - maya.name STRING "aiFocalDistance" - min FLOAT 0.001 - max FLOAT 99999 - default FLOAT 115 - desc STRING "Distance between lens and object in focus" - - [attr useDof] - maya.name STRING "aiUseDof" - default BOOL true - desc STRING "Enable Depth of Field" - - [attr opticalVignet] - maya.name STRING "aiOpticalVignet" - min FLOAT 0.0 - max FLOAT 100.0 - default FLOAT 0 - - [attr iso] - maya.name STRING "aiIso" - min INT 100 - max INT 12800 - default INT 400 - - [attr filterMap] - maya.name STRING "aiFilterMap" - min RGB 0 0 0 - max RGB 1 1 1 - default RGB 1 1 1 diff --git a/z_bin/zenoCamera.so b/z_bin/zenoCamera.so deleted file mode 100755 index ba75630..0000000 Binary files a/z_bin/zenoCamera.so and /dev/null differ