machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiblock logos & fix regular visualization

Browse Source
This commit is contained in:
Mononaut 2024-09-19 20:50:15 +00:00
parent 3a0edc6133
commit d815ab1830
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
View File

@ -681,10 +681,9 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
// WebGL shader attributes // WebGL shader attributes
const attribs = { const attribs = {
offset: { type: 'FLOAT', count: 2, pointer: null, offset: 0 }, bounds: { type: 'FLOAT', count: 4, pointer: null, offset: 0 },
posX: { type: 'FLOAT', count: 4, pointer: null, offset: 0 }, posX: { type: 'FLOAT', count: 4, pointer: null, offset: 0 },
posY: { type: 'FLOAT', count: 4, pointer: null, offset: 0 }, posY: { type: 'FLOAT', count: 4, pointer: null, offset: 0 },
posR: { type: 'FLOAT', count: 4, pointer: null, offset: 0 },
colR: { type: 'FLOAT', count: 4, pointer: null, offset: 0 }, colR: { type: 'FLOAT', count: 4, pointer: null, offset: 0 },
colG: { type: 'FLOAT', count: 4, pointer: null, offset: 0 }, colG: { type: 'FLOAT', count: 4, pointer: null, offset: 0 },
colB: { type: 'FLOAT', count: 4, pointer: null, offset: 0 }, colB: { type: 'FLOAT', count: 4, pointer: null, offset: 0 },
@ -707,10 +706,9 @@ varying lowp vec4 vColor;
// each attribute contains [x: startValue, y: endValue, z: startTime, w: rate] // each attribute contains [x: startValue, y: endValue, z: startTime, w: rate]
// shader interpolates between start and end values at the given rate, from the given time // shader interpolates between start and end values at the given rate, from the given time
attribute vec2 offset; attribute vec4 bounds;
attribute vec4 posX; attribute vec4 posX;
attribute vec4 posY; attribute vec4 posY;
attribute vec4 posR;
attribute vec4 colR; attribute vec4 colR;
attribute vec4 colG; attribute vec4 colG;
attribute vec4 colB; attribute vec4 colB;
@ -735,10 +733,7 @@ float interpolateAttribute(vec4 attr) {
void main() { void main() {
vec4 screenTransform = vec4(2.0 / screenSize.x, 2.0 / screenSize.y, -1.0, -1.0); vec4 screenTransform = vec4(2.0 / screenSize.x, 2.0 / screenSize.y, -1.0, -1.0);
// vec4 screenTransform = vec4(1.0 / screenSize.x, 1.0 / screenSize.y, -0.5, -0.5); // vec4 screenTransform = vec4(1.0 / screenSize.x, 1.0 / screenSize.y, -0.5, -0.5);
vec2 position = clamp(vec2(interpolateAttribute(posX), interpolateAttribute(posY)), bounds.xy, bounds.zw);
float radius = interpolateAttribute(posR);
vec2 position = vec2(interpolateAttribute(posX), interpolateAttribute(posY)) + (radius * offset);
gl_Position = vec4(position * screenTransform.xy + screenTransform.zw, 1.0, 1.0); gl_Position = vec4(position * screenTransform.xy + screenTransform.zw, 1.0, 1.0);
float red = interpolateAttribute(colR); float red = interpolateAttribute(colR);

2
frontend/src/app/components/eight-blocks/eight-blocks.component.html
View File

@ -18,7 +18,7 @@
<div class="block-container" [style]="containerStyle"> <div class="block-container" [style]="containerStyle">
<div *ngIf="showInfo && blockInfo[i]" class="info" @infoChange> <div *ngIf="showInfo && blockInfo[i]" class="info" @infoChange>
<h1 class="height">{{ blockInfo[i].height }}</h1> <h1 class="height">{{ blockInfo[i].height }}</h1>
<h2 class="mined-by">by {{ blockInfo[i].extras.pool.name || 'Unknown' }}</h2> <h2 class="mined-by">by {{ blockInfo[i].extras.pool.name || 'Unknown' }} <img class="pool-logo" [src]="'/resources/mining-pools/' + blockInfo[i].extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'"> </h2>
</div> </div>
</div> </div>
</div> </div>

8
frontend/src/app/components/eight-blocks/eight-blocks.component.scss
View File

@ -70,3 +70,11 @@
overflow: hidden; overflow: hidden;
} }
} }
.pool-logo {
width: 1.2em;
height: 1.2em;
position: relative;
top: -1px;
margin-right: 2px;
}