Skip to content

Commit 1161f02

Browse files
committed
sensibalize
1 parent 23cf7c9 commit 1161f02

File tree

4 files changed

+29
-28
lines changed

4 files changed

+29
-28
lines changed

src/components/tw-settings-modal/settings-modal.jsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -294,19 +294,19 @@ const EnableDangerousOptimizations = props => (
294294
/>
295295
);
296296

297-
const OOBRendering = props => (
297+
const disableOffscreenRendering = props => (
298298
<BooleanSetting
299299
{...props}
300300
label={
301301
<FormattedMessage
302-
defaultMessage="Disable Out of Bounds Rendering"
302+
defaultMessage="Disable Off Screen Rendering"
303303
description="Disable Out of Bounds Rendering setting"
304304
id="pm.settingsModal.oobRendering"
305305
/>
306306
}
307307
help={
308308
<FormattedMessage
309-
defaultMessage="When disabled, everything outside the stage will not be rendered."
309+
defaultMessage="When enabled all sprites that are off screen will not be rendered."
310310
description="Out of Bounds Rendering setting help"
311311
id="pm.settingsModal.oobRenderingHelp"
312312
/>
@@ -538,9 +538,9 @@ const SettingsModalComponent = props => (
538538
id="pm.settingsModal.optimizations"
539539
/>
540540
</Header>
541-
<OOBRendering
542-
value={props.oobRendering}
543-
onChange={props.onOobRenderingChange}
541+
<disableOffscreenRendering
542+
value={props.disableOffscreenRendering}
543+
onChange={props.onDisableOffscreenRenderingChange}
544544
/>
545545
<EnableDangerousOptimizations
546546
value={props.dangerousOptimizations}
@@ -614,8 +614,8 @@ SettingsModalComponent.propTypes = {
614614
dangerousOptimizations: PropTypes.bool,
615615
onDisableCompilerChange: PropTypes.func,
616616
onEnableDangerousOptimizationsChange: PropTypes.func,
617-
oobRendering: PropTypes.bool,
618-
onOobRenderingChange: PropTypes.func
617+
disableOffscreenRendering: PropTypes.bool,
618+
onDisableOffscreenRenderingChange: PropTypes.func
619619
};
620620

621621
export default injectIntl(SettingsModalComponent);

src/containers/tw-settings-modal.jsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class UsernameModal extends React.Component {
3333
'handleDisableCompilerChange',
3434
'handleStoreProjectOptions',
3535
'handleEnableDangerousOptimizationsChange',
36-
'handleOobRenderingChange'
36+
'handleDisableOffscreenRenderingChange'
3737
]);
3838
}
3939
handleFramerateChange (e) {
@@ -74,9 +74,9 @@ class UsernameModal extends React.Component {
7474
dangerousOptimizations: e.target.checked
7575
});
7676
}
77-
handleOobRenderingChange (e) {
77+
handleDisableOffscreenRenderingChange (e) {
7878
this.props.vm.setRuntimeOptions({
79-
oobRendering: !e.target.checked
79+
disableOffscreenRendering: e.target.checked
8080
});
8181
}
8282
handleWarpTimerChange (e) {
@@ -97,15 +97,15 @@ class UsernameModal extends React.Component {
9797
}
9898
handleStagePresetUsed (widescreen) {
9999
switch (widescreen) {
100-
case 1:
101-
this.props.vm.setStageSize(640, 360);
102-
break;
103-
case 2:
104-
this.props.vm.setStageSize(360, 360);
105-
break;
106-
default:
107-
this.props.vm.setStageSize(480, 360);
108-
break;
100+
case 1:
101+
this.props.vm.setStageSize(640, 360);
102+
break;
103+
case 2:
104+
this.props.vm.setStageSize(360, 360);
105+
break;
106+
default:
107+
this.props.vm.setStageSize(480, 360);
108+
break;
109109
}
110110
}
111111
handleStoreProjectOptions () {
@@ -130,7 +130,7 @@ class UsernameModal extends React.Component {
130130
onRemoveFencingChange={this.handleRemoveFencingChange}
131131
onRemoveLimitsChange={this.handleRemoveLimitsChange}
132132
onEnableDangerousOptimizationsChange={this.handleEnableDangerousOptimizationsChange}
133-
onOobRenderingChange={this.handleOobRenderingChange}
133+
onDisableOffscreenRenderingChange={this.handleDisableOffscreenRenderingChange}
134134
onWarpTimerChange={this.handleWarpTimerChange}
135135
onStageWidthChange={this.handleStageWidthChange}
136136
onStageHeightChange={this.handleStageHeightChange}
@@ -188,7 +188,7 @@ const mapStateToProps = state => ({
188188
infiniteClones: state.scratchGui.tw.runtimeOptions.maxClones === Infinity,
189189
removeFencing: !state.scratchGui.tw.runtimeOptions.fencing,
190190
removeLimits: !state.scratchGui.tw.runtimeOptions.miscLimits,
191-
oobRendering: !state.scratchGui.tw.runtimeOptions.oobRendering,
191+
disableOffscreenRendering: state.scratchGui.tw.runtimeOptions.disableOffscreenRendering,
192192
dangerousOptimizations: state.scratchGui.tw.runtimeOptions.dangerousOptimizations,
193193
warpTimer: state.scratchGui.tw.compilerOptions.warpTimer,
194194
customStageSize: state.scratchGui.customStageSize,

src/lib/tw-state-manager-hoc.jsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,9 @@ const TWStateManager = function (WrappedComponent) {
399399
});
400400
}
401401

402-
if (urlParams.has('oob')) {
402+
if (urlParams.has('nooffscreen')) {
403403
this.props.vm.setRuntimeOptions({
404-
oobRendering: false
404+
disableOffscreenRendering: true
405405
});
406406
}
407407

@@ -529,8 +529,8 @@ const TWStateManager = function (WrappedComponent) {
529529
searchParams.delete('optimize');
530530
}
531531

532-
if (runtimeOptions.oobRendering) {
533-
searchParams.delete('oob');
532+
if (runtimeOptions.disableOffscreenRendering) {
533+
searchParams.delete('nooffscreen');
534534
} else {
535535
searchParams.set('oob', '');
536536
}
@@ -618,7 +618,8 @@ const TWStateManager = function (WrappedComponent) {
618618
miscLimits: PropTypes.bool,
619619
dangerousOptimizations: PropTypes.bool,
620620
fencing: PropTypes.bool,
621-
maxClones: PropTypes.number
621+
maxClones: PropTypes.number,
622+
disableOffscreenRendering: PropTypes.bool
622623
}),
623624
highQualityPen: PropTypes.bool,
624625
framerate: PropTypes.number,

src/reducers/tw.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const initialState = {
3333
maxClones: 300,
3434
miscLimits: true,
3535
dangerousOptimizations: false,
36-
oobRendering: true,
36+
disableOffscreenRendering: false,
3737
fencing: true
3838
},
3939
isWindowFullScreen: false,

0 commit comments

Comments
 (0)