Skip to content

Commit a961281

Browse files
committed
Rolled back forceResolution.
1 parent ea70189 commit a961281

File tree

5 files changed

+0
-47
lines changed

5 files changed

+0
-47
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ The extension also supports highlighting of compilation errors in the text edito
156156

157157
## Recording Capabilities
158158
The following settings allow to configure recording quality
159-
* `shader-toy.forceResolution`: Set canvas resolution, this will also set the resolution of the recorded video file. By default, the canvas will stretch to fill the entire window.
160159
* `shader-toy.recordVideoContainer`: Set the video file container. Currently only `webm` is supported, but `mp4`support is coming [soon](https://chromestatus.com/feature/5163469011943424).
161160
* `shader-toy.recordVideoCodec`: Set video codec. `vp8`, `vp9`, `h264` and `avc1` are all supported. Default it `vp8`.
162161
* `shader-toy.recordVideoBitRate`: Set recording bit rate in bits/second. Default is 2500000.
@@ -186,7 +185,6 @@ Contributions of any kind are welcome and encouraged.
186185
## Release Notes
187186

188187
### 0.11.4
189-
* Added `shader-toy.forceResolution` (force canvas resolution),
190188
* Added `shader-toy.recordVideoContainer` (set video file container),
191189
* Added `shader-toy.recordVideoCodec` (set video codec),
192190
* Added `shader-toy.recordVideoBitRate` (set recording bit rate),

package.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,6 @@
3737
],
3838
"description": "Force the rendering into a specific aspect ratio. Set either to zero or negative to ignore."
3939
},
40-
"shader-toy.forceResolution": {
41-
"type": "array",
42-
"items": [
43-
{
44-
"type": "number"
45-
},
46-
{
47-
"type": "number"
48-
}
49-
],
50-
"default": [
51-
0,
52-
0
53-
],
54-
"description": "Force the rendering into a specific resolution. Set either to zero or negative to ignore."
55-
},
5640
"shader-toy.showCompileErrorsAsDiagnostics": {
5741
"type": "boolean",
5842
"default": true,

resources/webview_base.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -404,12 +404,6 @@
404404
let forcedAspectRatio = forcedAspects[0] / forcedAspects[1];
405405
let aspectRatio = width / height;
406406

407-
let forcedResolutions = [<!-- Forced Resolution -->];
408-
if (forcedResolutions[0] > 0 && forcedResolutions[1] > 0)
409-
{
410-
return new THREE.Vector3(forcedResolutions[0], forcedResolutions[1], 1);
411-
}
412-
413407
if (forcedAspectRatio <= 0 || !isFinite(forcedAspectRatio)) {
414408
let resolution = new THREE.Vector3(width, height, 1.0);
415409
return resolution;

src/extensions/forced_resolution_extension.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/webviewcontentprovider.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { InitialFlyControlPositionExtension } from './extensions/initial_fly_con
1515
import { InitialFlyControlRotationExtension } from './extensions/initial_fly_control_rotation_extension';
1616

1717
import { ForcedAspectExtension } from './extensions/forced_aspect_extension';
18-
import { ForcedResolutionExtension } from './extensions/forced_resolution_extension';
1918
import { ForcedScreenshotResolutionExtension } from './extensions/forced_screenshot_resolution_extension';
2019

2120
import { ShaderPreambleExtension } from './extensions/preamble_extension';
@@ -223,13 +222,6 @@ export class WebviewContentProvider {
223222
const forcedAspectExtension = new ForcedAspectExtension(forcedAspect);
224223
this.webviewAssembler.addReplaceModule(forcedAspectExtension, 'let forcedAspects = [<!-- Forced Aspect -->];', '<!-- Forced Aspect -->');
225224

226-
let forcedResolution = this.context.getConfig<[number, number]>('forceResolution');
227-
if (forcedResolution === undefined) {
228-
forcedResolution = [-1, -1];
229-
}
230-
const forcedResolutionExtension = new ForcedResolutionExtension(forcedResolution);
231-
this.webviewAssembler.addReplaceModule(forcedResolutionExtension, 'let forcedResolutions = [<!-- Forced Resolution -->];', '<!-- Forced Resolution -->');
232-
233225
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
234226
// Keyboard
235227
let keyboardShaderExtension: KeyboardShaderExtension | undefined;

0 commit comments

Comments
 (0)