Merge branch 'master' of goat:git/antikythera

diff --combined src/gear.cc
index 44c04d3,e6a5491..6a34815
--- 1/src/gear.cc
--- 2/src/gear.cc
+++ b/src/gear.cc
@@@ -1,3 -1,4 +1,4 @@@
+ #include <stdlib.h>
  #include <GL/glew.h>
  #include "gear.h"
  #include "meshgen.h"
@@@ -8,14 -9,14 +9,14 @@@ Gear::Gear(
  {
        pdist = 0;
        angle = 0;
 -      nteeth = 42;
 -      radius = 80;
        teeth_length = 5;
        thickness = 5;
        bevel = 1.5;
        init_angle = 0;
        xform_valid = false;
  
 +      set_teeth(42, 10);
 +
        supergear = 0;
  
        mesh = 0;
@@@ -78,11 -79,6 +79,11 @@@ float Gear::get_angular_offset() cons
  
  void Gear::set_teeth(int nt, float tooth_pitch)
  {
 +      if(tooth_pitch <= 0) {
 +              tooth_pitch = this->tooth_pitch;
 +      } else {
 +              this->tooth_pitch = tooth_pitch;
 +      }
        float circ = tooth_pitch * nt;
        radius = circ / (2.0 * M_PI);
        nteeth = nt;