Merge branch 'master' of opentoonz

Author: manongjohn

stuff/config/current.txt

@@ -832,6 +832,9 @@
   <item>"STD_inoAddFx"	"Add Ino"	</item>
   <item>"STD_inoAddFx.opacity"	"Opacity"	</item>
   <item>"STD_inoAddFx.clipping_mask"	"Clipping Mask"	</item>
+  <item>"STD_inoAddFx.linear"	"Linear Color Space"	</item>
+  <item>"STD_inoAddFx.gamma"	"Gamma"	</item>
+  <item>"STD_inoAddFx.premultiplied"	"Source is Premultiplied"	</item>
   <item>"STD_inoColorBurnFx"	"Color Burn Ino"	</item>
   <item>"STD_inoColorBurnFx.opacity"	"Opacity"	</item>
   <item>"STD_inoColorBurnFx.clipping_mask"	"Clipping Mask"	</item>
@@ -1316,6 +1319,28 @@
   <item>"STD_iwa_GlareFx.noise_evolution"	"Noise Evolution"		</item>
   <item>"STD_iwa_GlareFx.noise_offset"	"Noise Offset"		</item>
 
+  <item>"STD_iwa_FractalNoiseFx"	"Fractal Noise Iwa"	</item>
+  <item>"STD_iwa_FractalNoiseFx.fractalType"	"Fractal Type"	</item>
+  <item>"STD_iwa_FractalNoiseFx.noiseType"	"Noise Type"	</item>
+  <item>"STD_iwa_FractalNoiseFx.invert"	"Invert"	</item>
+  <item>"STD_iwa_FractalNoiseFx.rotation"	"Rotation"	</item>
+  <item>"STD_iwa_FractalNoiseFx.uniformScaling"	"Uniform Scaling"	</item>
+  <item>"STD_iwa_FractalNoiseFx.scale"	"Scale"	</item>
+  <item>"STD_iwa_FractalNoiseFx.scaleW"	"Scale W"	</item>
+  <item>"STD_iwa_FractalNoiseFx.scaleH"	"Scale H"	</item>
+  <item>"STD_iwa_FractalNoiseFx.offsetTurbulence"	"Offset Turbulence"	</item>
+  <item>"STD_iwa_FractalNoiseFx.perspectiveOffset"	"Perspective Offset"	</item>
+  <item>"STD_iwa_FractalNoiseFx.complexity"	"Complexity"	</item>
+  <item>"STD_iwa_FractalNoiseFx.subInfluence"	"Sub Influence"	</item>
+  <item>"STD_iwa_FractalNoiseFx.subScaling"	"Sub Scaling"	</item>
+  <item>"STD_iwa_FractalNoiseFx.subRotation"	"Sub Rotation"	</item>
+  <item>"STD_iwa_FractalNoiseFx.subOffset"	"Sub Offset"	</item>
+  <item>"STD_iwa_FractalNoiseFx.evolution"	"Evolution"	</item>
+  <item>"STD_iwa_FractalNoiseFx.cycleEvolution"	"Cycle Evolution"	</item>
+  <item>"STD_iwa_FractalNoiseFx.cycleEvolutionRange"	"Cycle (in Evolution)"	</item>
+  <item>"STD_iwa_FractalNoiseFx.dynamicIntensity"	"Dynamic Intensity"	</item>
+  <item>"STD_iwa_FractalNoiseFx.alphaRendering"	"Alpha Rendering"	</item>
+  
  <!------------------------------ Tiled Particles Iwa ------------------------------------------->
 
   <item>STD_iwa_TiledParticlesFx "Tiled Particles Iwa" </item>

stuff/doc/AddIno.pdf

