jrd/vrtue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting cleanup

Browse Source
This commit is contained in:
Jared Roberts
2016-10-05 14:24:30 -07:00
parent 193e807b6a
commit 708e0b4a16
2 changed files with 112 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/scenes/shader/torus_vertex.glsl
View File

@@ -40,11 +40,4 @@ void main() {
vec3 normal = vec3(toroid(thetaphi, 0, height, height)); vec3 normal = vec3(toroid(thetaphi, 0, height, height));
gl_Position = u_matrix * camera * gl_Position = u_matrix * camera *
vec4(toroid(thetaphi, R1, R2, R1) + a_pos.z * normal, 1.0); vec4(toroid(thetaphi, R1, R2, R1) + a_pos.z * normal, 1.0);
/*
gl_Position = u_matrix * camera *
vec4(R2 * -1.0 * sin(TWO_PI_CIRC * (a_pos.x + treadmill_x)),
(R1 + R2 * cos(TWO_PI_CIRC * (a_pos.x + treadmill_x))) * cos(TWO_PI_CIRC * (a_pos.z + treadmill_y)),
(R1 + R2 * cos(TWO_PI_CIRC * (a_pos.x + treadmill_x))) * sin(TWO_PI_CIRC * (a_pos.z + treadmill_y)),
1.0);
*/
} }