HardWareTool/SpeedScope
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Take strokeSize out of the rectangel batch renderer

Browse Source
This commit is contained in:
Jamie Wong
2018-01-25 08:48:38 -08:00
parent 47ae01f705
commit 1145c13452
3 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flamechart-minimap-view.tsx
View File

@@ -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
})
}

1
flamechart-view.tsx
View File

@@ -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
})
})

22
rectangle-batch-renderer.ts
View File

@@ -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
}
},