Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use symlink for DS resources, add AM bandwidth

Browse source
This commit is contained in:
Stephen Birarda 2015-04-30 13:53:44 -07:00
parent e8ee9e4b3a
commit b50545f414
4 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake
View file

@ -21,13 +21,13 @@ macro(SYMLINK_OR_COPY_DIRECTORY_BESIDE_TARGET _SHOULD_SYMLINK _DIRECTORY _DESTIN
else () else ()
# remove the current directory # remove the current directory
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} PRE_BUILD TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E remove_directory $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION} COMMAND "${CMAKE_COMMAND}" -E remove_directory $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
) )
# copy the directory # copy the directory
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} PRE_BUILD TARGET ${TARGET_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${_DIRECTORY} COMMAND ${CMAKE_COMMAND} -E copy_directory ${_DIRECTORY}
$<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION} $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
) )

6
domain-server/CMakeLists.txt
View file

@ -1,7 +1,7 @@
set(TARGET_NAME domain-server) set(TARGET_NAME domain-server)
if (UPPER_CMAKE_BUILD_TYPE MATCHES DEBUG AND NOT WIN32) if (UPPER_CMAKE_BUILD_TYPE MATCHES DEBUG AND NOT WIN32)
set(_SHOULD_SYMLINK_RESOURCES FALSE) set(_SHOULD_SYMLINK_RESOURCES TRUE)
else () else ()
set(_SHOULD_SYMLINK_RESOURCES FALSE) set(_SHOULD_SYMLINK_RESOURCES FALSE)
endif () endif ()
@ -9,7 +9,9 @@ endif ()
# setup the project and link required Qt modules # setup the project and link required Qt modules
setup_hifi_project(Network) setup_hifi_project(Network)
# TODO: find a solution that will handle web file changes in resources on windows without a re-build.
# Currently the resources are only copied on post-build. If one is changed but the domain-server is not, they will
# not be re-copied. This is worked-around on OS X/UNIX by using a symlink.
symlink_or_copy_directory_beside_target(${_SHOULD_SYMLINK_RESOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/resources" "resources") symlink_or_copy_directory_beside_target(${_SHOULD_SYMLINK_RESOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/resources" "resources")
# link the shared hifi libraries # link the shared hifi libraries

15
domain-server/resources/describe-settings.json
View file

@ -486,5 +486,20 @@
"advanced": true "advanced": true
} }
] ]
},
{
"name": "avatar_mixer",
"label": "Avatar Mixer",
"assignment-types": [1],
"settings": [
{
"name": "node_bandwidth",
"label": "Per-Node Bandwidth",
"help": "Desired maximum send bandwidth (in Megabits per second) to each node",
"placeholder": "1.0",
"default": "1.0",
"advanced": true
}
]
} }
] ]

2
libraries/networking/src/JSONBreakableMarshal.cpp
View file

@ -154,7 +154,7 @@ QVariantMap JSONBreakableMarshal::fromStringList(const QStringList& stringList)
QString keypath = marshalString.left(equalityIndex); QString keypath = marshalString.left(equalityIndex);
// setup for array index checking // setup for array index checking
const QString ARRAY_INDEX_REGEX_STRING = "\[\\d+\\]"; const QString ARRAY_INDEX_REGEX_STRING = "^[\\d+]";
QRegExp arrayRegex(ARRAY_INDEX_REGEX_STRING); QRegExp arrayRegex(ARRAY_INDEX_REGEX_STRING);
// as long as we have a keypath we need to recurse downwards // as long as we have a keypath we need to recurse downwards