@@ -0,0 +1,40 @@
+Following licenses are for source code ported from other open-source software authored by DWANGO Co., Ltd.
+
+- DWANGO OpenToonz Plugins [https://github.com/opentoonz/dwango_opentoonz_plugins]
+- OpenToonz Plugin Utility [https://github.com/opentoonz/opentoonz_plugin_utility]
+
+- - - - - - - - - - - - - - - -
+
+DWANGO OpenToonz Plugins
+
+Copyright (c) 2016, DWANGO Co., Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+- - - - - - - - - - - - - - - -
+
+OpenToonz Plugin Utility
+
+Copyright (c) 2016, DWANGO Co., Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+- - - - - - - - - - - - - - - -

stuff/doc/LICENSE/LICENSE_dwango.txt

@@ -2,5 +2,11 @@
   <page name="Add Ino">
     <control>opacity</control>
     <control>clipping_mask</control>
+    <separator/>
+    <control>linear</control>
+    <vbox modeSensitive="linear" mode="1">
+      <control>gamma</control>
+      <control>premultiplied</control>
+    </vbox>
   </page>
 </fxlayout>

stuff/doc/日本語/AddIno.pdf

@@ -0,0 +1,38 @@
+<fxlayout>
+	<page name="Fractal Noise Iwa">
+    <control>fractalType</control>
+    <control>noiseType</control>
+    <control>invert</control>
+<separator label="Transform"/>
+    <control>rotation</control>
+    <control>uniformScaling</control>
+    <vbox modeSensitive="uniformScaling" mode="1">
+    <control>scale</control>
+    </vbox>
+    <vbox modeSensitive="uniformScaling" mode="0">
+    <control>scaleW</control>
+    <control>scaleH</control>
+    </vbox>
+    <control>offsetTurbulence</control>
+    <control>perspectiveOffset</control>
+<separator/>
+    <control>complexity</control>
+<separator label="Sub Settings"/>
+    <control>subInfluence</control>
+    <control>subScaling</control>
+    <control>subRotation</control>
+    <control>subOffset</control>
+    <control>centerSubscale</control>
+<separator label="Evolution Options"/>
+    <control>evolution</control>
+    <control>cycleEvolution</control>
+    <vbox modeSensitive="cycleEvolution" mode="1">
+    <control>cycleEvolutionRange</control>
+    </vbox>
+<separator/>
+    <vbox modeSensitive="fractalType" mode="4,5">
+    <control>dynamicIntensity</control>
+    </vbox>
+    <control>alphaRendering</control>
+	</page>
+</fxlayout>

stuff/profiles/layouts/fxs/STD_inoAddFx.xml

@@ -143,6 +143,7 @@
     STD_noiseFx 
     STD_iwa_PNPerspectiveFx
     STD_saltpepperNoiseFx 
+    STD_iwa_FractalNoiseFx 
   </Noise>
   <Render>
     STD_cloudsFx 

stuff/profiles/layouts/fxs/STD_iwa_FractalNoiseFx.xml

@@ -4,6 +4,7 @@ if(WITH_SYSTEM_SUPERLU)
     set(_header_hints)
     set(_header_suffixes
         superlu
+        SuperLU
     )
     set(_lib_suffixes)
 else()

stuff/profiles/layouts/fxs/fxs.lst

@@ -391,8 +391,8 @@ class DisplayListManager  // singleton
   void recordList(GLuint listId, TVectorImage *image,
                   const TVectorRenderData &rd) {
     QMutexLocker sl(&m_mutex);
-    TRectD bbox       = image->getBBox();
-    double ry         = bbox.getLy() * 0.5;
+    TRectD bbox = image->getBBox();
+    double ry   = bbox.getLy() * 0.5;
     if (ry < 1e-5) ry = 1e-5;
     TAffine identity;
     TRect rect;
@@ -623,7 +623,7 @@ void TSolidColorStyle::drawStroke(const TColorFunction *cf,
   };  // locals
 
   TPixel32 color = m_color;
-  if (cf) color  = (*cf)(color);
+  if (cf) color = (*cf)(color);
 
   if (color.m == 0) return;
 
@@ -740,7 +740,7 @@ void TCenterLineStrokeStyle::drawStroke(const TColorFunction *cf,
   int i, n = stroke->getChunkCount();
   if (n == 0) return;
   TPixel32 color = m_color;
-  if (cf) color  = (*cf)(m_color);
+  if (cf) color = (*cf)(m_color);
   if (color.m == 0) return;
   tglColor(color);
   double pixelSize = sqrt(tglGetPixelSize2());
@@ -1485,21 +1485,21 @@ void TVectorImagePatternStrokeStyle::computeTransformations(
   double s             = 0;
 
   while (s < length) {
-    TFrameId fid                     = lit->first;
-    TVectorImageP img                = m_level->frame(fid);
+    TFrameId fid      = lit->first;
+    TVectorImageP img = m_level->frame(fid);
     if (++lit == m_level->end()) lit = m_level->begin();
     assert(img);
     if (img->getType() != TImage::VECTOR) return;
-    double t               = stroke->getParameterAtLength(s);
-    TThickPoint p          = stroke->getThickPoint(t);
-    TPointD v              = stroke->getSpeed(t);
-    double ang             = rad2degree(atan(v)) + m_rotation;
-    TRectD bbox            = img->getBBox();
-    TPointD center         = 0.5 * (bbox.getP00() + bbox.getP11());
-    double ry              = bbox.getLy() * 0.5;
+    double t       = stroke->getParameterAtLength(s);
+    TThickPoint p  = stroke->getThickPoint(t);
+    TPointD v      = stroke->getSpeed(t);
+    double ang     = rad2degree(atan(v)) + m_rotation;
+    TRectD bbox    = img->getBBox();
+    TPointD center = 0.5 * (bbox.getP00() + bbox.getP11());
+    double ry      = bbox.getLy() * 0.5;
     if (ry * ry < 1e-5) ry = p.thick;
-    double sc              = p.thick / ry;
-    if (sc < 0.0001) sc    = 0.0001;
+    double sc = p.thick / ry;
+    if (sc < 0.0001) sc = 0.0001;
     TAffine aff =
         TTranslation(p) * TRotation(ang) * TScale(sc) * TTranslation(-center);
     transformations.push_back(aff);
@@ -1618,8 +1618,8 @@ void TVectorImagePatternStrokeStyle::drawStroke(
     UINT i, size = transformations.size();
 
     for (i = 0; i < size; i++) {
-      TFrameId fid                     = lit->first;
-      TVectorImageP img                = m_level->frame(fid);
+      TFrameId fid      = lit->first;
+      TVectorImageP img = m_level->frame(fid);
       if (++lit == m_level->end()) lit = m_level->begin();
       assert(img);
       if (!img) continue;
@@ -1641,14 +1641,15 @@ void TVectorImagePatternStrokeStyle::drawStroke(
 
       CHECK_GL_ERROR
 #ifdef _WIN32
-
-      GLuint listId = DisplayListManager::instance()->getDisplayListId(
-          imgPointer, m_name, fid, rd);
-      if (listId != 0) {
-        CHECK_GL_ERROR
-        glCallList(listId);
-        CHECK_GL_ERROR
-      } else
+      // currently drawing with the display list doesn't work properly
+
+      // GLuint listId = DisplayListManager::instance()->getDisplayListId(
+      //    imgPointer, m_name, fid, rd);
+      // if (listId != 0) {
+      //  CHECK_GL_ERROR
+      //  glCallList(listId);
+      //  CHECK_GL_ERROR
+      //} else
 #endif
 
       {
@@ -1737,4 +1738,4 @@ TColorStyle::Declaration s0(new TCenterLineStrokeStyle());
 TColorStyle::Declaration s1(new TSolidColorStyle());
 TColorStyle::Declaration s3(new TRasterImagePatternStrokeStyle());
 TColorStyle::Declaration s4(new TVectorImagePatternStrokeStyle());
-}
+}  // namespace

toonz/cmake/FindSuperLU.cmake

@@ -80,6 +80,7 @@ set(HEADERS
     iwa_spingradientfx.h
     iwa_lineargradientfx.h
     iwa_glarefx.h
+    iwa_fractalnoisefx.h
 )
 
 set(SOURCES
@@ -266,6 +267,7 @@ set(SOURCES
     iwa_spingradientfx.cpp
     iwa_lineargradientfx.cpp
     iwa_glarefx.cpp
+    iwa_fractalnoisefx.cpp
 )
 
 set(OBJCSOURCES