TEST hybrid range inputs for ScalableGenerator

Auburn · Apr 28, 2024 · f8fd6f8 · f8fd6f8
1 parent f9498a4
commit f8fd6f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/include/FastNoise/Generators/BasicGenerators.h b/include/FastNoise/Generators/BasicGenerators.h
@@ -34,18 +34,19 @@ namespace FastNoise
     public:
         void SetOutputMin( float value )
         {
-            mRangeScale += mRangeMin - value;
+            //mRangeScale += mRangeMin - value;
             mRangeMin = value;
         }
 
         void SetOutputMax( float value )
         {
-            mRangeScale = ( value - mRangeMin );
+            mRangeScale = value;
+            //mRangeScale = ( value - mRangeMin );
         }
 
     protected:
-        float mRangeMin = -1;
-        float mRangeScale = 2;
+        HybridSource mRangeMin = -1;
+        HybridSource mRangeScale = 2;
     };
 
 #ifdef FASTNOISE_METADATA

diff --git a/include/FastNoise/Generators/BasicGenerators.inl b/include/FastNoise/Generators/BasicGenerators.inl
@@ -19,7 +19,10 @@ class FastSIMD::DispatchClass<FastNoise::VariableRange<PARENT>, SIMD> : public v
 protected:
     FS_FORCEINLINE float32v ScaleOutput( float32v value, float nativeMin, float nativeMax ) const
     {
-        return FS::FMulAdd( float32v( 1.0f / ( nativeMax - nativeMin ) ) * float32v( this->mRangeScale ), value - float32v( nativeMin ), float32v( this->mRangeMin ) );
+        float32v rangeMin = this->GetSourceValue( this->mRangeMin, int32v(), float32v(), float32v() );
+        float32v rangeScale = this->GetSourceValue( this->mRangeScale, int32v(), float32v(), float32v() ) - rangeMin;
+
+        return FS::FMulAdd( float32v( 1.0f / ( nativeMax - nativeMin ) ) * rangeScale, value - float32v( nativeMin ), rangeMin );
     }
 };