Skip to content

Commit e2fbd2d

Browse files
Merge pull request #115 from rcsoccersim/develop
Official Release 18.0.0
2 parents 97ce96d + d0c5a37 commit e2fbd2d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1731
-533
lines changed

.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
defaults: &defaults
44
working_directory: /home/circleci/rcssserver
55
docker:
6-
- image: ubuntu:xenial
6+
- image: ubuntu-2004
77

88
jobs:
99
build:
@@ -16,10 +16,10 @@ jobs:
1616
command: apt-get update
1717
- run:
1818
name: Install dependencies
19-
command: apt-get install g++ build-essential libboost-all-dev bison flex -y
19+
command: apt-get install build-essential flex bison libboost-all-dev -y
2020
- run:
2121
name: Install autotools libraries
22-
command: apt-get install autoconf -y
22+
command: apt-get install autoconf automake libtool -y
2323
- run:
2424
name: Generate configure file
2525
command: |

CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cmake_minimum_required(VERSION 3.5.1)
22

3-
project(RCSSServer VERSION 17.0.1)
3+
project(RCSSServer VERSION 18.0.0)
44

5-
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD 17)
66
set(CMAKE_CXX_STANDARD_REQUIRED ON)
77

88
if(NOT CMAKE_BUILD_TYPE)
@@ -18,7 +18,8 @@ if(ZLIB_FOUND)
1818
endif()
1919
find_package(BISON REQUIRED)
2020
find_package(FLEX REQUIRED)
21-
find_package(Boost COMPONENTS system filesystem REQUIRED)
21+
#find_package(Boost COMPONENTS system filesystem REQUIRED)
22+
find_package(Boost COMPONENTS system REQUIRED)
2223

2324
include(GNUInstallDirs)
2425
include(CheckIncludeFileCXX)

ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2023-03-07 Hidehisa Akiyama <hidehisaakiyama@users.noreply.github.com>
2+
3+
* CMakeLists.txt:
4+
* NEWS:
5+
* configure.ac:
6+
- update a major version number. Official release 18.0.0
7+
- update to C++17.
8+
- introduce a new observation model.
9+
- change the version number of JSON-based monitor protocol.
10+
111
2022-04-03 Hidehisa Akiyama <hidehisaakiyama@users.noreply.github.com>
212

313
* CMakeLists.txt:

NEWS

+43
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
1+
[18.0.0]
2+
* Update to C++17.
3+
4+
* New command:
5+
- "(change_focus DIST_MOMENT DIR_MOMENT)"
6+
All version players can use this command. If the command is
7+
accepted, that player's focus point is moved according to the
8+
given parameters. Details are described below.
9+
10+
* Change the version number of JSON-based monitor protocol to -1.
11+
And, change the header line of JSON-based game log to "JSON". If
12+
the value of server::game_log_version is -1, the content of the
13+
recorded game log is a JSON array except for the header line.
14+
15+
* Introduce a new observation model.
16+
17+
When the players connect with version 18 or higher, the vision
18+
sensor automatically enters the synchronous mode. In addition,
19+
players with version 18 or higher receive a see message every
20+
cycle, regardless of their view width. Instead, the noise in the
21+
observed information varies with the view width. When the
22+
observation information is serialized, the quantize step parameter
23+
is multiplied by the noise term parameter, which depends on the
24+
view width.
25+
26+
The concept of focus points is introduced. The focus point
27+
represents a position inside a player's view angle, and can be up
28+
to 40.0 meters away from the player's position. The focus point
29+
affects the visual sensor noise model, with the noise of observed
30+
objects increasing as the distance between the focus point and
31+
the object increases.
32+
33+
The initial position of the focus point is the player's position,
34+
and if a player does not change the focus point position, the
35+
server visual noise model behaves as in server v17. However, a
36+
player can change the position of the focus point by sending a
37+
**change_focus** command. This command takes two parameters,
38+
*dist_moment* and *dir_moment*, and changes the position of the
39+
focus point relative to the player's neck angle.
40+
41+
See the user manual for more information on the new observation
42+
model.
43+
144
[17.0.1]
245
* Fix build problems caused by missing headers.
346

configure.ac

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# -*- Autoconf -*-
22
# Process this file with autoconf to produce a configure script.
33

