diff --git a/src/operators/sdf2d/roundedRectangleSdf2d.glsl b/src/operators/sdf2d/roundedRectangleSdf2d.glsl index 7a9b256a7..928773743 100644 --- a/src/operators/sdf2d/roundedRectangleSdf2d.glsl +++ b/src/operators/sdf2d/roundedRectangleSdf2d.glsl @@ -7,6 +7,7 @@ ReturnT thismap(CoordT p, ContextT ctx) { #ifdef THIS_HAS_INPUT_roundingField r *= inputOp_roundingField(p, ctx); #endif + ROUNDNESS_UNIT_BODY(); ReturnT res = createSdf(sdRoundedBox(p, s, r)); #ifdef RAYTK_USE_UV assignUV(res, vec3(map01(p, -s/2., s/2.), 0.)); diff --git a/src/operators/sdf2d/roundedRectangleSdf2d.tox b/src/operators/sdf2d/roundedRectangleSdf2d.tox index ac004f7c3..b1e33ce3b 100644 Binary files a/src/operators/sdf2d/roundedRectangleSdf2d.tox and b/src/operators/sdf2d/roundedRectangleSdf2d.tox differ diff --git a/src/operators/sdf2d/roundedRectangleSdf2d.yaml b/src/operators/sdf2d/roundedRectangleSdf2d.yaml index baadcc105..e7b8f4506 100644 --- a/src/operators/sdf2d/roundedRectangleSdf2d.yaml +++ b/src/operators/sdf2d/roundedRectangleSdf2d.yaml @@ -1,7 +1,7 @@ !rop meta: !meta opType: raytk.operators.sdf2d.roundedRectangleSdf2d - opVersion: '8' + opVersion: '9' opStatus: default opDef: !def enable: true @@ -39,3 +39,19 @@ inputs: returnType: !returnT Returntypefloat: true Returntypevec4: true +elements: +- !opElement + name: codeSwitcher_Roundnessunit + elementType: codeSwitcher + params: + Elementroot: '' + Table: !table + file: src/operators/sdf2d/roundedRectangleSdf2d_roundnessUnits.txt + name: roundnessUnits + Param: Roundnessunit + Autoupdateparams: true + Manageparamstates: false + Alwaysincludeallparams: false + Switchmode: inline + Indexexpr: '' + Placeholder: ROUNDNESS_UNIT_BODY(); diff --git a/src/operators/sdf2d/roundedRectangleSdf2d_roundnessUnits.txt b/src/operators/sdf2d/roundedRectangleSdf2d_roundnessUnits.txt new file mode 100644 index 000000000..1b1ec56cf --- /dev/null +++ b/src/operators/sdf2d/roundedRectangleSdf2d_roundnessUnits.txt @@ -0,0 +1,3 @@ +name label code +dist Distance +ratio Ratio of Scale r *= vmin(s); diff --git a/tests/testCases/operators/sdf2d/roundedRectangleSdf2d_test.tox b/tests/testCases/operators/sdf2d/roundedRectangleSdf2d_test.tox index 0ebdc2988..106a3d1d4 100644 Binary files a/tests/testCases/operators/sdf2d/roundedRectangleSdf2d_test.tox and b/tests/testCases/operators/sdf2d/roundedRectangleSdf2d_test.tox differ