Don't invert scale in node editor settings

Auburn · Nov 8, 2023 · e7d934b · e7d934b
1 parent 6ca6d14
commit e7d934b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/tools/FastNoiseNodeEditor.cpp b/tools/FastNoiseNodeEditor.cpp
@@ -147,7 +147,7 @@ void FastNoiseNodeEditor::Node::GeneratePreview( bool nodeTreeChanged, bool benc
         auto scale = FastNoise::New<FastNoise::DomainScale>( editor.mMaxFeatureSet );
         genRGB->SetSource( scale );
         scale->SetSource( generator );
-        scale->SetScaling( 1 / editor.mNodeScale );
+        scale->SetScaling( editor.mNodeScale );
 
         FastNoise::SmartNode<FastNoise::ConvertRGBA8> l(nullptr);
 

diff --git a/tools/FastNoiseNodeEditor.h b/tools/FastNoiseNodeEditor.h
@@ -132,7 +132,7 @@ namespace Magnum
         int32_t mNodeBenchmarkIndex = 0;
         int32_t mNodeBenchmarkMax = 128;
 
-        float mNodeScale = 0.4f;
+        float mNodeScale = 2.5f;
         int mNodeSeed = 1337;
         NoiseTexture::GenType mNodeGenType = NoiseTexture::GenType_2D;
 

diff --git a/tools/MeshNoisePreview.cpp b/tools/MeshNoisePreview.cpp
@@ -52,7 +52,7 @@ void MeshNoisePreview::ReGenerate( FastNoise::SmartNodeArg<> generator )
     mLoadRange = 200.0f;
     mBuildData.generator = generator;
     mBuildData.generatorScaled = FastNoise::New<FastNoise::DomainScale>( generator->GetActiveFeatureSet() );
-    mBuildData.generatorScaled->SetScaling( 1 / mBuildData.scale );
+    mBuildData.generatorScaled->SetScaling( mBuildData.scale );
     mBuildData.generatorScaled->SetSource( generator );
     mBuildData.pos = Vector3i( 0 );
 

diff --git a/tools/NoiseTexture.cpp b/tools/NoiseTexture.cpp
@@ -190,7 +190,7 @@ void NoiseTexture::DoExport()
 
             float relativeScale = (float)mExportBuildData.size.sum() / mBuildData.size.sum();
 
-            mExportBuildData.scale *= relativeScale;
+            mExportBuildData.scale /= relativeScale;
             mExportBuildData.offset *= relativeScale;
 
             if( mExportThread.joinable() )
@@ -333,7 +333,7 @@ NoiseTexture::TextureData NoiseTexture::BuildTexture( const BuildData& buildData
     auto scale = FastNoise::New<FastNoise::DomainScale>( buildData.generator->GetActiveFeatureSet() );
     gen->SetSource( scale );
     scale->SetSource( buildData.generator );
-    scale->SetScaling( 1 / buildData.scale );
+    scale->SetScaling( buildData.scale );
 
     FastNoise::OutputMinMax minMax;