Skip to content

Commit

Permalink
Finalised stuff. Fin Ende
Browse files Browse the repository at this point in the history
  • Loading branch information
ranveeraggarwal committed Oct 3, 2014
1 parent 80e6690 commit c909a27
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#TRANSFORMER
The report for this bot can be found at http://www.cse.iitb.ac.in/~ranveer/graphics_2_1/

##Movements
The components of the transformer's body are mapped to keys. Pressing one of these keys will activate the corresponding component.
Expand Down
2 changes: 1 addition & 1 deletion body_draw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ double body::shoulder_x_max = 135;
double body::shoulder_y_min = 0;
double body::shoulder_y_max = 135;
double body::shoulder_z_min = -225;
double body::shoulder_z_max = 0;
double body::shoulder_z_max = 225;

double body::waist_x_min = 0;
double body::waist_x_max = 180;
Expand Down
6 changes: 3 additions & 3 deletions body_manip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,10 @@ void body::move_left_hip_y(double t)
void body::move_left_hip_z(double t)
{
double new_t = left_hip_z + t;
if(new_t > hip_z_max)
if(new_t < hip_z_max)
new_t = hip_z_max;
else if(new_t < hip_z_min)
new_t = hip_z_min;
else if(new_t > -hip_z_min)
new_t = -hip_z_min;
left_hip_z = new_t;
}

Expand Down
10 changes: 5 additions & 5 deletions transformer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ int main(int argc, char** argv)
std::cerr<<"GLEW Init Failed : %s"<<std::endl;
}
glViewport(0, 0, 640, 480);
//Print and see what context got enabled
std::cout<<"Vendor: "<<glGetString (GL_VENDOR)<<std::endl;
std::cout<<"Renderer: "<<glGetString (GL_RENDERER)<<std::endl;
std::cout<<"Version: "<<glGetString (GL_VERSION)<<std::endl;
std::cout<<"GLSL Version: "<<glGetString (GL_SHADING_LANGUAGE_VERSION)<<std::endl;
std::cout << "\n";
std::cout << "▀▀█▀▀ ▒█▀▀█ ░█▀▀█ ▒█▄░▒█ ▒█▀▀▀█ ▒█▀▀▀ ▒█▀▀▀█ ▒█▀▀█ ▒█▀▄▀█ ▒█▀▀▀ ▒█▀▀█\n";
std::cout << "░▒█░░ ▒█▄▄▀ ▒█▄▄█ ▒█▒█▒█ ░▀▀▀▄▄ ▒█▀▀▀ ▒█░░▒█ ▒█▄▄▀ ▒█▒█▒█ ▒█▀▀▀ ▒█▄▄▀\n";
std::cout << "░▒█░░ ▒█░▒█ ▒█░▒█ ▒█░░▀█ ▒█▄▄▄█ ▒█░░░ ▒█▄▄▄█ ▒█░▒█ ▒█░░▒█ ▒█▄▄▄ ▒█░▒█\n";
std::cout << "\n";

//Keyboard Callback
glfwSetKeyCallback(window, transpace::key_callback);
Expand Down

0 comments on commit c909a27

Please sign in to comment.