Freestyle: Fix for references of deprecated texture stroke shaders.
authorFolkert de Vries <flokkievids@gmail.com>
Tue, 27 Jan 2015 22:11:31 +0000 (23:11 +0100)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 9 Mar 2015 03:53:13 +0000 (12:53 +0900)
Removed all references of deprecated texture shader.  Also deleted
several lines of dead code.

Since texture_shader.py no longer does what it was supposed to do,
the file itself was removed.

Patch reviewed by Tamito Kajiyama (kjym3).

19 files changed:
release/scripts/freestyle/styles/anisotropic_diffusion.py
release/scripts/freestyle/styles/backbone_stretcher.py
release/scripts/freestyle/styles/blueprint_circles.py
release/scripts/freestyle/styles/blueprint_ellipses.py
release/scripts/freestyle/styles/blueprint_squares.py
release/scripts/freestyle/styles/curvature2d.py
release/scripts/freestyle/styles/external_contour_sketchy.py
release/scripts/freestyle/styles/japanese_bigbrush.py
release/scripts/freestyle/styles/multiple_parameterization.py
release/scripts/freestyle/styles/near_lines.py
release/scripts/freestyle/styles/qi0_not_external_contour.py
release/scripts/freestyle/styles/sequentialsplit_sketchy.py
release/scripts/freestyle/styles/sketchy_multiple_parameterization.py
release/scripts/freestyle/styles/sketchy_topology_broken.py
release/scripts/freestyle/styles/sketchy_topology_preserved.py
release/scripts/freestyle/styles/split_at_highest_2d_curvatures.py
release/scripts/freestyle/styles/split_at_tvertices.py
release/scripts/freestyle/styles/stroke_texture.py [deleted file]
release/scripts/freestyle/styles/uniformpruning_zsort.py

index 946c111e44ae5da4d38073c6de600d729e3ab3d7..fc136b23d82a34a0d39b8c31c3790f08783990a9 100644 (file)
@@ -34,7 +34,6 @@ from freestyle.shaders import (
     ConstantThicknessShader,
     IncreasingColorShader,
     SamplingShader,
-    StrokeTextureShader,
     pyDiffusion2Shader,
     )
 from freestyle.types import Operators, Stroke
@@ -50,7 +49,6 @@ bpred = TrueBP1D()
 Operators.bidirectional_chain(ChainPredicateIterator(upred, bpred), NotUP1D(upred))
 shaders_list = [
     ConstantThicknessShader(4),
-    StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, False),
     SamplingShader(2),
     pyDiffusion2Shader(offset, nbIter),
     IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
