Re: [Bf-committers] Branch merging and buildbot - propose to change build cycle
Hi, Not sure having this behavior always is nice. It's not really needed when you aren't merging and when you're doing merge, you can trigger re-build easily. And there's no need to rebuild Windows build when you're solving issues with Linux platform. About linux slaves.. Looks like there's no version of qsort with one additional argument to callback (like qsort_r and qsort_r) in older versions of libc. We've got two occurrences of this call - one in our navmesh_conversion.cpp and another in recast library. This function isn't used in current raycast svn and i think it can be easily replaced with own implementation of qsort for navmesh_conversion.cpp. Btw, why we've got C++ source in blenkernel? I heard it's because of recats is writtein in C++. But in this case we're writting C-API and storing it in extern//_C-API.c. Nathan Letwory wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Hi all, > > With the recent amount of branch merging and the amount of post-fixing > it generated, some of it due to different platforms in use by developers > I'd propose to change buildbot to build more often, even on per-commit > basis. This would allow developers to see pretty easy how their work > behaves with all necessary logs available. We know that many developers > turn of lots of features while working on their own beautiful little > garden, sometimes resulting in clipping of nice flowers from other > developers (blenderplayer, cross-platform code, etc.). > > Buildbot is running very well currently and gives useful output, but for > developers the nightly cycle can be too long to wait for. Changing to > build-on-change will make buildbot much more useful. Buildbot output > should become mandatory part of toolset of developers, with the proposed > change it will make actually sense too. > > /Nathan > > ps. right now linux builds both failed due to navmesh code ( > http://builder.blender.org/grid ) > > - -- > Nathan Letwory > Letwory Interactive | Studio Lumikuu > http://www.letworyinteractive.com | http://www.lumikuu.com > -BEGIN PGP SIGNATURE- > Version: GnuPG v1.4.10 (MingW32) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iQEcBAEBAgAGBQJObaKIAAoJEKtfN7KsE0TtnUcIAKdyAFUyEUWKg1BjcjsrKNTb > pGwvSEJXB/31Afu2LddMosMVVhQO5pEyUpKEwdol2EVqdNeVl88Jto7m/sP9OJUi > ILe8UXrabSyHzOWtiJR0kCsAt83XVsJ+ztL1ijCw27K0Q2kJvAjKLM3GF1/7vrFl > taWZg3SWTEPvQXBJhkJE2thT+EzJ9pwlk0ADEaZCwFKep18bA+TZroMvugmT166f > EMGH046UNhZ4VroL54WUETLNYboCjSspAtZXtPo2NLadLWgMUdDLgAclw5YKUXnz > TeJvfI/d822OUAnZeaBwp/zgsZTZRVLX62jU5Gk6v/s9/lZSrHP4BWJxYFoUydQ= > =f4VP > -END PGP SIGNATURE- > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers > -- With best regards, Sergey I. Sharybin ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
[Bf-committers] Branch merging and buildbot - propose to change build cycle
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi all, With the recent amount of branch merging and the amount of post-fixing it generated, some of it due to different platforms in use by developers I'd propose to change buildbot to build more often, even on per-commit basis. This would allow developers to see pretty easy how their work behaves with all necessary logs available. We know that many developers turn of lots of features while working on their own beautiful little garden, sometimes resulting in clipping of nice flowers from other developers (blenderplayer, cross-platform code, etc.). Buildbot is running very well currently and gives useful output, but for developers the nightly cycle can be too long to wait for. Changing to build-on-change will make buildbot much more useful. Buildbot output should become mandatory part of toolset of developers, with the proposed change it will make actually sense too. /Nathan ps. right now linux builds both failed due to navmesh code ( http://builder.blender.org/grid ) - -- Nathan Letwory Letwory Interactive | Studio Lumikuu http://www.letworyinteractive.com | http://www.lumikuu.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJObaKIAAoJEKtfN7KsE0TtnUcIAKdyAFUyEUWKg1BjcjsrKNTb pGwvSEJXB/31Afu2LddMosMVVhQO5pEyUpKEwdol2EVqdNeVl88Jto7m/sP9OJUi ILe8UXrabSyHzOWtiJR0kCsAt83XVsJ+ztL1ijCw27K0Q2kJvAjKLM3GF1/7vrFl taWZg3SWTEPvQXBJhkJE2thT+EzJ9pwlk0ADEaZCwFKep18bA+TZroMvugmT166f EMGH046UNhZ4VroL54WUETLNYboCjSspAtZXtPo2NLadLWgMUdDLgAclw5YKUXnz TeJvfI/d822OUAnZeaBwp/zgsZTZRVLX62jU5Gk6v/s9/lZSrHP4BWJxYFoUydQ= =f4VP -END PGP SIGNATURE- ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] Blender developers IRC meeting notes, 11 september 2011
>- What's status of TexFace properties migration? Dalai Felinto knows! I was waiting for the dust to settle on decast/retour :) Originally I was even waiting for after cucumber. But Daniel said they are still small bugs with lighting there and I still want to other code maintainers to help reviewing some parts of it. That said, I'm doing a re-sync with trunk here, will do a last round of tests and commit. This will include subversion bumping (from 2 to 3), change in the preview.blend and a popup when converting of materials fail (not a big deal, but it will alert of of that for every file you have before you save them with 2.59.3). I'm hoping go smooth. After committing I will prepare a code.blender.orgpost to orient artists. Cheers, Dalai 2011/9/11 Ton Roosendaal > Hi all, > > Here's a summary of today's topics: > > 1) Next release > > - BCon schedule and targets: > http://wiki.blender.org/index.php/Dev:Doc/Projects > > - What's status of TexFace properties migration? Dalai Felinto knows! > > - UI translation branch; in progress, Sergey Sharybin thinks it can > make it this week. Some features are a regression compared to 2.4 > though (needs restart, no 'only tooltips'). The specifications need to > be confirmed. Sergey checks with Brecht van Lommel if there's a > solution to use RNA for translation directly. > > - Weight Paint GSoC branch: the functionality review was very > positive. Campbell Barton offers to check the code, Sergey helps. > Thomas can help with UI script if needed. > Agreed is this only gets in trunk if non-intrusive and compatible. > Otherwise it better moves to next release. > > - Reminder for people working on UI: > > http://www.blender.org/documentation/blender_python_api_2_59_2/info_best_practice.html#user-interface-layout > > - Branch merger of "recast & detour" went unlucky... after merger > developer had to leave, leaving trunk unusable. Meeting agrees & > confirms that anyone who does bigger commits should stay around for as > long is needed to help fixing the immediate issues. > > - Ocean sim: Matt Ebb committed fixes, code needs to be uploaded for > final review. Should be in our tracker by now? Review can now > progress, target set for 2.61. Need to find reviewers too! > > 2) other projects > > - Nurbs Branch: Emmanuel Stone is back to help with it too. Needs to > set it going, Sergey is available for it too! > > - Bug Tracker work: everyone with a projects.blender.org account can > help reviewing bugs. It's a lot of work to do the initial "triaging". > Several volunteers popped up to review new incoming reports to help > making it clear cases for a coder to tackle. > > - BMesh: progress goes well, Campbell hopes to find more time for it. > Ender added to team as bf-project member for BMesh commit access. > > - Cycles: Brecht focuses on UI/integration issues, also with 2.61 > getting closer. > > Thanks, > > > -Ton- > > > Ton Roosendaal Blender Foundation t...@blender.orgwww.blender.org > Blender Institute Entrepotdok 57A 1018AD Amsterdam The Netherlands > > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers > ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] New *BMesh* Developer
Hi all, In case you wonder, Andrew prefers to use a nick name for his contributions. There's no conflicts of interest going on, he just likes to keep his professional and volunteering work separated. He has been identified by me and will be known by others who work for BF. -Ton- Ton Roosendaal Blender Foundation t...@blender.orgwww.blender.org Blender Institute Entrepotdok 57A 1018AD Amsterdam The Netherlands On 11 Sep, 2011, at 17:22, Campbell Barton wrote: > Hi all, > Andrew Wiggin (Ender79) has been granted commit access to work on > BMesh since he's already submitted some quite advanced patches and > fixes. > > Great to have another developer helping out om BMesh and have the > project active again. > > Welcome Andrew! > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
[Bf-committers] Blender developers IRC meeting notes, 11 september 2011
Hi all, Here's a summary of today's topics: 1) Next release - BCon schedule and targets: http://wiki.blender.org/index.php/Dev:Doc/Projects - What's status of TexFace properties migration? Dalai Felinto knows! - UI translation branch; in progress, Sergey Sharybin thinks it can make it this week. Some features are a regression compared to 2.4 though (needs restart, no 'only tooltips'). The specifications need to be confirmed. Sergey checks with Brecht van Lommel if there's a solution to use RNA for translation directly. - Weight Paint GSoC branch: the functionality review was very positive. Campbell Barton offers to check the code, Sergey helps. Thomas can help with UI script if needed. Agreed is this only gets in trunk if non-intrusive and compatible. Otherwise it better moves to next release. - Reminder for people working on UI: http://www.blender.org/documentation/blender_python_api_2_59_2/info_best_practice.html#user-interface-layout - Branch merger of "recast & detour" went unlucky... after merger developer had to leave, leaving trunk unusable. Meeting agrees & confirms that anyone who does bigger commits should stay around for as long is needed to help fixing the immediate issues. - Ocean sim: Matt Ebb committed fixes, code needs to be uploaded for final review. Should be in our tracker by now? Review can now progress, target set for 2.61. Need to find reviewers too! 2) other projects - Nurbs Branch: Emmanuel Stone is back to help with it too. Needs to set it going, Sergey is available for it too! - Bug Tracker work: everyone with a projects.blender.org account can help reviewing bugs. It's a lot of work to do the initial "triaging". Several volunteers popped up to review new incoming reports to help making it clear cases for a coder to tackle. - BMesh: progress goes well, Campbell hopes to find more time for it. Ender added to team as bf-project member for BMesh commit access. - Cycles: Brecht focuses on UI/integration issues, also with 2.61 getting closer. Thanks, -Ton- Ton Roosendaal Blender Foundation t...@blender.orgwww.blender.org Blender Institute Entrepotdok 57A 1018AD Amsterdam The Netherlands ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
[Bf-committers] New *BMesh* Developer
Hi all, Andrew Wiggin (Ender79) has been granted commit access to work on BMesh since he's already submitted some quite advanced patches and fixes. Great to have another developer helping out om BMesh and have the project active again. Welcome Andrew! ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40128] trunk/blender/source/blender: Recast: forgot the new files in last commit.
Now working :) -Messaggio originale- From: Benoit Bolsee Sent: Sunday, September 11, 2011 4:43 PM To: bf-blender-...@blender.org Subject: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40128] trunk/blender/source/blender: Recast: forgot the new files in last commit. Revision: 40128 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40128 Author: ben2610 Date: 2011-09-11 14:43:53 + (Sun, 11 Sep 2011) Log Message: --- Recast: forgot the new files in last commit. Added Paths: --- trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.cpp Removed Paths: - trunk/blender/source/blender/editors/include/ED_navmesh_conversion.h trunk/blender/source/blender/editors/util/navmesh_conversion.cpp Added: trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h === --- trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h (rev 0) +++ trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h 2011-09-11 14:43:53 UTC (rev 40128) @@ -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 Property changes on: trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h ___ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.cpp === --- trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.cpp (rev 0) +++ trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.cpp 2011-09-11 14:43:53 UTC (rev 40128) @@ -0,0 +1,464 @@ +/** +* $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 Fr
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40127] trunk/blender/source: Recast: fix bad level calls, Recast compiled out if BGE not enabled.
Hi benoit, same on linux :
http://www.pasteall.org/24804
Cheers, mib.
Am 11.09.2011, 16:34 Uhr, schrieb ValterVB :
> Scons don't work:
> source\blender\modifiers\intern\MOD_navmesh.cpp(37) : fatal error C1083:
> Cannot open include file: 'BKE_navmesh_conversion.h': No such file or
> directory
> iksolver_plugin.c
> Compiling ==> 'itasc_plugin.cpp'
> itasc_plugin.cpp
> scons: building terminated because of errors.
>
>
>
> -Messaggio originale-
> From: Benoit Bolsee
> Sent: Sunday, September 11, 2011 4:13 PM
> To: bf-blender-...@blender.org
> Subject: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40127]
> trunk/blender/source: Recast: fix bad level calls, Recast compiled out if
> BGE not enabled.
>
> Revision: 40127
>
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40127
> Author: ben2610
> Date: 2011-09-11 14:13:04 + (Sun, 11 Sep 2011)
> Log Message:
> ---
> Recast: fix bad level calls, Recast compiled out if BGE not enabled.
> SCons
> updated but not tested.
>
> Modified Paths:
> --
> trunk/blender/source/blender/blenkernel/CMakeLists.txt
> trunk/blender/source/blender/blenkernel/SConscript
> trunk/blender/source/blender/editors/util/CMakeLists.txt
> trunk/blender/source/blender/editors/util/SConscript
> trunk/blender/source/blender/modifiers/CMakeLists.txt
> trunk/blender/source/blender/modifiers/SConscript
> trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
> trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
> trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
> trunk/blender/source/gameengine/Ketsji/SConscript
>
> Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
> ===
> --- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-09-11
> 13:46:58 UTC (rev 40126)
> +++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-09-11
> 14:13:04 UTC (rev 40127)
> @@ -353,6 +353,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: trunk/blender/source/blender/blenkernel/SConscript
> ===
> --- trunk/blender/source/blender/blenkernel/SConscript 2011-09-11
> 13:46:58
> UTC (rev 40126)
> +++ trunk/blender/source/blender/blenkernel/SConscript 2011-09-11
> 14:13:04
> UTC (rev 40127)
> @@ -1,7 +1,7 @@
> #!/usr/bin/python
> Import ('env')
>
> -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'
> @@ -90,6 +90,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/navmesh_conversion.cpp')
> +
> if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross',
> 'win64-vc'):
> incs += ' ' + env['BF_PTHREADS_INC']
>
>
> Modified: trunk/blender/source/blender/editors/util/CMakeLists.txt
> ===
> --- trunk/blender/source/blender/editors/util/CMakeLists.txt 2011-09-11
> 13:46:58 UTC (rev 40126)
> +++ trunk/blender/source/blender/editors/util/CMakeLists.txt 2011-09-11
> 14:13:04 UTC (rev 40127)
> @@ -87,16 +87,4 @@
> ../include/UI_view2d.h
> )
>
> -if(WITH_GAMEENGINE)
> - list(APPEND INC
> - ../../../../extern/recastnavigation/Recast/Include
> - )
> -
> - list(APPEND SRC
> - navmesh_conversion.cpp
> -
> - ../include/ED_navmesh_conversion.h
> - )
> -endif()
> -
> blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")
>
> Modified: trunk/blender/source/blender/editors/util/SConscript
> ===
> --- trunk/blender/source/blender/editors/util/SConscript 2011-09-11
> 13:46:58
> UTC (rev 40126)
> +++ trunk/blender/source/blender/editors/util/SConscript 2011-09-11
> 14:13:04
> UTC (rev 40127)
> @@ -1,15 +1,11 @@
> #!/usr/bin/python
> Import ('env')
>
> -sources = env.Glob('*.c') + env.Glob('*.cpp')
> +sources = env.Glob('*.c')
>
> incs = '../include ../../blenlib ../../blenkernel ../../makesdna
> ../../imbuf'
> incs += ' ../../windowmanager #/intern/guardedalloc
> #/extern/glew/include'
> incs += ' ../../makesrna'
> -incs += ' #extern/recastnavigation/Recast/Include'
> incs += ' ../../blenloader'
>
> -if not env['WITH_BF_GAMEENGINE']:
> -sources.remove('navmesh_conversion.cpp')
> -
> env.BlenderLib ( 'bf_editors_util', s
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40127] trunk/blender/source: Recast: fix bad level calls, Recast compiled out if BGE not enabled.
Scons don't work:
source\blender\modifiers\intern\MOD_navmesh.cpp(37) : fatal error C1083:
Cannot open include file: 'BKE_navmesh_conversion.h': No such file or
directory
iksolver_plugin.c
Compiling ==> 'itasc_plugin.cpp'
itasc_plugin.cpp
scons: building terminated because of errors.
-Messaggio originale-
From: Benoit Bolsee
Sent: Sunday, September 11, 2011 4:13 PM
To: bf-blender-...@blender.org
Subject: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40127]
trunk/blender/source: Recast: fix bad level calls, Recast compiled out if
BGE not enabled.
Revision: 40127
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40127
Author: ben2610
Date: 2011-09-11 14:13:04 + (Sun, 11 Sep 2011)
Log Message:
---
Recast: fix bad level calls, Recast compiled out if BGE not enabled. SCons
updated but not tested.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/editors/util/SConscript
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
trunk/blender/source/gameengine/Ketsji/SConscript
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-09-11
14:13:04 UTC (rev 40127)
@@ -353,6 +353,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: trunk/blender/source/blender/blenkernel/SConscript
===
--- trunk/blender/source/blender/blenkernel/SConscript 2011-09-11 13:46:58
UTC (rev 40126)
+++ trunk/blender/source/blender/blenkernel/SConscript 2011-09-11 14:13:04
UTC (rev 40127)
@@ -1,7 +1,7 @@
#!/usr/bin/python
Import ('env')
-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'
@@ -90,6 +90,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/navmesh_conversion.cpp')
+
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross',
'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
Modified: trunk/blender/source/blender/editors/util/CMakeLists.txt
===
--- trunk/blender/source/blender/editors/util/CMakeLists.txt 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/blender/editors/util/CMakeLists.txt 2011-09-11
14:13:04 UTC (rev 40127)
@@ -87,16 +87,4 @@
../include/UI_view2d.h
)
-if(WITH_GAMEENGINE)
- list(APPEND INC
- ../../../../extern/recastnavigation/Recast/Include
- )
-
- list(APPEND SRC
- navmesh_conversion.cpp
-
- ../include/ED_navmesh_conversion.h
- )
-endif()
-
blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/util/SConscript
===
--- trunk/blender/source/blender/editors/util/SConscript 2011-09-11 13:46:58
UTC (rev 40126)
+++ trunk/blender/source/blender/editors/util/SConscript 2011-09-11 14:13:04
UTC (rev 40127)
@@ -1,15 +1,11 @@
#!/usr/bin/python
Import ('env')
-sources = env.Glob('*.c') + env.Glob('*.cpp')
+sources = env.Glob('*.c')
incs = '../include ../../blenlib ../../blenkernel ../../makesdna
../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
incs += ' ../../makesrna'
-incs += ' #extern/recastnavigation/Recast/Include'
incs += ' ../../blenloader'
-if not env['WITH_BF_GAMEENGINE']:
-sources.remove('navmesh_conversion.cpp')
-
env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [],
libtype=['core','player'], priority=[330,210] )
Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===
--- trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-09-11
13:46:58 UTC (rev 40126)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-09-11
14:13:04 UTC (rev 40127)
@@ -122,7 +
Re: [Bf-committers] Recast & Detour
[...] > Saw this when baking edits to the files, looks like Recast.h > could be made C compatible if the initializers and distructors > were removed from the structs but not sure if this end up > being a hassle to add alloc/free calls all over just so we > can rename the files to *.c. I would really not go that route, just for the purpose of not having cpp file in a blender core directory. This will in addition modify an external library that was meant to be C++. [...] > Still I'm a bit worried about this feature, I thought this > was BGE only but it adds a modifier thats only purpose seems > to be to add its own drawing calls into the derived mesh also > adds own customdata layer - but the modifier its self stores > no data. > > Were less intrusive methods of storing this data investigated? > - Curve, GreastPencil, ID-Properties? "Recast" is the blender part of the project : it is the set of tools to create the navigation mesh. The BGE part is "Detour" : automatic navigation in the game engine. In Recast we need to display the cell (convex area made of several triangles), we also need to create a navigation mesh from an existing without distroying the original mesh. I read back my correspondance with Nick about that. I told him to seek advise at Blender experts about the best way to do that but in the end it seems that we decided the architecture between ourselves. The workflow is as follow: select the mesh from which you want to create the navigation mesh, tune the operator settings and run it: it will create a new mesh that has the modifier added automatically so that you can see the cells. If you are not happy with the result, CTL-Z, change the settings and re-run. If the result is almost ok, you can edit the mesh instead. The workflow is definately efficient and for the implementation we only used existing interfaces: modifier to change rendering, custom data layer to store cell id. I did not realize that adding a custom data layer was intrusive and had no idea of the other methods you give. Is it really a serious drawback to use a custom data layer? /benoit ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] Can't compile with Blenderplayer after recast&detour merge (Windows x64, MSVC 2008, CMake)
I just committed a fix for part of the problem (the lack of linking of recast/detour lib for blenderplayer in CMake). The remaining linking issues are thanks to bad level call (i.e. modifier functions being called from inside a KX_ class). Benoit and Campbell said this will be addressed eventually. For those willing to build blenderplayer in the mean time you can use this patch: (tested on cmake+osx+gcc): http://www.pasteall.org/24798/diff -- Dalai www.dalaifelinto.com @dfelinto 2011/9/11 Lars Krueger > Same error on Gentoo Linux (32 bit) for r40115. Compiles fine without > player and game engine. > > > Original-Nachricht > > Datum: Sat, 10 Sep 2011 19:37:48 -0300 > > Von: Luciano Fraga Camboim > > An: bf-committers@blender.org > > Betreff: [Bf-committers] Can\'t compile with Blenderplayer after > recast&detour merge (Windows x64, MSVC 2008, CMake) > > > I was getting dna.c errors yesterday, and today I can't compile unless I > > disable blenderplayer > > > > MSVC 2008 and CMake, Windows 7 x64, target platform is x64 > > -- > Dr. Lars Krueger > > > NEU: FreePhone - 0ct/min Handyspartarif mit Geld-zurück-Garantie! > Jetzt informieren: http://www.gmx.net/de/go/freephone > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers > ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] Can't compile with Blenderplayer after recast&detour merge (Windows x64, MSVC 2008, CMake)
Same error on Gentoo Linux (32 bit) for r40115. Compiles fine without player and game engine. Original-Nachricht > Datum: Sat, 10 Sep 2011 19:37:48 -0300 > Von: Luciano Fraga Camboim > An: bf-committers@blender.org > Betreff: [Bf-committers] Can\'t compile with Blenderplayer after > recast&detour merge (Windows x64, MSVC 2008, CMake) > I was getting dna.c errors yesterday, and today I can't compile unless I > disable blenderplayer > > MSVC 2008 and CMake, Windows 7 x64, target platform is x64 -- Dr. Lars Krueger NEU: FreePhone - 0ct/min Handyspartarif mit Geld-zurück-Garantie! Jetzt informieren: http://www.gmx.net/de/go/freephone ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
