Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[23] trunk/rcssserver3d
|
From: <he...@us...> - 2009-01-20 16:13:49
|
Revision: 23
http://simspark.svn.sourceforge.net/simspark/?rev=23&view=rev
Author: hedayat
Date: 2009-01-20 16:13:20 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Some small fixes in running scripts
Adding rcssserver3d's installation directory to the list of resource locations (not very clean!)
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/configure.ac
trunk/rcssserver3d/rcssmonitor3d/Makefile.am
trunk/rcssserver3d/rcssmonitor3d/main.cpp
trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb
trunk/rcssserver3d/simspark/main.cpp
trunk/rcssserver3d/simspark/simspark.rb
trunk/rcssserver3d/windows/rcssserver3d_config.h
Property Changed:
----------------
trunk/rcssserver3d/
Property changes on: trunk/rcssserver3d
___________________________________________________________________
Modified: svn:ignore
- .project
.cproject
Makefile.in
rcssserver3d_config.h
rcssserver3d_config.h.in
configure
stamp-h1
aclocal.m4
autom4te.cache
config.status
.cdtconfigure.Build (GNU)
libtool
Makefile
+ .project
.cproject
Makefile.in
rcssserver3d_config.h
rcssserver3d_config.h.in
configure
stamp-h1
aclocal.m4
autom4te.cache
config.status
.cdtconfigure.Build (GNU)
libtool
Makefile
.settings
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-01-20 16:06:07 UTC (rev 22)
+++ trunk/rcssserver3d/ChangeLog 2009-01-20 16:13:20 UTC (rev 23)
@@ -1,3 +1,19 @@
+2009-01-20 Hedayat Vatankhah <he...@gr...>
+
+ * rcssmonitor3d/Makefile.am:
+ - added rpath
+
+ * rcssmonitor3d/rcssmonitor3d.rb:
+ - changed monitorspark.rb to rcssmonitor3d.rb
+
+ * rcssmonitor3d/main.cpp (MonitorSpark::InitApp):
+ * simspark/main.cpp (SimSpark::InitApp):
+ - adding rcss3d's installation directory to the list of resource locations.
+
+ * windows/rcssserver3d_config.h:
+ * configure.ac:
+ - added new define: RCSS_BUNDLE_PATH to store rcss3d's data directory.
+
2008-12-19 Hedayat Vatankhah <he...@gr...>
* plugin/soccer/kickeffector/kickeffector.cpp:
Modified: trunk/rcssserver3d/configure.ac
===================================================================
--- trunk/rcssserver3d/configure.ac 2009-01-20 16:06:07 UTC (rev 22)
+++ trunk/rcssserver3d/configure.ac 2009-01-20 16:13:20 UTC (rev 23)
@@ -40,6 +40,8 @@
AC_CHECK_HEADERS([backward/hash_map hash_map],break,
AC_MSG_NOTICE(['hash_map' will be substituted by 'map'. If you need hash_map install stlport]))
+AC_DEFINE_UNQUOTED(RCSS_BUNDLE_PATH,["$prefix/share/"PACKAGE_NAME],["Data dir"])
+
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_C_INLINE
Modified: trunk/rcssserver3d/rcssmonitor3d/Makefile.am
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/Makefile.am 2009-01-20 16:06:07 UTC (rev 22)
+++ trunk/rcssserver3d/rcssmonitor3d/Makefile.am 2009-01-20 16:13:20 UTC (rev 23)
@@ -12,9 +12,15 @@
@SPARK_CPPFLAGS@ @ZEITGEIST_CPPFLAGS@ \
@OXYGEN_CPPFLAGS@ @KEROSIN_CPPFLAGS@
+if NO_RPATH
AM_LDFLAGS = @SALT_LDFLAGS@ \
@SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \
@OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@
+else
+AM_LDFLAGS = -Wl,--rpath,$(DESTDIR)$(pkglibdir) \
+ @SALT_LDFLAGS@ @SPARK_LDFLAGS@ @ZEITGEIST_LDFLAGS@ \
+ @OXYGEN_LDFLAGS@ @KEROSIN_LDFLAGS@
+endif
rcssmonitor3d_SOURCES = \
main.cpp
Modified: trunk/rcssserver3d/rcssmonitor3d/main.cpp
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/main.cpp 2009-01-20 16:06:07 UTC (rev 22)
+++ trunk/rcssserver3d/rcssmonitor3d/main.cpp 2009-01-20 16:13:20 UTC (rev 23)
@@ -20,10 +20,16 @@
#include <spark/spark.h>
#include <zeitgeist/zeitgeist.h>
+#include <zeitgeist/fileserver/fileserver.h>
#include <oxygen/simulationserver/simulationserver.h>
#include <kerosin/renderserver/rendercontrol.h>
#include <kerosin/inputserver/inputcontrol.h>
+#ifdef HAVE_CONFIG_H
+#undef PACKAGE_NAME
+#include <rcssserver3d_config.h>
+#endif
+
using namespace spark;
using namespace kerosin;
using namespace oxygen;
@@ -93,6 +99,7 @@
bool MonitorSpark::InitApp(int argc, char** argv)
{
+ GetCore()->GetFileServer()->AddResourceLocation(RCSS_BUNDLE_PATH);
GetSimulationServer()->SetSimStep(0.02);
PrintGreeting();
@@ -115,7 +122,7 @@
GetScriptServer()->Eval(fileStr);
}
- GetScriptServer()->Run("monitorspark.rb");
+ GetScriptServer()->Run("rcssmonitor3d.rb");
// tell the inputControl node the loaction of our camera
shared_ptr<InputControl> inputCtr = GetInputControl();
Modified: trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb 2009-01-20 16:06:07 UTC (rev 22)
+++ trunk/rcssserver3d/rcssmonitor3d/rcssmonitor3d.rb 2009-01-20 16:13:20 UTC (rev 23)
@@ -1,5 +1,5 @@
#
-# monitorspark.rb
+# rcssmonitor3d.rb
#
sparkSetupRendering()
@@ -27,7 +27,7 @@
)
# setup default input bindings
-run "bindings.rb"
+run "scripts/bindings.rb"
# setup default materials common to all simulations
run "scripts/materials.rb"
Modified: trunk/rcssserver3d/simspark/main.cpp
===================================================================
--- trunk/rcssserver3d/simspark/main.cpp 2009-01-20 16:06:07 UTC (rev 22)
+++ trunk/rcssserver3d/simspark/main.cpp 2009-01-20 16:13:20 UTC (rev 23)
@@ -20,10 +20,16 @@
#include <spark/spark.h>
#include <zeitgeist/zeitgeist.h>
+#include <zeitgeist/fileserver/fileserver.h>
#include <oxygen/simulationserver/simulationserver.h>
#include <kerosin/renderserver/rendercontrol.h>
#include <kerosin/inputserver/inputcontrol.h>
+#ifdef HAVE_CONFIG_H
+#undef PACKAGE_NAME
+#include <rcssserver3d_config.h>
+#endif
+
using namespace spark;
using namespace kerosin;
using namespace oxygen;
@@ -88,6 +94,7 @@
bool SimSpark::InitApp(int argc, char** argv)
{
+ GetCore()->GetFileServer()->AddResourceLocation(RCSS_BUNDLE_PATH);
GetSimulationServer()->SetSimStep(0.02f);
PrintGreeting();
Modified: trunk/rcssserver3d/simspark/simspark.rb
===================================================================
--- trunk/rcssserver3d/simspark/simspark.rb 2009-01-20 16:06:07 UTC (rev 22)
+++ trunk/rcssserver3d/simspark/simspark.rb 2009-01-20 16:13:20 UTC (rev 23)
@@ -35,7 +35,7 @@
end
# setup default input bindings
-run "bindings.rb"
+run "scripts/bindings.rb"
# setup default materials common to all simulations
run "scripts/materials.rb"
Modified: trunk/rcssserver3d/windows/rcssserver3d_config.h
===================================================================
--- trunk/rcssserver3d/windows/rcssserver3d_config.h 2009-01-20 16:06:07 UTC (rev 22)
+++ trunk/rcssserver3d/windows/rcssserver3d_config.h 2009-01-20 16:13:20 UTC (rev 23)
@@ -4,6 +4,7 @@
#define HAVE_KEROSIN_KEROSIN_H 1
#define PACKAGE_NAME "rcssserver3d"
+#define RCSS_BUNDLE_PATH "."
#define HAVE_WINSOCK2_H 1
#define HAVE_SOCKET 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
