[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12432] branches/soc-2007-red_fox: Merge 11646:12431 from /trunk/blender
Levi Schooley
redfox at hhofministries.org
Tue Oct 30 01:24:50 CET 2007
Revision: 12432
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12432
Author: red_fox
Date: 2007-10-30 01:24:49 +0100 (Tue, 30 Oct 2007)
Log Message:
-----------
Merge 11646:12431 from /trunk/blender
A much needed sync with /trunk/blender.
Levi
Modified Paths:
--------------
branches/soc-2007-red_fox/intern/bmfont/BMF_Api.h
branches/soc-2007-red_fox/intern/bmfont/intern/BMF_Api.cpp
branches/soc-2007-red_fox/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/soc-2007-red_fox/intern/bmfont/intern/BMF_BitmapFont.h
branches/soc-2007-red_fox/intern/elbeem/intern/attributes.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/elbeem.h
branches/soc-2007-red_fox/intern/elbeem/intern/isosurface.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/ntl_geometryobject.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/ntl_vector3dim.h
branches/soc-2007-red_fox/intern/elbeem/intern/parametrizer.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/particletracer.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/simulation_object.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/solver_class.h
branches/soc-2007-red_fox/intern/elbeem/intern/solver_interface.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/solver_main.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/solver_util.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/utilities.cpp
branches/soc-2007-red_fox/intern/elbeem/intern/utilities.h
branches/soc-2007-red_fox/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2007-red_fox/intern/iksolver/extern/IK_solver.h
branches/soc-2007-red_fox/intern/iksolver/intern/IK_QJacobian.cpp
branches/soc-2007-red_fox/intern/iksolver/intern/IK_QJacobian.h
branches/soc-2007-red_fox/intern/iksolver/intern/IK_QJacobianSolver.cpp
branches/soc-2007-red_fox/intern/iksolver/intern/IK_QJacobianSolver.h
branches/soc-2007-red_fox/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2007-red_fox/intern/iksolver/intern/IK_QSegment.h
branches/soc-2007-red_fox/intern/iksolver/intern/IK_QTask.h
branches/soc-2007-red_fox/intern/iksolver/intern/IK_Solver.cpp
branches/soc-2007-red_fox/intern/memutil/MEM_CacheLimiter.h
branches/soc-2007-red_fox/intern/moto/include/MT_Vector3.h
branches/soc-2007-red_fox/intern/moto/include/MT_Vector4.h
branches/soc-2007-red_fox/intern/moto/include/MT_assert.h
branches/soc-2007-red_fox/intern/moto/intern/MT_Assert.cpp
branches/soc-2007-red_fox/intern/string/intern/STR_String.cpp
branches/soc-2007-red_fox/projectfiles/blender/src/BL_src.dsp
branches/soc-2007-red_fox/projectfiles/blender/src/BL_src_cre.dsp
branches/soc-2007-red_fox/release/Makefile
branches/soc-2007-red_fox/release/datafiles/blenderbuttons
branches/soc-2007-red_fox/release/datafiles/splash.jpg
branches/soc-2007-red_fox/release/scripts/3ds_import.py
branches/soc-2007-red_fox/release/scripts/bpymodules/BPyObject.py
branches/soc-2007-red_fox/release/scripts/bvh_import.py
branches/soc-2007-red_fox/release/scripts/console.py
branches/soc-2007-red_fox/release/scripts/export_fbx.py
branches/soc-2007-red_fox/release/scripts/export_obj.py
branches/soc-2007-red_fox/release/scripts/image_billboard.py
branches/soc-2007-red_fox/release/scripts/import_dxf.py
branches/soc-2007-red_fox/release/scripts/mesh_unfolder.py
branches/soc-2007-red_fox/release/scripts/scripttemplate_pyconstraint.py
branches/soc-2007-red_fox/release/scripts/uv_export.py
branches/soc-2007-red_fox/release/scripts/uv_seams_from_islands.py
branches/soc-2007-red_fox/release/scripts/uvcalc_follow_active_coords.py
branches/soc-2007-red_fox/release/scripts/uvcalc_lightmap.py
branches/soc-2007-red_fox/release/scripts/uvcalc_quad_clickproj.py
branches/soc-2007-red_fox/release/scripts/uvcalc_smart_project.py
branches/soc-2007-red_fox/source/blender/avi/intern/options.c
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_action.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_armature.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_bad_level_calls.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_blender.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_constraint.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_customdata.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_global.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_icons.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_image.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_key.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_mesh.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_node.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_object.h
branches/soc-2007-red_fox/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2007-red_fox/source/blender/blenkernel/CMakeLists.txt
branches/soc-2007-red_fox/source/blender/blenkernel/SConscript
branches/soc-2007-red_fox/source/blender/blenkernel/bad_level_call_stubs/Makefile
branches/soc-2007-red_fox/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/Makefile
branches/soc-2007-red_fox/source/blender/blenkernel/intern/action.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/armature.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/blender.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/colortools.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/curve.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/customdata.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/effect.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/exotic.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/icons.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/image.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/key.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/material.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/mesh.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/modifier.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/node.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/object.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/scene.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/softbody.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/texture.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/world.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/writeavi.c
branches/soc-2007-red_fox/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2007-red_fox/source/blender/blenlib/BLI_arithb.h
branches/soc-2007-red_fox/source/blender/blenlib/BLI_blenlib.h
branches/soc-2007-red_fox/source/blender/blenlib/BLI_editVert.h
branches/soc-2007-red_fox/source/blender/blenlib/BLI_storage_types.h
branches/soc-2007-red_fox/source/blender/blenlib/intern/Makefile
branches/soc-2007-red_fox/source/blender/blenlib/intern/arithb.c
branches/soc-2007-red_fox/source/blender/blenlib/intern/storage.c
branches/soc-2007-red_fox/source/blender/blenlib/intern/util.c
branches/soc-2007-red_fox/source/blender/blenloader/BLO_readfile.h
branches/soc-2007-red_fox/source/blender/blenloader/intern/Makefile
branches/soc-2007-red_fox/source/blender/blenloader/intern/readblenentry.c
branches/soc-2007-red_fox/source/blender/blenloader/intern/readfile.c
branches/soc-2007-red_fox/source/blender/blenloader/intern/writefile.c
branches/soc-2007-red_fox/source/blender/blenpluginapi/iff.h
branches/soc-2007-red_fox/source/blender/blenpluginapi/intern/Makefile
branches/soc-2007-red_fox/source/blender/ftfont/FTF_Api.h
branches/soc-2007-red_fox/source/blender/ftfont/intern/FTF_TTFont.h
branches/soc-2007-red_fox/source/blender/ftfont/intern/Makefile
branches/soc-2007-red_fox/source/blender/imbuf/IMB_imbuf.h
branches/soc-2007-red_fox/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/IMB_jpeg.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/Makefile
branches/soc-2007-red_fox/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/anim.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/cineon/Makefile
branches/soc-2007-red_fox/source/blender/imbuf/intern/dds/BlockDXT.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2007-red_fox/source/blender/imbuf/intern/dds/Makefile
branches/soc-2007-red_fox/source/blender/imbuf/intern/dds/Stream.cpp
branches/soc-2007-red_fox/source/blender/imbuf/intern/dds/Stream.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2007-red_fox/source/blender/imbuf/intern/divers.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/imageprocess.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/jpeg.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/openexr/Makefile
branches/soc-2007-red_fox/source/blender/imbuf/intern/png.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/readimage.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/rectop.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/rotate.c
branches/soc-2007-red_fox/source/blender/include/BDR_drawmesh.h
branches/soc-2007-red_fox/source/blender/include/BDR_editface.h
branches/soc-2007-red_fox/source/blender/include/BIF_butspace.h
branches/soc-2007-red_fox/source/blender/include/BIF_drawimage.h
branches/soc-2007-red_fox/source/blender/include/BIF_drawseq.h
branches/soc-2007-red_fox/source/blender/include/BIF_editaction.h
branches/soc-2007-red_fox/source/blender/include/BIF_editarmature.h
branches/soc-2007-red_fox/source/blender/include/BIF_editconstraint.h
branches/soc-2007-red_fox/source/blender/include/BIF_editmesh.h
branches/soc-2007-red_fox/source/blender/include/BIF_editseq.h
branches/soc-2007-red_fox/source/blender/include/BIF_editsima.h
branches/soc-2007-red_fox/source/blender/include/BIF_editsound.h
branches/soc-2007-red_fox/source/blender/include/BIF_fsmenu.h
branches/soc-2007-red_fox/source/blender/include/BIF_imasel.h
branches/soc-2007-red_fox/source/blender/include/BIF_interface_icons.h
branches/soc-2007-red_fox/source/blender/include/BIF_language.h
branches/soc-2007-red_fox/source/blender/include/BIF_resources.h
branches/soc-2007-red_fox/source/blender/include/BIF_space.h
branches/soc-2007-red_fox/source/blender/include/BIF_spacetypes.h
branches/soc-2007-red_fox/source/blender/include/BIF_transform.h
branches/soc-2007-red_fox/source/blender/include/BIF_usiblender.h
branches/soc-2007-red_fox/source/blender/include/BSE_drawimasel.h
branches/soc-2007-red_fox/source/blender/include/BSE_editipo.h
branches/soc-2007-red_fox/source/blender/include/BSE_filesel.h
branches/soc-2007-red_fox/source/blender/include/BSE_sequence.h
branches/soc-2007-red_fox/source/blender/include/BSE_time.h
branches/soc-2007-red_fox/source/blender/include/BSE_view.h
branches/soc-2007-red_fox/source/blender/include/blendef.h
branches/soc-2007-red_fox/source/blender/include/butspace.h
branches/soc-2007-red_fox/source/blender/include/datatoc.h
branches/soc-2007-red_fox/source/blender/include/editmesh.h
branches/soc-2007-red_fox/source/blender/include/interface.h
branches/soc-2007-red_fox/source/blender/include/mydevice.h
branches/soc-2007-red_fox/source/blender/include/transform.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_ID.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_action_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_armature_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_camera_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_curve_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_image_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_material_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_node_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_object_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_scene_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_space_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_texture_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2007-red_fox/source/blender/makesdna/DNA_world_types.h
branches/soc-2007-red_fox/source/blender/makesdna/intern/Makefile
branches/soc-2007-red_fox/source/blender/makesdna/intern/makesdna.c
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/Makefile
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_util.h
branches/soc-2007-red_fox/source/blender/nodes/intern/SHD_nodes/Makefile
branches/soc-2007-red_fox/source/blender/python/BPY_extern.h
branches/soc-2007-red_fox/source/blender/python/BPY_interface.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Armature.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/BGL.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Blender.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Bone.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Bone.h
branches/soc-2007-red_fox/source/blender/python/api2_2x/Camera.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Constraint.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Curve.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Draw.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Ipo.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Ipocurve.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Key.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Lamp.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Makefile
branches/soc-2007-red_fox/source/blender/python/api2_2x/Material.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Mesh.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Modifier.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/NLA.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/NMesh.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Noise.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Object.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Pose.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Texture.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Types.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Window.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/World.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/bpy_data.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Armature.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/BGL.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Constraint.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Key.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Mesh.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Modifier.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Pose.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Render.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Scene.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/Window.py
branches/soc-2007-red_fox/source/blender/python/api2_2x/euler.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/gen_library.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/gen_library.h
branches/soc-2007-red_fox/source/blender/python/api2_2x/gen_utils.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/gen_utils.h
branches/soc-2007-red_fox/source/blender/python/api2_2x/matrix.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/quat.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/rgbTuple.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/sceneRender.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/sceneSequence.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/vector.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/windowTheme.c
branches/soc-2007-red_fox/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2007-red_fox/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2007-red_fox/source/blender/radiosity/intern/source/Makefile
branches/soc-2007-red_fox/source/blender/render/intern/include/render_types.h
branches/soc-2007-red_fox/source/blender/render/intern/include/rendercore.h
branches/soc-2007-red_fox/source/blender/render/intern/source/Makefile
branches/soc-2007-red_fox/source/blender/render/intern/source/convertblender.c
branches/soc-2007-red_fox/source/blender/render/intern/source/pipeline.c
branches/soc-2007-red_fox/source/blender/render/intern/source/rayshade.c
branches/soc-2007-red_fox/source/blender/render/intern/source/shadeoutput.c
branches/soc-2007-red_fox/source/blender/render/intern/source/texture.c
branches/soc-2007-red_fox/source/blender/src/CMakeLists.txt
branches/soc-2007-red_fox/source/blender/src/Makefile
branches/soc-2007-red_fox/source/blender/src/SConscript
branches/soc-2007-red_fox/source/blender/src/blenderbuttons.c
branches/soc-2007-red_fox/source/blender/src/booleanops.c
branches/soc-2007-red_fox/source/blender/src/buttons_editing.c
branches/soc-2007-red_fox/source/blender/src/buttons_object.c
branches/soc-2007-red_fox/source/blender/src/buttons_scene.c
branches/soc-2007-red_fox/source/blender/src/buttons_shading.c
branches/soc-2007-red_fox/source/blender/src/drawaction.c
branches/soc-2007-red_fox/source/blender/src/drawarmature.c
branches/soc-2007-red_fox/source/blender/src/drawimage.c
branches/soc-2007-red_fox/source/blender/src/drawimasel.c
branches/soc-2007-red_fox/source/blender/src/drawipo.c
branches/soc-2007-red_fox/source/blender/src/drawmesh.c
branches/soc-2007-red_fox/source/blender/src/drawnla.c
branches/soc-2007-red_fox/source/blender/src/drawnode.c
branches/soc-2007-red_fox/source/blender/src/drawobject.c
branches/soc-2007-red_fox/source/blender/src/drawscene.c
branches/soc-2007-red_fox/source/blender/src/drawseq.c
branches/soc-2007-red_fox/source/blender/src/drawsound.c
branches/soc-2007-red_fox/source/blender/src/drawtime.c
branches/soc-2007-red_fox/source/blender/src/drawview.c
branches/soc-2007-red_fox/source/blender/src/edit.c
branches/soc-2007-red_fox/source/blender/src/editaction.c
branches/soc-2007-red_fox/source/blender/src/editarmature.c
branches/soc-2007-red_fox/source/blender/src/editconstraint.c
branches/soc-2007-red_fox/source/blender/src/editcurve.c
branches/soc-2007-red_fox/source/blender/src/editface.c
branches/soc-2007-red_fox/source/blender/src/editimasel.c
branches/soc-2007-red_fox/source/blender/src/editipo.c
branches/soc-2007-red_fox/source/blender/src/editipo_lib.c
branches/soc-2007-red_fox/source/blender/src/editipo_mods.c
branches/soc-2007-red_fox/source/blender/src/editkey.c
branches/soc-2007-red_fox/source/blender/src/editmesh.c
branches/soc-2007-red_fox/source/blender/src/editmesh_add.c
branches/soc-2007-red_fox/source/blender/src/editmesh_lib.c
branches/soc-2007-red_fox/source/blender/src/editmesh_loop.c
branches/soc-2007-red_fox/source/blender/src/editmesh_mods.c
branches/soc-2007-red_fox/source/blender/src/editmesh_tools.c
branches/soc-2007-red_fox/source/blender/src/editnla.c
branches/soc-2007-red_fox/source/blender/src/editnode.c
branches/soc-2007-red_fox/source/blender/src/editobject.c
branches/soc-2007-red_fox/source/blender/src/editscreen.c
branches/soc-2007-red_fox/source/blender/src/editseq.c
branches/soc-2007-red_fox/source/blender/src/editsima.c
branches/soc-2007-red_fox/source/blender/src/editsound.c
branches/soc-2007-red_fox/source/blender/src/edittime.c
branches/soc-2007-red_fox/source/blender/src/editview.c
branches/soc-2007-red_fox/source/blender/src/filesel.c
branches/soc-2007-red_fox/source/blender/src/fluidsim.c
branches/soc-2007-red_fox/source/blender/src/glutil.c
branches/soc-2007-red_fox/source/blender/src/hddaudio.c
branches/soc-2007-red_fox/source/blender/src/header_action.c
branches/soc-2007-red_fox/source/blender/src/header_filesel.c
branches/soc-2007-red_fox/source/blender/src/header_image.c
branches/soc-2007-red_fox/source/blender/src/header_imasel.c
branches/soc-2007-red_fox/source/blender/src/header_info.c
branches/soc-2007-red_fox/source/blender/src/header_ipo.c
branches/soc-2007-red_fox/source/blender/src/header_nla.c
branches/soc-2007-red_fox/source/blender/src/header_seq.c
branches/soc-2007-red_fox/source/blender/src/header_sound.c
branches/soc-2007-red_fox/source/blender/src/header_text.c
branches/soc-2007-red_fox/source/blender/src/header_time.c
branches/soc-2007-red_fox/source/blender/src/header_view3d.c
branches/soc-2007-red_fox/source/blender/src/headerbuttons.c
branches/soc-2007-red_fox/source/blender/src/imagepaint.c
branches/soc-2007-red_fox/source/blender/src/imasel.c
branches/soc-2007-red_fox/source/blender/src/interface.c
branches/soc-2007-red_fox/source/blender/src/interface_draw.c
branches/soc-2007-red_fox/source/blender/src/interface_icons.c
branches/soc-2007-red_fox/source/blender/src/language.c
branches/soc-2007-red_fox/source/blender/src/multires.c
branches/soc-2007-red_fox/source/blender/src/outliner.c
branches/soc-2007-red_fox/source/blender/src/parametrizer.c
branches/soc-2007-red_fox/source/blender/src/poseobject.c
branches/soc-2007-red_fox/source/blender/src/resources.c
branches/soc-2007-red_fox/source/blender/src/retopo.c
branches/soc-2007-red_fox/source/blender/src/sculptmode.c
branches/soc-2007-red_fox/source/blender/src/seqaudio.c
branches/soc-2007-red_fox/source/blender/src/seqeffects.c
branches/soc-2007-red_fox/source/blender/src/sequence.c
branches/soc-2007-red_fox/source/blender/src/space.c
branches/soc-2007-red_fox/source/blender/src/spacetypes.c
branches/soc-2007-red_fox/source/blender/src/splash.jpg.c
branches/soc-2007-red_fox/source/blender/src/toets.c
branches/soc-2007-red_fox/source/blender/src/toolbox.c
branches/soc-2007-red_fox/source/blender/src/transform.c
branches/soc-2007-red_fox/source/blender/src/transform_constraints.c
branches/soc-2007-red_fox/source/blender/src/transform_conversions.c
branches/soc-2007-red_fox/source/blender/src/transform_generics.c
branches/soc-2007-red_fox/source/blender/src/transform_manipulator.c
branches/soc-2007-red_fox/source/blender/src/transform_snap.c
branches/soc-2007-red_fox/source/blender/src/unwrapper.c
branches/soc-2007-red_fox/source/blender/src/usiblender.c
branches/soc-2007-red_fox/source/blender/src/view.c
branches/soc-2007-red_fox/source/blender/src/vpaint.c
branches/soc-2007-red_fox/source/blender/verify/intern/Makefile
branches/soc-2007-red_fox/source/blender/yafray/intern/Makefile
branches/soc-2007-red_fox/source/creator/Makefile
branches/soc-2007-red_fox/source/creator/creator.c
branches/soc-2007-red_fox/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2007-red_fox/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2007-red_fox/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2007-red_fox/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2007-red_fox/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2007-red_fox/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2007-red_fox/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2007-red_fox/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/soc-2007-red_fox/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2007-red_fox/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2007-red_fox/source/kernel/gen_messaging/intern/Makefile
branches/soc-2007-red_fox/source/nan_compile.mk
Added Paths:
-----------
branches/soc-2007-red_fox/release/datafiles/prvicons
branches/soc-2007-red_fox/source/blender/imbuf/IMB_thumbs.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/IMB_imginfo.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/imginfo.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/md5.c
branches/soc-2007-red_fox/source/blender/imbuf/intern/md5.h
branches/soc-2007-red_fox/source/blender/imbuf/intern/thumbs.c
branches/soc-2007-red_fox/source/blender/include/BIF_filelist.h
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/soc-2007-red_fox/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
branches/soc-2007-red_fox/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/soc-2007-red_fox/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/doc/epy_docgen-3.sh
branches/soc-2007-red_fox/source/blender/src/filelist.c
branches/soc-2007-red_fox/source/blender/src/fsmenu.c
branches/soc-2007-red_fox/source/blender/src/prvicons.c
Removed Paths:
-------------
branches/soc-2007-red_fox/release/scripts/uvcalc_from_adjacent.py
Property Changed:
----------------
branches/soc-2007-red_fox/intern/bsp/extern/CSG_BooleanOps.h
branches/soc-2007-red_fox/intern/bsp/intern/BSP_CSGException.h
branches/soc-2007-red_fox/intern/bsp/intern/BSP_CSGMesh.cpp
branches/soc-2007-red_fox/intern/bsp/intern/BSP_CSGMesh.h
branches/soc-2007-red_fox/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
branches/soc-2007-red_fox/intern/bsp/intern/BSP_MeshPrimitives.cpp
branches/soc-2007-red_fox/intern/bsp/intern/CSG_BooleanOps.cpp
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/bsp.ply
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/bsp_cube.ply
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/main.cpp
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/ply.h
branches/soc-2007-red_fox/intern/bsp/test/BSP_GhostTest/plyfile.c
branches/soc-2007-red_fox/intern/decimation/intern/future/LOD_ExternVColorEditor.cpp
branches/soc-2007-red_fox/intern/decimation/intern/future/LOD_ExternVColorEditor.h
branches/soc-2007-red_fox/intern/decimation/intern/future/LOD_NdQSDecimator.cpp
branches/soc-2007-red_fox/intern/decimation/intern/future/LOD_NdQSDecimator.h
branches/soc-2007-red_fox/intern/decimation/intern/future/LOD_NdQuadric.cpp
branches/soc-2007-red_fox/intern/decimation/intern/future/LOD_NdQuadric.h
branches/soc-2007-red_fox/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
branches/soc-2007-red_fox/intern/decimation/intern/future/LOD_NdQuadricEditor.h
branches/soc-2007-red_fox/intern/decimation/test/decimate_glut_test/intern/LOD_GhostTestApp.cpp
branches/soc-2007-red_fox/intern/decimation/test/decimate_glut_test/intern/LOD_GhostTestApp.h
branches/soc-2007-red_fox/intern/ghost/doc/ghost_interface.cfg
branches/soc-2007-red_fox/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/soc-2007-red_fox/intern/ghost/intern/GHOST_DisplayManagerX11.h
branches/soc-2007-red_fox/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2007-red_fox/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2007-red_fox/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2007-red_fox/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2007-red_fox/intern/ghost/test/Makefile
branches/soc-2007-red_fox/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2007-red_fox/intern/ghost/test/gears/Makefile
branches/soc-2007-red_fox/intern/ghost/test/multitest/MultiTest.c
branches/soc-2007-red_fox/intern/moto/include/MT_Matrix3x3.h
branches/soc-2007-red_fox/intern/moto/include/MT_Matrix4x4.h
branches/soc-2007-red_fox/intern/moto/include/MT_MinMax.h
branches/soc-2007-red_fox/intern/moto/include/MT_Scalar.h
branches/soc-2007-red_fox/intern/moto/include/MT_Stream.h
branches/soc-2007-red_fox/intern/moto/include/MT_Tuple2.h
branches/soc-2007-red_fox/intern/moto/include/MT_Tuple3.h
branches/soc-2007-red_fox/intern/moto/include/MT_Tuple4.h
branches/soc-2007-red_fox/intern/moto/include/MT_random.h
branches/soc-2007-red_fox/intern/moto/intern/MT_CmMatrix4x4.cpp
branches/soc-2007-red_fox/intern/moto/intern/MT_random.cpp
branches/soc-2007-red_fox/intern/moto/make/msvc_6_0/MoTo.dsp
branches/soc-2007-red_fox/intern/moto/make/msvc_6_0/MoTo.dsw
branches/soc-2007-red_fox/projectfiles/blender/yafray/BRE_yafray.dsp
branches/soc-2007-red_fox/release/datafiles/.Bfs
branches/soc-2007-red_fox/release/datafiles/DejaVuSans-Lite.sfd.bz2
branches/soc-2007-red_fox/release/datafiles/blenderbuttons
branches/soc-2007-red_fox/release/datafiles/splash.jpg
branches/soc-2007-red_fox/release/freedesktop/icons/16x16/blender.png
branches/soc-2007-red_fox/release/freedesktop/icons/16x16/blender.xcf.bz2
branches/soc-2007-red_fox/release/freedesktop/icons/22x22/blender.png
branches/soc-2007-red_fox/release/freedesktop/icons/22x22/blender.xcf.bz2
branches/soc-2007-red_fox/release/freedesktop/icons/32x32/blender.png
branches/soc-2007-red_fox/release/freedesktop/icons/32x32/blender.svg
branches/soc-2007-red_fox/release/scripts/IDPropBrowser.py
branches/soc-2007-red_fox/release/scripts/bpymodules/BPyWindow.py
branches/soc-2007-red_fox/release/scripts/bpymodules/colladaImEx/logo.png
branches/soc-2007-red_fox/release/scripts/bpymodules/mesh_gradient.py
branches/soc-2007-red_fox/release/scripts/flt_export.py
branches/soc-2007-red_fox/release/scripts/flt_import.py
branches/soc-2007-red_fox/release/scripts/mesh_boneweight_copy.py
branches/soc-2007-red_fox/release/scripts/object_cookie_cutter.py
branches/soc-2007-red_fox/release/scripts/object_random_loc_sz_rot.py
branches/soc-2007-red_fox/release/scripts/vertexpaint_gradient.py
branches/soc-2007-red_fox/release/scripts/weightpaint_gradient.py
branches/soc-2007-red_fox/release/text/BlenderQuickStart.pdf
branches/soc-2007-red_fox/release/text/blender.html
branches/soc-2007-red_fox/release/windows/extra/Python24.zip
branches/soc-2007-red_fox/release/windows/extra/python25.zip
branches/soc-2007-red_fox/release/windows/installer/00.checked.bmp
branches/soc-2007-red_fox/release/windows/installer/00.header.bmp
branches/soc-2007-red_fox/release/windows/installer/00.unchecked.bmp
branches/soc-2007-red_fox/release/windows/installer/01.installer.bmp
branches/soc-2007-red_fox/release/windows/publ_installer/01.installer.bmp
branches/soc-2007-red_fox/source/blender/include/BIF_transform.h
branches/soc-2007-red_fox/source/blender/include/transform.h
branches/soc-2007-red_fox/source/blender/python/api2_2x/Group.c
branches/soc-2007-red_fox/source/blender/python/api2_2x/Group.h
branches/soc-2007-red_fox/source/blender/src/transform.c
branches/soc-2007-red_fox/source/blender/src/transform_constraints.c
branches/soc-2007-red_fox/source/blender/src/transform_conversions.c
branches/soc-2007-red_fox/source/blender/src/transform_generics.c
branches/soc-2007-red_fox/source/blender/src/transform_numinput.c
branches/soc-2007-red_fox/source/blender/yafray/intern/api.cpp
branches/soc-2007-red_fox/source/blender/yafray/intern/export_File.cpp
branches/soc-2007-red_fox/source/blender/yafray/intern/export_File.h
branches/soc-2007-red_fox/source/darwin/Makefile
branches/soc-2007-red_fox/source/gameengine/BlenderRoutines/SConscript
branches/soc-2007-red_fox/source/gameengine/Converter/SConscript
branches/soc-2007-red_fox/source/gameengine/Expressions/SConscript
branches/soc-2007-red_fox/source/gameengine/GameLogic/SConscript
branches/soc-2007-red_fox/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.bmp
branches/soc-2007-red_fox/source/gameengine/Ketsji/KXNetwork/SConscript
branches/soc-2007-red_fox/source/gameengine/Network/LoopBackNetwork/SConscript
branches/soc-2007-red_fox/source/gameengine/Network/SConscript
branches/soc-2007-red_fox/source/gameengine/Physics/BlOde/SConscript
branches/soc-2007-red_fox/source/gameengine/Physics/Dummy/SConscript
branches/soc-2007-red_fox/source/gameengine/Physics/Sumo/SConscript
branches/soc-2007-red_fox/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp
branches/soc-2007-red_fox/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h
branches/soc-2007-red_fox/source/gameengine/Physics/common/SConscript
branches/soc-2007-red_fox/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2007-red_fox/source/gameengine/Rasterizer/SConscript
branches/soc-2007-red_fox/source/gameengine/SceneGraph/SConscript
Modified: branches/soc-2007-red_fox/intern/bmfont/BMF_Api.h
===================================================================
--- branches/soc-2007-red_fox/intern/bmfont/BMF_Api.h 2007-10-29 19:41:25 UTC (rev 12431)
+++ branches/soc-2007-red_fox/intern/bmfont/BMF_Api.h 2007-10-30 00:24:49 UTC (rev 12432)
@@ -89,15 +89,32 @@
int BMF_GetStringWidth(BMF_Font* font, char* str);
/**
+ * Returns the bounding box of a string of characters.
+ * @param font The font to use.
+ * @param str The string.
+ * @param llx Lower left x coord
+ * @param lly Lower left y coord
+ * @param urx Upper right x coord
+ * @param ury Upper right y coord
+ */
+void BMF_GetStringBoundingBox(BMF_Font* font, char* str, float*llx, float *lly, float *urx, float *ury);
+
+
+/**
* Returns the bounding box of the font. The width and
* height represent the bounding box of the union of
* all glyps. The minimum and maximum values of the
* box represent the extent of the font and its positioning
* about the origin.
*/
-void BMF_GetBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r);
+void BMF_GetFontBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r);
/**
+ * Same as GetFontBoundingBox but only returns the height
+ */
+int BMF_GetFontHeight(BMF_Font* font);
+
+/**
* Convert the given @a font to a texture, and return the GL texture
* ID of the texture. If the texture ID is bound, text can
* be drawn using the texture by calling DrawStringTexture.
@@ -122,6 +139,23 @@
*/
void BMF_DrawStringTexture(BMF_Font* font, char* string, float x, float y, float z);
+ /**
+ * Draw the given @a string at the point @a xpos, @a ypos using
+ * char and float buffers.
+ *
+ * @param string The c-string to draw.
+ * @param xpos The x coordinate to start drawing at.
+ * @param ypos The y coordinate to start drawing at.
+ * @param fgcol The forground color.
+ * @param bgcol The background color.
+ * @param buf Unsigned char image buffer, when NULL to not operate on it.
+ * @param fbuf float image buffer, when NULL to not operate on it.
+ * @param w image buffer width.
+ * @param h image buffer height.
+ */
+void BMF_DrawStringBuf(BMF_Font* font, char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h);
+
+
#ifdef __cplusplus
}
#endif
Modified: branches/soc-2007-red_fox/intern/bmfont/intern/BMF_Api.cpp
===================================================================
--- branches/soc-2007-red_fox/intern/bmfont/intern/BMF_Api.cpp 2007-10-29 19:41:25 UTC (rev 12431)
+++ branches/soc-2007-red_fox/intern/bmfont/intern/BMF_Api.cpp 2007-10-30 00:24:49 UTC (rev 12432)
@@ -150,13 +150,26 @@
return ((BMF_BitmapFont*)font)->GetStringWidth(str);
}
+void BMF_GetStringBoundingBox(BMF_Font* font, char* str, float*llx, float *lly, float *urx, float *ury){
+ if (!font){
+ *llx = *lly = *urx = *ury = 0;
+ }else{
+ ((BMF_BitmapFont*)font)->GetStringBoundingBox(str, llx, lly, urx, ury);
+ }
+}
-void BMF_GetBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r)
+void BMF_GetFontBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r)
{
if (!font) return;
- ((BMF_BitmapFont*)font)->GetBoundingBox(*xmin_r, *ymin_r, *xmax_r, *ymax_r);
+ ((BMF_BitmapFont*)font)->GetFontBoundingBox(*xmin_r, *ymin_r, *xmax_r, *ymax_r);
}
+int BMF_GetFontHeight(BMF_Font* font)
+{
+ if (!font) return -1;
+ return ((BMF_BitmapFont*)font)->GetFontHeight();
+}
+
int BMF_GetFontTexture(BMF_Font* font) {
if (!font) return -1;
return ((BMF_BitmapFont*)font)->GetTexture();
@@ -166,3 +179,8 @@
if (!font) return;
((BMF_BitmapFont*)font)->DrawStringTexture(string, x, y, z);
}
+
+void BMF_DrawStringBuf(BMF_Font* font, char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h) {
+ if (!font) return;
+ ((BMF_BitmapFont*)font)->DrawStringBuf(str, posx, posy, col, buf, fbuf, w, h);
+}
Modified: branches/soc-2007-red_fox/intern/bmfont/intern/BMF_BitmapFont.cpp
===================================================================
--- branches/soc-2007-red_fox/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-10-29 19:41:25 UTC (rev 12431)
+++ branches/soc-2007-red_fox/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-10-30 00:24:49 UTC (rev 12432)
@@ -35,6 +35,11 @@
* Copyright (C) 2001 NaN Technologies B.V.
*/
+
+#include <stdio.h>
+
+
+
#include <string.h>
#ifdef HAVE_CONFIG_H
@@ -107,7 +112,7 @@
return length;
}
-void BMF_BitmapFont::GetBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax)
+void BMF_BitmapFont::GetFontBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax)
{
xMin = m_fontData->xmin;
yMin = m_fontData->ymin;
@@ -115,6 +120,32 @@
yMax = m_fontData->ymax;
}
+int BMF_BitmapFont::GetFontHeight( void )
+{
+ return m_fontData->ymax - m_fontData->ymin;
+}
+
+void BMF_BitmapFont::GetStringBoundingBox(char* str, float*llx, float *lly, float *urx, float *ury)
+{
+ unsigned char c;
+ int length = 0;
+ int ascent = 0;
+ int descent = 0;
+
+ while ( (c = (unsigned char) *str++) ) {
+ length += m_fontData->chars[c].advance;
+ int d = m_fontData->chars[c].yorig;
+ int a = m_fontData->chars[c].height - m_fontData->chars[c].yorig;
+ if(a > ascent) ascent = a;
+ if(d > descent) descent = d;
+ }
+ *llx = (float)0;
+ *lly = (float)-descent;
+ *urx = (float)length;
+ *ury = (float)ascent;
+}
+
+
int BMF_BitmapFont::GetTexture()
{
int fWidth = m_fontData->xmax - m_fontData->xmin;
@@ -208,3 +239,84 @@
}
glEnd();
}
+
+#define FTOCHAR(val) val<=0.0f?0: (val>=1.0f?255: (char)(255.0f*val))
+void BMF_BitmapFont::DrawStringBuf(char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h)
+{
+ int x, y;
+
+ if (buf==0 && fbuf==0)
+ return;
+
+ /*offset for font*/
+ posx -= m_fontData->xmin;
+ posy -= m_fontData->ymin;
+
+ if (buf) {
+ unsigned char colch[4];
+ unsigned char *max, *pixel;
+ unsigned char c;
+
+ for (x=0; x<4; x++) {
+ colch[x] = FTOCHAR(col[x]);
+ }
+
+ max = buf + (4 * (w * h));
+ while ((c = (unsigned char) *str++)) {
+ BMF_CharData & cd = m_fontData->chars[c];
+ if (cd.data_offset != -1) {
+ for (y = 0; y < cd.height; y++) {
+ unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y];
+ for (x = cd.xorig; x < cd.width; x++) {
+ pixel = buf + 4 * (((posy + y - cd.yorig) * w) + (posx + x));
+ if ((pixel < max) && (pixel > buf)) {
+ int byteIdx = x/8;
+ int bitIdx = 7 - (x%8);
+
+ if (chrRow[byteIdx]&(1<<bitIdx)) {
+ pixel[0] = colch[0];
+ pixel[1] = colch[1];
+ pixel[2] = colch[2];
+ pixel[4] = 1; /*colch[3];*/
+
+ }
+ }
+ }
+ }
+ }
+ posx += cd.advance;
+ }
+ }
+
+ if (fbuf) {
+ float *pixel, *max;
+ unsigned char c;
+ int x, y;
+
+ max = fbuf + (4 * (w * h));
+
+ while ((c = (unsigned char) *str++)) {
+ BMF_CharData & cd = m_fontData->chars[c];
+ if (cd.data_offset != -1) {
+ for (y = 0; y < cd.height; y++) {
+ unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y];
+ for (x = cd.xorig; x < cd.width; x++) {
+ pixel = fbuf + 4 * (((posy + y - cd.yorig) * w) + (posx + x));
+ if ((pixel < max) && (pixel > fbuf)) {
+ int byteIdx = x/8;
+ int bitIdx = 7 - (x%8);
+
+ if (chrRow[byteIdx]&(1<<bitIdx)) {
+ pixel[0] = col[0];
+ pixel[1] = col[1];
+ pixel[2] = col[2];
+ pixel[3] = 1; /*col[3];*/
+ }
+ }
+ }
+ }
+ }
+ posx += cd.advance;
+ }
+ }
+}
Modified: branches/soc-2007-red_fox/intern/bmfont/intern/BMF_BitmapFont.h
===================================================================
--- branches/soc-2007-red_fox/intern/bmfont/intern/BMF_BitmapFont.h 2007-10-29 19:41:25 UTC (rev 12431)
+++ branches/soc-2007-red_fox/intern/bmfont/intern/BMF_BitmapFont.h 2007-10-30 00:24:49 UTC (rev 12432)
@@ -76,8 +76,25 @@
* box represent the extent of the font and its positioning
* about the origin.
*/
- void GetBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax);
+ void GetFontBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax);
+
+ /**
+ * Return the bounding box height of the font.
+ */
+ int GetFontHeight(void);
+
+ /**
+ * Returns the bounding box of a string of characters.
+ * @param font The font to use.
+ * @param str The string.
+ * @param llx Lower left x coord
+ * @param lly Lower left y coord
+ * @param urx Upper right x coord
+ * @param ury Upper right y coord
+ */
+ void GetStringBoundingBox(char* str, float*llx, float *lly, float *urx, float *ury);
+
/**
* Convert the font to a texture, and return the GL texture
* ID of the texture. If the texture ID is bound, text can
@@ -101,6 +118,21 @@
*/
void DrawStringTexture(char* string, float x, float y, float z);
+ /**
+ * Draw the given @a string at the point @a xpos, @a ypos using
+ * char and float buffers.
+ *
+ * @param string The c-string to draw.
+ * @param xpos The x coordinate to start drawing at.
+ * @param ypos The y coordinate to start drawing at.
+ * @param col The forground color.
+ * @param buf Unsigned char image buffer, when NULL to not operate on it.
+ * @param fbuf float image buffer, when NULL to not operate on it.
+ * @param w image buffer width.
+ * @param h image buffer height.
+ */
+ void DrawStringBuf(char *str, int posx, int posy, float *col, unsigned char *buf, float *fbuf, int w, int h);
+
protected:
/** Pointer to the font data. */
BMF_FontData* m_fontData;
Property changes on: branches/soc-2007-red_fox/intern/bsp/extern/CSG_BooleanOps.h
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/soc-2007-red_fox/intern/bsp/intern/BSP_CSGException.h
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/soc-2007-red_fox/intern/bsp/intern/BSP_CSGMesh.cpp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/soc-2007-red_fox/intern/bsp/intern/BSP_CSGMesh.h
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/soc-2007-red_fox/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
___________________________________________________________________
Name: svn:executable
- *
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list