Merge branch 'master' into ccapture

# Conflicts:
#	README.md

Author: shadielhajj

README.md

@@ -163,7 +163,6 @@ The default is real-time rendering to activate offline rendering set `shader-toy
 
 ### Shared parameters
 
-* `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.
 * `shader-toy.recordTargetFramerate`: Set recording target frame-rate. Default is 30fps.
 * `shader-toy.recordMaxDuration`: Maximum recording duration in seconds. 0 (the default) will keep recording until the record button is pressed again.
 
@@ -201,7 +200,6 @@ Contributions of any kind are welcome and encouraged.
 ## Release Notes
 
 ### 0.11.4
-* Added `shader-toy.forceResolution` (force canvas resolution).
 * Added `shader-toy.recordVideoContainer` (set video file container).
 * Added `shader-toy.recordVideoCodec` (set video codec).
 * Added `shader-toy.recordVideoBitRate` (set recording bit rate).

package.json

@@ -37,22 +37,6 @@
                     ],
                     "description": "Force the rendering into a specific aspect ratio. Set either to zero or negative to ignore."
                 },
-                "shader-toy.forceResolution": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "number"
-                        },
-                        {
-                            "type": "number"
-                        }
-                    ],
-                    "default": [
-                        0,
-                        0
-                    ],
-                    "description": "Force the rendering into a specific resolution. Set either to zero or negative to ignore."
-                },
                 "shader-toy.showCompileErrorsAsDiagnostics": {
                     "type": "boolean",
                     "default": true,
@@ -137,6 +121,7 @@
                 "shader-toy.recordVideoCodec": {
                     "type": "string",
                     "default": "vp8",
+                    "enum": ["vp8", "vp9", "h264", "avc1"],
                     "description": "Video codec. vp8, vp9, h264 and avc1 are all supported. Default it vp8."
                 },
                 "shader-toy.recordVideoBitRate": {

resources/webview_base.html

@@ -410,12 +410,6 @@
         let forcedAspectRatio = forcedAspects[0] / forcedAspects[1];
         let aspectRatio = width / height;
 
-        let forcedResolutions = [<!-- Forced Resolution -->];
-        if (forcedResolutions[0] > 0 && forcedResolutions[1] > 0)
-        {
-            return new THREE.Vector3(forcedResolutions[0], forcedResolutions[1], 1); 
-        }
-
         if (forcedAspectRatio <= 0 || !isFinite(forcedAspectRatio)) {
             let resolution = new THREE.Vector3(width, height, 1.0);
             return resolution;

src/extensions/forced_resolution_extension.ts

@@ -12,4 +12,4 @@ export class RecordVideoCodecExtension implements WebviewExtension {
     public generateContent(): string {
         return `"${this.recordVideoCodec}"`;
     }
-}
+}

src/extensions/user_interface/record_video_codec_extension.ts

@@ -15,7 +15,6 @@ import { InitialFlyControlPositionExtension } from './extensions/initial_fly_con
 import { InitialFlyControlRotationExtension } from './extensions/initial_fly_control_rotation_extension';
 
 import { ForcedAspectExtension } from './extensions/forced_aspect_extension';
-import { ForcedResolutionExtension } from './extensions/forced_resolution_extension';
 import { ForcedScreenshotResolutionExtension } from './extensions/forced_screenshot_resolution_extension';
 
 import { ShaderPreambleExtension } from './extensions/preamble_extension';
@@ -226,13 +225,6 @@ export class WebviewContentProvider {
         const forcedAspectExtension = new ForcedAspectExtension(forcedAspect);
         this.webviewAssembler.addReplaceModule(forcedAspectExtension, 'let forcedAspects = [<!-- Forced Aspect -->];', '<!-- Forced Aspect -->');
 
-        let forcedResolution = this.context.getConfig<[number, number]>('forceResolution');
-        if (forcedResolution === undefined) {
-            forcedResolution = [-1, -1];
-        }
-        const forcedResolutionExtension = new ForcedResolutionExtension(forcedResolution);
-        this.webviewAssembler.addReplaceModule(forcedResolutionExtension, 'let forcedResolutions = [<!-- Forced Resolution -->];', '<!-- Forced Resolution -->');
-
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         // Keyboard
         let keyboardShaderExtension: KeyboardShaderExtension | undefined;