kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

warning fix for gcc

Browse Source
This commit is contained in:
Campbell Barton 2011-06-11 15:37:16 +00:00
parent fbd5b4eb53
commit 3d7dc49e3e
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source/gameengine/Physics/Bullet/CcdPhysicsController.h
View File

@ -226,18 +226,43 @@ struct CcdConstructionInfo
CcdConstructionInfo()
: m_localInertiaTensor(1.f, 1.f, 1.f),
:m_localInertiaTensor(1.f, 1.f, 1.f),
m_gravity(0,0,0),
m_scaling(1.f,1.f,1.f),
m_mass(0.f),
m_clamp_vel_min(-1.f),
m_clamp_vel_max(-1.f),
m_clamp_vel_min(-1.f),
m_clamp_vel_max(-1.f),
m_restitution(0.1f),
m_friction(0.5f),
m_linearDamping(0.1f),
m_angularDamping(0.1f),
m_margin(0.06f),
m_gamesoftFlag(0),
m_soft_linStiff(1.f),
m_soft_angStiff(1.f),
m_soft_volume(1.f),
m_soft_viterations(0),
m_soft_piterations(1),
m_soft_diterations(0),
m_soft_citerations(4),
m_soft_kSRHR_CL(0.1f),
m_soft_kSKHR_CL(1.f),
m_soft_kSSHR_CL(0.5f),
m_soft_kSR_SPLT_CL(0.5f),
m_soft_kSK_SPLT_CL(0.5f),
m_soft_kSS_SPLT_CL(0.5f),
m_soft_kVCF(1.f),
m_soft_kDP(0.f),
m_soft_kDG(0.f),
m_soft_kLF(0.f),
m_soft_kPR(0.f),
m_soft_kVC(0.f),
m_soft_kDF(0.2f),
m_soft_kMT(0),
m_soft_kCHR(1.0f),
m_soft_kKHR(0.1f),
m_soft_kSHR(1.0f),
m_soft_kAHR(0.7f),
m_collisionFlags(0),
m_bRigid(false),
m_bSoft(false),
@ -252,38 +277,13 @@ struct CcdConstructionInfo
m_inertiaFactor(1.f),
m_do_anisotropic(false),
m_anisotropicFriction(1.f,1.f,1.f),
m_contactProcessingThreshold(1e10f),
m_soft_linStiff(1.f),
m_soft_angStiff(1.f),
m_soft_volume(1.f),
m_soft_viterations(0),
m_soft_piterations(1),
m_soft_diterations(0),
m_soft_citerations(4),
m_do_fh(false),
m_do_rot_fh(false),
m_fh_spring(0.f),
m_fh_damping(0.f),
m_fh_distance(1.f),
m_fh_normal(false),
m_soft_kVCF(1.f),
m_soft_kDG(0.f),
m_soft_kLF(0.f),
m_soft_kDP(0.f),
m_soft_kPR(0.f),
m_soft_kVC(0.f),
m_soft_kDF(0.2f),
m_soft_kMT(0),
m_soft_kCHR(1.0f),
m_soft_kKHR(0.1f),
m_soft_kSHR(1.0f),
m_soft_kAHR(0.7f),
m_soft_kSRHR_CL(0.1f),
m_soft_kSKHR_CL(1.f),
m_soft_kSSHR_CL(0.5f),
m_soft_kSR_SPLT_CL(0.5f),
m_soft_kSK_SPLT_CL(0.5f),
m_soft_kSS_SPLT_CL(0.5f)
m_contactProcessingThreshold(1e10f)
{
}