[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38220] branches/soc-2011-tomato: Merging r38197 through r38219 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Fri Jul 8 10:36:52 CEST 2011
Revision: 38220
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38220
Author: nazgul
Date: 2011-07-08 08:36:51 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Merging r38197 through r38219 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38197
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38219
Modified Paths:
--------------
branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py
branches/soc-2011-tomato/doc/python_api/examples/blf.py
branches/soc-2011-tomato/doc/python_api/examples/bpy.types.RenderEngine.py
branches/soc-2011-tomato/doc/python_api/rst/bge.events.rst
branches/soc-2011-tomato/doc/python_api/rst/bge.texture.rst
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
Added Paths:
-----------
branches/soc-2011-tomato/doc/python_api/examples/bge.constraints.py
branches/soc-2011-tomato/doc/python_api/rst/bge.constraints.rst
Property Changed:
----------------
branches/soc-2011-tomato/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-38196
+ /trunk/blender:36831-38219
Copied: branches/soc-2011-tomato/doc/python_api/examples/bge.constraints.py (from rev 38219, trunk/blender/doc/python_api/examples/bge.constraints.py)
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bge.constraints.py (rev 0)
+++ branches/soc-2011-tomato/doc/python_api/examples/bge.constraints.py 2011-07-08 08:36:51 UTC (rev 38220)
@@ -0,0 +1,37 @@
+"""
+Basic Physics Constraint
+++++++++++++++++++++++
+Example of how to create a hinge Physics Constraint between two objects.
+"""
+from bge import logic
+from bge import constraints
+
+# get object list
+objects = logic.getCurrentScene().objects
+
+# get object named Object1 and Object 2
+object_1 = objects["Object1"]
+object_2 = objects["Object2"]
+
+# want to use Edge constraint type
+constraint_type = 2
+
+# get Object1 and Object2 physics IDs
+physics_id_1 = object_1.getPhysicsId()
+physics_id_2 = object_2.getPhysicsId()
+
+# Use bottom right edge of Object1 for hinge position
+edge_position_x = 1.0
+edge_position_y = 0.0
+edge_position_z = -1.0
+
+# use Object1 y axis for angle to point hinge
+edge_angle_x = 0.0
+edge_angle_y = 1.0
+edge_angle_z = 0.0
+
+# create an edge constraint
+constraints.createConstraint( physics_id_1, physics_id_2,
+ constraint_type,
+ edge_position_x, edge_position_y, edge_position_z,
+ edge_angle_x, edge_angle_y, edge_angle_z )
Modified: branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py 2011-07-08 07:32:45 UTC (rev 38219)
+++ branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py 2011-07-08 08:36:51 UTC (rev 38220)
@@ -5,7 +5,6 @@
createTexture() and removeTexture() are to be called from a module Python
Controller.
"""
-import bge
from bge import logic
from bge import texture
@@ -14,7 +13,7 @@
object = cont.owner
# get the reference pointer (ID) of the internal texture
- ID = VT.materialID(obj, 'IMoriginal.png')
+ ID = texture.materialID(obj, 'IMoriginal.png')
# create a texture object
object_texture = texture.Texture(object, ID)
Modified: branches/soc-2011-tomato/doc/python_api/examples/blf.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/blf.py 2011-07-08 07:32:45 UTC (rev 38219)
+++ branches/soc-2011-tomato/doc/python_api/examples/blf.py 2011-07-08 08:36:51 UTC (rev 38220)
@@ -5,7 +5,6 @@
need to use the OpenGL wrapper :class:`~bgl` as well.
"""
# import game engine modules
-import bge
from bge import render
from bge import logic
# import stand alone modules
Modified: branches/soc-2011-tomato/doc/python_api/examples/bpy.types.RenderEngine.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bpy.types.RenderEngine.py 2011-07-08 07:32:45 UTC (rev 38219)
+++ branches/soc-2011-tomato/doc/python_api/examples/bpy.types.RenderEngine.py 2011-07-08 08:36:51 UTC (rev 38220)
@@ -61,10 +61,10 @@
# Otherwise most of the UI will be empty when the engine is selected.
# In this example, we need to see the main render image button and
# the material preview panel.
-import properties_render
+from bl_ui import properties_render
properties_render.RENDER_PT_render.COMPAT_ENGINES.add('custom_renderer')
del properties_render
-import properties_material
+from bl_ui import properties_material
properties_material.MATERIAL_PT_preview.COMPAT_ENGINES.add('custom_renderer')
del properties_material
Copied: branches/soc-2011-tomato/doc/python_api/rst/bge.constraints.rst (from rev 38219, trunk/blender/doc/python_api/rst/bge.constraints.rst)
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.constraints.rst (rev 0)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.constraints.rst 2011-07-08 08:36:51 UTC (rev 38220)
@@ -0,0 +1,199 @@
+
+Game Engine bge.constraints Module
+==================================
+
+.. note::
+ This documentation is still very weak, and needs some help!
+
+.. 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 obj2: second object on Constraint
+ :type obj2: :class:'bge.types.KX_GameObject' #too
+
+ :arg restLength: #to be filled
+ :type restLength: float
+
+ :arg restitution: #to be filled
+ :type restitution: float
+
+ :arg damping: #to be filled
+ :type damping: float
+
+.. attribute:: error
+
+ Simbolic constant string that indicates error.
+
+.. function:: exportBulletFile(filename)
+
+ export a .bullet file
+
+ :arg filename: File name
+ :type filename: string
+
+.. function:: getAppliedImpulse(constraintId)
+
+ :arg constraintId: The id of the constraint.
+ :type constraintId: int
+
+ :return: the most recent applied impulse.
+ :rtype: float
+
+.. function:: getVehicleConstraint(constraintId)
+
+ :arg constraintId: The id of the vehicle constraint.
+ :type constraintId: int
+
+ :return: a vehicle constraint object.
+ :rtype: :class:'KX_VehicleWrapper'
+
+.. function:: removeConstraint(constraintId)
+
+ Removes a constraint.
+
+ :arg constraintId: The id of the constraint to be removed.
+ :type constraintId: int
+
+.. function:: setCcdMode(ccdMode)
+
+ ..note::
+ Very experimental, not recommended
+
+ Sets the CCD mode in the Physics Environment.
+
+ :arg ccdMode: The new CCD mode.
+ :type ccdMode: int
+
+.. function:: setContactBreakingTreshold(breakingTreshold)
+
+ .. note::
+ Reasonable default is 0.02 (if units are meters)
+
+ Sets the contact breaking treshold in the Physics Environment.
+
+ :arg breakingTreshold: The new contact breaking treshold.
+ :type breakingTreshold: float
+
+.. function:: setDeactivationAngularTreshold(angularTreshold)
+
+ Sets the deactivation angular treshold.
+
+ :arg angularTreshold: New deactivation angular treshold.
+ :type angularTreshold: float
+
+.. function:: setDeactivationLinearTreshold(linearTreshold)
+
+ Sets the deactivation linear treshold.
+
+ :arg linearTreshold: New deactivation linear treshold.
+ :type linearTreshold: float
+
+.. function:: setDeactivationTime(time)
+
+ Sets the time after which a resting rigidbody gets deactived.
+
+ :arg time: The deactivation time.
+ :type time: float
+
+.. function:: setDebugMode(mode)
+
+ 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) = ?
+
+ :arg mode: The new debug mode.
+ :type mode: int
+
+.. function:: setGravity(x, y, z)
+
+ Sets the gravity force.
+
+ :arg x: Gravity X force.
+ :type x: float
+
+ :arg y: Gravity Y force.
+ :type y: float
+
+ :arg z: Gravity Z force.
+ :type z: float
+
+.. function:: setLinearAirDamping(damping)
+
+ Not implemented.
+
+.. function:: setNumIterations(numiter)
+
+ Sets the number of iterations for an iterative constraint solver.
+
+ :arg numiter: New number of iterations.
+ :type numiter: int
+
+.. function:: setNumTimeSubSteps(numsubstep)
+
+ Sets the number of substeps for each physics proceed. Tradeoff quality for performance.
+
+ :arg numsubstep: New number of substeps.
+ :type numsubstep: int
+
+.. function:: setSolverDamping(damping)
+
+ ..note::
+ Very experimental, not recommended
+
+ Sets the solver damping.
+
+ :arg damping: New damping for the solver.
+ :type damping: float
+
+.. function:: setSolverTau(tau)
+
+ .. note::
+ Very experimental, not recommended
+
+ Sets the solver tau.
+
+ :arg tau: New tau for the solver.
+ :type tau: float
+
+.. function:: setSolverType(solverType)
+
+ .. note::
+ Very experimental, not recommended
+
+ Sets the solver type.
+
+ :arg solverType: The new type of the solver.
+ :type solverType: int
+
+.. function:: setSorConstant(sor)
+
+ .. note::
+ Very experimental, not recommended
+
+ Sets the sor constant.
+
+ :arg sor: New sor value.
+ :type sor: float
+
+.. function:: setUseEpa(epa)
+
+ Not implemented.
Modified: branches/soc-2011-tomato/doc/python_api/rst/bge.events.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.events.rst 2011-07-08 07:32:45 UTC (rev 38219)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.events.rst 2011-07-08 08:36:51 UTC (rev 38220)
@@ -1,5 +1,5 @@
-Game Engine bge.events module
+Game Engine bge.events Module
=============================
*****
Modified: branches/soc-2011-tomato/doc/python_api/rst/bge.texture.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.texture.rst 2011-07-08 07:32:45 UTC (rev 38219)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.texture.rst 2011-07-08 08:36:51 UTC (rev 38220)
@@ -3,8 +3,8 @@
==============================
.. note::
- This documentation is still very weak, and needs some help! Right now they are mostly a collection
- of the docstrings found in the bge.texture source code + some random places filled with text.
+ This documentation is still very weak, and needs some help! Right now they are mostly a collection
+ of the docstrings found in the bge.texture source code + some random places filled with text.
*****
Intro
@@ -20,20 +20,20 @@
bge.texture uses FFmpeg to load images and videos. All the formats and codecs that FFmpeg supports are supported by this module, including but not limited to::
- * AVI
- * Ogg
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list