[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55582] trunk/blender: SVN maintenance.
gsr b3d
gsr.b3d at infernal-iceberg.com
Tue Mar 26 02:16:58 CET 2013
Revision: 55582
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55582
Author: gsrb3d
Date: 2013-03-26 01:16:58 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
SVN maintenance.
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
trunk/blender/release/scripts/presets/interaction/3dsmax.py
trunk/blender/release/scripts/presets/keyconfig/3dsmax.py
Property Changed:
----------------
trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
trunk/blender/doc/python_api/examples/bpy.types.NodeTree.py
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
trunk/blender/extern/bullet2/src/LinearMath/btPolarDecomposition.cpp
trunk/blender/extern/bullet2/src/LinearMath/btPolarDecomposition.h
trunk/blender/extern/bullet2/src/LinearMath/btVector3.cpp
trunk/blender/extern/libmv/libmv/multiview/panography.h
trunk/blender/extern/wcwidth/CMakeLists.txt
trunk/blender/extern/wcwidth/SConscript
trunk/blender/extern/wcwidth/wcwidth.c
trunk/blender/extern/wcwidth/wcwidth.h
trunk/blender/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
trunk/blender/release/scripts/presets/interaction/3dsmax.py
trunk/blender/release/scripts/presets/keyconfig/3dsmax.py
trunk/blender/release/scripts/templates_py/custom_nodes.py
trunk/blender/source/blender/gpu/GPU_simple_shader.h
trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c
Property changes on: trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/doc/python_api/examples/bpy.types.NodeTree.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h 2013-03-26 00:36:43 UTC (rev 55581)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h 2013-03-26 01:16:58 UTC (rev 55582)
@@ -1,43 +1,43 @@
-#ifndef BT_COLLISION_OBJECT_WRAPPER_H
-#define BT_COLLISION_OBJECT_WRAPPER_H
-
-///btCollisionObjectWrapperis an internal data structure.
-///Most users can ignore this and use btCollisionObject and btCollisionShape instead
-class btCollisionShape;
-class btCollisionObject;
-class btTransform;
-#include "LinearMath/btScalar.h" // for SIMD_FORCE_INLINE definition
-
-#define BT_DECLARE_STACK_ONLY_OBJECT \
- private: \
- void* operator new(size_t size); \
- void operator delete(void*);
-
-struct btCollisionObjectWrapper;
-struct btCollisionObjectWrapper
-{
-BT_DECLARE_STACK_ONLY_OBJECT
-
-private:
- btCollisionObjectWrapper(const btCollisionObjectWrapper&); // not implemented. Not allowed.
- btCollisionObjectWrapper* operator=(const btCollisionObjectWrapper&);
-
-public:
- const btCollisionObjectWrapper* m_parent;
- const btCollisionShape* m_shape;
- const btCollisionObject* m_collisionObject;
- const btTransform& m_worldTransform;
- int m_partId;
- int m_index;
-
- btCollisionObjectWrapper(const btCollisionObjectWrapper* parent, const btCollisionShape* shape, const btCollisionObject* collisionObject, const btTransform& worldTransform, int partId, int index)
- : m_parent(parent), m_shape(shape), m_collisionObject(collisionObject), m_worldTransform(worldTransform),
- m_partId(partId), m_index(index)
- {}
-
- SIMD_FORCE_INLINE const btTransform& getWorldTransform() const { return m_worldTransform; }
- SIMD_FORCE_INLINE const btCollisionObject* getCollisionObject() const { return m_collisionObject; }
- SIMD_FORCE_INLINE const btCollisionShape* getCollisionShape() const { return m_shape; }
-};
-
-#endif //BT_COLLISION_OBJECT_WRAPPER_H
+#ifndef BT_COLLISION_OBJECT_WRAPPER_H
+#define BT_COLLISION_OBJECT_WRAPPER_H
+
+///btCollisionObjectWrapperis an internal data structure.
+///Most users can ignore this and use btCollisionObject and btCollisionShape instead
+class btCollisionShape;
+class btCollisionObject;
+class btTransform;
+#include "LinearMath/btScalar.h" // for SIMD_FORCE_INLINE definition
+
+#define BT_DECLARE_STACK_ONLY_OBJECT \
+ private: \
+ void* operator new(size_t size); \
+ void operator delete(void*);
+
+struct btCollisionObjectWrapper;
+struct btCollisionObjectWrapper
+{
+BT_DECLARE_STACK_ONLY_OBJECT
+
+private:
+ btCollisionObjectWrapper(const btCollisionObjectWrapper&); // not implemented. Not allowed.
+ btCollisionObjectWrapper* operator=(const btCollisionObjectWrapper&);
+
+public:
+ const btCollisionObjectWrapper* m_parent;
+ const btCollisionShape* m_shape;
+ const btCollisionObject* m_collisionObject;
+ const btTransform& m_worldTransform;
+ int m_partId;
+ int m_index;
+
+ btCollisionObjectWrapper(const btCollisionObjectWrapper* parent, const btCollisionShape* shape, const btCollisionObject* collisionObject, const btTransform& worldTransform, int partId, int index)
+ : m_parent(parent), m_shape(shape), m_collisionObject(collisionObject), m_worldTransform(worldTransform),
+ m_partId(partId), m_index(index)
+ {}
+
+ SIMD_FORCE_INLINE const btTransform& getWorldTransform() const { return m_worldTransform; }
+ SIMD_FORCE_INLINE const btCollisionObject* getCollisionObject() const { return m_collisionObject; }
+ SIMD_FORCE_INLINE const btCollisionShape* getCollisionShape() const { return m_shape; }
+};
+
+#endif //BT_COLLISION_OBJECT_WRAPPER_H
Property changes on: trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp 2013-03-26 00:36:43 UTC (rev 55581)
+++ trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp 2013-03-26 01:16:58 UTC (rev 55582)
@@ -1,54 +1,54 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2012 Advanced Micro Devices, Inc. http://bulletphysics.org
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/// Implemented by Erwin Coumans. The idea for the constraint comes from Dimitris Papavasiliou.
-
-#include "btGearConstraint.h"
-
-btGearConstraint::btGearConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& axisInA,const btVector3& axisInB, btScalar ratio)
-:btTypedConstraint(GEAR_CONSTRAINT_TYPE,rbA,rbB),
-m_axisInA(axisInA),
-m_axisInB(axisInB),
-m_ratio(ratio)
-{
-}
-
-btGearConstraint::~btGearConstraint ()
-{
-}
-
-void btGearConstraint::getInfo1 (btConstraintInfo1* info)
-{
- info->m_numConstraintRows = 1;
- info->nub = 1;
-}
-
-void btGearConstraint::getInfo2 (btConstraintInfo2* info)
-{
- btVector3 globalAxisA, globalAxisB;
-
- globalAxisA = m_rbA.getWorldTransform().getBasis()*this->m_axisInA;
- globalAxisB = m_rbB.getWorldTransform().getBasis()*this->m_axisInB;
-
- info->m_J1angularAxis[0] = globalAxisA[0];
- info->m_J1angularAxis[1] = globalAxisA[1];
- info->m_J1angularAxis[2] = globalAxisA[2];
-
- info->m_J2angularAxis[0] = m_ratio*globalAxisB[0];
- info->m_J2angularAxis[1] = m_ratio*globalAxisB[1];
- info->m_J2angularAxis[2] = m_ratio*globalAxisB[2];
-
-}
-
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2012 Advanced Micro Devices, Inc. http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// Implemented by Erwin Coumans. The idea for the constraint comes from Dimitris Papavasiliou.
+
+#include "btGearConstraint.h"
+
+btGearConstraint::btGearConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& axisInA,const btVector3& axisInB, btScalar ratio)
+:btTypedConstraint(GEAR_CONSTRAINT_TYPE,rbA,rbB),
+m_axisInA(axisInA),
+m_axisInB(axisInB),
+m_ratio(ratio)
+{
+}
+
+btGearConstraint::~btGearConstraint ()
+{
+}
+
+void btGearConstraint::getInfo1 (btConstraintInfo1* info)
+{
+ info->m_numConstraintRows = 1;
+ info->nub = 1;
+}
+
+void btGearConstraint::getInfo2 (btConstraintInfo2* info)
+{
+ btVector3 globalAxisA, globalAxisB;
+
+ globalAxisA = m_rbA.getWorldTransform().getBasis()*this->m_axisInA;
+ globalAxisB = m_rbB.getWorldTransform().getBasis()*this->m_axisInB;
+
+ info->m_J1angularAxis[0] = globalAxisA[0];
+ info->m_J1angularAxis[1] = globalAxisA[1];
+ info->m_J1angularAxis[2] = globalAxisA[2];
+
+ info->m_J2angularAxis[0] = m_ratio*globalAxisB[0];
+ info->m_J2angularAxis[1] = m_ratio*globalAxisB[1];
+ info->m_J2angularAxis[2] = m_ratio*globalAxisB[2];
+
+}
+
Property changes on: trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
===================================================================
--- trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h 2013-03-26 00:36:43 UTC (rev 55581)
+++ trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h 2013-03-26 01:16:58 UTC (rev 55582)
@@ -1,56 +1,56 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2012 Advanced Micro Devices, Inc. http://bulletphysics.org
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list