1
=== modified file 'examples/eglplasma.c'
2
--- examples/eglplasma.c	2014-03-05 09:26:01 +0000
3
+++ examples/eglplasma.c	2016-05-26 02:13:43 +0000
4
@@ -61,40 +61,23 @@
5
61
61
6
62
    const char fshadersrc[] =
62
    const char fshadersrc[] =
7
63
        "precision mediump float;                                \n"
63
        "precision mediump float;                                \n"
9
64
        "uniform float theta;                                    \n"
64
        "uniform vec4 theta;                                     \n"
10
65
        "varying vec2 texcoord;                                  \n"
65
        "varying vec2 texcoord;                                  \n"
11
66
        "uniform vec3 low_color, high_color;                     \n"
66
        "uniform vec3 low_color, high_color;                     \n"
12
67
        "                                                        \n"
67
        "                                                        \n"
13
68
        "vec3 gradient(float x)                                  \n"
14
69
        "{                                                       \n"
15
70
        "    vec3 col;                                           \n"
16
71
        "    const vec3 white = vec3(1.0, 1.0, 1.0);             \n"
17
72
        "    if (x < 0.333)                                      \n"
18
73
        "        col = x * low_color / 0.333;                    \n"
19
74
        "    else if (x < 0.666)                                 \n"
20
75
        "        col = (x - 0.333) * (high_color - low_color) /  \n"
21
76
        "              0.333 + low_color;                        \n"
22
77
        "    else                                                \n"
23
78
        "        col = (x - 0.666) * (white - high_color) /      \n"
24
79
        "              0.333 + high_color;                       \n"
25
80
        "    return col;                                         \n"
26
81
        "}                                                       \n"
27
82
        "                                                        \n"
28
83
        "void main()                                             \n"
68
        "void main()                                             \n"
29
84
        "{                                                       \n"
69
        "{                                                       \n"
30
85
        "    const float pi2 = 6.283185308;                      \n"
70
        "    const float pi2 = 6.283185308;                      \n"
43
86
        "    float u = texcoord.x * pi2;                         \n"
71
        "    float x = texcoord.x * pi2;                         \n"
44
87
        "    float v = texcoord.y * pi2;                         \n"
72
        "    float y = texcoord.y * pi2;                         \n"
45
88
        "    float us = (cos(1.1 * u + 7.0 * theta) +            \n"
73
        "    float a = cos(1.0 * (x + theta.x));                 \n"
46
89
        "                cos(2.3 * v * cos(1.0 * theta)) +       \n"
74
        "    float b = cos(2.0 * (y + theta.y + a));             \n"
47
90
        "                cos(0.3 * u * cos(3.0 * theta))         \n"
75
        "    float c = cos(2.0 * (2.0*x + theta.z + b));         \n"
48
91
        "               ) / 3.0;                                 \n"
76
        "    float d = cos(1.0 * (3.0*y + theta.w + c));         \n"
49
92
        "    float vs = (cos(2.3 * v + 8.0 * theta) +            \n"
77
        "    float v = (a+b+c+d + 4.0) / 8.0;                    \n"
50
93
        "                cos(1.3 * u * cos(3.0 * theta)) +       \n"
78
        "    vec3 color = v * (high_color - low_color) +         \n"
51
94
        "                cos(1.7 * v * cos(2.0 * theta))         \n"
79
        "                 low_color;                             \n"
52
95
        "               ) / 3.0;                                 \n"
80
        "    gl_FragColor = vec4(color, 1.0);                    \n"
41
96
        "    float x = (us * vs + 1.0) / 2.0;                    \n"
42
97
        "    gl_FragColor = vec4(gradient(x), 1.0);              \n"
53
98
        "}                                                       \n";
81
        "}                                                       \n";
54
99
82
55
100
    const GLfloat vertices[] =
83
    const GLfloat vertices[] =
56
@@ -108,7 +91,7 @@
57
108
    GLuint vshader, fshader, prog;
91
    GLuint vshader, fshader, prog;
58
109
    GLint linked, low_color, high_color, vpos, theta;
92
    GLint linked, low_color, high_color, vpos, theta;
59
110
    unsigned int width = 0, height = 0;
93
    unsigned int width = 0, height = 0;
61
111
    GLfloat angle = 0.0f;
94
    GLfloat angle[4] = {3.1f, 4.1f, 5.9f, 2.6f};
62
112
95
63
113
    if (!mir_eglapp_init(argc, argv, &width, &height))
96
    if (!mir_eglapp_init(argc, argv, &width, &height))
64
114
        return 1;
97
        return 1;
65
@@ -149,10 +132,13 @@
66
149
132
67
150
    while (mir_eglapp_running())
133
    while (mir_eglapp_running())
68
151
    {
134
    {
73
152
        glUniform1f(theta, angle);
135
        glUniform4fv(theta, 1, angle);
74
153
        angle += 0.005f;
136
        angle[0] += 0.00345f;
75
154
        if (angle > pi2)
137
        angle[1] += 0.01947f;
76
155
            angle -= pi2;
138
        angle[2] += 0.03758f;
77
139
        angle[3] += 0.01711f;
78
140
        for (int a = 0; a < 4; ++a)
79
141
            if (angle[a] > pi2) angle[a] -= pi2;
80
156
        glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
142
        glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
81
157
        mir_eglapp_swap_buffers();
143
        mir_eglapp_swap_buffers();
82
158
    }
144
    }
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-05-26
Daniel van Vugt			Approve on 2016-05-26
Andreas Pokorny (community)			Approve on 2016-05-25
Cemil Azizoglu (community)		2016-05-24	Approve on 2016-05-24
Review via email: mp+295564@code.launchpad.net