[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40598] branches/soc-2011-tomato: Merging r40572 through r40597 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Tue Sep 27 11:26:47 CEST 2011
Revision: 40598
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40598
Author: nazgul
Date: 2011-09-27 09:26:46 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Merging r40572 through r40597 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40572
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40597
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2011-tomato/build_files/cmake/project_source_info.py
branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp
branches/soc-2011-tomato/extern/recastnavigation/recast-capi.h
branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/anim_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
branches/soc-2011-tomato/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_anim.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/mesh/SConscript
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-tomato/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/object/SConscript
branches/soc-2011-tomato/source/blender/editors/object/object_intern.h
branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/util/editmode_undo.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/python/generic/IDProp.c
branches/soc-2011-tomato/source/blender/python/generic/bgl.c
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/creator/creator.c
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/editors/object/object_navmesh.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40571
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40597
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-09-27 09:21:17 UTC (rev 40597)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-09-27 09:26:46 UTC (rev 40598)
@@ -1156,14 +1156,19 @@
# set the endian define
-include(TestBigEndian)
-test_big_endian(_SYSTEM_BIG_ENDIAN)
-if(_SYSTEM_BIG_ENDIAN)
- add_definitions(-D__BIG_ENDIAN__)
+if(MSVC)
+ # for some reason this fails on msvc
+ add_definitions(-D__LITTLE_ENDIAN__)
else()
- add_definitions(-D__LITTLE_ENDIAN__)
+ include(TestBigEndian)
+ test_big_endian(_SYSTEM_BIG_ENDIAN)
+ if(_SYSTEM_BIG_ENDIAN)
+ add_definitions(-D__BIG_ENDIAN__)
+ else()
+ add_definitions(-D__LITTLE_ENDIAN__)
+ endif()
+ unset(_SYSTEM_BIG_ENDIAN)
endif()
-unset(_SYSTEM_BIG_ENDIAN)
if(WITH_IMAGE_OPENJPEG)
Modified: branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-27 09:21:17 UTC (rev 40597)
+++ branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-27 09:26:46 UTC (rev 40598)
@@ -58,8 +58,8 @@
check_commands.append((c, cmd))
+ process_functions = []
- process_functions = []
def my_process(i, c, cmd):
percent = 100.0 * (i / (len(check_commands) - 1))
percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
Modified: branches/soc-2011-tomato/build_files/cmake/project_source_info.py
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/project_source_info.py 2011-09-27 09:21:17 UTC (rev 40597)
+++ branches/soc-2011-tomato/build_files/cmake/project_source_info.py 2011-09-27 09:26:46 UTC (rev 40598)
@@ -161,8 +161,6 @@
del multiprocessing
if job_total == 1:
- import os
- import sys
for func, args in process_funcs:
sys.stdout.flush()
sys.stderr.flush()
@@ -171,14 +169,13 @@
process.wait()
else:
import time
- import subprocess
processes = []
for func, args in process_funcs:
# wait until a thread is free
while 1:
processes[:] = [p for p in processes if p.poll() is None]
-
+
if len(processes) <= job_total:
break
else:
Modified: branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp
===================================================================
--- branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp 2011-09-27 09:21:17 UTC (rev 40597)
+++ branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp 2011-09-27 09:26:46 UTC (rev 40598)
@@ -35,3 +35,218 @@
{
return (int) buildMeshAdjacency(polys, npolys, nverts, vertsPerPoly);
}
+
+void recast_calcBounds(const float *verts, int nv, float *bmin, float *bmax)
+{
+ rcCalcBounds(verts, nv, bmin, bmax);
+}
+
+void recast_calcGridSize(const float *bmin, const float *bmax, float cs, int *w, int *h)
+{
+ rcCalcGridSize(bmin, bmax, cs, w, h);
+}
+
+struct recast_heightfield *recast_newHeightfield(void)
+{
+ return (struct recast_heightfield *) (new rcHeightfield);
+}
+
+void recast_destroyHeightfield(struct recast_heightfield *heightfield)
+{
+ delete (rcHeightfield *) heightfield;
+}
+
+int recast_createHeightfield(struct recast_heightfield *hf, int width, int height,
+ const float *bmin, const float* bmax, float cs, float ch)
+{
+ return rcCreateHeightfield(*(rcHeightfield *)hf, width, height, bmin, bmax, cs, ch);
+}
+
+void recast_markWalkableTriangles(const float walkableSlopeAngle,const float *verts, int nv,
+ const int *tris, int nt, unsigned char *flags)
+{
+ rcMarkWalkableTriangles(walkableSlopeAngle, verts, nv, tris, nt, flags);
+}
+
+void recast_rasterizeTriangles(const float *verts, int nv, const int *tris,
+ const unsigned char *flags, int nt, struct recast_heightfield *solid)
+{
+ rcRasterizeTriangles(verts, nv, tris, flags, nt, *(rcHeightfield *) solid);
+}
+
+void recast_filterLedgeSpans(const int walkableHeight, const int walkableClimb,
+ struct recast_heightfield *solid)
+{
+ rcFilterLedgeSpans(walkableHeight, walkableClimb, *(rcHeightfield *) solid);
+}
+
+void recast_filterWalkableLowHeightSpans(int walkableHeight, struct recast_heightfield *solid)
+{
+ rcFilterWalkableLowHeightSpans(walkableHeight, *(rcHeightfield *) solid);
+}
+
+struct recast_compactHeightfield *recast_newCompactHeightfield(void)
+{
+ return (struct recast_compactHeightfield *) (new rcCompactHeightfield);
+}
+
+void recast_destroyCompactHeightfield(struct recast_compactHeightfield *compactHeightfield)
+{
+ delete (rcCompactHeightfield *) compactHeightfield;
+}
+
+int recast_buildCompactHeightfield(const int walkableHeight, const int walkableClimb,
+ unsigned char flags, struct recast_heightfield *hf, struct recast_compactHeightfield *chf)
+{
+ int rcFlags = 0;
+
+ if(flags & RECAST_WALKABLE)
+ rcFlags |= RC_WALKABLE;
+
+ if(flags & RECAST_REACHABLE)
+ rcFlags |= RC_REACHABLE;
+
+ return rcBuildCompactHeightfield(walkableHeight, walkableClimb, rcFlags,
+ *(rcHeightfield *) hf, *(rcCompactHeightfield *) chf);
+}
+
+int recast_buildDistanceField(struct recast_compactHeightfield *chf)
+{
+ return rcBuildDistanceField(*(rcCompactHeightfield *) chf);
+}
+
+int recast_buildRegions(struct recast_compactHeightfield *chf, int walkableRadius, int borderSize,
+ int minRegionSize, int mergeRegionSize)
+{
+ return rcBuildRegions(*(rcCompactHeightfield *) chf, walkableRadius, borderSize,
+ minRegionSize, mergeRegionSize);
+}
+
+struct recast_contourSet *recast_newContourSet(void)
+{
+ return (struct recast_contourSet *) (new rcContourSet);
+}
+
+void recast_destroyContourSet(struct recast_contourSet *contourSet)
+{
+ delete (rcContourSet *) contourSet;
+}
+
+int recast_buildContours(struct recast_compactHeightfield *chf,
+ const float maxError, const int maxEdgeLen, struct recast_contourSet *cset)
+{
+ return rcBuildContours(*(rcCompactHeightfield *) chf, maxError, maxEdgeLen, *(rcContourSet *) cset);
+}
+
+struct recast_polyMesh *recast_newPolyMesh(void)
+{
+ return (recast_polyMesh *) (new rcPolyMesh);
+}
+
+void recast_destroyPolyMesh(struct recast_polyMesh *polyMesh)
+{
+ delete (rcPolyMesh *) polyMesh;
+}
+
+int recast_buildPolyMesh(struct recast_contourSet *cset, int nvp, struct recast_polyMesh *mesh)
+{
+ return rcBuildPolyMesh(*(rcContourSet *) cset, nvp, * (rcPolyMesh *) mesh);
+}
+
+unsigned short *recast_polyMeshGetVerts(struct recast_polyMesh *mesh, int *nverts)
+{
+ rcPolyMesh *pmesh = (rcPolyMesh *)mesh;
+
+ if (nverts)
+ *nverts = pmesh->nverts;
+
+ return pmesh->verts;
+}
+
+void recast_polyMeshGetBoundbox(struct recast_polyMesh *mesh, float *bmin, float *bmax)
+{
+ rcPolyMesh *pmesh = (rcPolyMesh *)mesh;
+
+ if (bmin) {
+ bmin[0] = pmesh->bmin[0];
+ bmin[1] = pmesh->bmin[1];
+ bmin[2] = pmesh->bmin[2];
+ }
+
+ if (bmax) {
+ bmax[0] = pmesh->bmax[0];
+ bmax[1] = pmesh->bmax[1];
+ bmax[2] = pmesh->bmax[2];
+ }
+}
+
+void recast_polyMeshGetCell(struct recast_polyMesh *mesh, float *cs, float *ch)
+{
+ rcPolyMesh *pmesh = (rcPolyMesh *)mesh;
+
+ if (cs)
+ *cs = pmesh->cs;
+
+ if (ch)
+ *ch = pmesh->ch;
+}
+
+unsigned short *recast_polyMeshGetPolys(struct recast_polyMesh *mesh, int *npolys, int *nvp)
+{
+ rcPolyMesh *pmesh = (rcPolyMesh *)mesh;
+
+ if (npolys)
+ *npolys = pmesh->npolys;
+
+ if (nvp)
+ *nvp = pmesh->nvp;
+
+ return pmesh->polys;
+}
+
+struct recast_polyMeshDetail *recast_newPolyMeshDetail(void)
+{
+ return (struct recast_polyMeshDetail *) (new rcPolyMeshDetail);
+}
+
+void recast_destroyPolyMeshDetail(struct recast_polyMeshDetail *polyMeshDetail)
+{
+ delete (rcPolyMeshDetail *) polyMeshDetail;
+}
+
+int recast_buildPolyMeshDetail(const struct recast_polyMesh *mesh, const struct recast_compactHeightfield *chf,
+ const float sampleDist, const float sampleMaxError, struct recast_polyMeshDetail *dmesh)
+{
+ return rcBuildPolyMeshDetail(*(rcPolyMesh *) mesh, *(rcCompactHeightfield *) chf,
+ sampleDist, sampleMaxError, *(rcPolyMeshDetail *) dmesh);
+}
+
+float *recast_polyMeshDetailGetVerts(struct recast_polyMeshDetail *mesh, int *nverts)
+{
+ rcPolyMeshDetail *dmesh = (rcPolyMeshDetail *)mesh;
+
+ if (nverts)
+ *nverts = dmesh->nverts;
+
+ return dmesh->verts;
+}
+
+unsigned char *recast_polyMeshDetailGetTris(struct recast_polyMeshDetail *mesh, int *ntris)
+{
+ rcPolyMeshDetail *dmesh = (rcPolyMeshDetail *)mesh;
+
+ if (ntris)
+ *ntris = dmesh->ntris;
+
+ return dmesh->tris;
+}
+
+unsigned short *recast_polyMeshDetailGetMeshes(struct recast_polyMeshDetail *mesh, int *nmeshes)
+{
+ rcPolyMeshDetail *dmesh = (rcPolyMeshDetail *)mesh;
+
+ if (nmeshes)
+ *nmeshes = dmesh->nmeshes;
+
+ return dmesh->meshes;
+}
Modified: branches/soc-2011-tomato/extern/recastnavigation/recast-capi.h
===================================================================
--- branches/soc-2011-tomato/extern/recastnavigation/recast-capi.h 2011-09-27 09:21:17 UTC (rev 40597)
+++ branches/soc-2011-tomato/extern/recastnavigation/recast-capi.h 2011-09-27 09:26:46 UTC (rev 40598)
@@ -32,9 +32,95 @@
extern "C" {
#endif
+struct recast_polyMesh;
+struct recast_polyMeshDetail;
+struct recast_heightfield;
+struct recast_compactHeightfield;
+struct recast_contourSet;
+
+enum recast_SpanFlags
+{
+ RECAST_WALKABLE = 0x01,
+ RECAST_REACHABLE = 0x02
+};
+
int recast_buildMeshAdjacency(unsigned short* polys, const int npolys,
const int nverts, const int vertsPerPoly);
+void recast_calcBounds(const float *verts, int nv, float *bmin, float *bmax);
+
+void recast_calcGridSize(const float *bmin, const float *bmax, float cs, int *w, int *h);
+
+struct recast_heightfield *recast_newHeightfield(void);
+
+void recast_destroyHeightfield(struct recast_heightfield *heightfield);
+
+int recast_createHeightfield(struct recast_heightfield *hf, int width, int height,
+ const float *bmin, const float* bmax, float cs, float ch);
+
+void recast_markWalkableTriangles(const float walkableSlopeAngle,const float *verts, int nv,
+ const int *tris, int nt, unsigned char *flags);
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list