Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Side by Side Diff: include/effects/SkPerlinNoiseShader.h

Issue 169973002: Begin making SkPerlinNoiseShader const. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Don't lazily initialize bitmaps. Use setPixels Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/effects/SkPerlinNoiseShader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkPerlinNoiseShader_DEFINED 8 #ifndef SkPerlinNoiseShader_DEFINED
9 #define SkPerlinNoiseShader_DEFINED 9 #define SkPerlinNoiseShader_DEFINED
10 10
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 SK_DEVELOPER_TO_STRING() 72 SK_DEVELOPER_TO_STRING()
73 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) 73 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader)
74 74
75 protected: 75 protected:
76 SkPerlinNoiseShader(SkReadBuffer&); 76 SkPerlinNoiseShader(SkReadBuffer&);
77 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; 77 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
78 78
79 private: 79 private:
80 SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX, 80 SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX,
81 SkScalar baseFrequencyY, int numOctaves, SkScalar seed, 81 SkScalar baseFrequencyY, int numOctaves, SkScalar seed,
82 const SkISize* tileSize = NULL); 82 const SkISize* tileSize);
83 virtual ~SkPerlinNoiseShader(); 83 virtual ~SkPerlinNoiseShader();
84 84
85 void setTileSize(const SkISize&);
86
87 void initPaint(PaintingData& paintingData);
88
89 SkScalar noise2D(int channel, const PaintingData& paintingData, 85 SkScalar noise2D(int channel, const PaintingData& paintingData,
90 const StitchData& stitchData, const SkPoint& noiseVector); 86 const StitchData& stitchData, const SkPoint& noiseVector) c onst;
91 87
92 SkScalar calculateTurbulenceValueForPoint(int channel, const PaintingData& p aintingData, 88 SkScalar calculateTurbulenceValueForPoint(int channel, const PaintingData& p aintingData,
93 StitchData& stitchData, const SkPo int& point); 89 StitchData& stitchData, const SkPo int& point) const;
94 90
95 SkPMColor shade(const SkPoint& point, StitchData& stitchData); 91 SkPMColor shade(const SkPoint& point, StitchData& stitchData) const;
96 92
97 SkPerlinNoiseShader::Type fType; 93 // TODO (scroggo): Once all SkShaders are created from a factory, and we hav e removed the
98 SkScalar fBaseFrequencyX; 94 // constructor that creates SkPerlinNoiseShader from an SkReadBuffer, severa l fields can
99 SkScalar fBaseFrequencyY; 95 // be made constant.
100 int fNumOctaves; 96 /*const*/ SkPerlinNoiseShader::Type fType;
101 SkScalar fSeed; 97 /*const*/ SkScalar fBaseFrequencyX;
102 SkISize fTileSize; 98 /*const*/ SkScalar fBaseFrequencyY;
103 bool fStitchTiles; 99 /*const*/ int fNumOctaves;
100 /*const*/ SkScalar fSeed;
101 /*const*/ SkISize fTileSize;
102 /*const*/ bool fStitchTiles;
103 // TODO (scroggo): Once setContext creates a new object, place this on that object.
104 SkMatrix fMatrix; 104 SkMatrix fMatrix;
105 105
106 PaintingData* fPaintingData; 106 PaintingData* fPaintingData;
107 107
108 typedef SkShader INHERITED; 108 typedef SkShader INHERITED;
109 }; 109 };
110 110
111 #endif 111 #endif
OLDNEW
« no previous file with comments | « no previous file | src/effects/SkPerlinNoiseShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698