From 1145c13452a471efb548fb56868fdbc3cda1f147 Mon Sep 17 00:00:00 2001
From: Jamie Wong <jamie.lf.wong@gmail.com>
Date: Thu, 25 Jan 2018 08:48:38 -0800
Subject: [PATCH] Take strokeSize out of the rectangel batch renderer

---
 flamechart-minimap-view.tsx |  3 +--
 flamechart-view.tsx         |  1 -
 rectangle-batch-renderer.ts | 22 ++--------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/flamechart-minimap-view.tsx b/flamechart-minimap-view.tsx
index 3e04e37..ed07c6e 100644
--- a/flamechart-minimap-view.tsx
+++ b/flamechart-minimap-view.tsx
@@ -96,9 +96,8 @@ export class FlamechartMinimapView extends Component<FlamechartMinimapViewProps,
         },
         render: (props) => {
           this.props.canvasContext.drawRectangleBatch({
-            configSpaceToNDC: props.configSpaceToNDC,
             physicalSize: props.physicalSize,
-            strokeSize: 0,
+            configSpaceToNDC: props.configSpaceToNDC,
             batch: this.props.rectangles
           })
         }
diff --git a/flamechart-view.tsx b/flamechart-view.tsx
index 829f024..89a3ce0 100644
--- a/flamechart-view.tsx
+++ b/flamechart-view.tsx
@@ -327,7 +327,6 @@ export class FlamechartPanZoomView extends ReloadableComponent<FlamechartPanZoom
       this.props.canvasContext.drawRectangleBatch({
         configSpaceToNDC: configSpaceToNDC,
         physicalSize: this.physicalViewSize(),
-        strokeSize: 1,
         batch: this.props.rectangles
       })
     })
diff --git a/rectangle-batch-renderer.ts b/rectangle-batch-renderer.ts
index 1ce9d30..0ce7ec7 100644
--- a/rectangle-batch-renderer.ts
+++ b/rectangle-batch-renderer.ts
@@ -70,7 +70,6 @@ export class RectangleBatch {
 export interface RectangleBatchRendererProps {
   configSpaceToNDC: AffineTransform
   physicalSize: Vec2
-  strokeSize: number
   batch: RectangleBatch
 }
 
@@ -80,8 +79,6 @@ export class RectangleBatchRenderer {
     this.command = gl({
       vert: `
       uniform mat3 configSpaceToNDC;
-      uniform vec2 physicalSize;
-      uniform float strokeSize;
 
       // Non-instanced
       attribute float corner;
@@ -94,29 +91,20 @@ export class RectangleBatchRenderer {
 
       void main() {
         vColor = color;
-
         vec2 configSpacePos = configSpaceOffset;
-        vec2 physicalSpaceOffset = vec2(0, 0);
 
         // Corners go NW, NE, SW, SE
         if (corner == 0.0) {
-          physicalSpaceOffset = vec2(1, -1);
         } else if (corner == 1.0) {
-          physicalSpaceOffset = vec2(-1, -1);
           configSpacePos.x += configSpaceSize.x;
         } else if (corner == 2.0) {
-          physicalSpaceOffset = vec2(1, 1);
           configSpacePos.y += configSpaceSize.y;
         } else if (corner == 3.0) {
-          physicalSpaceOffset = vec2(-1, 1);
           configSpacePos += configSpaceSize;
         }
 
-        vec2 roundedPosition = (configSpaceToNDC * vec3(configSpacePos, 1)).xy;
-        vec2 halfSize = physicalSize / 2.0;
-        vec2 physicalPixelSize = 2.0 / physicalSize;
-        roundedPosition = floor(roundedPosition * halfSize) / halfSize;
-        gl_Position = vec4(roundedPosition + physicalPixelSize * physicalSpaceOffset * strokeSize, 0, 1);
+        vec2 position = (configSpaceToNDC * vec3(configSpacePos, 1)).xy;
+        gl_Position = vec4(position, 0, 1);
       }
     `,
 
@@ -169,12 +157,6 @@ export class RectangleBatchRenderer {
       uniforms: {
         configSpaceToNDC: (context, props) => {
           return props.configSpaceToNDC.flatten()
-        },
-        physicalSize: (context, props) => {
-          return props.physicalSize.flatten()
-        },
-        strokeSize: (context, props) => {
-          return props.strokeSize
         }
       },