Revision: 40935
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40935
Author: psy-fi
Date: 2011-10-11 13:54:38 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
merge with trunk version 40934
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/doc/build_systems/cmake.txt
branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-onion-uv-tools/intern/container/CTR_List.h
branches/soc-2011-onion-uv-tools/intern/container/CTR_Map.h
branches/soc-2011-onion-uv-tools/intern/ghost/GHOST_Types.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_Buttons.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_ModifierKeys.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCarbon.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_Window.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowCarbon.h
branches/soc-2011-onion-uv-tools/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2011-onion-uv-tools/intern/string/STR_String.h
branches/soc-2011-onion-uv-tools/po/POTFILES.in
branches/soc-2011-onion-uv-tools/po/README.txt
branches/soc-2011-onion-uv-tools/po/ar.po
branches/soc-2011-onion-uv-tools/po/bg.po
branches/soc-2011-onion-uv-tools/po/ca.po
branches/soc-2011-onion-uv-tools/po/cs.po
branches/soc-2011-onion-uv-tools/po/de.po
branches/soc-2011-onion-uv-tools/po/el.po
branches/soc-2011-onion-uv-tools/po/es.po
branches/soc-2011-onion-uv-tools/po/fi.po
branches/soc-2011-onion-uv-tools/po/fr.po
branches/soc-2011-onion-uv-tools/po/hr.po
branches/soc-2011-onion-uv-tools/po/it.po
branches/soc-2011-onion-uv-tools/po/ja.po
branches/soc-2011-onion-uv-tools/po/ko.po
branches/soc-2011-onion-uv-tools/po/ne.po
branches/soc-2011-onion-uv-tools/po/nl.po
branches/soc-2011-onion-uv-tools/po/pl.po
branches/soc-2011-onion-uv-tools/po/pt_BR.po
branches/soc-2011-onion-uv-tools/po/ro.po
branches/soc-2011-onion-uv-tools/po/ru.po
branches/soc-2011-onion-uv-tools/po/sr.po
branches/soc-2011-onion-uv-tools/po/[email protected]
branches/soc-2011-onion-uv-tools/po/sv.po
branches/soc-2011-onion-uv-tools/po/uk.po
branches/soc-2011-onion-uv-tools/po/update_msg.py
branches/soc-2011-onion-uv-tools/po/zh_CN.po
branches/soc-2011-onion-uv-tools/po/zh_TW.po
branches/soc-2011-onion-uv-tools/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/soc-2011-onion-uv-tools/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy/path.py
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/image.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/keyingsets_builtins.py
branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_action.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_anim.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_armature.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_bullet.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_font.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_icons.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_nla.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_packedFile.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_suggestions.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_unit.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_writeframeserver.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/action.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/blender.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/bmfont.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/boids.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/bullet.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/curve.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/deform.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/displist.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/effect.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/font.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/icons.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image_gen.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/key.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/library.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mball.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/nla.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/property.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/script.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/seqcache.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sketch.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sound.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/texture.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/world.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/keyframing.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseobject.c
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editfont.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_transform.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sound/sound_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/space_info.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/drawnode.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-onion-uv-tools/source/blender/editors/util/ed_util.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_ID.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_props.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Dome.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_OrientationInterpolator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2011-onion-uv-tools/source/gameengine/SceneGraph/SG_DList.h
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/ImageRender.h
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/ImageViewport.h
branches/soc-2011-onion-uv-tools/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/soc-2011-onion-uv-tools/po/fa.po
branches/soc-2011-onion-uv-tools/release/bin/.blender/locale/fa/
branches/soc-2011-onion-uv-tools/release/bin/.blender/locale/fa/LC_MESSAGES/
Removed Paths:
-------------
branches/soc-2011-onion-uv-tools/release/bin/.blender/locale/fa/LC_MESSAGES/
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
branches/soc-2011-onion-uv-tools/po/el.po
branches/soc-2011-onion-uv-tools/po/ko.po
branches/soc-2011-onion-uv-tools/po/ne.po
branches/soc-2011-onion-uv-tools/po/zh_TW.po
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39665-40833
+ /trunk/blender:39665-40934
Modified: branches/soc-2011-onion-uv-tools/doc/build_systems/cmake.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/doc/build_systems/cmake.txt
2011-10-11 10:59:52 UTC (rev 40934)
+++ branches/soc-2011-onion-uv-tools/doc/build_systems/cmake.txt
2011-10-11 13:54:38 UTC (rev 40935)
@@ -11,7 +11,7 @@
3. Obtaining Dependencies
4. Deciding on a Build Environment
5. Configuring the build for the first time
- 6. Configuring the build after CVS updates
+ 6. Configuring the build after SVN updates
7. Specify alternate Python library versions and locations
@@ -36,7 +36,7 @@
http://www.blender.org/cms/Getting_Dependencies.135.0.html that you
have all dependencies needed for building Blender. Note that for
windows many of these dependencies already come in the lib/windows
- module from CVS.
+ module from SVN.
4. Deciding on a Build Environment
----------------------------------
@@ -47,8 +47,8 @@
have been successfully used to generate build files for the following
environments:
- 1. Microsoft Visual Studio 2005. There is a free version available
- at http://msdn.microsoft.com/vstudio/express/visualc/.
+ 1. Microsoft Visual Studio 2008. There is a free version available
+ at
http://http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
2. Xcode on Mac OSX
@@ -65,7 +65,7 @@
with different Blender configurations (Audio/NoAudio,
GameEngine/NoGameEngine etc.)
while maintaining a clean source tree. It also makes it possible to
generate files
for different build systems on the same source tree. This also has
benefits for
- general CVS management for the developer as patches and submit logs are
much cleaner.
+ general SVN management for the developer as patches and submit logs are
much cleaner.
Create a directory outside the blender source tree where you would like to
build
Blender (from now on called $BLENDERBUILD). On the commandline you can
then run
@@ -78,27 +78,27 @@
% cd $BLENDERBUILD
% cmake
- ...
- ...
- --version [file] = Show program name/version banner
and exit.
+ ...
+ ...
+ --version [file] = Show program name/version banner and
exit.
- Generators
+ Generators
- The following generators are available on this platform:
- KDevelop3 = Generates KDevelop 3 project
files.
- Unix Makefiles = Generates standard UNIX
makefiles.
- Xcode = Generate XCode project files.
+ The following generators are available on this platform:
+ KDevelop3 = Generates KDevelop 3 project files.
+ Unix Makefiles = Generates standard UNIX makefiles.
+ Xcode = Generate XCode project files.
% cmake -G Xcode $BLENDERSOURCE
- ...
- ...
- -- Configuring blender
- -- Configuring blenderplayer
- -- Configuring done
- -- Generating done
- -- Build files have been written to: $BLENDERBUILD
+ ...
+ ...
+ -- Configuring blender
+ -- Configuring blenderplayer
+ -- Configuring done
+ -- Generating done
+ -- Build files have been written to: $BLENDERBUILD
This will generate the build files with default values. Specific features
can
be enabled or disabled by running the ccmake "GUI" from $BLENDERBUILD as
follows:
@@ -114,15 +114,15 @@
It is also possible to use the commandline of 'cmake' to override certain
of these settings.
- 6. Configuring the build after CVS updates
+ 6. Configuring the build after SVN updates
------------------------------------------
The $BLENDERBUILD directory maintains a file called CMakeCache.txt which
remembers the initial run's settings for subsequent generation runs. After
- every CVS update it may be a good idea to rerun the generation before
building
+ every SVN update it may be a good idea to rerun the generation before
building
Blender again. Just rerun the original 'cmake' run to do this, the settings
will be remembered. For the example above the following will do after every
- 'cvs up':
+ 'svn up':
% cmake -G Xcode $BLENDERSOURCE
@@ -132,9 +132,9 @@
The commandline can be used to override detected/default settings, e.g:
On Unix:
- cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.1/config/libpython3.1.so
-D PYTHON_INCLUDE_DIRS=/usr/local/include/python3.1 -G "Unix Makefiles"
../blender
+ cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.2/config/libpython3.2.so
-D PYTHON_INCLUDE_DIR=/usr/local/include/python3.2 ../blender
On Macs:
- cmake -D
PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1
-G Xcode ../blender
+ cmake -D
PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2
-G Xcode ../blender
Mote that this should only be needed once per build directory generation
because it will keep the overrides in CMakeCache.txt for subsequent runs.
@@ -153,4 +153,3 @@
on the various platforms.
/Jacques Beaurain (jbinto)
-
Modified: branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_C-API.cpp
2011-10-11 10:59:52 UTC (rev 40934)
+++ branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_C-API.cpp
2011-10-11 13:54:38 UTC (rev 40935)
@@ -1094,9 +1094,11 @@
specs.specs = reader->getSpecs();
int len;
float samplejump = specs.rate / samples_per_second;
- float min, max, power;
+ float min, max, power, overallmax;
bool eos;
+ overallmax = 0;
+
for(int i = 0; i < length; i++)
{
len = floor(samplejump * (i+1)) - floor(samplejump * i);
@@ -1121,6 +1123,11 @@
buffer[i * 3 + 1] = max;
buffer[i * 3 + 2] = sqrt(power) / len;
+ if(overallmax < max)
+ overallmax = max;
+ if(overallmax < -min)
+ overallmax = -min;
+
if(eos)
{
length = i;
@@ -1128,6 +1135,14 @@
}
}
+ if(overallmax > 1.0f)
+ {
+ for(int i = 0; i < length * 3; i++)
+ {
+ buffer[i] /= overallmax;
+ }
+ }
+
return length;
}
Modified: branches/soc-2011-onion-uv-tools/intern/container/CTR_List.h
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/container/CTR_List.h
2011-10-11 10:59:52 UTC (rev 40934)
+++ branches/soc-2011-onion-uv-tools/intern/container/CTR_List.h
2011-10-11 13:54:38 UTC (rev 40935)
@@ -37,18 +37,18 @@
class CTR_Link {
public:
- CTR_Link(
+ CTR_Link(
) ;
- CTR_Link(
+ CTR_Link(
CTR_Link *next,
CTR_Link *prev
) ;
-
+
CTR_Link *
getNext(
) const ;
-
+
CTR_Link *
getPrev(
) const ;
@@ -76,14 +76,14 @@
) ;
private:
- CTR_Link *m_next;
- CTR_Link *m_prev;
+ CTR_Link *m_next;
+ CTR_Link *m_prev;
};
class CTR_List {
public:
- CTR_List(
+ CTR_List(
) ;
CTR_Link *
@@ -103,10 +103,10 @@
addTail(
CTR_Link *link
) ;
-
+
private:
- CTR_Link m_head;
- CTR_Link m_tail;
+ CTR_Link m_head;
+ CTR_Link m_tail;
};
#endif
Modified: branches/soc-2011-onion-uv-tools/intern/container/CTR_Map.h
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/container/CTR_Map.h 2011-10-11
10:59:52 UTC (rev 40934)
+++ branches/soc-2011-onion-uv-tools/intern/container/CTR_Map.h 2011-10-11
13:54:38 UTC (rev 40935)
@@ -37,24 +37,24 @@
template <class Key, class Value>
class CTR_Map {
private:
- struct Entry {
- Entry (Entry *next, Key key, Value value) :
- m_next(next),
- m_key(key),
- m_value(value) {}
+ struct Entry {
+ Entry (Entry *next, Key key, Value value) :
+ m_next(next),
+ m_key(key),
+ m_value(value) {}
- Entry *m_next;
- Key m_key;
- Value m_value;
- };
-
+ Entry *m_next;
+ Key m_key;
+ Value m_value;
+ };
+
public:
- CTR_Map(int num_buckets = 100) : m_num_buckets(num_buckets) {
- m_buckets = new Entry *[num_buckets];
- for (int i = 0; i < num_buckets; ++i) {
- m_buckets[i] = 0;
- }
- }
+ CTR_Map(int num_buckets = 100) : m_num_buckets(num_buckets) {
+ m_buckets = new Entry *[num_buckets];
+ for (int i = 0; i < num_buckets; ++i) {
+ m_buckets[i] = 0;
+ }
+ }
CTR_Map(const CTR_Map& map)
{
@@ -68,114 +68,114 @@
insert(entry->m_key, entry->m_value);
}
}
-
- int size() {
- int count=0;
- for (int i=0;i<m_num_buckets;i++)
- {
- Entry* bucket = m_buckets[i];
- while(bucket)
- {
- bucket = bucket->m_next;
- count++;
- }
- }
- return count;
- }
-
- Value* at(int index) {
- int count=0;
- for (int i=0;i<m_num_buckets;i++)
- {
- Entry* bucket = m_buckets[i];
- while(bucket)
- {
- if (count==index)
- {
- return &bucket->m_value;
- }
- bucket = bucket->m_next;
- count++;
- }
- }
- return 0;
- }
- Key* getKey(int index) {
- int count=0;
- for (int i=0;i<m_num_buckets;i++)
- {
- Entry* bucket = m_buckets[i];
- while(bucket)
- {
- if (count==index)
- {
- return &bucket->m_key;
- }
- bucket = bucket->m_next;
- count++;
- }
- }
- return 0;
- }
-
- void clear() {
- for (int i = 0; i < m_num_buckets; ++i) {
- Entry *entry_ptr = m_buckets[i];
-
- while (entry_ptr != 0) {
- Entry *tmp_ptr = entry_ptr->m_next;
- delete entry_ptr;
- entry_ptr = tmp_ptr;
- }
- m_buckets[i] = 0;
- }
- }
-
- ~CTR_Map() {
- clear();
- delete [] m_buckets;
- }
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
