|
@@ -70,16 +70,16 @@
|
|
|
varying vec3 vPosition;
|
|
|
varying vec4 vColor;
|
|
|
|
|
|
- void main() {
|
|
|
+ void main(){
|
|
|
|
|
|
- vPosition = offset * max(abs(sineTime * 2.0 + 1.0), 0.5) + position;
|
|
|
- vec4 orientation = normalize(mix(orientationStart, orientationEnd, sineTime));
|
|
|
- vec3 vcV = cross(orientation.xyz, vPosition);
|
|
|
- vPosition = vcV * (2.0 * orientation.w) + (cross(orientation.xyz, vcV) * 2.0 + vPosition);
|
|
|
+ vPosition = offset * max(abs(sineTime * 2.0 + 1.0), 0.5) + position;
|
|
|
+ vec4 orientation = normalize(mix(orientationStart, orientationEnd, sineTime));
|
|
|
+ vec3 vcV = cross(orientation.xyz, vPosition);
|
|
|
+ vPosition = vcV * (2.0 * orientation.w) + (cross(orientation.xyz, vcV) * 2.0 + vPosition);
|
|
|
|
|
|
- vColor = color;
|
|
|
+ vColor = color;
|
|
|
|
|
|
- gl_Position = projectionMatrix * modelViewMatrix * vec4( vPosition, 1.0 );
|
|
|
+ gl_Position = projectionMatrix * modelViewMatrix * vec4( vPosition, 1.0 );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -94,12 +94,12 @@
|
|
|
varying vec3 vPosition;
|
|
|
varying vec4 vColor;
|
|
|
|
|
|
- void main() {
|
|
|
+ void main() {
|
|
|
|
|
|
- vec4 color = vec4( vColor );
|
|
|
- color.r += sin( vPosition.x * 10.0 + time ) * 0.5;
|
|
|
+ vec4 color = vec4( vColor );
|
|
|
+ color.r += sin( vPosition.x * 10.0 + time ) * 0.5;
|
|
|
|
|
|
- gl_FragColor = color;
|
|
|
+ gl_FragColor = color;
|
|
|
|
|
|
}
|
|
|
|