Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[259] trunk/rcssserver3d
|
From: <he...@us...> - 2011-03-24 20:25:30
|
Revision: 259
http://simspark.svn.sourceforge.net/simspark/?rev=259&view=rev
Author: hedayat
Date: 2011-03-24 20:25:24 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
* Removing FindDevIL in favor of cmake's own module
* Do not print error message for unused variables
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.cpp
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssserver3d/naosoccersim.rb
Removed Paths:
-------------
trunk/rcssserver3d/cmake/FindDevIL.cmake
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2011-03-24 18:08:49 UTC (rev 258)
+++ trunk/rcssserver3d/ChangeLog 2011-03-24 20:25:24 UTC (rev 259)
@@ -1,5 +1,18 @@
2011-03-24 Hedayat Vatankhah <hed...@gm...>
+ * plugin/soccer/CMakeLists.txt:
+ * plugin/soccermonitor/CMakeLists.txt:
+ - fixed to use CMake's own FindDevIL module
+
+ * plugin/soccer/gamestateaspect/gamestateitem.cpp
+ (GameStateItem::GetInitialPredicates):
+ - do not try to send obsolete variables: AgentMass and AgentMaxSpeed
+
+ * rcssserver3d/naosoccersim.rb:
+ - added MaxTouchGroupSize variable
+ - added a BorderSize variable to stop simulator from complaining for
+ missing variable
+
* CMakeLists.txt:
- updated PACKAGE_VERSION to 0.6.5 for the next release
Deleted: trunk/rcssserver3d/cmake/FindDevIL.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindDevIL.cmake 2011-03-24 18:08:49 UTC (rev 258)
+++ trunk/rcssserver3d/cmake/FindDevIL.cmake 2011-03-24 20:25:24 UTC (rev 259)
@@ -1,124 +0,0 @@
-# -Try to find DevIL (developer image) library
-# formerly known as OpenIL, see
-# http://openil.sourceforge.net
-#
-# Once run this will define:
-#
-# DevIL_FOUND
-# DevIL_INCLUDE_DIR
-# DevIL_LIBRARIES
-#
-# Jan Woetzel 12/2005.
-#
-# www.mip.informatik.uni-kiel.de/~jw
-# --------------------------------
-
-# base dirs:
-SET(DevIL_POSSIBLE_ROOT_PATHS
- ${DevIL_ROOT_DIR}
- $ENV{DevIL_ROOT_DIR}
- ${DevIL_DIR}
- $ENV{DevIL_DIR}
- ${DEVIL_DIR}
- $ENV{DEVIL_DIR}
- ${DEVIL_HOME}
- $ENV{DEVIL_HOME}
- "$ENV{EXTERN_LIBS_DIR}/DevIL"
- $ENV{EXTRA_DIR}
- $ENV{EXTRA}
- $ENV{ProgramFiles}/DevIL
- /usr/local/
- /usr/
- /opt/net/gcc41/DevIL
- /opt/net/gcc33/DevIL
- C:/library/DevIL
- "C:/Program Files/DevIL"
- "C:/Program Files (x86)/DevIL"
- C:/DevIL
- )
-
-# appended
-SET(DevIL_POSSIBLE_INCDIR_SUFFIXES
- include
- DevIL/include )
-SET(DevIL_POSSIBLE_LIBDIR_SUFFIXES
- lib
- lib64
- )
-
-
-
-FIND_PATH(DevIL_INCLUDE_DIR
- NAMES IL/il.h
- PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
- PATH_SUFFIXES ${DevIL_POSSIBLE_INCDIR_SUFFIXES} )
-#MESSAGE("DBG DevIL_INCLUDE_DIR=${DevIL_INCLUDE_DIR}")
-
-
-FIND_LIBRARY(DevIL_LIBRARY_IL
- NAMES DevIL devil DevIL IL
- PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
- PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
-#MESSAGE("DBG DevIL_LIBRARY_IL=${DevIL_LIBRARY_IL}")
-
-FIND_LIBRARY(DevIL_LIBRARY_ILU
- NAMES ILU ilu Ilu
- PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
- PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
-#MESSAGE("DBG DevIL_LIBRARY_ILU=${DevIL_LIBRARY_ILU}")
-
-FIND_LIBRARY(DevIL_LIBRARY_ILUT
- NAMES ILUT ilu Ilut
- PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
- PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
-#MESSAGE("DBG DevIL_LIBRARY_ILUT=${DevIL_LIBRARY_ILUT}")
-
-
-
-# --------------------------------
-
-IF (DevIL_INCLUDE_DIR)
- IF (DevIL_LIBRARY_IL)
- IF (DevIL_LIBRARY_ILU)# AND DevIL_LIBRARY_ILUT)
-
- SET(DevIL_FOUND TRUE)
- SET(DevIL_LIBRARIES
- ${DevIL_LIBRARY_IL}
- ${DevIL_LIBRARY_ILU})
- IF (DevIL_LIBRARY_ILUT)
- SET(DevIL_LIBRARIES ${DevIL_LIBRARIES} ${DevIL_LIBRARY_ILUT})
- ENDIF (DevIL_LIBRARY_ILUT)
-
- # get the link directory for rpath to be used with LINK_DIRECTORIES:
- GET_FILENAME_COMPONENT(DevIL_LINK_DIRECTORIES ${DevIL_LIBRARY_IL} PATH)
-
- ENDIF(DevIL_LIBRARY_ILU)# AND DevIL_LIBRARY_ILUT)
- ENDIF(DevIL_LIBRARY_IL)
-ENDIF (DevIL_INCLUDE_DIR)
-
-
-MARK_AS_ADVANCED(
- DevIL_INCLUDE_DIR
- DevIL_LIBRARY_IL
- DevIL_LIBRARY_ILU
- DevIL_LIBRARY_ILUT
- DevIL_LIBRARIES
- )
-
-
-# ==========================================
-IF(NOT DevIL_FOUND)
- # make FIND_PACKAGE friendly
- IF(NOT DevIL_FIND_QUIETLY)
- IF(DevIL_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "DevIL required, please specify it's location.")
- ELSE(DevIL_FIND_REQUIRED)
- MESSAGE(STATUS "ERROR: DevIL was not found.")
- ENDIF(DevIL_FIND_REQUIRED)
- ENDIF(NOT DevIL_FIND_QUIETLY)
-ENDIF(NOT DevIL_FOUND)
-
-# backward compatibility
-SET(DEVIL_FOUND ${DevIL_FOUND})
-SET(DEVIL_LIBRARIES ${DevIL_LIBRARIES})
-SET(DEVIL_INCLUDE_DIR ${DevIL_INCLUDE_DIR})
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2011-03-24 18:08:49 UTC (rev 258)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2011-03-24 20:25:24 UTC (rev 259)
@@ -126,7 +126,7 @@
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${FREETYPE_INCLUDE_DIRS}
- ${DevIL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR})
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
Modified: trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.cpp 2011-03-24 18:08:49 UTC (rev 258)
+++ trunk/rcssserver3d/plugin/soccer/gamestateaspect/gamestateitem.cpp 2011-03-24 20:25:24 UTC (rev 259)
@@ -75,9 +75,9 @@
PutFloatParam("WaitBeforeKickOff",pList);
// agent parameter
- PutFloatParam("AgentMass",pList);
+// PutFloatParam("AgentMass",pList);
PutFloatParam("AgentRadius",pList);
- PutFloatParam("AgentMaxSpeed",pList);
+// PutFloatParam("AgentMaxSpeed",pList);
// ball parameter
PutFloatParam("BallRadius",pList);
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2011-03-24 18:08:49 UTC (rev 258)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2011-03-24 20:25:24 UTC (rev 259)
@@ -19,7 +19,7 @@
)
include_directories(${CMAKE_SOURCE_DIR}/plugin ${FREETYPE_INCLUDE_DIRS}
- ${DevIL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR})
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
Modified: trunk/rcssserver3d/rcssserver3d/naosoccersim.rb
===================================================================
--- trunk/rcssserver3d/rcssserver3d/naosoccersim.rb 2011-03-24 18:08:49 UTC (rev 258)
+++ trunk/rcssserver3d/rcssserver3d/naosoccersim.rb 2011-03-24 20:25:24 UTC (rev 259)
@@ -50,6 +50,7 @@
addSoccerVar('GoalKickDist', 1.0)
addSoccerVar('AutomaticKickOff', false)
addSoccerVar('WaitBeforeKickOff', 2.0)
+addSoccerVar('BorderSize', 0.0) # prevent complaining about missing variable
# agent parameters
addSoccerVar('AgentRadius', 0.4)
@@ -59,12 +60,13 @@
addSoccerVar('BallMass',0.026)
# soccer rule parameters
-addSoccerVar('RuleGoalPauseTime',3.0)
-addSoccerVar('RuleKickInPauseTime',1.0)
-addSoccerVar('RuleHalfTime',5.0 * 60)
-addSoccerVar('RuleDropBallTime',15)
+addSoccerVar('RuleGoalPauseTime', 3.0)
+addSoccerVar('RuleKickInPauseTime', 1.0)
+addSoccerVar('RuleHalfTime', 5.0 * 60)
+addSoccerVar('RuleDropBallTime', 15)
addSoccerVar('SingleHalfTime', false)
-addSoccerVar('UseOffside',false)
+addSoccerVar('UseOffside', false)
+addSoccerVar('MaxTouchGroupSize', 2)
# auto ref parameters FCP 2010
addSoccerVar('NotStandingMaxTime',30)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
