[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40141] branches/bmesh/blender: svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Mon Sep 12 02:38:58 CEST 2011
Revision: 40141
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40141
Author: campbellbarton
Date: 2011-09-12 00:38:57 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40124
Modified Paths:
--------------
branches/bmesh/blender/extern/SConscript
branches/bmesh/blender/intern/tools/credits_svn_gen.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/SConscript
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/editors/animation/keyframing.c
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/space_file/filelist.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_select.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/util/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/util/SConscript
branches/bmesh/blender/source/blender/modifiers/CMakeLists.txt
branches/bmesh/blender/source/blender/modifiers/SConscript
branches/bmesh/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
branches/bmesh/blender/source/blender/nodes/shader/node_shader_tree.c
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/Ketsji/CMakeLists.txt
branches/bmesh/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/bmesh/blender/source/gameengine/Ketsji/SConscript
Added Paths:
-----------
branches/bmesh/blender/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/bmesh/blender/source/blender/blenkernel/intern/navmesh_conversion.cpp
Removed Paths:
-------------
branches/bmesh/blender/source/blender/editors/include/ED_navmesh_conversion.h
branches/bmesh/blender/source/blender/editors/util/navmesh_conversion.cpp
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-40124
+ /trunk/blender:39992-40140
Modified: branches/bmesh/blender/extern/SConscript
===================================================================
--- branches/bmesh/blender/extern/SConscript 2011-09-12 00:13:49 UTC (rev 40140)
+++ branches/bmesh/blender/extern/SConscript 2011-09-12 00:38:57 UTC (rev 40141)
@@ -3,8 +3,10 @@
Import('env')
SConscript(['glew/SConscript'])
-SConscript(['recastnavigation/SConscript'])
+if env['WITH_BF_GAMEENGINE']:
+ SConscript(['recastnavigation/SConscript'])
+
if env['WITH_BF_ELTOPO']:
SConscript(['eltopo/SConscript'])
Modified: branches/bmesh/blender/intern/tools/credits_svn_gen.py
===================================================================
--- branches/bmesh/blender/intern/tools/credits_svn_gen.py 2011-09-12 00:13:49 UTC (rev 40140)
+++ branches/bmesh/blender/intern/tools/credits_svn_gen.py 2011-09-12 00:38:57 UTC (rev 40141)
@@ -88,7 +88,6 @@
def parse_commits(filepath):
- import xml.dom.minidom
from xml.dom.minidom import parse
svn_xml = parse(filepath)
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-40124
+ /trunk/blender/release:31524-40140
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-12 00:13:49 UTC (rev 40140)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-12 00:38:57 UTC (rev 40141)
@@ -763,11 +763,11 @@
split.template_ID(md, "mask_texture", new="texture.new")
if md.mask_texture:
split = layout.split()
-
+
col = split.column()
col.label(text="Texture Coordinates:")
col.prop(md, "mask_tex_mapping", text="")
-
+
col = split.column()
col.label(text="Use Channel:")
col.prop(md, "mask_tex_use_channel", text="")
@@ -810,7 +810,7 @@
def VERTEX_WEIGHT_MIX(self, layout, ob, md):
split = layout.split()
-
+
col = split.column()
col.label(text="Vertex Group A:")
col.prop_search(md, "vertex_group_a", ob, "vertex_groups", text="")
@@ -835,7 +835,7 @@
def VERTEX_WEIGHT_PROXIMITY(self, layout, ob, md):
split = layout.split()
-
+
col = split.column()
col.label(text="Vertex Group:")
col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py 2011-09-12 00:13:49 UTC (rev 40140)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py 2011-09-12 00:38:57 UTC (rev 40141)
@@ -195,10 +195,11 @@
row.prop(game, "collision_margin", text="Margin", slider=True)
row.prop(game, "use_collision_compound", text="Compound")
+
class PHYSICS_PT_game_obstacles(PhysicsButtonsPanel, Panel):
bl_label = "Create Obstacle"
COMPAT_ENGINES = {'BLENDER_GAME'}
-
+
@classmethod
def poll(cls, context):
game = context.object.game
@@ -221,6 +222,7 @@
row.prop(game, "obstacle_radius", text="Radius")
row.label()
+
class RenderButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@@ -387,17 +389,19 @@
flow.prop(gs, "show_physics_visualization", text="Physics Visualization")
flow.prop(gs, "use_deprecation_warnings")
flow.prop(gs, "show_mouse", text="Mouse Cursor")
-
+
+
class SceneButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
bl_context = "scene"
-
+
+
class SCENE_PT_game_navmesh(SceneButtonsPanel, bpy.types.Panel):
bl_label = "Navigation mesh"
bl_default_closed = True
COMPAT_ENGINES = {'BLENDER_GAME'}
-
+
@classmethod
def poll(cls, context):
scene = context.scene
@@ -437,13 +441,13 @@
col = layout.column()
col.label(text="Polygonization:")
split = col.split()
-
+
col = split.column()
col.prop(rd, "edge_max_len")
col.prop(rd, "edge_max_error")
split.prop(rd, "verts_per_poly")
-
+
col = layout.column()
col.label(text="Detail Mesh:")
row = col.row()
@@ -574,10 +578,11 @@
col.label(text="Logic Steps:")
col.prop(gs, "logic_step_max", text="Max")
+
class WORLD_PT_game_physics_obstacles(WorldButtonsPanel, Panel):
bl_label = "Obstacle simulation"
COMPAT_ENGINES = {'BLENDER_GAME'}
-
+
@classmethod
def poll(cls, context):
scene = context.scene
@@ -588,7 +593,7 @@
gs = context.scene.game_settings
- layout.prop(gs, "obstacle_simulation", text = "Type")
+ layout.prop(gs, "obstacle_simulation", text="Type")
if gs.obstacle_simulation != 'NONE':
layout.prop(gs, "level_height")
layout.prop(gs, "show_obstacle_simulation")
Copied: branches/bmesh/blender/source/blender/blenkernel/BKE_navmesh_conversion.h (from rev 40140, trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h)
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_navmesh_conversion.h (rev 0)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_navmesh_conversion.h 2011-09-12 00:38:57 UTC (rev 40141)
@@ -0,0 +1,64 @@
+/**
+* $Id$
+*
+* ***** BEGIN GPL LICENSE BLOCK *****
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+* All rights reserved.
+*
+* The Original Code is: all of this file.
+*
+* Contributor(s): none yet.
+*
+* ***** END GPL LICENSE BLOCK *****
+*/
+
+#ifndef BKE_NAVMESH_CONVERSION_H
+#define BKE_NAVMESH_CONVERSION_H
+
+struct DerivedMesh;
+
+/* navmesh_conversion.cpp */
+bool buildNavMeshDataByDerivedMesh(DerivedMesh *dm, int& vertsPerPoly,
+ int &nverts, float *&verts,
+ int &ndtris, unsigned short *&dtris,
+ int& npolys, unsigned short *&dmeshes,
+ unsigned short*& polys, int *&dtrisToPolysMap,
+ int *&dtrisToTrisMap, int *&trisToFacesMap);
+
+bool buildRawVertIndicesData(DerivedMesh* dm, int &nverts, float *&verts,
+ int &ntris, unsigned short *&tris, int *&trisToFacesMap,
+ int *&recastData);
+
+bool buildNavMeshData(const int nverts, const float* verts,
+ const int ntris, const unsigned short *tris,
+ const int* recastData, const int* trisToFacesMap,
+ int &ndtris, unsigned short *&dtris,
+ int &npolys, unsigned short *&dmeshes, unsigned short *&polys,
+ int &vertsPerPoly, int *&dtrisToPolysMap, int *&dtrisToTrisMap);
+
+bool buildPolygonsByDetailedMeshes(const int vertsPerPoly, const int npolys,
+ unsigned short* polys, const unsigned short* dmeshes,
+ const float* verts, const unsigned short* dtris,
+ const int* dtrisToPolysMap);
+
+int polyNumVerts(const unsigned short* p, const int vertsPerPoly);
+bool polyIsConvex(const unsigned short* p, const int vertsPerPoly, const float* verts);
+int polyFindVertex(const unsigned short* p, const int vertsPerPoly, unsigned short vertexIdx);
+float distPointToSegmentSq(const float* point, const float* a, const float* b);
+
+#endif //NAVMESH_CONVERSION_H
Modified: branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt 2011-09-12 00:13:49 UTC (rev 40140)
+++ branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt 2011-09-12 00:38:57 UTC (rev 40141)
@@ -357,6 +357,16 @@
add_definitions(-DWITH_LZMA)
endif()
+if(WITH_GAMEENGINE)
+ list(APPEND INC_SYS
+ ../../../extern/recastnavigation/Recast/Include
+ )
+ list(APPEND SRC
+ intern/navmesh_conversion.cpp
+ BKE_navmesh_conversion.h
+ )
+endif()
+
if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
endif()
Modified: branches/bmesh/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/SConscript 2011-09-12 00:13:49 UTC (rev 40140)
+++ branches/bmesh/blender/source/blender/blenkernel/SConscript 2011-09-12 00:38:57 UTC (rev 40141)
@@ -1,7 +1,8 @@
#!/usr/bin/python
Import ('env')
+import os
-sources = env.Glob('intern/*.c')
+sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include'
incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager'
@@ -91,6 +92,12 @@
incs += ' #/extern/lzma'
defs.append('WITH_LZMA')
+if env['WITH_BF_GAMEENGINE']:
+ incs += ' #/extern/recastnavigation/Recast/Include'
+ defs.append('WITH_GAMEENGINE')
+else:
+ sources.remove('intern' + os.sep + 'navmesh_conversion.cpp')
+
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
Copied: branches/bmesh/blender/source/blender/blenkernel/intern/navmesh_conversion.cpp (from rev 40140, trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.cpp)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list