4-
AC_PREREQ(2.61)
4+
AC_PREREQ([2.69])
55
LT_PREREQ([2.2])
6-
AC_INIT([RCSSServer],[17.0.1],[https://github.com/rcsoccersim/],[rcssserver])
6+
AC_INIT([RCSSServer],[18.0.0],[https://github.com/rcsoccersim/],[rcssserver])
77

88
#AM_INIT_AUTOMAKE([gnu 1.7.2 check-news dist-bzip2 dist-zip])
99
AM_INIT_AUTOMAKE([gnu 1.7.2 check-news foreign])
@@ -70,15 +70,12 @@ AC_STRUCT_TM
7070
AC_TYPE_UINT16_T
7171
AC_TYPE_UINT32_T
7272
AC_TYPE_UINT8_T
73+
AC_CHECK_TYPES([ptrdiff_t])
7374

7475
AC_CHECK_TYPES([socklen_t], [], [], [
7576
#include <sys/types.h>
7677
#include <sys/socket.h>
7778
])
78-
AC_CHECK_TYPES([size_t], [], [], [
79-
#include <sys/types.h>
80-
#include <sys/socket.h>
81-
])
8279

8380

8481
##################################################
@@ -108,7 +105,7 @@ AC_CHECK_FUNCS([memset], [], [
108105
exit 1
109106
])
110107
AC_CHECK_FUNCS([floor gethostbyname gettimeofday inet_ntoa memset mkdir pow rint])
111-
AC_CHECK_FUNCS([socket sqrt strdup strerror])
108+
AC_CHECK_FUNCS([select socket sqrt strdup strerror])
112109

113110
##################################################
114111
# check flex
@@ -191,15 +188,14 @@ AC_SUBST(LIBTOOL_DEPS)
191188
# check C++
192189
##################################################
193190

194-
AX_CXX_COMPILE_STDCXX_14(noext)
191+
AX_CXX_COMPILE_STDCXX_17(noext)
195192

196193
##################################################
197194
# check boost
198195
##################################################
199196

200197
AX_BOOST_BASE([1.32.0])
201198
AX_BOOST_SYSTEM
202-
AX_BOOST_FILESYSTEM
203199
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
204200
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
205201
#OLDLIBS="$LIBS"

m4/ax_boost_base.m4

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
# Test for the Boost C++ libraries of a particular version (or newer)
1212
#
1313
# If no path to the installed boost library is given the macro searchs
14-
# under /usr, /usr/local, /opt and /opt/local and evaluates the
15-
# $BOOST_ROOT environment variable. Further documentation is available at
16-
# <http://randspringer.de/boost/index.html>.
14+
# under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates
15+
# the $BOOST_ROOT environment variable. Further documentation is available
16+
# at <http://randspringer.de/boost/index.html>.
1717
#
1818
# This macro calls:
1919
#
@@ -33,7 +33,7 @@
3333
# and this notice are preserved. This file is offered as-is, without any
3434
# warranty.
3535

36-
#serial 49
36+
#serial 52
3737

3838
# example boost program (need to pass version)
3939
m4_define([_AX_BOOST_BASE_PROGRAM],
@@ -114,7 +114,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
114114
AS_CASE([${host_cpu}],
115115
[x86_64],[libsubdirs="lib64 libx32 lib lib64"],
116116
[mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
117-
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
117+
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k|loongarch64],[libsubdirs="lib64 lib lib64"],
118118
[libsubdirs="lib"]
119119
)
120120
@@ -128,7 +128,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
128128
)
129129
130130
dnl first we check the system location for boost libraries
131-
dnl this location ist chosen if boost libraries are installed with the --layout=system option
131+
dnl this location is chosen if boost libraries are installed with the --layout=system option
132132
dnl or if you install boost with RPM
133133
AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[
134134
AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"])
@@ -151,7 +151,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
151151
else
152152
search_libsubdirs="$multiarch_libsubdir $libsubdirs"
153153
fi
154-
for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
154+
for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew ; do
155155
if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then
156156
for libsubdir in $search_libsubdirs ; do
157157
if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
@@ -227,7 +227,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
227227
fi
228228
else
229229
if test "x$cross_compiling" != "xyes" ; then
230-
for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local ; do
230+
for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local /opt/homebrew ; do
231231
if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then
232232
for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do
233233
_version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`

m4/ax_boost_filesystem.m4

-118
This file was deleted.

0 commit comments

Comments
 (0)