[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38906] branches/merwin-spacenav: svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/ blender .
Mike Erwin
significant.bit at gmail.com
Tue Aug 2 03:01:59 CEST 2011
Revision: 38906
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38906
Author: merwin
Date: 2011-08-02 01:01:56 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38814
Modified Paths:
--------------
branches/merwin-spacenav/CMakeLists.txt
branches/merwin-spacenav/build_files/cmake/cmake_consistency_check.py
branches/merwin-spacenav/build_files/cmake/cmake_netbeans_project.py
branches/merwin-spacenav/build_files/cmake/cmake_qtcreator_project.py
branches/merwin-spacenav/doc/python_api/rst/bge.constraints.rst
branches/merwin-spacenav/doc/python_api/rst/bge.events.rst
branches/merwin-spacenav/doc/python_api/rst/bge.logic.rst
branches/merwin-spacenav/doc/python_api/rst/bge.render.rst
branches/merwin-spacenav/doc/python_api/rst/bge.texture.rst
branches/merwin-spacenav/doc/python_api/rst/bge.types.rst
branches/merwin-spacenav/doc/python_api/rst/bgl.rst
branches/merwin-spacenav/doc/python_api/sphinx_doc_gen.py
branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/merwin-spacenav/release/scripts/modules/addon_utils.py
branches/merwin-spacenav/release/scripts/modules/bpy/__init__.py
branches/merwin-spacenav/release/scripts/modules/bpy/path.py
branches/merwin-spacenav/release/scripts/modules/bpy/utils.py
branches/merwin-spacenav/release/scripts/modules/bpy_extras/__init__.py
branches/merwin-spacenav/release/scripts/modules/bpy_extras/image_utils.py
branches/merwin-spacenav/release/scripts/modules/bpy_extras/io_utils.py
branches/merwin-spacenav/release/scripts/modules/bpy_extras/mesh_utils.py
branches/merwin-spacenav/release/scripts/modules/bpy_extras/object_utils.py
branches/merwin-spacenav/release/scripts/modules/bpy_extras/view3d_utils.py
branches/merwin-spacenav/release/scripts/modules/keyingsets_utils.py
branches/merwin-spacenav/release/scripts/templates/addon_add_object.py
branches/merwin-spacenav/source/blender/blenkernel/BKE_curve.h
branches/merwin-spacenav/source/blender/blenkernel/BKE_material.h
branches/merwin-spacenav/source/blender/blenkernel/intern/DerivedMesh.c
branches/merwin-spacenav/source/blender/blenkernel/intern/curve.c
branches/merwin-spacenav/source/blender/blenkernel/intern/ipo.c
branches/merwin-spacenav/source/blender/blenkernel/intern/key.c
branches/merwin-spacenav/source/blender/blenkernel/intern/material.c
branches/merwin-spacenav/source/blender/blenkernel/intern/mesh.c
branches/merwin-spacenav/source/blender/blenlib/intern/BLI_args.c
branches/merwin-spacenav/source/blender/blenlib/intern/pbvh.c
branches/merwin-spacenav/source/blender/blenloader/intern/readfile.c
branches/merwin-spacenav/source/blender/editors/curve/editcurve.c
branches/merwin-spacenav/source/blender/editors/interface/interface_anim.c
branches/merwin-spacenav/source/blender/editors/interface/resources.c
branches/merwin-spacenav/source/blender/editors/object/object_relations.c
branches/merwin-spacenav/source/blender/editors/screen/screen_ops.c
branches/merwin-spacenav/source/blender/editors/sculpt_paint/paint_image.c
branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_header.c
branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_select.c
branches/merwin-spacenav/source/blender/editors/transform/transform.c
branches/merwin-spacenav/source/blender/makesrna/intern/rna_ID.c
branches/merwin-spacenav/source/blender/makesrna/intern/rna_wm_api.c
branches/merwin-spacenav/source/blender/modifiers/intern/MOD_uvproject.c
branches/merwin-spacenav/source/blender/python/intern/bpy_rna.c
branches/merwin-spacenav/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
Property Changed:
----------------
branches/merwin-spacenav/
branches/merwin-spacenav/intern/audaspace/OpenAL/
branches/merwin-spacenav/release/scripts/modules/bpy/ops.py
branches/merwin-spacenav/release/scripts/modules/bpy/utils.py
branches/merwin-spacenav/release/scripts/presets/sss/chicken.py
branches/merwin-spacenav/release/scripts/presets/sss/cream.py
branches/merwin-spacenav/release/scripts/presets/sss/ketchup.py
branches/merwin-spacenav/release/scripts/presets/sss/marble.py
branches/merwin-spacenav/release/scripts/presets/sss/potato.py
branches/merwin-spacenav/release/scripts/presets/sss/skim_milk.py
branches/merwin-spacenav/release/scripts/presets/sss/skin1.py
branches/merwin-spacenav/release/scripts/presets/sss/skin2.py
branches/merwin-spacenav/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/merwin-spacenav/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/merwin-spacenav/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_armature.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_bone.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_camera.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_empty.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_game.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_material.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_particle.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_physics_field.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_texture.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/properties_world.py
branches/merwin-spacenav/release/scripts/startup/bl_ui/space_node.py
branches/merwin-spacenav/source/blender/blenkernel/BKE_customdata_file.h
branches/merwin-spacenav/source/blender/blenkernel/intern/customdata_file.c
branches/merwin-spacenav/source/blender/editors/datafiles/startup.blend.c
branches/merwin-spacenav/source/blender/editors/include/ED_particle.h
branches/merwin-spacenav/source/blender/editors/include/ED_physics.h
branches/merwin-spacenav/source/blender/editors/include/ED_render.h
branches/merwin-spacenav/source/blender/editors/include/ED_transform.h
branches/merwin-spacenav/source/blender/editors/interface/interface_intern.h
branches/merwin-spacenav/source/blender/editors/mesh/mesh_data.c
branches/merwin-spacenav/source/blender/editors/metaball/mball_edit.c
branches/merwin-spacenav/source/blender/editors/object/object_add.c
branches/merwin-spacenav/source/blender/editors/object/object_constraint.c
branches/merwin-spacenav/source/blender/editors/object/object_group.c
branches/merwin-spacenav/source/blender/editors/object/object_hook.c
branches/merwin-spacenav/source/blender/editors/object/object_lattice.c
branches/merwin-spacenav/source/blender/editors/object/object_relations.c
branches/merwin-spacenav/source/blender/editors/object/object_select.c
branches/merwin-spacenav/source/blender/editors/object/object_shapekey.c
branches/merwin-spacenav/source/blender/editors/object/object_transform.c
branches/merwin-spacenav/source/blender/editors/object/object_vgroup.c
branches/merwin-spacenav/source/blender/editors/physics/particle_boids.c
branches/merwin-spacenav/source/blender/editors/physics/particle_edit.c
branches/merwin-spacenav/source/blender/editors/physics/physics_fluid.c
branches/merwin-spacenav/source/blender/editors/physics/physics_pointcache.c
branches/merwin-spacenav/source/blender/editors/render/
branches/merwin-spacenav/source/blender/editors/render/render_intern.h
branches/merwin-spacenav/source/blender/editors/render/render_preview.c
branches/merwin-spacenav/source/blender/editors/render/render_shading.c
branches/merwin-spacenav/source/blender/editors/render/render_update.c
branches/merwin-spacenav/source/blender/editors/sculpt_paint/
branches/merwin-spacenav/source/blender/editors/sculpt_paint/paint_image.c
branches/merwin-spacenav/source/blender/editors/sculpt_paint/paint_vertex.c
branches/merwin-spacenav/source/blender/editors/sculpt_paint/sculpt.c
branches/merwin-spacenav/source/blender/editors/space_image/image_buttons.c
branches/merwin-spacenav/source/blender/editors/space_info/info_ops.c
branches/merwin-spacenav/source/blender/editors/space_node/node_edit.c
branches/merwin-spacenav/source/blender/editors/space_node/node_state.c
branches/merwin-spacenav/source/blender/editors/space_text/text_ops.c
branches/merwin-spacenav/source/blender/editors/space_userpref/
branches/merwin-spacenav/source/blender/editors/space_userpref/space_userpref.c
branches/merwin-spacenav/source/blender/editors/space_userpref/userpref_intern.h
branches/merwin-spacenav/source/blender/editors/space_userpref/userpref_ops.c
branches/merwin-spacenav/source/blender/editors/uvedit/uvedit_buttons.c
branches/merwin-spacenav/source/blender/editors/uvedit/uvedit_intern.h
branches/merwin-spacenav/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/merwin-spacenav/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/merwin-spacenav/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/merwin-spacenav/source/blender/gpu/GPU_buffers.h
branches/merwin-spacenav/source/blender/makesdna/DNA_outliner_types.h
branches/merwin-spacenav/source/blender/makesrna/intern/rna_sculpt_paint.c
Property changes on: branches/merwin-spacenav
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:37274-38554
+ /trunk/blender:37274-38554,38815-38905
Modified: branches/merwin-spacenav/CMakeLists.txt
===================================================================
--- branches/merwin-spacenav/CMakeLists.txt 2011-08-01 23:02:10 UTC (rev 38905)
+++ branches/merwin-spacenav/CMakeLists.txt 2011-08-02 01:01:56 UTC (rev 38906)
@@ -1069,20 +1069,34 @@
endif()
endif()
+# See TEST_SSE_SUPPORT() for how this is defined.
+
if(WITH_RAYOPTIMIZATION)
if(CMAKE_COMPILER_IS_GNUCC)
- if(SUPPORT_SSE_BUILD)
- set(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
- add_definitions(-D__SSE__ -D__MMX__)
+ set(_sse "-msse")
+ set(_sse2 "-msse2")
+ elseif(MSVC)
+ set(_sse "/arch:SSE")
+ set(_sse2 "/arch:SSE2")
+ else()
+ message(WARNING "SSE flags for this compiler not known")
+ set(_sse)
+ set(_sse2)
+ endif()
+
+ if(SUPPORT_SSE_BUILD)
+ set(PLATFORM_CFLAGS " ${_sse} ${PLATFORM_CFLAGS}")
+ add_definitions(-D__SSE__ -D__MMX__)
+ endif()
+ if(SUPPORT_SSE2_BUILD)
+ set(PLATFORM_CFLAGS " ${_sse2} ${PLATFORM_CFLAGS}")
+ add_definitions(-D__SSE2__)
+ if(NOT SUPPORT_SSE_BUILD) # dont double up
+ add_definitions(-D__MMX__)
endif()
- if(SUPPORT_SSE2_BUILD)
- set(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
- add_definitions(-D__SSE2__)
- if(NOT SUPPORT_SSE_BUILD) # dont double up
- add_definitions(-D__MMX__)
- endif()
- endif()
endif()
+ unset(_sse)
+ unset(_sse2)
endif()
if(WITH_IMAGE_OPENJPEG)
Modified: branches/merwin-spacenav/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/merwin-spacenav/build_files/cmake/cmake_consistency_check.py 2011-08-01 23:02:10 UTC (rev 38905)
+++ branches/merwin-spacenav/build_files/cmake/cmake_consistency_check.py 2011-08-02 01:01:56 UTC (rev 38906)
@@ -39,7 +39,7 @@
file_handle = open(f, 'r')
data = file_handle.readlines()
file_handle.close()
-
+
l = data[i]
ws = l[:len(l) - len(l.lstrip())]
Modified: branches/merwin-spacenav/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/merwin-spacenav/build_files/cmake/cmake_netbeans_project.py 2011-08-01 23:02:10 UTC (rev 38905)
+++ branches/merwin-spacenav/build_files/cmake/cmake_netbeans_project.py 2011-08-02 01:01:56 UTC (rev 38906)
@@ -37,7 +37,7 @@
source_list,
is_project_file,
is_c_header,
- is_py,
+ # is_py,
cmake_advanced_info,
cmake_compiler_defines,
)
Modified: branches/merwin-spacenav/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/merwin-spacenav/build_files/cmake/cmake_qtcreator_project.py 2011-08-01 23:02:10 UTC (rev 38905)
+++ branches/merwin-spacenav/build_files/cmake/cmake_qtcreator_project.py 2011-08-02 01:01:56 UTC (rev 38906)
@@ -33,7 +33,7 @@
from project_info import (SIMPLE_PROJECTFILE,
SOURCE_DIR,
- CMAKE_DIR,
+ # CMAKE_DIR,
PROJECT_DIR,
source_list,
is_project_file,
Modified: branches/merwin-spacenav/doc/python_api/rst/bge.constraints.rst
===================================================================
--- branches/merwin-spacenav/doc/python_api/rst/bge.constraints.rst 2011-08-01 23:02:10 UTC (rev 38905)
+++ branches/merwin-spacenav/doc/python_api/rst/bge.constraints.rst 2011-08-02 01:01:56 UTC (rev 38906)
@@ -1,29 +1,48 @@
-Game Engine bge.constraints Module
-==================================
+Physics Constraints (bge.constraints)
+=====================================
-.. note::
- This documentation is still very weak, and needs some help!
+.. function:: createConstraint(physicsid, physicsid2, constrainttype, [pivotX, pivotY, pivotZ, [axisX, axisY, axisZ, [flag]]]])
-.. function:: createConstraint([obj1, [obj2, [restLength, [restitution, [damping]]]]])
-
Creates a constraint.
- :arg obj1: first object on Constraint
- :type obj1: :class:'bge.types.KX_GameObject' #I think, there is no error when I use one
+ :arg physicsid: the physics id of the first object in constraint
+ :type physicsid: int
- :arg obj2: second object on Constraint
- :type obj2: :class:'bge.types.KX_GameObject' #too
+ :arg physicsid2: the physics id of the second object in constraint
+ :type physicsid2: int
- :arg restLength: #to be filled
- :type restLength: float
+ :arg constrainttype: the type of the constraint. The constraint types are:
- :arg restitution: #to be filled
- :type restitution: float
+ - :class:`POINTTOPOINT_CONSTRAINT`
+ - :class:`LINEHINGE_CONSTRAINT`
+ - :class:`ANGULAR_CONSTRAINT`
+ - :class:`CONETWIST_CONSTRAINT`
+ - :class:`VEHICLE_CONSTRAINT`
- :arg damping: #to be filled
- :type damping: float
+ :type constrainttype: int
+ :arg pivotX: pivot X position
+ :type pivotX: float
+
+ :arg pivotY: pivot Y position
+ :type pivotY: float
+
+ :arg pivotZ: pivot Z position
+ :type pivotZ: float
+
+ :arg axisX: X axis
+ :type axisX: float
+
+ :arg axisY: Y axis
+ :type axisY: float
+
+ :arg axisZ: Z axis
+ :type axisZ: float
+
+ :arg flag: .. to do
+ :type flag: int
+
.. attribute:: error
Simbolic constant string that indicates error.
@@ -49,7 +68,7 @@
:type constraintId: int
:return: a vehicle constraint object.
- :rtype: :class:'KX_VehicleWrapper'
+ :rtype: :class:`bge.types.KX_VehicleWrapper`
.. function:: removeConstraint(constraintId)
@@ -60,10 +79,10 @@
.. function:: setCcdMode(ccdMode)
- ..note::
+ .. note::
Very experimental, not recommended
- Sets the CCD mode in the Physics Environment.
+ Sets the CCD (Continous Colision Detection) mode in the Physics Environment.
:arg ccdMode: The new CCD mode.
:type ccdMode: int
@@ -73,21 +92,21 @@
.. note::
Reasonable default is 0.02 (if units are meters)
- Sets the contact breaking treshold in the Physics Environment.
+ Sets tresholds to do with contact point management.
:arg breakingTreshold: The new contact breaking treshold.
:type breakingTreshold: float
.. function:: setDeactivationAngularTreshold(angularTreshold)
- Sets the deactivation angular treshold.
+ Sets the angular velocity treshold.
:arg angularTreshold: New deactivation angular treshold.
:type angularTreshold: float
.. function:: setDeactivationLinearTreshold(linearTreshold)
- Sets the deactivation linear treshold.
+ Sets the linear velocity treshold.
:arg linearTreshold: New deactivation linear treshold.
:type linearTreshold: float
@@ -104,21 +123,20 @@
Sets the debug mode.
Debug modes:
- - No debug: 0
- - Draw wireframe: 1
- - Draw Aabb: 2 #What's Aabb?
- - Draw freatures text: 4
- - Draw contact points: 8
- - No deactivation: 16
- - No help text: 32
- - Draw text: 64
- - Profile timings: 128
- - Enable sat comparision: 256
- - Disable Bullet LCP: 512
- - Enable CCD: 1024
- - Draw Constraints: #(1 << 11) = ?
- - Draw Constraint Limits: #(1 << 12) = ?
- - Fast Wireframe: #(1 << 13) = ?
+ - :class:`DBG_NODEBUG`
+ - :class:`DBG_DRAWWIREFRAME`
+ - :class:`DBG_DRAWAABB`
+ - :class:`DBG_DRAWFREATURESTEXT`
+ - :class:`DBG_DRAWCONTACTPOINTS`
+ - :class:`DBG_NOHELPTEXT`
+ - :class:`DBG_DRAWTEXT`
+ - :class:`DBG_PROFILETIMINGS`
+ - :class:`DBG_ENABLESATCOMPARISION`
+ - :class:`DBG_DISABLEBULLETLCP`
+ - :class:`DBG_ENABLECCD`
+ - :class:`DBG_DRAWCONSTRAINTS`
+ - :class:`DBG_DRAWCONSTRAINTLIMITS`
+ - :class:`DBG_FASTWIREFRAME`
:arg mode: The new debug mode.
:type mode: int
@@ -138,8 +156,11 @@
.. function:: setLinearAirDamping(damping)
- Not implemented.
+ .. note::
+ Not implemented.
+ Sets the linear air damping for rigidbodies.
+
.. function:: setNumIterations(numiter)
Sets the number of iterations for an iterative constraint solver.
@@ -156,10 +177,10 @@
.. function:: setSolverDamping(damping)
- ..note::
+ .. note::
Very experimental, not recommended
- Sets the solver damping.
+ Sets the damper constant of a penalty based solver.
:arg damping: New damping for the solver.
:type damping: float
@@ -169,7 +190,7 @@
.. note::
Very experimental, not recommended
- Sets the solver tau.
+ Sets the spring constant of a penalty based solver.
:arg tau: New tau for the solver.
:type tau: float
@@ -189,7 +210,7 @@
.. note::
Very experimental, not recommended
- Sets the sor constant.
+ Sets the successive overrelaxation constant.
:arg sor: New sor value.
:type sor: float
@@ -197,3 +218,136 @@
.. function:: setUseEpa(epa)
Not implemented.
+
+.. data:: DBG_NODEBUG
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
+
+ No debug.
+
+.. data:: DBG_DRAWWIREFRAME
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
+
+ Draw wireframe in debug.
+
+.. data:: DBG_DRAWAABB
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
+
+ Draw Axis Aligned Bounding Box in debug.
+
+.. data:: DBG_DRAWFREATURESTEXT
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
+
+ Draw freatures text in debug.
+
+.. data:: DBG_DRAWCONTACTPOINTS
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
+
+ Draw contact points in debug.
+
+.. data:: DBG_NOHELPTEXT
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
+
+ Debug without help text.
+
+.. data:: DBG_DRAWTEXT
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
+
+ Draw text in debug.
+
+.. data:: DBG_PROFILETIMINGS
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
+
+ Draw profile timings in debug.
+
+.. data:: DBG_ENABLESATCOMPARISION
+
+ .. note::
+ Debug mode to be used with function :class:`setDebugMode`
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list