index 3eb921ddb349d659bca5af91385703559b86676e..cc495f3371683d38d93900f6353148aab3d04577 100644 (file)
@@ -30,7 +30,6 @@ from freestyle.predicates import (
 from freestyle.shaders import (
     BackboneStretcherShader,
     ConstantColorShader,
-    TextureAssignerShader,
     )
 from freestyle.types import Operators
 
@@ -38,7 +37,6 @@ from freestyle.types import Operators
 Operators.select(QuantitativeInvisibilityUP1D(0))
 Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
 shaders_list = [
-    TextureAssignerShader(4),
     ConstantColorShader(0.5, 0.5, 0.5),
     BackboneStretcherShader(20),
     ]
index aade164698ac3fa7c5a059aefc1b4d48b83be38e..f39cda5cff9d983d221e373f5edd7e83d95dc1d6 100644 (file)
@@ -34,7 +34,6 @@ from freestyle.predicates import (
 from freestyle.shaders import (
     ConstantThicknessShader,
     IncreasingColorShader,
-    TextureAssignerShader,
     pyBluePrintCirclesShader,
     pyPerlinNoise1DShader,
     )
@@ -50,7 +49,6 @@ shaders_list = [
     ConstantThicknessShader(5),
     pyBluePrintCirclesShader(3),
     pyPerlinNoise1DShader(0.1, 15, 8),
-    TextureAssignerShader(4),
     IncreasingColorShader(0.8, 0.8, 0.3, 0.4, 0.3, 0.3, 0.3, 0.1),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index d0bd0c45c6c0cb3e946108d9c1fe247efec03771..3d977a10d1c52ea8e07dd21391b4da2d81d6a18d 100644 (file)
@@ -34,7 +34,6 @@ from freestyle.predicates import (
 from freestyle.shaders import (
     ConstantThicknessShader,
     IncreasingColorShader,
-    TextureAssignerShader,
     pyBluePrintEllipsesShader,
     pyPerlinNoise1DShader,
     )
@@ -50,7 +49,6 @@ shaders_list = [
     ConstantThicknessShader(5),
     pyBluePrintEllipsesShader(3),
     pyPerlinNoise1DShader(0.1, 10, 8),
-    TextureAssignerShader(4),
     IncreasingColorShader(0.6, 0.3, 0.3, 0.7, 0.3, 0.3, 0.3, 0.1),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index 82ab6a80dd7c1d6391f57150d37465e91a682441..7110fe413fcc1bc76673d003f5d49a104f642b48 100644 (file)
@@ -34,7 +34,6 @@ from freestyle.predicates import (
 from freestyle.shaders import (
     ConstantThicknessShader,
     IncreasingColorShader,
-    TextureAssignerShader,
     pyBluePrintSquaresShader,
     pyPerlinNoise1DShader,
     )
@@ -50,7 +49,6 @@ shaders_list = [
     ConstantThicknessShader(8),
     pyBluePrintSquaresShader(2, 20),
     pyPerlinNoise1DShader(0.07, 10, 8),
-    TextureAssignerShader(4),
     IncreasingColorShader(0.6, 0.3, 0.3, 0.7, 0.6, 0.3, 0.3, 0.3),
     ConstantThicknessShader(4),
     ]
index 66c8a6c65440e94047cdc385ebbe92b6ac469f09..faf1223b735873e6713cc4cc79653bbaa7e91fa7 100644 (file)
@@ -30,7 +30,6 @@ from freestyle.predicates import (
     )
 from freestyle.shaders import (
     ConstantThicknessShader,
-    StrokeTextureShader,
     py2DCurvatureColorShader,
     )
 from freestyle.types import Operators, Stroke
@@ -39,7 +38,6 @@ from freestyle.types import Operators, Stroke
 Operators.select(QuantitativeInvisibilityUP1D(0))
 Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
 shaders_list = [
-    StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, False),
     ConstantThicknessShader(5),
     py2DCurvatureColorShader()
     ]
index 6a7a2333bb5c0b4f94bfd4a6334b46f563018693..44dbda4709fce6a364131c2149d99c7203e0154a 100644 (file)
@@ -37,7 +37,6 @@ from freestyle.shaders import (
     SamplingShader,
     SmoothingShader,
     SpatialNoiseShader,
-    TextureAssignerShader,
     )
 from freestyle.types import Operators
 
@@ -51,6 +50,5 @@ shaders_list = [
     IncreasingThicknessShader(4, 10),
     SmoothingShader(400, 0.1, 0, 0.2, 0, 0, 0, 1),
     IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
-    TextureAssignerShader(4),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index 521fbbc1a7e7b33b14fdc4319e2108503b31dde6..a312bcd43583dd27a039442556fd492f587a724f 100644 (file)
@@ -37,7 +37,6 @@ from freestyle.shaders import (
     ConstantColorShader,
     ConstantThicknessShader,
     SamplingShader,
-    TextureAssignerShader,
     TipRemoverShader,
     pyNonLinearVaryingThicknessShader,
     pySamplingShader,
@@ -62,7 +61,6 @@ shaders_list = [
     SamplingShader(50),
     ConstantThicknessShader(10),
     pyNonLinearVaryingThicknessShader(4, 25, 0.6),
-    TextureAssignerShader(6),
     ConstantColorShader(0.2, 0.2, 0.2,1.0),
     TipRemoverShader(10),
     ]
index bf0691f2ce1bf1cf0e5dd43dc92bd7177021cbe5..0e224c74bbf30bc4b2f426224fe921ed05dd1981 100644 (file)
@@ -37,7 +37,6 @@ from freestyle.shaders import (
     IncreasingColorShader,
     IncreasingThicknessShader,
     SamplingShader,
-    TextureAssignerShader,
     pyHLRShader,
     )
 from freestyle.types import Operators
@@ -52,7 +51,6 @@ shaders_list = [
     IncreasingThicknessShader(1.5, 30),
     ConstantColorShader(0.0, 0.0, 0.0),
     IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
-    TextureAssignerShader(-1),
     pyHLRShader(),  ## this shader draws only visible portions
     ]
 Operators.create(TrueUP1D(), shaders_list)
index b91eaea4023b04c77b39aa269019e781f31f1d9c..5e260a223822122ff552352554a88318e580def6 100644 (file)
@@ -33,7 +33,6 @@ from freestyle.predicates import (
 from freestyle.shaders import (
     ConstantColorShader,
     ConstantThicknessShader,
-    TextureAssignerShader,
     )
 from freestyle.types import IntegrationType, Operators
 
@@ -42,7 +41,6 @@ upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyZSmallerUP1D(0.5, Integration
 Operators.select(upred)
 Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(upred))
 shaders_list = [
-    TextureAssignerShader(-1),
     ConstantThicknessShader(5),
     ConstantColorShader(0.0, 0.0, 0.0),
     ]
index fb3e3279b6c5fc49544cf222082eb04bf3f257cb..3c9b8873485b6df07ff63581b7a97a0332d116d0 100644 (file)
@@ -36,7 +36,6 @@ from freestyle.shaders import (
     IncreasingThicknessShader,
     SamplingShader,
     SpatialNoiseShader,
-    TextureAssignerShader,
     )
 from freestyle.types import Operators
 
@@ -50,6 +49,5 @@ shaders_list = [
     IncreasingThicknessShader(2, 5),
     BackboneStretcherShader(20),
     IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
-    TextureAssignerShader(4),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index e97e8f6da39813d8d3c683e131886771fac22bf9..b980fdc87d7f8bf43ff3d93aa8b681c1e2644670 100644 (file)
@@ -35,7 +35,6 @@ from freestyle.shaders import (
     ConstantColorShader,
     IncreasingThicknessShader,
     SpatialNoiseShader,
-    TextureAssignerShader,
     )
 from freestyle.types import Nature, Operators
 
@@ -51,6 +50,5 @@ shaders_list = [
     SpatialNoiseShader(7, 120, 2, True, True),
     IncreasingThicknessShader(5, 8),
     ConstantColorShader(0.2, 0.2, 0.2, 1),
-    TextureAssignerShader(4),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index 0beb6e37c21bc931c400c11b6b8261a7f324bdaa..a3ce61121657e64e1e93d293f0a70ed97c42d176 100644 (file)
@@ -34,7 +34,6 @@ from freestyle.shaders import (
     SamplingShader,
     SmoothingShader,
     SpatialNoiseShader,
-    TextureAssignerShader,
     pyHLRShader,
     )
 from freestyle.types import Operators
@@ -48,7 +47,6 @@ shaders_list = [
     IncreasingThicknessShader(5, 30),
     SmoothingShader(100, 0.05, 0, 0.2, 0, 0, 0, 1),
     IncreasingColorShader(0, 0.2, 0, 1, 0.2, 0.7, 0.2, 1),
-    TextureAssignerShader(6),
     pyHLRShader(),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index 134031865e05c64ebf668ce7fa6351d2a557212c..191d2d8bcbef233e0a12a896d3cea1fcadd5e412 100644 (file)
@@ -34,8 +34,7 @@ from freestyle.shaders import (
     SamplingShader,
     SmoothingShader,
     SpatialNoiseShader,
-    TextureAssignerShader,
-    pyBackboneStretcherNoCuspShader
+    pyBackboneStretcherNoCuspShader,
     )
 from freestyle.types import Operators
 
@@ -50,9 +49,6 @@ shaders_list = [
     IncreasingThicknessShader(4, 10),
     SmoothingShader(100, 0.1, 0, 0.2, 0, 0, 0, 1),
     pyBackboneStretcherNoCuspShader(20),
-    #ConstantColorShader(0.0, 0.0, 0.0)
     IncreasingColorShader(0.2, 0.2, 0.2, 1, 0.5, 0.5, 0.5, 1),
-    #IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
-    TextureAssignerShader(4),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index 161654f1f97a99e63c8a47028545fa1d9f47340d..26c7fd379642f86ad3d7630747fa9717046c3a22 100644 (file)
@@ -34,7 +34,6 @@ from freestyle.shaders import (
     SamplingShader,
     SmoothingShader,
     SpatialNoiseShader,
-    TextureAssignerShader,
     )
 from freestyle.types import Operators
 
@@ -48,6 +47,5 @@ shaders_list = [
     IncreasingThicknessShader(4, 8),
     SmoothingShader(300, 0.05, 0, 0.2, 0, 0, 0, 0.5),
     ConstantColorShader(0.6, 0.2, 0.0),
-    TextureAssignerShader(4),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index 3bfdb05a2dbd4862058ae1d1839b5169788c0bc5..68a80d89ea7c7b23302858dd2ddfe88b93707121 100644 (file)
@@ -34,7 +34,6 @@ from freestyle.predicates import (
 from freestyle.shaders import (
     ConstantThicknessShader,
     IncreasingColorShader,
-    TextureAssignerShader,
     )
 from freestyle.types import Operators
 
@@ -46,6 +45,5 @@ Operators.recursive_split(func, pyParameterUP0D(0.4, 0.6), NotUP1D(pyHigherLengt
 shaders_list = [
     ConstantThicknessShader(10),
     IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
-    TextureAssignerShader(3),
     ]
 Operators.create(TrueUP1D(), shaders_list)
index 213922a03b1408d2648df50e315ce3a7fc7810d2..8978b98f56b3b099c4552679351b688d97645bc3 100644 (file)
@@ -31,7 +31,6 @@ from freestyle.predicates import (
 from freestyle.shaders import (
     ConstantThicknessShader,
     IncreasingColorShader,
-    TextureAssignerShader,
     )
 from freestyle.types import Nature, Operators
 
@@ -45,6 +44,5 @@ Operators.sequential_split(start, start, 10)
 shaders_list = [
     ConstantThicknessShader(5),
     IncreasingColorShader(1, 0, 0, 1, 0, 1, 0, 1),
-    TextureAssignerShader(3),
     ]
 Operators.create(TrueUP1D(), shaders_list)
diff --git a/release/scripts/freestyle/styles/stroke_texture.py b/release/scripts/freestyle/styles/stroke_texture.py
deleted file mode 100644 (file)
index 614c34a..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-#  Filename : stroke_texture.py
-#  Author   : Stephane Grabli
-#  Date     : 04/08/2005
-#  Purpose  : Draws textured strokes (illustrate the StrokeTextureShader shader)
-
-from freestyle.chainingiterators import ChainSilhouetteIterator
-from freestyle.predicates import (
-    NotUP1D,
-    QuantitativeInvisibilityUP1D,
-    TrueUP1D,
-    )
-from freestyle.shaders import (
-    BezierCurveShader,
-    ConstantColorShader,
-    ConstantThicknessShader,
-    SamplingShader,
-    StrokeTextureShader,
-    )
-from freestyle.types import Operators, Stroke
-
-
-Operators.select(QuantitativeInvisibilityUP1D(0))
-Operators.bidirectional_chain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
-shaders_list = [
-    SamplingShader(3),
-    BezierCurveShader(4),
-    StrokeTextureShader("washbrushAlpha.bmp", Stroke.DRY_MEDIUM, True),
-    ConstantThicknessShader(40),
-    ConstantColorShader(0, 0, 0, 1),
-    ]
-Operators.create(TrueUP1D(), shaders_list)
index 29b634b765b2b0949293c0adcedd172eab9faef0..814e140ee495ecbf6d2fa3f90c56da1e9c43453f 100644 (file)
@@ -30,7 +30,6 @@ from freestyle.shaders import (
     ConstantColorShader,
     ConstantThicknessShader,
     SamplingShader,
-    StrokeTextureShader,
     )
 from freestyle.types import IntegrationType, Operators, Stroke
 
@@ -40,10 +39,8 @@ Operators.bidirectional_chain(ChainSilhouetteIterator())
 #Operators.sequential_split(pyVertexNatureUP0D(Nature.VIEW_VERTEX), 2)
 Operators.sort(pyZBP1D())
 shaders_list = [
-    StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, False),
     ConstantThicknessShader(3),
     SamplingShader(5.0),
     ConstantColorShader(0, 0, 0, 1),
     ]
 Operators.create(pyDensityUP1D(2, 0.05, IntegrationType.MEAN, 4), shaders_list)
-#Operators.create(pyDensityFunctorUP1D(8, 0.03, pyGetInverseProjectedZF1D(), 0, 1, IntegrationType.MEAN), shaders_list)