evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into voice

Browse Source
This commit is contained in:
Kae 2023-07-13 19:21:07 +10:00
commit 212de6b876
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/extern/fmt/core.h vendored
View File

@ -1671,8 +1671,7 @@ constexpr auto encode_types() -> unsigned long long {
template <typename Context, typename T> template <typename Context, typename T>
FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> { FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> {
auto&& arg = arg_mapper<Context>().map(FMT_FORWARD(val)); using arg_type = remove_cvref_t<decltype(arg_mapper<Context>().map(val))>;
using arg_type = remove_cvref_t<decltype(arg)>;
constexpr bool formattable_char = constexpr bool formattable_char =
!std::is_same<arg_type, unformattable_char>::value; !std::is_same<arg_type, unformattable_char>::value;
@ -1691,7 +1690,7 @@ FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value<Context> {
formattable, formattable,
"Cannot format an argument. To make type T formattable provide a " "Cannot format an argument. To make type T formattable provide a "
"formatter<T> specialization: https://fmt.dev/latest/api.html#udt"); "formatter<T> specialization: https://fmt.dev/latest/api.html#udt");
return {arg}; return {arg_mapper<Context>().map(val)};
} }
template <typename Context, typename T> template <typename Context, typename T>

7
source/server/main.cpp
View File

@ -47,6 +47,13 @@ int main(int argc, char** argv) {
{ {
Logger::info("Server Version {} ({}) Source ID: {} Protocol: {}", StarVersionString, StarArchitectureString, StarSourceIdentifierString, StarProtocolVersion); Logger::info("Server Version {} ({}) Source ID: {} Protocol: {}", StarVersionString, StarArchitectureString, StarSourceIdentifierString, StarProtocolVersion);
float updateRate = 1.0f / WorldTimestep;
if (auto jUpdateRate = configuration->get("updateRate")) {
updateRate = jUpdateRate.toFloat();
WorldTimestep = 1.0f / updateRate;
Logger::info("Configured tickrate is {:4.2f}hz", updateRate);
}
UniverseServerUPtr server = make_unique<UniverseServer>(root->toStoragePath("universe")); UniverseServerUPtr server = make_unique<UniverseServer>(root->toStoragePath("universe"));
server->setListeningTcp(true); server->setListeningTcp(true);
server->start(); server->start();