From 9278b8a1ab58b6591669db57f0a755eb604a77dd Mon Sep 17 00:00:00 2001 From: Surma Date: Thu, 27 May 2021 11:50:43 +0100 Subject: [PATCH] Move up UASTC/ETC1S dropdown --- codecs/basis/enc/basis_enc.wasm | Bin 1465602 -> 1465525 bytes src/features/encoders/basis/client/index.tsx | 22 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/codecs/basis/enc/basis_enc.wasm b/codecs/basis/enc/basis_enc.wasm index 31ab5f69f61de08f3a8fe3f4c011c7d57c650373..158e42be3d302d717853a2e78cfc52169e14c45b 100755 GIT binary patch delta 7989 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 { const { options } = this.props; const newOptions: EncodeOptions = { - // Copy over options the form doesn't currently care about, eg arithmetic ...this.props.options, - uastc: inputFieldChecked(form.uastc, options.uastc), + uastc: form.mode.value === '1', y_flip: inputFieldChecked(form.y_flip, options.y_flip), perceptual: inputFieldChecked(form.perceptual, options.perceptual), mipmap: inputFieldChecked(form.mipmap, options.mipmap), @@ -67,6 +66,17 @@ export class Options extends Component { return (
+ { {showAdvanced ? (
-