From 8b742e43e6eaadecd951be31ed9e51a9958b7485 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 30 Apr 2013 10:15:48 -0700 Subject: [PATCH] =?UTF-8?q?GCC=20fails=20on=20these=20constants=20(ISO=20C?= =?UTF-8?q?++=20forbids=20initialization=20of=20member=20=E2=80=98COLLISIO?= =?UTF-8?q?N=5FBALL=5FFORCE=E2=80=99),=20so=20I=20moved=20them=20into=20th?= =?UTF-8?q?e=20CPP=20(they=20don't=20seem=20to=20require=20external=20visi?= =?UTF-8?q?bility=20anyway).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interface/src/Avatar.cpp | 21 +++++++++++++++++++++ interface/src/Avatar.h | 22 ---------------------- interface/src/AvatarTouch.cpp | 1 + interface/src/AvatarTouch.h | 2 -- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index f6de7f6a77..889a158324 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -22,6 +22,27 @@ using namespace std; const bool BALLS_ON = false; +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; + float skinColor[] = {1.0, 0.84, 0.66}; float lightBlue[] = { 0.7, 0.8, 1.0 }; float browColor[] = {210.0/255.0, 105.0/255.0, 30.0/255.0}; diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h index 0f252af378..0d17b3b2a4 100644 --- a/interface/src/Avatar.h +++ b/interface/src/Avatar.h @@ -145,28 +145,6 @@ public: private: - 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; - struct AvatarBone { AvatarBoneID parent; // which bone is this bone connected to? diff --git a/interface/src/AvatarTouch.cpp b/interface/src/AvatarTouch.cpp index 41e040c382..b26b030b1d 100644 --- a/interface/src/AvatarTouch.cpp +++ b/interface/src/AvatarTouch.cpp @@ -11,6 +11,7 @@ #include "AvatarTouch.h" #include "InterfaceConfig.h" +const float THREAD_RADIUS = 0.007; AvatarTouch::AvatarTouch() { diff --git a/interface/src/AvatarTouch.h b/interface/src/AvatarTouch.h index 46afad6cf5..3c7a58a2b5 100644 --- a/interface/src/AvatarTouch.h +++ b/interface/src/AvatarTouch.h @@ -19,8 +19,6 @@ public: void setYourHandPosition( glm::vec3 position ); void simulate(float deltaTime); void render(); - - const float THREAD_RADIUS = 0.007; private: