Revision: 8562
http://playerstage.svn.sourceforge.net/playerstage/?rev=8562&view=rev
Author: rtv
Date: 2010-03-03 19:30:44 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
fixed fasr2 build on Linux, per bug #2962369
Modified Paths:
--------------
code/stage/trunk/examples/ctrl/CMakeLists.txt
code/stage/trunk/examples/ctrl/astar/findpath.cpp
code/stage/trunk/examples/ctrl/astar/stlastar.h
code/stage/trunk/worlds/fasr2.world
Modified: code/stage/trunk/examples/ctrl/CMakeLists.txt
===================================================================
--- code/stage/trunk/examples/ctrl/CMakeLists.txt 2010-02-27 01:45:33 UTC
(rev 8561)
+++ code/stage/trunk/examples/ctrl/CMakeLists.txt 2010-03-03 19:30:44 UTC
(rev 8562)
@@ -1,7 +1,6 @@
SET( PLUGINS
fasr
- fasr2
lasernoise
sink
source
@@ -17,7 +16,6 @@
# SET( PLUGINS ${PLUGINS} fasr_plan )
#endif( PLAYER_FOUND )
-set_source_files_properties( ${PLUGINS} PROPERTIES COMPILE_FLAGS
"${FLTK_CFLAGS}" )
# create a library module for each plugin and link libstage to each
@@ -30,6 +28,8 @@
# add fasr2 to the list of plugins
SET( PLUGINS ${PLUGINS} fasr2 )
+set_source_files_properties( ${PLUGINS} PROPERTIES COMPILE_FLAGS
"${FLTK_CFLAGS}" )
+
foreach( PLUGIN ${PLUGINS} )
TARGET_LINK_LIBRARIES( ${PLUGIN} stage )
endforeach( PLUGIN )
Modified: code/stage/trunk/examples/ctrl/astar/findpath.cpp
===================================================================
--- code/stage/trunk/examples/ctrl/astar/findpath.cpp 2010-02-27 01:45:33 UTC
(rev 8561)
+++ code/stage/trunk/examples/ctrl/astar/findpath.cpp 2010-03-03 19:30:44 UTC
(rev 8562)
@@ -128,7 +128,7 @@
// push each possible move except allowing the search to go backwards
- if( (GetMap( x-1, y ) < 9)
+ if( (GetMap( x-1, y ) < (unsigned int)9)
&& !((parent_x == x-1) && (parent_y == y))
)
{
@@ -238,38 +238,38 @@
#if DEBUG_LISTS
cout << "Steps:" << SearchSteps << "\n";
-
+
int len = 0;
-
+
cout << "Open:\n";
MapSearchNode *p = astarsearch.GetOpenListStart();
while( p )
- {
- len++;
- #if !DEBUG_LIST_LENGTHS_ONLY
- ((MapSearchNode *)p)->PrintNodeInfo();
- #endif
- p = astarsearch.GetOpenListNext();
-
- }
-
+ {
+ len++;
+#if !DEBUG_LIST_LENGTHS_ONLY
+ ((MapSearchNode *)p)->PrintNodeInfo();
+#endif
+ p = astarsearch.GetOpenListNext();
+
+ }
+
cout << "Open list has " << len << " nodes\n";
-
+
len = 0;
-
+
cout << "Closed:\n";
p = astarsearch.GetClosedListStart();
while( p )
- {
- len++;
- #if !DEBUG_LIST_LENGTHS_ONLY
- p->PrintNodeInfo();
- #endif
- p = astarsearch.GetClosedListNext();
- }
-
+ {
+ len++;
+#if !DEBUG_LIST_LENGTHS_ONLY
+ p->PrintNodeInfo();
+#endif
+ p = astarsearch.GetClosedListNext();
+ }
+
cout << "Closed list has " << len << " nodes\n";
- #endif
+#endif
}
while( SearchState ==
AStarSearch<MapSearchNode>::SEARCH_STATE_SEARCHING );
Modified: code/stage/trunk/examples/ctrl/astar/stlastar.h
===================================================================
--- code/stage/trunk/examples/ctrl/astar/stlastar.h 2010-02-27 01:45:33 UTC
(rev 8561)
+++ code/stage/trunk/examples/ctrl/astar/stlastar.h 2010-03-03 19:30:44 UTC
(rev 8562)
@@ -29,6 +29,9 @@
//#include <conio.h>
#include <assert.h>
+// some systems need this for uint8_t
+#include <stdint.h>
+
// stl includes
#include <algorithm>
#include <set>
@@ -111,7 +114,7 @@
// constructor just initialises private data
- AStarSearch( int MaxNodes = 1000 ) :
+ AStarSearch( int MaxNodes = 2000 ) :
m_AllocateNodeCount(0),
#if USE_FSA_MEMORY
m_FixedSizeAllocator( MaxNodes ),
Modified: code/stage/trunk/worlds/fasr2.world
===================================================================
--- code/stage/trunk/worlds/fasr2.world 2010-02-27 01:45:33 UTC (rev 8561)
+++ code/stage/trunk/worlds/fasr2.world 2010-03-03 19:30:44 UTC (rev 8562)
@@ -23,9 +23,9 @@
(
size [ 758.000 809.000 ]
- center [ -42.865 -43.165 ]
+ center [ 0.114 -16.418 ]
rotate [ 0 0 ]
- scale 51.926
+ scale 5.533
show_data 1
show_flags 1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
