Revision: 7200
http://playerstage.svn.sourceforge.net/playerstage/?rev=7200&view=rev
Author: rtv
Date: 2008-12-10 23:14:55 +0000 (Wed, 10 Dec 2008)
Log Message:
-----------
attempting to fix cmake on mac and linux
Modified Paths:
--------------
code/stage/trunk/CMakeLists.txt
code/stage/trunk/docsrc/stage.dox
code/stage/trunk/libstage/CMakeLists.txt
code/stage/trunk/libstage/model.cc
code/stage/trunk/libstage/model_laser.cc
code/stage/trunk/libstage/world.cc
code/stage/trunk/worlds/asr.world
Modified: code/stage/trunk/CMakeLists.txt
===================================================================
--- code/stage/trunk/CMakeLists.txt 2008-12-10 18:00:48 UTC (rev 7199)
+++ code/stage/trunk/CMakeLists.txt 2008-12-10 23:14:55 UTC (rev 7200)
@@ -103,8 +103,16 @@
EXECUTE_PROCESS ( COMMAND ${FLTK_CONFIG} --use-gl --use-images --ldstaticflags
OUTPUT_VARIABLE FLTK_LDFLAGS
OUTPUT_STRIP_TRAILING_WHITESPACE )
+EXECUTE_PROCESS ( COMMAND ${FLTK_CONFIG} --use-gl --use-images --libs
+ OUTPUT_VARIABLE FLTK_LIBS_NEWLINES
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+# replace the newlines with semicolons
+STRING(REGEX REPLACE "\n" ";" FLTK_LIBS "${FLTK_LIBS_NEWLINES}")
+
MESSAGE( " FLTK_CFLAGS = ${FLTK_CFLAGS}")
MESSAGE( " FLTK_LDFLAGS = ${FLTK_LDFLAGS}")
+MESSAGE( " FLTK_LIBS = ${FLTK_LIBS}")
+
SET (FLTK_FOUND TRUE)
#MESSAGE( ${INDENT} "Checking for OpenGL" )
Modified: code/stage/trunk/docsrc/stage.dox
===================================================================
--- code/stage/trunk/docsrc/stage.dox 2008-12-10 18:00:48 UTC (rev 7199)
+++ code/stage/trunk/docsrc/stage.dox 2008-12-10 23:14:55 UTC (rev 7200)
@@ -1086,21 +1086,21 @@
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
-HAVE_DOT = NO
+HAVE_DOT = YES
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect inheritance relations. Setting this tag to YES will force the
# the CLASS_DIAGRAMS tag to NO.
-CLASS_GRAPH = NO
+CLASS_GRAPH = YES
# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect implementation dependencies (inheritance, containment, and
# class references variables) of the class with other documented classes.
-COLLABORATION_GRAPH = NO
+COLLABORATION_GRAPH = YES
# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for groups, showing the direct groups dependencies
@@ -1138,7 +1138,7 @@
# So in most cases it will be better to enable call graphs for selected
# functions only using the \callgraph command.
-CALL_GRAPH = NO
+CALL_GRAPH = YES
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
# will graphical hierarchy of all classes instead of a textual one.
Modified: code/stage/trunk/libstage/CMakeLists.txt
===================================================================
--- code/stage/trunk/libstage/CMakeLists.txt 2008-12-10 18:00:48 UTC (rev
7199)
+++ code/stage/trunk/libstage/CMakeLists.txt 2008-12-10 23:14:55 UTC (rev
7200)
@@ -1,5 +1,8 @@
MESSAGE( STATUS "Configuring libstage" )
+# for config.h
+include_directories(${PROJECT_BINARY_DIR})
+
set( stageSrcs ancestor.cc
block.cc
blockgroup.cc
@@ -38,22 +41,15 @@
add_library(stage SHARED ${stageSrcs})
+set_source_files_properties( ${stageSrcs} PROPERTIES COMPILE_FLAGS
"${FLTK_CFLAGS}" )
+
target_link_libraries( stage
${GLIB_LIBRARIES}
${OPENGL_LIBRARIES}
${LTDL_LIB}
+ ${FLTK_LIBS2}
)
-# When linking stage, pass LDFLAGS from fltk-config
-# use quotes to prevent spaces being parsed as a list of properties
-set_target_properties( stage PROPERTIES LINK_FLAGS "${FLTK_LDFLAGS}" )
-
-# When compiling stageSrcs, pass CFLAGS from fltk-config
-set_source_files_properties( ${stageSrcs} PROPERTIES COMPILE_FLAGS
"${FLTK_CFLAGS}" )
-
-# for the config.h
-include_directories(${PROJECT_BINARY_DIR})
-
# causes the shared library to have a version number
set_target_properties( stage PROPERTIES
VERSION ${VERSION}
@@ -67,10 +63,7 @@
# When compiling stagebinarySrcs, pass CFLAGS from fltk-config
set_source_files_properties( ${stagebinarySrcs} PROPERTIES COMPILE_FLAGS
"${FLTK_CFLAGS}" )
-set_target_properties( stagebinary PROPERTIES
- OUTPUT_NAME stage
- LINK_FLAGS "${FLTK_LDFLAGS}"
-)
+set_target_properties( stagebinary PROPERTIES OUTPUT_NAME stage )
target_link_libraries( stagebinary stage )
Modified: code/stage/trunk/libstage/model.cc
===================================================================
--- code/stage/trunk/libstage/model.cc 2008-12-10 18:00:48 UTC (rev 7199)
+++ code/stage/trunk/libstage/model.cc 2008-12-10 23:14:55 UTC (rev 7200)
@@ -419,25 +419,6 @@
g_list_free( list );
}
-// // convert a global pose into the model's local coordinate system
-// void StgModel::GlobalToLocal( stg_pose_t* pose )
-// {
-// // get model's global pose
-// stg_pose_t org = GetGlobalPose();
-
-// //printf( "g2l global origin %.2f %.2f %.2f\n",
-// // org.x, org.y, org.a );
-
-// // compute global pose in local coords
-// double sx = (pose->x - org.x) * cos(org.a) + (pose->y - org.y) *
sin(org.a);
-// double sy = -(pose->x - org.x) * sin(org.a) + (pose->y - org.y) *
cos(org.a);
-// double sa = pose->a - org.a;
-
-// pose->x = sx;
-// pose->y = sy;
-// pose->a = sa;
-// }
-
// convert a global pose into the model's local coordinate system
stg_pose_t StgModel::GlobalToLocal( stg_pose_t pose )
{
@@ -562,9 +543,6 @@
}
-// convert a pose in this model's local coordinates into global
-// coordinates
-// should one day do all this with affine transforms for neatness?
inline stg_pose_t StgModel::LocalToGlobal( stg_pose_t pose )
{
return pose_sum( pose_sum( GetGlobalPose(), geom.pose ), pose );
Modified: code/stage/trunk/libstage/model_laser.cc
===================================================================
--- code/stage/trunk/libstage/model_laser.cc 2008-12-10 18:00:48 UTC (rev
7199)
+++ code/stage/trunk/libstage/model_laser.cc 2008-12-10 23:14:55 UTC (rev
7200)
@@ -164,10 +164,7 @@
{
// Ignore the model that's looking and things that are invisible to
// lasers
- if( (hit != finder) && (hit->GetLaserReturn() > 0 ) )
- return true; // match!
-
- return false; // no match
+ return( (hit != finder) && (hit->GetLaserReturn() > 0 ) );
}
void StgModelLaser::Update( void )
Modified: code/stage/trunk/libstage/world.cc
===================================================================
--- code/stage/trunk/libstage/world.cc 2008-12-10 18:00:48 UTC (rev 7199)
+++ code/stage/trunk/libstage/world.cc 2008-12-10 23:14:55 UTC (rev 7200)
@@ -521,8 +521,6 @@
inline int32_t SUPERREGION( const int32_t x )
{
- if( abs((x>>SRBITS) > 100 ) )
- printf( "MACRO[ %d %d ]", x, (x>>SRBITS) );
return( x >> SRBITS );
}
Modified: code/stage/trunk/worlds/asr.world
===================================================================
--- code/stage/trunk/worlds/asr.world 2008-12-10 18:00:48 UTC (rev 7199)
+++ code/stage/trunk/worlds/asr.world 2008-12-10 23:14:55 UTC (rev 7200)
@@ -41,7 +41,7 @@
(
name "cave"
size [100.000 100.000 0.600]
- pose [0 0 0 0]
+ pose [0 0 0 50]
bitmap "bitmaps/frieburg.png"
boundary 0
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
