Skip to content

Commit

Permalink
MinkowskiP defaults to 1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Auburn committed May 4, 2024
1 parent fe0fd43 commit 9df09c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions include/FastNoise/Generators/BasicGenerators.h
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ namespace FastNoise

protected:
GeneratorSource mSource;
HybridSource mMinkowskiP = 0.5f;
HybridSource mMinkowskiP = 1.5f;
DistanceFunction mDistanceFunction = DistanceFunction::EuclideanSquared;
PerDimensionVariable<HybridSource> mPoint = 0.0f;

Expand All @@ -234,7 +234,7 @@ namespace FastNoise
this->AddVariableEnum( "Distance Function", DistanceFunction::Euclidean, &DistanceToPoint::SetDistanceFunction, kDistanceFunction_Strings );
this->AddPerDimensionHybridSource( { "Point", "Point in current domain space" }, 0.0f, []( DistanceToPoint* p ) { return std::ref( p->mPoint ); } );

this->AddHybridSource( { "Minkowski P", "Only affects Minkowski distance function\n1 = Manhattan\n2 = Euclidean" }, 0.5f, &DistanceToPoint::SetMinkowskiP, &DistanceToPoint::SetMinkowskiP );
this->AddHybridSource( { "Minkowski P", "Only affects Minkowski distance function\n1 = Manhattan\n2 = Euclidean" }, 1.5f, &DistanceToPoint::SetMinkowskiP, &DistanceToPoint::SetMinkowskiP );

description =
"Outputs distance between point and input position";
Expand Down
4 changes: 2 additions & 2 deletions include/FastNoise/Generators/Cellular.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace FastNoise
void SetJitterModifier( float value ) { mJitterModifier = value; }

protected:
HybridSource mMinkowskiP = 0.5f;
HybridSource mMinkowskiP = 1.5f;
HybridSource mJitterModifier = 1.0f;
DistanceFunction mDistanceFunction = DistanceFunction::EuclideanSquared;
};
Expand All @@ -32,7 +32,7 @@ namespace FastNoise
this->groups.push_back( "Coherent Noise" );
this->AddVariableEnum( { "Distance Function", "How distance to closest cells is calculated\nHybrid is EuclideanSquared + Manhattan" },
DistanceFunction::EuclideanSquared, &Cellular<PARENT>::SetDistanceFunction, kDistanceFunction_Strings );
this->AddHybridSource( { "Minkowski P", "Only affects Minkowski distance function\n1 = Manhattan\n2 = Euclidean" }, 0.5f, &Cellular<PARENT>::SetMinkowskiP, &Cellular<PARENT>::SetMinkowskiP );
this->AddHybridSource( { "Minkowski P", "Only affects Minkowski distance function\n1 = Manhattan\n2 = Euclidean" }, 1.5f, &Cellular<PARENT>::SetMinkowskiP, &Cellular<PARENT>::SetMinkowskiP );

this->AddHybridSource( { "Jitter Modifier", "Above 1.0 will cause grid artifacts" }, 1.0f, &Cellular<PARENT>::SetJitterModifier, &Cellular<PARENT>::SetJitterModifier );
}
Expand Down

0 comments on commit 9df09c8

Please sign in to comment.