Revision: 16227 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16227 Author: blendix Date: 2008-08-22 13:51:56 +0200 (Fri, 22 Aug 2008)
Log Message: ----------- Apricot Branch: svn merge -r 16194:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender Modified Paths: -------------- branches/apricot/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp branches/apricot/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj branches/apricot/release/scripts/flt_properties.py branches/apricot/source/blender/blenkernel/BKE_deform.h branches/apricot/source/blender/blenkernel/BKE_effect.h branches/apricot/source/blender/blenkernel/intern/bvhutils.c branches/apricot/source/blender/blenkernel/intern/deform.c branches/apricot/source/blender/blenkernel/intern/effect.c branches/apricot/source/blender/blenkernel/intern/ipo.c branches/apricot/source/blender/blenkernel/intern/modifier.c branches/apricot/source/blender/blenkernel/intern/particle.c branches/apricot/source/blender/blenkernel/intern/particle_system.c branches/apricot/source/blender/blenlib/intern/BLI_kdopbvh.c branches/apricot/source/blender/blenloader/intern/readfile.c branches/apricot/source/blender/blenloader/intern/writefile.c branches/apricot/source/blender/include/BDR_gpencil.h branches/apricot/source/blender/include/BIF_drawgpencil.h branches/apricot/source/blender/makesdna/DNA_gpencil_types.h branches/apricot/source/blender/makesdna/DNA_ipo_types.h branches/apricot/source/blender/makesdna/DNA_modifier_types.h branches/apricot/source/blender/makesdna/DNA_object_force.h branches/apricot/source/blender/makesdna/DNA_particle_types.h branches/apricot/source/blender/makesdna/DNA_space_types.h branches/apricot/source/blender/python/api2_2x/Mesh.c branches/apricot/source/blender/python/api2_2x/Object.c branches/apricot/source/blender/python/api2_2x/doc/Object.py branches/apricot/source/blender/src/buttons_editing.c branches/apricot/source/blender/src/buttons_object.c branches/apricot/source/blender/src/drawgpencil.c branches/apricot/source/blender/src/editipo.c branches/apricot/source/blender/src/editipo_lib.c branches/apricot/source/blender/src/gpencil.c branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp branches/apricot/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp branches/apricot/source/gameengine/Ketsji/KX_Scene.h branches/apricot/source/gameengine/Physics/Bullet/CMakeLists.txt branches/apricot/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp branches/apricot/source/gameengine/Physics/Bullet/CcdPhysicsController.h branches/apricot/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp branches/apricot/source/gameengine/Physics/Bullet/SConscript branches/apricot/source/gameengine/Physics/common/PHY_DynamicTypes.h branches/apricot/source/gameengine/PyDoc/GameLogic.py Added Paths: ----------- branches/apricot/release/scripts/flt_dofedit.py branches/apricot/release/scripts/flt_lodedit.py branches/apricot/source/blender/blenkernel/BKE_shrinkwrap.h branches/apricot/source/blender/blenkernel/intern/shrinkwrap.c Modified: branches/apricot/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp =================================================================== --- branches/apricot/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-08-22 11:46:59 UTC (rev 16226) +++ branches/apricot/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-08-22 11:51:56 UTC (rev 16227) @@ -856,10 +856,26 @@ btScalar radius = coneShape->getRadius();//+coneShape->getMargin(); btScalar height = coneShape->getHeight();//+coneShape->getMargin(); btVector3 start = worldTransform.getOrigin(); - getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color); - getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color); - getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color); - getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),-radius,btScalar(-0.5)*height),color); + // insert here Bullet 2.69 that fixes representation of cone + int upAxis= coneShape->getConeUpIndex(); + + btVector3 offsetHeight(0,0,0); + offsetHeight[upAxis] = height * btScalar(0.5); + btVector3 offsetRadius(0,0,0); + offsetRadius[(upAxis+1)%3] = radius; + btVector3 offset2Radius(0,0,0); + offset2Radius[(upAxis+2)%3] = radius; + + getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight+offsetRadius),color); + getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight-offsetRadius),color); + getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight+offset2Radius),color); + getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight-offset2Radius),color); + + // buggy code that does not take into account the direction of the cone + //getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color); + //getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color); + //getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color); + //getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),-radius,btScalar(-0.5)*height),color); break; } Modified: branches/apricot/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj =================================================================== --- branches/apricot/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj 2008-08-22 11:46:59 UTC (rev 16226) +++ branches/apricot/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj 2008-08-22 11:51:56 UTC (rev 16227) @@ -19,7 +19,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet" + AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="FALSE" BasicRuntimeChecks="3" @@ -64,7 +64,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet" + AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="0" UsePrecompiledHeader="2" @@ -107,7 +107,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet" + AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="0" UsePrecompiledHeader="2" @@ -151,7 +151,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet" + AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="FALSE" BasicRuntimeChecks="3" Copied: branches/apricot/release/scripts/flt_dofedit.py (from rev 16225, trunk/blender/release/scripts/flt_dofedit.py) =================================================================== --- branches/apricot/release/scripts/flt_dofedit.py (rev 0) +++ branches/apricot/release/scripts/flt_dofedit.py 2008-08-22 11:51:56 UTC (rev 16227) @@ -0,0 +1,835 @@ +#!BPY + +""" +Name: 'FLT DOF Editor' +Blender: 240 +Group: 'Misc' +Tooltip: 'Degree of Freedom editor for FLT nodes' +""" + +__author__ = "Geoffrey Bantle" +__version__ = "1.0 11/21/07" +__email__ = ('scripts', 'Author, ') +__url__ = ('blender', 'blenderartists.org') + +__bpydoc__ ="""\ +This script provides tools for working with OpenFlight databases in Blender. OpenFlight is a +registered trademark of MultiGen-Paradigm, Inc. + +Feature overview and more availible at: +http://wiki.blender.org/index.php/Scripts/Manual/FLTools +""" + +# -------------------------------------------------------------------------- +# flt_palettemanager.py version 0.1 2005/04/08 +# -------------------------------------------------------------------------- +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# Copyright (C) 2007: Blender Foundation +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# ***** END GPL LICENCE BLOCK ***** +# -------------------------------------------------------------------------- + +import Blender.Draw as Draw +from Blender.BGL import * +import Blender +import flt_properties +reload(flt_properties) +from flt_properties import * + +#event codes +evcode = { + "DOF_MAKE" : 100, + "DOF_UPDATE" : 138, + "DOF_DELETE" : 101, + "DOF_TRANSX" : 102, + "DOF_TRANSY" : 103, + "DOF_TRANSZ" : 104, + "DOF_ROTX" : 105, + "DOF_ROTY" : 106, + "DOF_ROTZ" : 107, + "DOF_SCALEX" : 108, + "DOF_SCALEY" : 109, + "DOF_SCALEZ" : 110, + "DOF_MIN_TRANSX" : 111, + "DOF_MIN_TRANSY" : 112, + "DOF_MIN_TRANSZ" : 113, + "DOF_MIN_ROTX" : 114, + "DOF_MIN_ROTY" : 115, + "DOF_MIN_ROTZ" : 116, + "DOF_MIN_SCALEX" : 117, + "DOF_MIN_SCALEY" : 118, + "DOF_MIN_SCALEZ" : 119, + "DOF_MAX_TRANSX" : 120, + "DOF_MAX_TRANSY" : 121, + "DOF_MAX_TRANSZ" : 122, + "DOF_MAX_ROTX" : 123, + "DOF_MAX_ROTY" : 124, + "DOF_MAX_ROTZ" : 125, + "DOF_MAX_SCALEX" : 126, + "DOF_MAX_SCALEY" : 127, + "DOF_MAX_SCALEZ" : 128, + "DOF_STEP_TRANSX" : 129, + "DOF_STEP_TRANSY" : 130, + "DOF_STEP_TRANSZ" : 131, + "DOF_STEP_ROTX" : 132, + "DOF_STEP_ROTY" : 133, + "DOF_STEP_ROTZ" : 134, + "DOF_STEP_SCALEX" : 135, + "DOF_STEP_SCALEY" : 136, + "DOF_STEP_SCALEZ" : 137 +} + +#system +DOF_MAKE = None +DOF_UPDATE = None +DOF_DELETE = None + +#toggle buttons +DOF_TRANSX = None +DOF_TRANSY = None +DOF_TRANSZ = None +DOF_ROTX = None +DOF_ROTY = None +DOF_ROTZ = None +DOF_SCALEX = None +DOF_SCALEY = None +DOF_SCALEZ = None + +#Minimums +DOF_MIN_TRANSX = None +DOF_MIN_TRANSY = None @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs