[simspark-svn] SF.net SVN: simspark:[79] trunk/rcssserver3d

[<he...@us...>]

Revision: 79
          http://simspark.svn.sourceforge.net/simspark/?rev=79&view=rev
Author:   hedayat
Date:     2009-07-30 17:21:13 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
do not link plugins with spark libraries. prevents segfault for  rcssmonitor3d on exit. 
do not setup materials when internal monitor doesn't run
disable internal monitor by default

Modified Paths:
--------------
    trunk/rcssserver3d/ChangeLog
    trunk/rcssserver3d/plugin/CMakeLists.txt
    trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
    trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
    trunk/rcssserver3d/simspark/naosoccersim.rb
    trunk/rcssserver3d/simspark/simspark.rb

Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog	2009-07-29 12:18:34 UTC (rev 78)
+++ trunk/rcssserver3d/ChangeLog	2009-07-30 17:21:13 UTC (rev 79)
@@ -1,3 +1,17 @@
+2009-07-30  Hedayat Vatankhah  <he...@gr...>
+
+	* plugin/CMakeLists.txt: 
+	* plugin/soccer/CMakeLists.txt: 
+	* plugin/soccermonitor/CMakeLists.txt:
+	- do not link plugins with spark libraries. prevents segfault for
+	  rcssmonitor3d on exit. 
+	
+	* simspark/naosoccersim.rb: 
+	- do not setup materials when internal monitor doesn't run
+	
+	* simspark/simspark.rb: 
+	- disable internal monitor by default
+
 2009-07-27  Hedayat Vatankhah  <he...@gr...>
 
 	* CMakeLists.txt: 

Modified: trunk/rcssserver3d/plugin/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/CMakeLists.txt	2009-07-29 12:18:34 UTC (rev 78)
+++ trunk/rcssserver3d/plugin/CMakeLists.txt	2009-07-30 17:21:13 UTC (rev 79)
@@ -1,2 +1,7 @@
+if (WIN32 OR APPLE)
+   set(spark_libs ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES} ${ZEITGEIST_LIBRARIES}
+    ${KEROSIN_LIBRARIES} ${RCSSNET3D_LIBRARY})
+endif (WIN32 OR APPLE)
+
 add_subdirectory(soccer)
 add_subdirectory(soccermonitor)

Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt	2009-07-29 12:18:34 UTC (rev 78)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt	2009-07-30 17:21:13 UTC (rev 79)
@@ -115,9 +115,7 @@
 
 add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
 
-target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
-   	${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
-    ${OPENGL_gl_LIBRARY} ${RCSSNET3D_LIBRARY})
+target_link_libraries(soccer ${spark_libs} ${OPENGL_gl_LIBRARY})
 
 if (NOT APPLE)
    set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)

Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt	2009-07-29 12:18:34 UTC (rev 78)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt	2009-07-30 17:21:13 UTC (rev 79)
@@ -25,9 +25,7 @@
 add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
    ${soccermonitor_LIB_HDRS})
 
-target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
-   	${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
-	${RCSSNET3D_LIBRARY})
+target_link_libraries(soccermonitor ${spark_libs})
 
 if (NOT APPLE)
    set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)

Modified: trunk/rcssserver3d/simspark/naosoccersim.rb
===================================================================
--- trunk/rcssserver3d/simspark/naosoccersim.rb	2009-07-29 12:18:34 UTC (rev 78)
+++ trunk/rcssserver3d/simspark/naosoccersim.rb	2009-07-30 17:21:13 UTC (rev 79)
@@ -4,13 +4,15 @@
 
 # setup soccer specific materials
 # run "scripts/rcs-materials.rb"
-run "scripts/rcs-materials-textures.rb"
+if ($enableInternalMonitor)
+    run "scripts/rcs-materials-textures.rb"
+    
+    material = sparkCreate('kerosin/Material2DTexture', $serverPath+'material/matGrass');
+    material.setDiffuse(1.0,1.0,1.0,1.0)
+    material.setAmbient(0.5,0.5,0.5,1.0)
+    material.setDiffuseTexture('textures/rcs-naofield.png')
+end
 
-material = sparkCreate('kerosin/Material2DTexture', $serverPath+'material/matGrass');
-material.setDiffuse(1.0,1.0,1.0,1.0)
-material.setAmbient(0.5,0.5,0.5,1.0)
-material.setDiffuseTexture('textures/rcs-naofield.png')
-
 importBundle "soccer"
 
 # soccer namespace

Modified: trunk/rcssserver3d/simspark/simspark.rb
===================================================================
--- trunk/rcssserver3d/simspark/simspark.rb	2009-07-29 12:18:34 UTC (rev 78)
+++ trunk/rcssserver3d/simspark/simspark.rb	2009-07-30 17:21:13 UTC (rev 79)
@@ -6,7 +6,7 @@
 $recordLogfile = false
 
 # toggle the internal monitor
-$enableInternalMonitor = true
+$enableInternalMonitor = false
 
 sparkSetupServer()
 if ($enableInternalMonitor)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.