From 562851fd6e91fbdbe8919610af93a0d307dc3119 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 17 Oct 2017 11:58:03 -0700 Subject: [PATCH] Lint against long lines --- demo/client/src/camera.ts | 7 +++++-- demo/client/src/renderer.ts | 3 ++- demo/client/src/svg-demo.ts | 3 ++- demo/client/src/text-renderer.ts | 8 ++++++-- demo/client/src/xcaa-strategy.ts | 12 ++++++++---- demo/client/tslint.json | 3 ++- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/demo/client/src/camera.ts b/demo/client/src/camera.ts index 917ceaaf..047a4910 100644 --- a/demo/client/src/camera.ts +++ b/demo/client/src/camera.ts @@ -352,7 +352,9 @@ export class PerspectiveCamera extends Camera { let empty = true; for (const key of KEYCODES) { if (this.wasdPress[key]) { - glmatrix.vec3.add(this.movementDelta, this.movementDelta, PERSPECTIVE_MOVEMENT_VECTORS[key]); + glmatrix.vec3.add(this.movementDelta, + this.movementDelta, + PERSPECTIVE_MOVEMENT_VECTORS[key]); empty = false; } } @@ -361,7 +363,8 @@ export class PerspectiveCamera extends Camera { private startMoving(): void { if (this.movementInterval == null) - this.movementInterval = window.setInterval(() => this.move(), PERSPECTIVE_MOVEMENT_INTERVAL_DELAY); + this.movementInterval = window.setInterval(() => this.move(), + PERSPECTIVE_MOVEMENT_INTERVAL_DELAY); } private stopMoving(): void { diff --git a/demo/client/src/renderer.ts b/demo/client/src/renderer.ts index 8f2cd993..3f20d420 100644 --- a/demo/client/src/renderer.ts +++ b/demo/client/src/renderer.ts @@ -295,7 +295,8 @@ export abstract class Renderer { // TODO(pcwalton): Cache these. const directInteriorProgram = renderContext.shaderPrograms[this.directInteriorProgramName]; - const implicitCoverInteriorVAO = renderContext.vertexArrayObjectExt.createVertexArrayOES(); + const implicitCoverInteriorVAO = renderContext.vertexArrayObjectExt + .createVertexArrayOES(); renderContext.vertexArrayObjectExt.bindVertexArrayOES(implicitCoverInteriorVAO); this.initImplicitCoverInteriorVAO(objectIndex); diff --git a/demo/client/src/svg-demo.ts b/demo/client/src/svg-demo.ts index a9ec8001..76b762d8 100644 --- a/demo/client/src/svg-demo.ts +++ b/demo/client/src/svg-demo.ts @@ -188,7 +188,8 @@ class SVGDemoRenderer extends Renderer { } protected newTimingsReceived(): void { - this.renderContext.appController.newTimingsReceived(_.pick(this.lastTimings, ['rendering'])); + this.renderContext.appController.newTimingsReceived(_.pick(this.lastTimings, + ['rendering'])); } protected pathColorsForObject(objectIndex: number): Uint8Array { diff --git a/demo/client/src/text-renderer.ts b/demo/client/src/text-renderer.ts index ca6ea393..62bb5fd3 100644 --- a/demo/client/src/text-renderer.ts +++ b/demo/client/src/text-renderer.ts @@ -15,7 +15,8 @@ import {AntialiasingStrategy, AntialiasingStrategyName, NoAAStrategy} from './aa import {StemDarkeningMode, SubpixelAAType} from './aa-strategy'; import {Atlas, ATLAS_SIZE, AtlasGlyph, GlyphKey, SUBPIXEL_GRANULARITY} from './atlas'; import {OrthographicCamera} from './camera'; -import {createFramebuffer, createFramebufferDepthTexture, QUAD_ELEMENTS, UniformMap} from './gl-utils'; +import {createFramebuffer, createFramebufferDepthTexture, QUAD_ELEMENTS} from './gl-utils'; +import {UniformMap} from './gl-utils'; import {Renderer} from './renderer'; import {ShaderMap} from './shader-loader'; import SSAAStrategy from './ssaa-strategy'; @@ -241,7 +242,10 @@ export class TextRenderer extends Renderer { protected compositeIfNecessary() { // Set up composite state. this.renderContext.gl.bindFramebuffer(this.renderContext.gl.FRAMEBUFFER, null); - this.renderContext.gl.viewport(0, 0, this.renderContext.canvas.width, this.renderContext.canvas.height); + this.renderContext.gl.viewport(0, + 0, + this.renderContext.canvas.width, + this.renderContext.canvas.height); this.renderContext.gl.disable(this.renderContext.gl.DEPTH_TEST); this.renderContext.gl.disable(this.renderContext.gl.SCISSOR_TEST); this.renderContext.gl.blendEquation(this.renderContext.gl.FUNC_ADD); diff --git a/demo/client/src/xcaa-strategy.ts b/demo/client/src/xcaa-strategy.ts index a6a9bee6..0fdafab4 100644 --- a/demo/client/src/xcaa-strategy.ts +++ b/demo/client/src/xcaa-strategy.ts @@ -361,7 +361,8 @@ export abstract class MCAAStrategy extends XCAAStrategy { const coverProgram = renderContext.shaderPrograms.mcaaCover; const attributes = coverProgram.attributes; renderContext.gl.useProgram(coverProgram.program); - renderContext.gl.bindBuffer(renderContext.gl.ARRAY_BUFFER, renderContext.quadPositionsBuffer); + renderContext.gl.bindBuffer(renderContext.gl.ARRAY_BUFFER, + renderContext.quadPositionsBuffer); renderContext.gl.vertexAttribPointer(attributes.aQuadPosition, 2, renderContext.gl.FLOAT, @@ -545,7 +546,8 @@ export abstract class MCAAStrategy extends XCAAStrategy { .vertexAttribDivisorANGLE(attributes.aRightPosition, 1); renderContext.instancedArraysExt.vertexAttribDivisorANGLE(attributes.aPathID, 1); - renderContext.gl.bindBuffer(renderContext.gl.ELEMENT_ARRAY_BUFFER, renderContext.quadElementsBuffer); + renderContext.gl.bindBuffer(renderContext.gl.ELEMENT_ARRAY_BUFFER, + renderContext.quadElementsBuffer); vaos[direction] = vao; } @@ -791,7 +793,8 @@ export class ECAAStrategy extends XCAAStrategy { renderContext.instancedArraysExt.vertexAttribDivisorANGLE(attributes.aLeftNormalAngle, 1); renderContext.instancedArraysExt.vertexAttribDivisorANGLE(attributes.aRightNormalAngle, 1); - renderContext.gl.bindBuffer(renderContext.gl.ELEMENT_ARRAY_BUFFER, renderContext.quadElementsBuffer); + renderContext.gl.bindBuffer(renderContext.gl.ELEMENT_ARRAY_BUFFER, + renderContext.quadElementsBuffer); renderContext.vertexArrayObjectExt.bindVertexArrayOES(null); @@ -812,7 +815,8 @@ export class ECAAStrategy extends XCAAStrategy { const curveNormalsBuffer = renderer.meshes[0].segmentCurveNormals; renderContext.gl.useProgram(curveProgram.program); - renderContext.gl.bindBuffer(renderContext.gl.ARRAY_BUFFER, renderContext.quadPositionsBuffer); + renderContext.gl.bindBuffer(renderContext.gl.ARRAY_BUFFER, + renderContext.quadPositionsBuffer); renderContext.gl.vertexAttribPointer(attributes.aQuadPosition, 2, renderContext.gl.FLOAT, diff --git a/demo/client/tslint.json b/demo/client/tslint.json index 84215060..552e7c09 100644 --- a/demo/client/tslint.json +++ b/demo/client/tslint.json @@ -21,7 +21,8 @@ "new-parens": false, "no-conditional-assignment": false, "no-shadowed-variable": false, - "no-var-requires": false + "no-var-requires": false, + "max-line-length": [true, 100] }, "rulesDirectory": [] } \ No newline at end of file