Revision: 21183
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21183
Author: ben2610
Date: 2009-06-27 12:39:03 +0200 (Sat, 27 Jun 2009)
Log Message:
-----------
svn merge -r 20622:21181
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/ge_dev/SConstruct
branches/ge_dev/config/win32-vc-config.py
branches/ge_dev/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/ge_dev/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/ge_dev/extern/ffmpeg/libavformat/dv.c
branches/ge_dev/projectfiles_vc9/blender/blender.vcproj
branches/ge_dev/projectfiles_vc9/blender/nodes/nodes.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/ge_dev/release/VERSION
branches/ge_dev/release/datafiles/splash.jpg
branches/ge_dev/release/scripts/bpymodules/dxfLibrary.py
branches/ge_dev/release/scripts/bvh_import.py
branches/ge_dev/release/scripts/export_dxf.py
branches/ge_dev/release/scripts/export_fbx.py
branches/ge_dev/release/scripts/export_obj.py
branches/ge_dev/release/scripts/flt_properties.py
branches/ge_dev/release/scripts/import_dxf.py
branches/ge_dev/release/scripts/import_obj.py
branches/ge_dev/release/scripts/textplugin_convert_ge.py
branches/ge_dev/release/scripts/vertexpaint_selfshadow_ao.py
branches/ge_dev/release/scripts/wizard_bolt_factory.py
branches/ge_dev/release/windows/extra/python26.zip
branches/ge_dev/release/windows/installer/00.sconsblender.nsi
branches/ge_dev/source/blender/avi/intern/avi.c
branches/ge_dev/source/blender/blenkernel/BKE_blender.h
branches/ge_dev/source/blender/blenkernel/BKE_displist.h
branches/ge_dev/source/blender/blenkernel/BKE_modifier.h
branches/ge_dev/source/blender/blenkernel/BKE_node.h
branches/ge_dev/source/blender/blenkernel/BKE_softbody.h
branches/ge_dev/source/blender/blenkernel/intern/BME_tools.c
branches/ge_dev/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_dev/source/blender/blenkernel/intern/action.c
branches/ge_dev/source/blender/blenkernel/intern/displist.c
branches/ge_dev/source/blender/blenkernel/intern/effect.c
branches/ge_dev/source/blender/blenkernel/intern/modifier.c
branches/ge_dev/source/blender/blenkernel/intern/node.c
branches/ge_dev/source/blender/blenkernel/intern/particle.c
branches/ge_dev/source/blender/blenkernel/intern/particle_system.c
branches/ge_dev/source/blender/blenkernel/intern/scene.c
branches/ge_dev/source/blender/blenkernel/intern/softbody.c
branches/ge_dev/source/blender/blenlib/intern/freetypefont.c
branches/ge_dev/source/blender/blenloader/intern/readfile.c
branches/ge_dev/source/blender/gpu/intern/gpu_extensions.c
branches/ge_dev/source/blender/gpu/intern/gpu_material.c
branches/ge_dev/source/blender/imbuf/intern/anim.c
branches/ge_dev/source/blender/imbuf/intern/radiance_hdr.c
branches/ge_dev/source/blender/imbuf/intern/util.c
branches/ge_dev/source/blender/include/BSE_sequence.h
branches/ge_dev/source/blender/include/butspace.h
branches/ge_dev/source/blender/makesdna/DNA_object_force.h
branches/ge_dev/source/blender/makesdna/DNA_sequence_types.h
branches/ge_dev/source/blender/nodes/TEX_node.h
branches/ge_dev/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
branches/ge_dev/source/blender/python/BPY_menus.c
branches/ge_dev/source/blender/python/api2_2x/BGL.c
branches/ge_dev/source/blender/python/api2_2x/Geometry.c
branches/ge_dev/source/blender/python/api2_2x/Material.c
branches/ge_dev/source/blender/python/api2_2x/Mathutils.c
branches/ge_dev/source/blender/python/api2_2x/Object.c
branches/ge_dev/source/blender/python/api2_2x/Particle.c
branches/ge_dev/source/blender/python/api2_2x/bpy_config.c
branches/ge_dev/source/blender/python/api2_2x/doc/BGL.py
branches/ge_dev/source/blender/python/api2_2x/doc/Geometry.py
branches/ge_dev/source/blender/python/api2_2x/doc/Material.py
branches/ge_dev/source/blender/python/api2_2x/doc/Mathutils.py
branches/ge_dev/source/blender/python/api2_2x/doc/Particle.py
branches/ge_dev/source/blender/python/api2_2x/euler.c
branches/ge_dev/source/blender/python/api2_2x/quat.c
branches/ge_dev/source/blender/python/api2_2x/sceneRender.c
branches/ge_dev/source/blender/render/intern/source/convertblender.c
branches/ge_dev/source/blender/render/intern/source/shadeoutput.c
branches/ge_dev/source/blender/render/intern/source/texture.c
branches/ge_dev/source/blender/src/booleanops.c
branches/ge_dev/source/blender/src/buttons_editing.c
branches/ge_dev/source/blender/src/buttons_logic.c
branches/ge_dev/source/blender/src/buttons_object.c
branches/ge_dev/source/blender/src/buttons_scene.c
branches/ge_dev/source/blender/src/drawseq.c
branches/ge_dev/source/blender/src/editparticle.c
branches/ge_dev/source/blender/src/editseq.c
branches/ge_dev/source/blender/src/hddaudio.c
branches/ge_dev/source/blender/src/header_info.c
branches/ge_dev/source/blender/src/header_node.c
branches/ge_dev/source/blender/src/header_seq.c
branches/ge_dev/source/blender/src/headerbuttons.c
branches/ge_dev/source/blender/src/poseobject.c
branches/ge_dev/source/blender/src/seqaudio.c
branches/ge_dev/source/blender/src/seqeffects.c
branches/ge_dev/source/blender/src/sequence.c
branches/ge_dev/source/blender/src/space.c
branches/ge_dev/source/blender/src/splash.jpg.c
branches/ge_dev/source/creator/creator.c
branches/ge_dev/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/ge_dev/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/ge_dev/source/gameengine/Converter/BL_ActionActuator.cpp
branches/ge_dev/source/gameengine/Converter/BL_ActionActuator.h
branches/ge_dev/source/gameengine/Converter/BL_ArmatureObject.h
branches/ge_dev/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/ge_dev/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/ge_dev/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/ge_dev/source/gameengine/Expressions/InputParser.cpp
branches/ge_dev/source/gameengine/Expressions/ListValue.cpp
branches/ge_dev/source/gameengine/Expressions/PyObjectPlus.h
branches/ge_dev/source/gameengine/Expressions/Value.cpp
branches/ge_dev/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/ge_dev/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/ge_dev/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/ge_dev/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/ge_dev/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Camera.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.h
branches/ge_dev/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/ge_dev/source/gameengine/Ketsji/KX_Light.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Light.h
branches/ge_dev/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Scene.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Scene.h
branches/ge_dev/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/ge_dev/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/ge_dev/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
branches/ge_dev/source/gameengine/Physics/Sumo/SumoPhysicsController.h
branches/ge_dev/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/ge_dev/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
branches/ge_dev/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/ge_dev/source/gameengine/PyDoc/API_intro.py
branches/ge_dev/source/gameengine/PyDoc/GameLogic.py
branches/ge_dev/source/gameengine/PyDoc/GameTypes.py
branches/ge_dev/source/gameengine/Rasterizer/RAS_LightObject.h
branches/ge_dev/source/gameengine/VideoTexture/VideoBase.cpp
branches/ge_dev/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/ge_dev/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/ge_dev/tools/Blender.py
branches/ge_dev/tools/btools.py
Added Paths:
-----------
branches/ge_dev/extern/ffmpeg/patches/ffmpeg_work_around_dv_crash.patch
branches/ge_dev/source/blender/nodes/intern/TEX_nodes/TEX_at.c
Removed Paths:
-------------
branches/ge_dev/ChangeLog
Deleted: branches/ge_dev/ChangeLog
===================================================================
--- branches/ge_dev/ChangeLog 2009-06-27 09:29:30 UTC (rev 21182)
+++ branches/ge_dev/ChangeLog 2009-06-27 10:39:03 UTC (rev 21183)
@@ -1,114 +0,0 @@
-
-Fri Feb 21 10:37:54 CST 2003 [email protected]
- Added Goofsters alt-m menu for merging verts in edit mode.
-
-Fri Feb 21 10:37:54 CST 2003 [email protected]
- Added MacOSX plugin stuff
-
-Thu Apr 24 00:48:43 CST 2003 [email protected]
- Added auto-skinning support. When parenting a mesh to an
- armature the user is confronted with a menu about creating
- weight groups. They can either create empty groups,
- create groups that are populated based on a closest bone
- algorithm, or create no groups.
-
-Mon Apr 28 04:04:44 CET 2003 [email protected]
- Added Quicktime image and movie import for textures.
- Added Quicktime movie export for rendering.
- Note: the selected export codec isn't saved in the blendfile.
- Enable with the WITH_QUICKTIME compile flag.
-
-Mon Apr 28 12:32:12 CET 2003 [email protected]
- Added (Win32) text clipboard support and a rightmouse menu to
- the text editor. Added the possibility to export text from
- the editor to a 3D Font object with alt-m. (up to 1000 chars)
- Added rename/delete popups to the file and imageselectors.
- Redesigned the userpreference window layout. (unfinished atm.)
-
-Mon Apr 28 23:17:04 CET 2003 [email protected]
- Added a 3D font loader that uses the Freetype2 library to
- parse the vector data. Freetype2 supports many font formats
- including Type1, TrueType and OpenType fonts.
- Enable with the WITH_FREETYPE2 compile flag.
-
-Initial Change Log for Blender 2.26 Sun Feb 9 10:53:10 UTC 2003
-
-New features of Blender 2.26:
------------------------------
-
-- Mousewheel support for all windows. Two user settings are added in the
- top window for mousewheel usage. The zoom direction [WZoom] and the
- number of lines that get scrolled [WLines] can be set here.
- The mousewheel also works to increase/decrease the size of the circle
- while selecting or doing proportional scaling.
-
-- A "fake user" button next to the material popup has been added, to keep
- the data when it has been unlinked from an object. (Basically a shortcut
- for pressing Shift+F4 and F)
-
-- Added support for manipulating Ipo bezier handles through the action
- window. Selecting action keys and pressing VKEY, HKEY, or shift-HKEY
- modifies the handles of the keys in the same way it does in the IPO
- window.
-
-- CKEY in the action window scrolls the window so that the current frame
- is in the center.
-
-- Extra selection support for the action window, including:
- - border select initiated in the channel names border selects the
- channels and constraint channels.
- - right click or border select initiated in the horizontal scroll
- causes blender to select all keys for the selected frames.
- - right click or border select in the vertical scroll causes blender
- to select all keys for the channel or constraint channels that are
- to the left of the selection.
-
-- X-ray bones support for showing armature bones in shaded mode (disabled
- depth test). The new x-ray button is added in the edit buttons when the
- armature is selected.
-
-- TKEY in the action window changes the Ipo type (constant/linear/bezier)
- for the Ipo curves owned by the selected channels
-
-- Simple shaded+wire and solid+wire drawmodes. It basically draws the
- wireframe after drawing the model in solid/shaded/textured mode.
- The user can set this per object using the "Wire" button in the edit
- buttons window.
-
-- A headerbutton for drawing linenumbers in the texteditor.
-
-- Ctrl keystrokes for cut/copy/paste/undo/redo in the texteditor.
-
-- NTSC render preset (Image size - 720x480, Aspect ratio - 10x11, 30 fps)
-
-
-Bugfixes:
----------
-
-- Make switching to bottom, back, and left view (shift+pad7, shift+pad1
- and shift+pad1) work when in camera view.
-
-- Full screen by default under Unix.
-
-- Ignore WM_DELETE_WINDOW on IRIX.
-
-- Icons in the imageselect window get drawn properly.
-
-
-Workarounds:
-------------
-
-- A small modification is made that prevents closing the renderwindow on
- Mac OSX, so the GUI won't becoming irresponsive.
-
-
-Still Not working:
------------------
-
-Plugins in MacOSX
-
-Older Python API
-
-New build system using configure (this is partially working but
- needs some work)
-
Modified: branches/ge_dev/SConstruct
===================================================================
--- branches/ge_dev/SConstruct 2009-06-27 09:29:30 UTC (rev 21182)
+++ branches/ge_dev/SConstruct 2009-06-27 10:39:03 UTC (rev 21183)
@@ -476,7 +476,6 @@
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
- print ">>>", env['BF_INSTALLDIR'], tp, f
iconlist.append(tp+os.sep+f)
icontargetlist.append(env['BF_INSTALLDIR']+tp[19:]+os.sep+f)
@@ -501,7 +500,6 @@
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
- print ">>>", env['BF_INSTALLDIR'], tp, f
pluglist.append(tp+os.sep+f)
plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f)
Modified: branches/ge_dev/config/win32-vc-config.py
===================================================================
--- branches/ge_dev/config/win32-vc-config.py 2009-06-27 09:29:30 UTC (rev
21182)
+++ branches/ge_dev/config/win32-vc-config.py 2009-06-27 10:39:03 UTC (rev
21183)
@@ -12,10 +12,10 @@
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib
swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = '2.6'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python25'
+BF_PYTHON_LIB = 'python26'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = True
Modified:
branches/ge_dev/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
===================================================================
---
branches/ge_dev/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
2009-06-27 09:29:30 UTC (rev 21182)
+++
branches/ge_dev/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
2009-06-27 10:39:03 UTC (rev 21183)
@@ -663,10 +663,15 @@
}
+btScalar btGeneric6DofConstraint::getRelativePivotPosition(int
axisIndex) const
+{
+ return m_calculatedLinearDiff[axisIndex];
+}
-btScalar btGeneric6DofConstraint::getAngle(int axis_index) const
+
+btScalar btGeneric6DofConstraint::getAngle(int axisIndex) const
{
- return m_calculatedAxisAngleDiff[axis_index];
+ return m_calculatedAxisAngleDiff[axisIndex];
}
@@ -726,7 +731,7 @@
J2[srow+1] = -ax1[1];
J2[srow+2] = -ax1[2];
}
- if((!rotational) && limit)
+ if((!rotational))
{
btVector3 ltd; // Linear Torque Decoupling vector
btVector3 c = m_calculatedTransformB.getOrigin() -
body0->getCenterOfMassPosition();
@@ -839,7 +844,6 @@
-
btGeneric6DofSpringConstraint::btGeneric6DofSpringConstraint(btRigidBody& rbA,
btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB
,bool useLinearReferenceFrameA)
: btGeneric6DofConstraint(rbA, rbB, frameInA, frameInB,
useLinearReferenceFrameA)
{
@@ -848,6 +852,7 @@
m_springEnabled[i] = false;
m_equilibriumPoint[i] = btScalar(0.f);
m_springStiffness[i] = btScalar(0.f);
+ m_springDamping[i] = btScalar(1.f);
}
}
@@ -875,6 +880,13 @@
}
+void btGeneric6DofSpringConstraint::setDamping(int index, btScalar damping)
+{
+ btAssert((index >= 0) && (index < 6));
+ m_springDamping[index] = damping;
+}
+
+
void btGeneric6DofSpringConstraint::setEquilibriumPoint()
{
calculateTransforms();
@@ -908,6 +920,7 @@
void btGeneric6DofSpringConstraint::internalUpdateSprings(btConstraintInfo2*
info)
{
+ calculateTransforms();
// it is assumed that calculateTransforms() have been called before
this call
int i;
btVector3 relVel = m_rbB.getLinearVelocity() -
m_rbA.getLinearVelocity();
@@ -921,8 +934,9 @@
btScalar delta = currPos - m_equilibriumPoint[i];
// spring force is (delta * m_stiffness) according to
Hooke's Law
btScalar force = delta * m_springStiffness[i];
- m_linearLimits.m_targetVelocity[i] = force * info->fps;
- m_linearLimits.m_maxMotorForce[i] = btFabs(force) /
info->fps;
+ btScalar velFactor = info->fps * m_springDamping[i];
+ m_linearLimits.m_targetVelocity[i] = velFactor * force;
+ m_linearLimits.m_maxMotorForce[i] = btFabs(force) /
info->fps;
}
}
for(i = 0; i < 3; i++)
@@ -935,7 +949,8 @@
btScalar delta = currPos - m_equilibriumPoint[i+3];
// spring force is (-delta * m_stiffness) according to
Hooke's Law
btScalar force = -delta * m_springStiffness[i+3];
- m_angularLimits[i].m_targetVelocity = force *
info->fps;
+ btScalar velFactor = info->fps * m_springDamping[i+3];
+ m_angularLimits[i].m_targetVelocity = velFactor * force;
m_angularLimits[i].m_maxMotorForce = btFabs(force) /
info->fps;
}
}
Modified:
branches/ge_dev/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
===================================================================
---
branches/ge_dev/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
2009-06-27 09:29:30 UTC (rev 21182)
+++
branches/ge_dev/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
2009-06-27 10:39:03 UTC (rev 21183)
@@ -382,14 +382,21 @@
//! Get the relative Euler angle
/*!
- \pre btGeneric6DofConstraint.buildJacobian must be called previously.
+ \pre btGeneric6DofConstraint::calculateTransforms() must be called
previously.
*/
btScalar getAngle(int axis_index) const;
+ //! Get the relative position of the constraint pivot
+ /*!
+ \pre btGeneric6DofConstraint::calculateTransforms() must be called
previously.
+ */
+ btScalar getRelativePivotPosition(int axis_index) const;
+
+
//! Test angular limit.
/*!
Calculates angular correction and returns true if limit needs to be
corrected.
- \pre btGeneric6DofConstraint.buildJacobian must be called previously.
+ \pre btGeneric6DofConstraint::calculateTransforms() must be called
previously.
*/
bool testAngularLimitMotor(int axis_index);
@@ -496,11 +503,13 @@
bool m_springEnabled[6];
btScalar m_equilibriumPoint[6];
btScalar m_springStiffness[6];
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
