Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pxt-core",
"version": "12.3.4",
"version": "12.3.5",
"description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors",
"keywords": [
"TypeScript",
Expand Down
12 changes: 9 additions & 3 deletions pxtsim/sound/audioContextManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,15 @@ namespace pxsim.AudioContextManager {
export function setListenerPosition(x: number, y: number, z: number) {
const ctx = context();
if (ctx) {
ctx.listener.positionX.setTargetAtTime(x, 0, 0.02);
ctx.listener.positionY.setTargetAtTime(y, 0, 0.02);
ctx.listener.positionZ.setTargetAtTime(z, 0, 0.02);
// Firefox does not support AudioParam-based positionX/Y/Z on AudioListener.
// Fall back to the deprecated setPosition() method.
if (ctx.listener.positionX) {
ctx.listener.positionX.setTargetAtTime(x, 0, 0.02);
ctx.listener.positionY.setTargetAtTime(y, 0, 0.02);
ctx.listener.positionZ.setTargetAtTime(z, 0, 0.02);
} else {
ctx.listener.setPosition(x, y, z);
}
}
}
}
46 changes: 31 additions & 15 deletions pxtsim/sound/spatialAudioPlayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,20 @@ namespace pxsim.AudioContextManager {
this.panner = new PannerNode(context, {
panningModel: 'HRTF',
distanceModel: "linear",
positionX: 0,
positionY: 0,
positionZ: 0,
orientationX: 0,
orientationY: 0,
orientationZ: -1,
});
// Set initial position/orientation using the compat helpers
// (Firefox doesn't support AudioParam-based position/orientation properties)
setPannerPosition(this.panner, 0, 0, 0);
setPannerOrientation(this.panner, 0, 0, -1);
this.panner.connect(destination);
}

setPosition(x: number, y: number, z: number) {
this.panner.positionX.setTargetAtTime(x, 0, 0.02);
this.panner.positionY.setTargetAtTime(y, 0, 0.02);
this.panner.positionZ.setTargetAtTime(z, 0, 0.02);
setPannerPosition(this.panner, x, y, z);
}

setOrientation(x: number, y: number, z: number) {
this.panner.orientationX.setTargetAtTime(x, 0, 0.02);
this.panner.orientationY.setTargetAtTime(y, 0, 0.02);
this.panner.orientationZ.setTargetAtTime(z, 0, 0.02);
setPannerOrientation(this.panner, x, y, z);
}

setCone(innerAngle: number, outerAngle: number, outerGain: number) {
Expand Down Expand Up @@ -83,9 +77,9 @@ namespace pxsim.AudioContextManager {
}
}

get x(): number { return this.panner.positionX.value; }
get y(): number { return this.panner.positionY.value; }
get z(): number { return this.panner.positionZ.value; }
get x(): number { return this.panner.positionX?.value ?? 0; }
get y(): number { return this.panner.positionY?.value ?? 0; }
get z(): number { return this.panner.positionZ?.value ?? 0; }

dispose() {
this.panner.disconnect();
Expand All @@ -110,4 +104,26 @@ namespace pxsim.AudioContextManager {
await this.audioWorkletSource.playInstructionsAsync(b);
}
}

// Firefox does not support AudioParam-based positionX/Y/Z and orientationX/Y/Z
// on PannerNode or AudioListener. Fall back to the deprecated setPosition()/setOrientation() methods.
function setPannerPosition(panner: PannerNode, x: number, y: number, z: number) {
if (panner.positionX) {
panner.positionX.setTargetAtTime(x, 0, 0.02);
panner.positionY.setTargetAtTime(y, 0, 0.02);
panner.positionZ.setTargetAtTime(z, 0, 0.02);
} else {
panner.setPosition(x, y, z);
}
}

function setPannerOrientation(panner: PannerNode, x: number, y: number, z: number) {
if (panner.orientationX) {
panner.orientationX.setTargetAtTime(x, 0, 0.02);
panner.orientationY.setTargetAtTime(y, 0, 0.02);
panner.orientationZ.setTargetAtTime(z, 0, 0.02);
} else {
panner.setOrientation(x, y, z);
}
}
}
4 changes: 2 additions & 2 deletions webapp/src/editortoolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ export class EditorToolbar extends data.Component<ISettingsProps, EditorToolbarS
const hasUndo = this.props.parent.editor.hasUndo();
const hasRedo = this.props.parent.editor.hasRedo();
return [
<EditorToolbarButton icon='xicon undo' className={`editortools-btn undo-editortools-btn ${!hasUndo ? 'disabled' : ''}`} title={lf("Undo")} ariaLabel={lf("{0}, {1}", lf("Undo"), !hasUndo ? lf("Disabled") : "")} onButtonClick={this.undo} view={this.getViewString(view)} key="undo" />,
<EditorToolbarButton icon='xicon redo' className={`editortools-btn redo-editortools-btn ${!hasRedo ? 'disabled' : ''}`} title={lf("Redo")} ariaLabel={lf("{0}, {1}", lf("Redo"), !hasRedo ? lf("Disabled") : "")} onButtonClick={this.redo} view={this.getViewString(view)} key="redo" />
<EditorToolbarButton icon='xicon undo' className={`editortools-btn undo-editortools-btn ${!hasUndo ? 'disabled' : ''}`} ariaDisabled={!hasUndo} ariaLabel={lf("{0}, {1}", lf("Undo"), !hasUndo ? lf("Disabled") : "")} onButtonClick={this.undo} view={this.getViewString(view)} key="undo" />,
<EditorToolbarButton icon='xicon redo' className={`editortools-btn redo-editortools-btn ${!hasRedo ? 'disabled' : ''}`} ariaDisabled={!hasRedo} ariaLabel={lf("{0}, {1}", lf("Redo"), !hasRedo ? lf("Disabled") : "")} onButtonClick={this.redo} view={this.getViewString(view)} key="redo" />
];
}

Expand Down
2 changes: 2 additions & 0 deletions webapp/src/sui.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ export interface ButtonProps extends UiProps, TooltipUIProps {
id?: string;
title?: string;
ariaLabel?: string;
ariaDisabled?: boolean;
ariaExpanded?: boolean;
onClick?: (e: React.MouseEvent<HTMLElement>) => void;
disabled?: boolean;
Expand Down Expand Up @@ -539,6 +540,7 @@ export class Button extends StatelessUIElement<ButtonProps> {
tabIndex={this.props.tabIndex || 0}
aria-label={this.props.ariaLabel}
aria-expanded={this.props.ariaExpanded}
aria-disabled={this.props.ariaDisabled ?? disabled}
onClick={this.props.onClick}
onKeyDown={this.props.onKeyDown}
autoFocus={this.props.autoFocus}
Expand Down
Loading