Skip to content

Commit 0bb7adf

Browse files
committed
make use of inv_3f and div2_3f
1 parent f544455 commit 0bb7adf

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/engine/audio/Audio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ namespace Audio {
669669
const float PERCEPTUAL_C = 0.866224835960518f;
670670
const float PERCEPTUAL_D = 0.187108105667604f;
671671

672-
return std::pow(10.0f, (perceptual - PERCEPTUAL_D) / 3.0f) - PERCEPTUAL_C;
672+
return std::pow(10.0f, (perceptual - PERCEPTUAL_D) * Math::inv_3_f) - PERCEPTUAL_C;
673673
}
674674

675675
float SliderToAmplitude(float slider) {

src/engine/renderer/Material.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2232,11 +2232,11 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
22322232

22332233
const float id = ( float ) material.id / ( materialPacks[0].materials.size() + 2 ) + 1;
22342234

2235-
color[0] = std::min( id, 1 / 3.0f ) * 3.0 * colors[int( material.id * 6.0
2235+
color[0] = std::min( id, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22362236
/ materialPacks[0].materials.size() )][0];
2237-
color[1] = Math::Clamp( id - 1 / 3.0, 0.0, 1 / 3.0 ) * 3.0 * colors[int( material.id * 6.0
2237+
color[1] = Math::Clamp( id - Math::inv_3_f, 0.0f, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22382238
/ materialPacks[0].materials.size() )][1];
2239-
color[2] = Math::Clamp( id - 2 / 3.0, 0.0, 1 / 3.0 ) * 3.0 * colors[int( material.id * 6.0
2239+
color[2] = Math::Clamp( id - Math::div2_3_f, 0.0f, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22402240
/ materialPacks[0].materials.size() )][2];
22412241

22422242
break;
@@ -2250,11 +2250,11 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
22502250
const float id = ( float ) ( material.id + 1 )
22512251
/ ( materialPacks[1].materials.size() + materialPacks[2].materials.size() + 2 );
22522252

2253-
color[0] = std::min( id, 1 / 3.0f ) * 3.0 * colors[int( material.id * 6.0
2253+
color[0] = std::min( id, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22542254
/ ( materialPacks[1].materials.size() + materialPacks[2].materials.size() ) )][0];
2255-
color[1] = Math::Clamp( id - 1 / 3.0, 0.0, 1 / 3.0 ) * 3.0 * colors[int( material.id * 6.0
2255+
color[1] = Math::Clamp( id - Math::inv_3_f, 0.0f, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22562256
/ ( materialPacks[1].materials.size() + materialPacks[2].materials.size() ) )][1];
2257-
color[2] = Math::Clamp( id - 2 / 3.0, 0.0, 1 / 3.0 ) * 3.0 * colors[int( material.id * 6.0
2257+
color[2] = Math::Clamp( id - Math::div2_3_f, 0.0f, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22582258
/ ( materialPacks[1].materials.size() + materialPacks[2].materials.size() ) )][2];
22592259

22602260
break;
@@ -2268,11 +2268,11 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
22682268
const float id = ( float ) ( material.id + 1 )
22692269
/ ( materialPacks[1].materials.size() + materialPacks[2].materials.size() + 2 ) + 1;
22702270

2271-
color[0] = std::min( id, 1 / 3.0f ) * 3.0 * colors[int( material.id * 6.0
2271+
color[0] = std::min( id, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22722272
/ ( materialPacks[1].materials.size() + materialPacks[2].materials.size() ) )][0];
2273-
color[1] = Math::Clamp( id - 1 / 3.0, 0.0, 1 / 3.0 ) * 3.0 * colors[int( material.id * 6.0
2273+
color[1] = Math::Clamp( id - Math::inv_3_f, 0.0f, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22742274
/ ( materialPacks[1].materials.size() + materialPacks[2].materials.size() ) )][1];
2275-
color[2] = Math::Clamp( id - 2 / 3.0, 0.0, 1 / 3.0 ) * 3.0 * colors[int( material.id * 6.0
2275+
color[2] = Math::Clamp( id - Math::div2_3_f, 0.0f, Math::inv_3_f ) * 3.0f * colors[int( material.id * 6.0f
22762276
/ ( materialPacks[1].materials.size() + materialPacks[2].materials.size() ) )][2];
22772277

22782278
break;

0 commit comments

Comments
 (0)