Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'rockets' #249

Merged
merged 20 commits into from Dec 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0bd84bb
Remove ZeroEQ plugin, replaced by Rockets plugin for HTTP
Oct 3, 2017
3424757
Detection distance to simulation model is now configurable (#233)
favreau Oct 23, 2017
2d1c204
Introduce modified flag for Scene to reflect updates; fix #232 (#234)
tribal-tec Oct 23, 2017
b3abe53
Various cleanups in startup sequence, only use Lexis for network plugin
Oct 26, 2017
f16903a
Fixed Optix geometry (#237)
favreau Oct 31, 2017
d6aebc9
Allow use of OSPRay default renderers (#239)
favreau Nov 1, 2017
0f6ffd7
Add websockets support (#240)
tribal-tec Nov 7, 2017
13f993b
RocketsPlugin: Return errors as proper JSON
tribal-tec Nov 8, 2017
4cc1025
RocketsPlugin: websocket events are handled w/o "v1/" prefix
tribal-tec Nov 8, 2017
0e2af58
RocketsPlugin: add binary image streaming over websockets
tribal-tec Nov 8, 2017
abe08c1
RocketsPlugin: add broadcast of progress
tribal-tec Nov 8, 2017
b10dfc2
Fix double JSON encoding, bug from #240
tribal-tec Nov 10, 2017
2a172e8
Fixed bug in connectivity loader (#243)
favreau Nov 17, 2017
d17a2ff
Upgraded python example to latest API (#244)
favreau Nov 17, 2017
837bcd7
Removed circular dependency in Brayns library (#245)
favreau Nov 21, 2017
304bc3d
RocketsPlugin: re-broadcast changes to all other clients, send initia…
tribal-tec Nov 17, 2017
6cb8c32
Simulation renderer cleanup (#247)
favreau Nov 30, 2017
8c4cf2b
Fixed depth buffer in basic renderer (#248)
favreau Dec 4, 2017
b213b22
Merge branch 'rockets'
tribal-tec Dec 6, 2017
47d700f
Fix cppcheck wrt json.hpp
tribal-tec Dec 6, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 7 additions & 8 deletions .gitignore
@@ -1,18 +1,17 @@
./
Deflect/
FlatBuffers/
RESTBridge/
Servus/
ZeroBuf/
build/
ZeroEQ/
Brion/
Deflect/
FlatBuffers/
Lexis/
Lunchbox/
MVDTool/
httpxx/
vmmlib/
Pydoxine/
RESTBridge/
Rockets/
Servus/
vmmlib/
ZeroBuf/
CMakeFiles
.DS_Store
*~
Expand Down
19 changes: 8 additions & 11 deletions .gitsubprojects
@@ -1,28 +1,25 @@
# -*- mode: cmake -*-
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git f4b3706)
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git f36655b)

if(BRAYNS_NETWORKING_ENABLED)
git_subproject(Servus https://github.com/HBPVIS/Servus.git 2e9a23a)
git_subproject(ZeroBuf https://github.com/HBPVIS/ZeroBuf.git 6d403bc)
git_subproject(ZeroEQ https://github.com/HBPVis/ZeroEQ.git 1e66ee3)
endif()

if(BRAYNS_NETWORKING_ENABLED OR BRAYNS_DEFLECT_ENABLED)
git_subproject(Lexis https://github.com/HBPVis/Lexis.git a4e458a)
git_subproject(Lexis https://github.com/HBPVis/Lexis.git f84436c)
git_subproject(Rockets https://github.com/BlueBrain/Rockets.git e93e1e4)
git_subproject(ZeroBuf https://github.com/HBPVIS/ZeroBuf.git 96e793d)
endif()

# Streaming to display walls
if(BRAYNS_DEFLECT_ENABLED)
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 1a1fb97)
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git cc4c732)
endif()

# Data access
if(BRAYNS_BRION_ENABLED)
git_subproject(Brion https://github.com/BlueBrain/Brion.git af46c14)
git_subproject(Servus https://github.com/HBPVIS/Servus.git 2e9a23a)
git_subproject(Brion https://github.com/BlueBrain/Brion.git d265ed3)
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 41ac72b)
endif()

# Livre rendering engine
if(BRAYNS_LIVRE_ENABLED)
git_subproject(Livre https://github.com/BlueBrain/Livre.git 379c6fb)
git_subproject(Livre https://github.com/BlueBrain/Livre.git 1b341a6)
endif()
36 changes: 0 additions & 36 deletions CMake/clang.cmake

This file was deleted.

59 changes: 0 additions & 59 deletions CMake/gcc.cmake

This file was deleted.

59 changes: 0 additions & 59 deletions CMake/icc.cmake

This file was deleted.