From 668e25f9cd5cf9c1352764240389ae392f62fd9d Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Wed, 1 May 2013 11:51:19 -0700 Subject: [PATCH] Fixed merge issue. --- interface/src/Avatar.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 74b605a137..36e9843672 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -20,28 +20,6 @@ using namespace std; -const bool AVATAR_GRAVITY = true; -const float DECAY = 0.1; -const float THRUST_MAG = 1200.0; -const float YAW_MAG = 500.0; //JJV - changed from 300.0; -const float TEST_YAW_DECAY = 5.0; -const float LIN_VEL_DECAY = 5.0; -const float MY_HAND_HOLDING_PULL = 0.2; -const float YOUR_HAND_HOLDING_PULL = 1.0; -const float BODY_SPRING_FORCE = 6.0f; -const float BODY_SPRING_DECAY = 16.0f; - -//const float COLLISION_FRICTION = 0.5; -//const float COLLISION_RADIUS_SCALAR = 1.8; -//const float COLLISION_BALL_FORCE = 0.1; -//const float COLLISION_BODY_FORCE = 3.0; - -const float COLLISION_RADIUS_SCALAR = 1.8; -const float COLLISION_BALL_FORCE = 0.6; -const float COLLISION_BODY_FORCE = 6.0; -const float COLLISION_BALL_FRICTION = 200.0; -const float COLLISION_BODY_FRICTION = 0.5; - const bool BALLS_ON = false; const bool AVATAR_GRAVITY = true;