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

Side by Side Diff: src/effects/SkPerlinNoiseShader.cpp

Issue 207543008: SkPerlinNoiseShader::CreateTubulenceNoise() is misspelled (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Added alias to CreateTubulence Created 6 years, 8 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 | « samplecode/SampleFilterFuzz.cpp ('k') | no next file » | 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 #include "SkDither.h" 8 #include "SkDither.h"
9 #include "SkPerlinNoiseShader.h" 9 #include "SkPerlinNoiseShader.h"
10 #include "SkColorFilter.h" 10 #include "SkColorFilter.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 #endif 249 #endif
250 }; 250 };
251 251
252 SkShader* SkPerlinNoiseShader::CreateFractalNoise(SkScalar baseFrequencyX, SkSca lar baseFrequencyY, 252 SkShader* SkPerlinNoiseShader::CreateFractalNoise(SkScalar baseFrequencyX, SkSca lar baseFrequencyY,
253 int numOctaves, SkScalar seed, 253 int numOctaves, SkScalar seed,
254 const SkISize* tileSize) { 254 const SkISize* tileSize) {
255 return SkNEW_ARGS(SkPerlinNoiseShader, (kFractalNoise_Type, baseFrequencyX, baseFrequencyY, 255 return SkNEW_ARGS(SkPerlinNoiseShader, (kFractalNoise_Type, baseFrequencyX, baseFrequencyY,
256 numOctaves, seed, tileSize)); 256 numOctaves, seed, tileSize));
257 } 257 }
258 258
259 SkShader* SkPerlinNoiseShader::CreateTubulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY, 259 SkShader* SkPerlinNoiseShader::CreateTurbulence(SkScalar baseFrequencyX, SkScala r baseFrequencyY,
260 int numOctaves, SkScalar seed, 260 int numOctaves, SkScalar seed,
261 const SkISize* tileSize) { 261 const SkISize* tileSize) {
262 return SkNEW_ARGS(SkPerlinNoiseShader, (kTurbulence_Type, baseFrequencyX, ba seFrequencyY, 262 return SkNEW_ARGS(SkPerlinNoiseShader, (kTurbulence_Type, baseFrequencyX, ba seFrequencyY,
263 numOctaves, seed, tileSize)); 263 numOctaves, seed, tileSize));
264 } 264 }
265 265
266 SkPerlinNoiseShader::SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, 266 SkPerlinNoiseShader::SkPerlinNoiseShader(SkPerlinNoiseShader::Type type,
267 SkScalar baseFrequencyX, 267 SkScalar baseFrequencyX,
268 SkScalar baseFrequencyY, 268 SkScalar baseFrequencyY,
269 int numOctaves, 269 int numOctaves,
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 SkScalar seed = SkIntToScalar(random->nextU()); 699 SkScalar seed = SkIntToScalar(random->nextU());
700 SkISize tileSize = SkISize::Make(random->nextRangeU(4, 4096), random->nextR angeU(4, 4096)); 700 SkISize tileSize = SkISize::Make(random->nextRangeU(4, 4096), random->nextR angeU(4, 4096));
701 SkScalar baseFrequencyX = random->nextRangeScalar(0.01f, 701 SkScalar baseFrequencyX = random->nextRangeScalar(0.01f,
702 0.99f); 702 0.99f);
703 SkScalar baseFrequencyY = random->nextRangeScalar(0.01f, 703 SkScalar baseFrequencyY = random->nextRangeScalar(0.01f,
704 0.99f); 704 0.99f);
705 705
706 SkShader* shader = random->nextBool() ? 706 SkShader* shader = random->nextBool() ?
707 SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, seed, 707 SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, seed,
708 stitchTiles ? &tileSize : NULL) : 708 stitchTiles ? &tileSize : NULL) :
709 SkPerlinNoiseShader::CreateTubulence(baseFrequencyX, baseFrequencyY, num Octaves, seed, 709 SkPerlinNoiseShader::CreateTurbulence(baseFrequencyX, baseFrequencyY, nu mOctaves, seed,
710 stitchTiles ? &tileSize : NULL); 710 stitchTiles ? &tileSize : NULL);
711 711
712 SkPaint paint; 712 SkPaint paint;
713 GrEffectRef* effect = shader->asNewEffect(context, paint); 713 GrEffectRef* effect = shader->asNewEffect(context, paint);
714 714
715 SkDELETE(shader); 715 SkDELETE(shader);
716 716
717 return effect; 717 return effect;
718 } 718 }
719 719
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 str->append(" seed: "); 1347 str->append(" seed: ");
1348 str->appendScalar(fSeed); 1348 str->appendScalar(fSeed);
1349 str->append(" stitch tiles: "); 1349 str->append(" stitch tiles: ");
1350 str->append(fStitchTiles ? "true " : "false "); 1350 str->append(fStitchTiles ? "true " : "false ");
1351 1351
1352 this->INHERITED::toString(str); 1352 this->INHERITED::toString(str);
1353 1353
1354 str->append(")"); 1354 str->append(")");
1355 } 1355 }
1356 #endif 1356 #endif
OLDNEW
« no previous file with comments | « samplecode/SampleFilterFuzz.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698