Skip to content

Commit f727488

Browse files
committed
rename MDL functions
1 parent 70e2bc8 commit f727488

2 files changed

Lines changed: 8 additions & 11 deletions

File tree

source/MaterialXGenMdl/mdl/materialx/noise.mdl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -530,10 +530,7 @@ export float4 mx_fractal2d_noise_float4(
530530
return float4(c.x, c.y, c.z, a);
531531
}
532532

533-
// TODO - do we want to rename these to mx_fractal3D_noise_float - if so where else might things need to be updated
534-
// leaving this refactor out of the current PR for now as I don't have a good MDL test setup.
535-
536-
export float mx_fractal_noise_float(
533+
export float mx_fractal3d_noise_float(
537534
float3 mxp_p = state::transform_point(state::coordinate_internal, state::coordinate_object, state::position()),
538535
int mxp_octaves = 3,
539536
float mxp_lacunarity = 2.0,
@@ -553,7 +550,7 @@ export float mx_fractal_noise_float(
553550
return result;
554551
}
555552

556-
export float3 mx_fractal_noise_float3(
553+
export float3 mx_fractal3d_noise_float3(
557554
float3 mxp_p = state::transform_point(state::coordinate_internal, state::coordinate_object, state::position()),
558555
int mxp_octaves = 3,
559556
float mxp_lacunarity = 2.0,
@@ -573,7 +570,7 @@ export float3 mx_fractal_noise_float3(
573570
return result;
574571
}
575572

576-
export float2 mx_fractal_noise_float2(
573+
export float2 mx_fractal3d_noise_float2(
577574
float3 mxp_p = state::transform_point(state::coordinate_internal, state::coordinate_object, state::position()),
578575
int mxp_octaves = 3,
579576
float mxp_lacunarity = 2.0,
@@ -586,7 +583,7 @@ export float2 mx_fractal_noise_float2(
586583
mx_fractal_noise_float(mxp_p+float3(19, 193, 17), mxp_octaves, mxp_lacunarity, mxp_diminish));
587584
}
588585

589-
export float4 mx_fractal_noise_float4(
586+
export float4 mx_fractal3d_noise_float4(
590587
float3 mxp_p = state::transform_point(state::coordinate_internal, state::coordinate_object, state::position()),
591588
int mxp_octaves = 3,
592589
float mxp_lacunarity = 2.0,

source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4418,7 +4418,7 @@ export float mx_fractal3d_float(
44184418
float3 mxp_position = state::transform_point(state::coordinate_internal, state::coordinate_object, state::position())
44194419
)
44204420
{
4421-
float v = noise::mx_fractal_noise_float(mxp_position, mxp_octaves, mxp_lacunarity, mxp_diminish);
4421+
float v = noise::mx_fractal3d_noise_float(mxp_position, mxp_octaves, mxp_lacunarity, mxp_diminish);
44224422
return v * mxp_amplitude;
44234423
}
44244424

@@ -4430,7 +4430,7 @@ export float2 mx_fractal3d_float2(
44304430
float3 mxp_position = state::transform_point(state::coordinate_internal, state::coordinate_object, state::position())
44314431
)
44324432
{
4433-
float2 v = noise::mx_fractal_noise_float2(mxp_position, mxp_octaves, mxp_lacunarity, mxp_diminish);
4433+
float2 v = noise::mx_fractal3d_noise_float2(mxp_position, mxp_octaves, mxp_lacunarity, mxp_diminish);
44344434
return v * mxp_amplitude;
44354435
}
44364436

@@ -4442,7 +4442,7 @@ export float3 mx_fractal3d_float3(
44424442
float3 mxp_position = state::transform_point(state::coordinate_internal, state::coordinate_object, state::position())
44434443
)
44444444
{
4445-
float3 v = noise::mx_fractal_noise_float3(mxp_position, mxp_octaves, mxp_lacunarity, mxp_diminish);
4445+
float3 v = noise::mx_fractal3d_noise_float3(mxp_position, mxp_octaves, mxp_lacunarity, mxp_diminish);
44464446
return v * mxp_amplitude;
44474447
}
44484448

@@ -4454,7 +4454,7 @@ export float4 mx_fractal3d_float4(
44544454
float3 mxp_position = state::transform_point(state::coordinate_internal, state::coordinate_object, state::position())
44554455
)
44564456
{
4457-
float4 v = noise::mx_fractal_noise_float4(mxp_position, mxp_octaves, mxp_lacunarity, mxp_diminish);
4457+
float4 v = noise::mx_fractal3d_noise_float4(mxp_position, mxp_octaves, mxp_lacunarity, mxp_diminish);
44584458
return v * mxp_amplitude;
44594459
}
44604460

0 commit comments

Comments
 (0)