8966587048

Committed 06 May 2024 08:58AM UTC coverage: 30.969% (-0.03%) from 31.003%

Build # 8966587048

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #13002 from acolombier/feat/slipmode-render

SlipMode waveform visual for RGB GLSL

Run Details

0 of 165 new or added lines in 10 files covered. (0.0%)

14 existing lines in 6 files now uncovered.

31396 of 101379 relevant lines covered (30.97%)

50249.89 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/shaders/slipmodeshader.cpp

#include "shaders/slipmodeshader.h"

using namespace mixxx;

void SlipModeShader::init() {
    QString vertexShaderCode = QStringLiteral(R"--(
#version 150
attribute highp vec4 position; // use vec4 here (will be padded) to assign directly to gl_Position

out highp vec4 vposition;

void main()
{
    vposition = position;
    gl_Position = position;
}
)--");

    QString fragmentShaderCode = QStringLiteral(R"--(
#version 120
uniform highp vec4 color;
uniform highp vec2 borders;
uniform highp vec2 dimension;

in highp vec4 vposition;

void main()
{

    float xBorder = abs(dimension.x * vposition.x);
    float yBorder = dimension.y * vposition.y;
    float upperBoard = borders.x;
    float lowerBoard = borders.y;

    if (yBorder < 0){
        float borderAlpha = max(
            0, 
            lowerBoard + yBorder
        ) / lowerBoard;
        gl_FragColor = vec4(color.xyz, mix(0, color.w, borderAlpha));

    } else if( (xBorder > dimension.x - upperBoard && yBorder >= 0) || yBorder > dimension.y - upperBoard)
    {
        float borderAlpha = max(0, max(
            yBorder - dimension.y, 
            xBorder - dimension.x) + upperBoard) / upperBoard;
        gl_FragColor = vec4(mix(vec3(0, 0, 0), color.rgb, min(color.w, borderAlpha)), 1);
    } else {
        gl_FragColor = vec4(0, 0, 0, 1);
    }
}
)--");

    load(vertexShaderCode, fragmentShaderCode);

    m_positionLocation = attributeLocation("position");
    m_boarderLocation = uniformLocation("borders");
    m_dimensionLocation = uniformLocation("dimension");
    m_colorLocation = uniformLocation("color");
}

1	#include "shaders/slipmodeshader.h"
2
3	using namespace mixxx;
4
NEW 5	void SlipModeShader::init() {	×
NEW 6	QString vertexShaderCode = QStringLiteral(R"--(	×
7	#version 150
8	attribute highp vec4 position; // use vec4 here (will be padded) to assign directly to gl_Position
9
10	out highp vec4 vposition;
11
12	void main()
13	{
14	vposition = position;
15	gl_Position = position;
16	}
17	)--");
18
NEW 19	QString fragmentShaderCode = QStringLiteral(R"--(	×
20	#version 120
21	uniform highp vec4 color;
22	uniform highp vec2 borders;
23	uniform highp vec2 dimension;
24
25	in highp vec4 vposition;
26
27	void main()
28	{
29
30	float xBorder = abs(dimension.x * vposition.x);
31	float yBorder = dimension.y * vposition.y;
32	float upperBoard = borders.x;
33	float lowerBoard = borders.y;
34
35	if (yBorder < 0){
36	float borderAlpha = max(
37	0,
38	lowerBoard + yBorder
39	) / lowerBoard;
40	gl_FragColor = vec4(color.xyz, mix(0, color.w, borderAlpha));
41
42	} else if( (xBorder > dimension.x - upperBoard && yBorder >= 0) \|\| yBorder > dimension.y - upperBoard)
43	{
44	float borderAlpha = max(0, max(
45	yBorder - dimension.y,
46	xBorder - dimension.x) + upperBoard) / upperBoard;
47	gl_FragColor = vec4(mix(vec3(0, 0, 0), color.rgb, min(color.w, borderAlpha)), 1);
48	} else {
49	gl_FragColor = vec4(0, 0, 0, 1);
50	}
51	}
52	)--");
53
NEW 54	load(vertexShaderCode, fragmentShaderCode);	×
55
NEW 56	m_positionLocation = attributeLocation("position");	×
NEW 57	m_boarderLocation = uniformLocation("borders");	×
NEW 58	m_dimensionLocation = uniformLocation("dimension");	×
NEW 59	m_colorLocation = uniformLocation("color");	×
NEW 60	}	×

mixxxdj / mixxx / 8966587048

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous